Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2016-03-31 17:15:08 +0300
committervng <viktor.govako@gmail.com>2016-04-05 18:37:17 +0300
commit9d52efd6538cc3be684329888a9490c3428f653e (patch)
tree3392a07bbefb1d4dd9a47e93057653d00b03b4a5 /indexer/classificator_loader.cpp
parent7c8eb0712e16dc63a60c43de8125715de3588cba (diff)
[tests] Set “Clear” style default for all unit tests.
Diffstat (limited to 'indexer/classificator_loader.cpp')
-rw-r--r--indexer/classificator_loader.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index 54acb5930d..242a299bdb 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -46,23 +46,9 @@ namespace classificator
Platform & p = GetPlatform();
- MapStyle const originMapStyle = GetStyleReader().GetCurrentStyle();
+ ReadCommon(p.GetReader("classificator.txt"), p.GetReader("types.txt"));
- for (size_t i = 0; i < MapStyleCount; ++i)
- {
- MapStyle const mapStyle = static_cast<MapStyle>(i);
- // 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"));
-
- drule::LoadRules();
- }
- }
-
- GetStyleReader().SetCurrentStyle(originMapStyle);
+ drule::LoadRules();
LOG(LDEBUG, ("Reading of classificator finished"));
}