Added multiple versions of classificators and rule holders

1 files changed, 11 insertions, 2 deletions

diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index 8f4ad4dc77..dffebd5610 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -1,5 +1,6 @@
 #include "indexer/classificator.hpp"
 #include "indexer/tree_structure.hpp"
+#include "indexer/map_style_reader.hpp"
 
 #include "base/macros.hpp"
 #include "base/logging.hpp"
@@ -119,10 +120,18 @@ void ClassifObject::ConcatChildNames(string & s) const
 // Classificator implementation
 /////////////////////////////////////////////////////////////////////////////////////////
 
+Classificator & classif(MapStyle mapStyle)
+{
+  int const index = static_cast<int>(mapStyle);
+  ASSERT_GREATER_OR_EQUAL(index, 0, ());
+  ASSERT_LESS(index, MapStyleCount, ());
+  static Classificator c[MapStyleCount];
+  return c[index];
+}
+
 Classificator & classif()
 {
-  static Classificator c;
-  return c;
+  return classif(GetStyleReader().GetCurrentStyle());
 }
 
 namespace ftype