diff options
| author | Constantin Shalnev <c.shalnev@corp.mail.ru> | 2015-08-28 11:50:27 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 03:02:59 +0300 |
| commit | ac88e25dd2a8c4d0516486e2785bbc0a3192bc1b (patch) | |
| tree | 72f2289101f099bb85b83605bcbddd83195a4a46 /indexer/map_style_reader.cpp | |
| parent | 4b8589ad5d431f973a72e40e2d7a3caa5e721291 (diff) | |
Code improvement: removed code dup
Diffstat (limited to 'indexer/map_style_reader.cpp')
| -rw-r--r-- | indexer/map_style_reader.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp index 75860eb5f5..72b3e485d5 100644 --- a/indexer/map_style_reader.cpp +++ b/indexer/map_style_reader.cpp @@ -14,22 +14,6 @@ namespace char const * const MAP_STYLE_KEY = "MapStyleKey"; -string GetDrawingRulesFile(MapStyle mapStyle) -{ - switch (mapStyle) - { - case MapStyleLight: - 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(); - } -} - string GetStyleSuffix(MapStyle mapStyle) { switch (mapStyle) @@ -63,7 +47,7 @@ MapStyle StyleReader::GetCurrentStyle() ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() { - string const rulesFile = GetDrawingRulesFile(GetCurrentStyle()); + string const rulesFile = string("drules_proto") + GetStyleSuffix(GetCurrentStyle()) + ".bin"; return GetPlatform().GetReader(rulesFile); } |