diff options
author | Maksim Andrianov <maksimandrianov1@gmail.com> | 2019-11-15 14:01:23 +0300 |
---|---|---|
committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2019-12-04 16:18:41 +0300 |
commit | 295c66b91c9b9e8a75fac77a487cf2150d5ac09e (patch) | |
tree | 0ba0ad6066d59216e3d43c8c37e86688b553f812 /drape_frontend | |
parent | 281465d9f8920c2cb58d3302be552e4ecbae1a44 (diff) |
[generator] Added processing of objects with tag 'building:part' for complexes.
Diffstat (limited to 'drape_frontend')
-rw-r--r-- | drape_frontend/rule_drawer.cpp | 2 | ||||
-rw-r--r-- | drape_frontend/stylist.cpp | 7 | ||||
-rw-r--r-- | drape_frontend/stylist.hpp | 7 |
3 files changed, 2 insertions, 14 deletions
diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp index 8c66b2fd1a..5fc9016155 100644 --- a/drape_frontend/rule_drawer.cpp +++ b/drape_frontend/rule_drawer.cpp @@ -268,7 +268,7 @@ void RuleDrawer::ProcessAreaStyle(FeatureType & f, Stylist const & s, if (f.GetLayer() >= 0) { bool const hasParts = IsBuildingHasPartsChecker::Instance()(f); - bool const isPart = IsBuildingPartChecker::Instance()(f); + bool const isPart = ftypes::IsBuildingPartChecker::Instance()(f); // Looks like nonsense, but there are some osm objects with types // highway-path-bridge and building (sic!) at the same time (pedestrian crossing). diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp index 00d1d2d4a8..101c414d4a 100644 --- a/drape_frontend/stylist.cpp +++ b/drape_frontend/stylist.cpp @@ -166,11 +166,6 @@ IsBuildingHasPartsChecker::IsBuildingHasPartsChecker() m_types.push_back(classif().GetTypeByPath({"building", "has_parts"})); } -IsBuildingPartChecker::IsBuildingPartChecker() : BaseChecker(1 /* level */) -{ - m_types.push_back(classif().GetTypeByPath({"building:part"})); -} - IsHatchingTerritoryChecker::IsHatchingTerritoryChecker() { Classificator const & c = classif(); @@ -327,7 +322,7 @@ bool InitStylist(FeatureType & f, int8_t deviceLang, int const zoomLevel, bool b { feature::TypesHolder const types(f); - if (!buildings3d && IsBuildingPartChecker::Instance()(types) && + if (!buildings3d && ftypes::IsBuildingPartChecker::Instance()(types) && !ftypes::IsBuildingChecker::Instance()(types)) return false; diff --git a/drape_frontend/stylist.hpp b/drape_frontend/stylist.hpp index faebf33621..71b451f5ae 100644 --- a/drape_frontend/stylist.hpp +++ b/drape_frontend/stylist.hpp @@ -24,13 +24,6 @@ public: DECLARE_CHECKER_INSTANCE(IsBuildingHasPartsChecker); }; -class IsBuildingPartChecker : public ftypes::BaseChecker -{ - IsBuildingPartChecker(); -public: - DECLARE_CHECKER_INSTANCE(IsBuildingPartChecker); -}; - class IsHatchingTerritoryChecker : public ftypes::BaseChecker { IsHatchingTerritoryChecker(); |