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

[indexer_tool] Added merge code for boundaries-2

Browse source
This commit is contained in:
Alex Zolotarev 2011-03-17 18:53:36 +01:00 • committed by Alex Zolotarev
parent fd55847b4b
commit bc886c042d
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
indexer/indexer_tool/world_map_generator.hpp
View file

@ -120,13 +120,19 @@ public:
m_worldBucket.reset(new FeatureOutT(WORLD_FILE_NAME, featureOutInitData));
// fill vector with types that need to be merged
char const * arrMerge[][2] = { {"natural", "coastline"} };
static size_t const MAX_TYPES_IN_PATH = 3;
char const * arrMerge[][MAX_TYPES_IN_PATH] = { {"natural", "coastline", ""},
{"boundary", "administrative", "2"} };
for (size_t i = 0; i < ARRAY_SIZE(arrMerge); ++i)
{
vector<string> path(2);
path[0] = arrMerge[i][0];
path[1] = arrMerge[i][1];
vector<string> path;
for (size_t j = 0; j < MAX_TYPES_IN_PATH; ++j)
{
string const strType(arrMerge[i][j]);
if (!strType.empty())
path.push_back(strType);
}
m_MergeTypes.push_back(classif().GetTypeByPath(path));
ASSERT_NOT_EQUAL ( m_MergeTypes.back(), ftype::GetEmptyValue(), () );