From 6e71616f39007579275fb6f53c5752636a2e0985 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Thu, 14 Jan 2016 18:51:13 +0300
Subject: [PATCH] [styles] Update classificator loader

---
 indexer/classificator_loader.cpp | 12 ++++++++----
 indexer/map_style.cpp            |  2 ++
 2 files changed, 10 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);
diff --git a/indexer/map_style.cpp b/indexer/map_style.cpp
index ab6bd66525..05cd3ef5a3 100644
--- a/indexer/map_style.cpp
+++ b/indexer/map_style.cpp
@@ -12,6 +12,8 @@ string DebugPrint(MapStyle mapStyle)
     return "MapStyleDark";
   case MapStyleClear:
     return "MapStyleClear";
+  case MapStyleMerged:
+    return "MapStyleMerged";
 
   case MapStyleCount:
     break;