diff --git a/indexer/map_style.hpp b/indexer/map_style.hpp index fb3ecd821b..72131bcaa0 100644 --- a/indexer/map_style.hpp +++ b/indexer/map_style.hpp @@ -3,6 +3,7 @@ enum MapStyle { MapStyleLight = 0, - MapStyleDark = 1 + MapStyleDark = 1, + MapStyleClear = 2 // Add new map style here }; diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp index f3972d6c06..75860eb5f5 100644 --- a/indexer/map_style_reader.cpp +++ b/indexer/map_style_reader.cpp @@ -22,6 +22,8 @@ string GetDrawingRulesFile(MapStyle mapStyle) return "drules_proto.bin"; case MapStyleDark: return "drules_proto_dark.bin"; + case MapStyleClear: + return "drules_proto_clear.bin"; default: LOG(LWARNING, ("Unknown map style", mapStyle)); return string(); @@ -36,6 +38,8 @@ string GetStyleSuffix(MapStyle mapStyle) return ""; case MapStyleDark: return "_dark"; + case MapStyleClear: + return "_clear"; default: LOG(LWARNING, ("Unknown map style", mapStyle)); return string(); diff --git a/map/framework.cpp b/map/framework.cpp index ce9a9f1476..7575d2314d 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -30,7 +30,6 @@ #include "indexer/categories_holder.hpp" #include "indexer/classificator_loader.hpp" -#include "indexer/drawing_rules.hpp" #include "indexer/feature.hpp" #include "indexer/map_style_reader.hpp" #include "indexer/scales.hpp" @@ -1605,7 +1604,7 @@ void Framework::CreateDrapeEngine(dp::RefPointer contextF void Framework::SetMapStyle(MapStyle mapStyle) { GetStyleReader().SetCurrentStyle(mapStyle); - drule::LoadRules(); + classificator::Load(); } MapStyle Framework::GetMapStyle() const