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

Add reading of binary proto drawing rules.

1 files changed, 20 insertions, 0 deletions

diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 6d6b29b43e..684b8b8be7 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -273,6 +273,26 @@ void RulesHolder::LoadFromTextProto(string const & buffer)
 
   DoSetIndex doSet(*this);
   google::protobuf::TextFormat::ParseFromString(buffer, &doSet.m_cont);
+
+  classif().GetMutableRoot()->ForEachObject(bind<void>(ref(doSet), _1));
+}
+
+void RulesHolder::SaveToBinaryProto(string const & buffer, ostream & s)
+{
+  ContainerProto cont;
+  google::protobuf::TextFormat::ParseFromString(buffer, &cont);
+
+  CHECK ( cont.SerializeToOstream(&s), ("Error in proto saving!") );
+}
+
+void RulesHolder::LoadFromBinaryProto(istream & s)
+{
+  Clean();
+
+  DoSetIndex doSet(*this);
+
+  CHECK ( doSet.m_cont.ParseFromIstream(&s), ("Error in proto loading!") );
+
   classif().GetMutableRoot()->ForEachObject(bind<void>(ref(doSet), _1));
 }