Added multiple versions of classificators and rule holders

1 files changed, 10 insertions, 2 deletions

diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 08dd783c5b..8b81b75b07 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -185,10 +185,18 @@ void RulesHolder::ResizeCaches(size_t s)
   ForEachRule(bind(&BaseRule::CheckCacheSize, _4, s));
 }
 
+RulesHolder & rules(MapStyle mapStyle)
+{
+  int const index = static_cast<int>(mapStyle);
+  ASSERT_GREATER_OR_EQUAL(index, 0, ());
+  ASSERT_LESS(index, MapStyleCount, ());
+  static RulesHolder h[MapStyleCount];
+  return h[index];
+}
+
 RulesHolder & rules()
 {
-  static RulesHolder holder;
-  return holder;
+  return rules(GetStyleReader().GetCurrentStyle());
 }
 
 namespace