diff options
author | Ilya Zverev <zverik@textual.ru> | 2016-01-14 18:51:13 +0300 |
---|---|---|
committer | Ilya Zverev <zverik@textual.ru> | 2016-01-19 12:17:18 +0300 |
commit | 6e71616f39007579275fb6f53c5752636a2e0985 (patch) | |
tree | b94ff7ea7d0df04f20cd2b4f2158d5b19939689e /indexer/classificator_loader.cpp | |
parent | 19ba8eb778e36cf88e1154600d197ae6216896fc (diff) |
[styles] Update classificator loader
Diffstat (limited to 'indexer/classificator_loader.cpp')
-rw-r--r-- | indexer/classificator_loader.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp index ef9d8fe717..6387be4d00 100644 --- a/indexer/classificator_loader.cpp +++ b/indexer/classificator_loader.cpp @@ -51,12 +51,16 @@ namespace classificator for (size_t i = 0; i < MapStyleCount; ++i) { MapStyle const mapStyle = static_cast<MapStyle>(i); - GetStyleReader().SetCurrentStyle(mapStyle); + // Read the merged style only if it was requested. + if (mapStyle != MapStyleMerged || originMapStyle == MapStyleMerged) + { + GetStyleReader().SetCurrentStyle(mapStyle); - ReadCommon(p.GetReader("classificator.txt"), - p.GetReader("types.txt")); + ReadCommon(p.GetReader("classificator.txt"), + p.GetReader("types.txt")); - drule::LoadRules(); + drule::LoadRules(); + } } GetStyleReader().SetCurrentStyle(originMapStyle); |