Add additional types mapping (index <-> type) in classificator.

1 files changed, 12 insertions, 3 deletions

diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index 23a1b74a7c..8d1995b816 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -10,7 +10,10 @@
 
 namespace classificator
 {
-  void Read(file_t const & rules, file_t const & classificator, file_t const & visibility)
+  void Read(file_t const & rules,
+            file_t const & classificator,
+            file_t const & visibility,
+            file_t const & types)
   {
     LOG(LINFO, ("Reading drawing rules"));
     ReaderPtrStream rulesS(rules);
@@ -18,13 +21,19 @@ namespace classificator
 
     string buffer;
 
+    Classificator & c = classif();
+
     LOG(LINFO, ("Reading classificator"));
     classificator.ReadAsString(buffer);
-    classif().ReadClassificator(buffer);
+    c.ReadClassificator(buffer);
 
     LOG(LINFO, ("Reading visibility"));
     visibility.ReadAsString(buffer);
-    classif().ReadVisibility(buffer);
+    c.ReadVisibility(buffer);
+
+    LOG(LINFO, ("Reading types mapping"));
+    types.ReadAsString(buffer);
+    c.ReadTypesMapping(buffer);
 
     LOG(LINFO, ("Reading of classificator done"));
   }