Avoid overhead in classificator reading (read to string -> istringstream).

Add reading of binary proto drawing rules.

1 files changed, 9 insertions, 10 deletions

diff --git a/indexer/types_mapping.cpp b/indexer/types_mapping.cpp
index e25029d3a0..ed9a8382f7 100644
--- a/indexer/types_mapping.cpp
+++ b/indexer/types_mapping.cpp
@@ -5,26 +5,25 @@
 #include "../base/stl_add.hpp"
 
 
-void BaseTypeMapper::Load(string const & buffer)
+void BaseTypeMapper::Load(istream & s)
 {
-  istringstream ss(buffer);
   Classificator const & c = classif();
 
   string v;
   vector<string> path;
 
   uint32_t ind = 0;
-  while (true)
+  while (s.good())
   {
-    ss >> v;
+    s >> v;
 
-    if (ss.eof())
-      break;
+    if (!v.empty())
+    {
+      path.clear();
+      strings::Tokenize(v, "|", MakeBackInsertFunctor(path));
 
-    path.clear();
-    strings::Tokenize(v, "|", MakeBackInsertFunctor(path));
-
-    Add(ind++, c.GetTypeByPath(path));
+      Add(ind++, c.GetTypeByPath(path));
+    }
   }
 }