gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Support dynamic scales in mwm header.

Browse source
This commit is contained in:
vng 2011-10-15 20:21:08 +03:00 • committed by Alex Zolotarev
parent 7213aade43
commit da53c6195b
7 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/feature_sorter.cpp
View file

@ -80,8 +80,6 @@ namespace
namespace feature
{
typedef array<uint8_t, 4> scales_t;
class FeaturesCollector2 : public FeaturesCollector
{
FilesContainerW m_writer;

17
indexer/data_header.cpp
View file

@ -16,8 +16,9 @@
namespace feature
{
serial::CodingParams DataHeader::GetCodingParams(int scaleIndex) const
{
return serial::CodingParams(m_codingParams.GetCoordBits() - (m_scales[3] - m_scales[scaleIndex]) / 2,
{
return serial::CodingParams(m_codingParams.GetCoordBits() -
(m_scales.back() - m_scales[scaleIndex]) / 2,
m_codingParams.GetBasePointUint64());
}
@ -31,12 +32,6 @@ namespace feature
m_bounds = RectToInt64(r, m_codingParams.GetCoordBits());
}
void DataHeader::SetScales(int * arr)
{
for (size_t i = 0; i < m_scales.size(); ++i)
m_scales[i] = static_cast<uint8_t>(arr[i]);
}
pair<int, int> DataHeader::GetScaleRange() const
{
using namespace scales;
@ -64,6 +59,7 @@ namespace feature
WriteVarInt(w, m_bounds.first);
WriteVarInt(w, m_bounds.second);
WriteVarUint(w, m_scales.size());
w.Write(m_scales.data(), m_scales.size());
WriteVarInt(w, static_cast<int32_t>(m_type));
@ -77,7 +73,9 @@ namespace feature
m_bounds.first = ReadVarInt<int64_t>(src);
m_bounds.second = ReadVarInt<int64_t>(src);
src.Read(m_scales.data(), m_scales.size());
uint32_t const count = ReadVarUint<uint32_t>(src);
m_scales.resize(count);
src.Read(m_scales.data(), count);
m_type = static_cast<MapType>(ReadVarInt<int32_t>(src));
@ -93,6 +91,7 @@ namespace feature
m_bounds.first = ReadVarInt<int64_t>(src) + base;
m_bounds.second = ReadVarInt<int64_t>(src) + base;
m_scales.resize(4);
src.Read(m_scales.data(), m_scales.size());
m_ver = v1;

14
indexer/data_header.hpp
View file

@ -4,7 +4,7 @@
#include "../geometry/rect2d.hpp"
#include "../std/array.hpp"
#include "../base/buffer_vector.hpp"
class ModelReaderPtr;
@ -14,11 +14,15 @@ namespace feature
{
class DataHeader
{
public:
static const size_t MAX_SCALES_COUNT = 4;
private:
serial::CodingParams m_codingParams;
pair<int64_t, int64_t> m_bounds;
array<uint8_t, 4> m_scales;
buffer_vector<uint8_t, MAX_SCALES_COUNT> m_scales;
public:
@ -35,7 +39,11 @@ namespace feature
m2::RectD const GetBounds() const;
void SetBounds(m2::RectD const & r);
void SetScales(int * arr);
template <size_t N>
void SetScales(int const (&arr)[N])
{
m_scales.assign(arr, arr + N);
}
inline size_t GetScalesCount() const { return m_scales.size(); }
inline int GetScale(int i) const { return static_cast<int>(m_scales[i]); }

6
indexer/feature_impl.hpp
View file

@ -5,8 +5,8 @@
namespace feature
{
static int g_arrWorldScales[] = { 2, 5, 7, 9 }; // 9 = scales::GetUpperWorldScale()
static int g_arrCountryScales[] = { 10, 12, 14, 17 }; // 17 = scales::GetUpperScale()
static int g_arrWorldScales[] = { 5, 7, 9 }; // 9 = scales::GetUpperWorldScale()
static int g_arrCountryScales[] = { 12, 15, 17 }; // 17 = scales::GetUpperScale()
inline string GetTagForIndex(char const * prefix, int ind)
{
@ -14,7 +14,7 @@ namespace feature
str.reserve(strlen(prefix) + 1);
str = prefix;
static char arrChar[] = { '0', '1', '2', '3' };
static char arrChar[] = { '0', '1', '2' };
STATIC_ASSERT ( ARRAY_SIZE(arrChar) == ARRAY_SIZE(g_arrWorldScales) );
STATIC_ASSERT ( ARRAY_SIZE(arrChar) == ARRAY_SIZE(g_arrCountryScales) );
ASSERT ( ind >= 0 && ind < ARRAY_SIZE(arrChar), (ind) );

10
indexer/feature_loader.cpp
View file

@ -266,18 +266,14 @@ namespace
void LoaderCurrent::ReadOffsets(ArrayByteSource & src, uint8_t mask, offsets_t & offsets) const
{
ASSERT ( offsets.empty(), () );
ASSERT_GREATER ( mask, 0, () );
int index = 0;
while (mask > 0)
{
ASSERT_LESS ( index, m_Info.GetScalesCount(), () );
offsets[index++] = (mask & 0x01) ? ReadVarUint<uint32_t>(src) : kInvalidOffset;
offsets.push_back((mask & 0x01) ? ReadVarUint<uint32_t>(src) : kInvalidOffset);
mask = mask >> 1;
}
while (index < offsets.size())
offsets[index++] = kInvalidOffset;
}
int LoaderCurrent::GetScaleIndex(int scale) const
@ -340,7 +336,7 @@ int LoaderCurrent::GetScaleIndex(int scale, offsets_t const & offsets) const
return ind;
else
{
CHECK ( false, ("Feature should have any geometry ...") );
ASSERT ( false, ("Feature should have any geometry ...") );
return -1;
}
}

2
indexer/feature_loader_base.hpp
View file

@ -93,7 +93,7 @@ namespace feature
uint32_t m_ptsSimpMask;
typedef array<uint32_t, 4> offsets_t; // should be synchronized with ARRAY_SIZE(g_arrScales)
typedef buffer_vector<uint32_t, DataHeader::MAX_SCALES_COUNT> offsets_t;
offsets_t m_ptsOffsets, m_trgOffsets;
};

5
indexer/old/feature_loader_101.cpp
View file

@ -359,13 +359,12 @@ uint32_t LoaderImpl::ParseTriangles(int scale)
void LoaderImpl::ReadOffsets(ArrayByteSource & src, uint8_t mask, offsets_t & offsets) const
{
ASSERT ( offsets.empty(), () );
ASSERT_GREATER ( mask, 0, () );
int index = 0;
while (mask > 0)
{
ASSERT_LESS ( index, m_Info.GetScalesCount(), () );
offsets[index++] = (mask & 0x01) ? ReadVarUint<uint32_t>(src) : kInvalidOffset;
offsets.push_back((mask & 0x01) ? ReadVarUint<uint32_t>(src) : kInvalidOffset);
mask = mask >> 1;
}
}