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

Fix bug with proto rules generation (I forgot about pathtext rule).

Browse source
This commit is contained in:
vng 2011-11-16 07:18:45 +03:00 • committed by Alex Zolotarev
parent ad7b270a85
commit aa46411283
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
indexer/classificator.cpp
View file

@ -292,7 +292,11 @@ namespace
{
static const int visible[3][drule::count_of_rules] = {
{0, 0, 1, 1, 1, 0, 0}, // fpoint
#ifdef USE_PROTO_STYLES
{1, 0, 0, 1, 0, 0, 0}, // fline
#else
{1, 0, 0, 0, 0, 1, 0}, // fline
#endif
{1, 1, 1, 1, 0, 0, 0} // farea
};
@ -412,7 +416,11 @@ bool ClassifObject::IsDrawableLike(FeatureGeoType ft) const
static const int visible[3][drule::count_of_rules] = {
{0, 0, 1, 1, 1, 0, 0}, // fpoint
#ifdef USE_PROTO_STYLES
{1, 0, 0, 1, 0, 0, 0}, // fline
#else
{1, 0, 0, 0, 0, 1, 0}, // fline
#endif
{0, 1, 0, 0, 0, 0, 0} // farea (!!! key difference with GetSuitable !!!)
};

3
indexer/drawing_rules.cpp
View file

@ -1202,7 +1202,7 @@ namespace
for (size_t i = 0; i < keys.size(); ++i)
{
// skip unnecessary trash
if (keys[i].m_type > circle)
if (keys[i].m_type == waymarker)
continue;
if (pDE == 0 || pDE->scale() != keys[i].m_scale)
@ -1227,6 +1227,7 @@ namespace
Convert(pRule, keys[i].m_priority, pDE->mutable_symbol());
break;
case caption:
case pathtext:
Convert(pRule, keys[i].m_priority, pDE->mutable_caption());
break;
case circle: