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

Temporary patch. Do not draw arrows on non-highway features.

Browse source
This commit is contained in:
vng 2013-11-23 02:57:02 +03:00 • committed by Alex Zolotarev
parent a1b16464be
commit d757fe1657
1 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
indexer/feature_visibility.cpp
View file

@ -138,6 +138,34 @@ namespace
};
}
namespace
{
class UselessCheckPatch
{
uint32_t m_oneway, m_highway;
public:
UselessCheckPatch(Classificator const & c)
{
vector<string> v;
v.push_back("oneway");
m_oneway = c.GetTypeByPath(v);
v.clear();
v.push_back("highway");
m_highway = c.GetTypeByPath(v);
}
bool IsHighway(uint32_t t) const
{
ftype::TruncValue(t, 1);
return (t == m_highway);
}
bool IsOneway(uint32_t t) const { return (t == m_oneway); }
};
}
pair<int, bool> GetDrawRule(FeatureBase const & f, int level,
drule::KeysT & keys, string & names)
{
@ -146,13 +174,28 @@ pair<int, bool> GetDrawRule(FeatureBase const & f, int level,
ASSERT ( keys.empty(), () );
Classificator const & c = classif();
static UselessCheckPatch patch(c);
bool hasHighway = false;
for (size_t i = 0; i < types.Size(); ++i)
if (patch.IsHighway(types[i]))
{
hasHighway = true;
break;
}
DrawRuleGetter doRules(level, types.GetGeoType(), keys
#ifdef DEBUG
, names
#endif
);
for (size_t i = 0; i < types.Size(); ++i)
{
if (!hasHighway && patch.IsOneway(types[i]))
continue;
(void)c.ProcessObjects(types[i], doRules);
}
return make_pair(types.GetGeoType(), types.Has(c.GetCoastType()));
}