Better classificator loading. File names are incapsulated now.

generator/generator_tests/osm_type_test.cpp

@@ -7,8 +7,6 @@
 #include "../../indexer/classificator.hpp"
 #include "../../indexer/classificator_loader.hpp"
 
-#include "../../platform/platform.hpp"
-
 
 namespace
 {
@@ -35,11 +33,7 @@ namespace
 
 UNIT_TEST(OsmType_SkipDummy)
 {
-  Platform & p = GetPlatform();
-  classificator::Read(p.GetReader("drawing_rules.bin"),
-                      p.GetReader("classificator.txt"),
-                      p.GetReader("visibility.txt"),
-                      p.GetReader("types.txt"));
+  classificator::Load();
 
   char const * arr[][2] = {
     { "abutters", "residential" },

generator/generator_tool/generator_tool.cpp

@@ -98,16 +98,16 @@ int main(int argc, char ** argv)
   {
     //classificator::GenerateAndWrite(path);
 
-    classificator::Read(pl.GetReader("drawing_rules.bin"),
-                        pl.GetReader("classificator.txt"),
-                        pl.GetReader("visibility.txt"),
-                        pl.GetReader("types.txt"));
+    /// This is temporary code for rules dumping.
+    //@{
+    classificator::Load();
 
     string buffer;
     drule::ConvertToProtocolBuffers(buffer);
 
     FileWriter w(path + "drules_proto.txt");
     w.Write(buffer.c_str(), buffer.size());
+    //@}
   }
 
   // Generating intermediate files
@@ -126,10 +126,7 @@ int main(int argc, char ** argv)
       FLAGS_generate_index || FLAGS_generate_search_index ||
       FLAGS_calc_statistics || FLAGS_dump_types || FLAGS_dump_prefixes)
   {
-    classificator::Read(pl.GetReader("drawing_rules.bin"),
-                        pl.GetReader("classificator.txt"),
-                        pl.GetReader("visibility.txt"),
-                        pl.GetReader("types.txt"));
+    classificator::Load();
     classificator::PrepareForFeatureGeneration();
   }
 

indexer/classificator_loader.cpp

@@ -2,6 +2,8 @@
 #include "classificator.hpp"
 #include "drawing_rules.hpp"
 
+#include "../../platform/platform.hpp"
+
 #include "../coding/file_reader_stream.hpp"
 #include "../coding/file_reader.hpp"
 
@@ -45,4 +47,14 @@ namespace classificator
     ReaderType(new FileReader(fPath)).ReadAsString(buffer);
     classif().ReadVisibility(buffer);
   }
+
+  void Load()
+  {
+    Platform & p = GetPlatform();
+
+    Read(p.GetReader("drawing_rules.bin"),
+         p.GetReader("classificator.txt"),
+         p.GetReader("visibility.txt"),
+         p.GetReader("types.txt"));
+  }
 }

indexer/classificator_loader.hpp

@@ -14,4 +14,6 @@ namespace classificator
             ReaderType const & visibility,
             ReaderType const & types);
   void ReadVisibility(string const & fPath);
+
+  void Load();
 }

indexer/indexer_tests/categories_test.cpp

@@ -5,12 +5,11 @@
 #include "../../indexer/classificator.hpp"
 #include "../../indexer/classificator_loader.hpp"
 
-#include "../../platform/platform.hpp"
-
 #include "../../coding/multilang_utf8_string.hpp"
 
 #include "../../std/sstream.hpp"
 
+
 char const * TEST_STRING =  "amenity-bench\n"
                             "en:1bench|sit down|to sit\n"
                             "de:0bank|auf die strafbank schicken\n"
@@ -69,11 +68,8 @@ struct Checker
 
 UNIT_TEST(LoadCategories)
 {
-  Platform & p = GetPlatform();
-  classificator::Read(p.GetReader("drawing_rules.bin"),
-                      p.GetReader("classificator.txt"),
-                      p.GetReader("visibility.txt"),
-                      p.GetReader("types.txt"));
+  classificator::Load();
+
   CategoriesHolder h;
   string buffer = TEST_STRING;
   TEST_GREATER(h.LoadFromStream(buffer), 0, ());

indexer/indexer_tests/index_builder_test.cpp

@@ -18,10 +18,7 @@
 UNIT_TEST(BuildIndexTest)
 {
   Platform & p = GetPlatform();
-  classificator::Read(p.GetReader("drawing_rules.bin"),
-                      p.GetReader("classificator.txt"),
-                      p.GetReader("visibility.txt"),
-                      p.GetReader("types.txt"));
+  classificator::Load();
 
   FilesContainerR originalContainer(p.GetReader("minsk-pass" DATA_FILE_EXTENSION));
 

map/benchmark_tool/main.cpp

@@ -18,11 +18,7 @@ DEFINE_bool(print_scales, false, "Print geometry scales for MWM and exit");
 
 int main(int argc, char ** argv)
 {
-  Platform & pl = GetPlatform();
-  classificator::Read(pl.GetReader("drawing_rules.bin"),
-                      pl.GetReader("classificator.txt"),
-                      pl.GetReader("visibility.txt"),
-                      pl.GetReader("types.txt"));
+  classificator::Load();
 
   google::SetUsageMessage("MWM benchmarking tool");
   if (argc < 2)
@@ -36,7 +32,7 @@ int main(int argc, char ** argv)
   if (FLAGS_print_scales)
   {
     feature::DataHeader h;
-    LoadMapHeader(pl.GetReader(FLAGS_input), h);
+    LoadMapHeader(GetPlatform().GetReader(FLAGS_input), h);
 
     cout << "Scales with geometry: ";
     for (size_t i = 0; i < h.GetScalesCount(); ++i)

map/feature_vec_model.cpp

@@ -18,14 +18,9 @@ namespace model
 
 void FeaturesFetcher::InitClassificator()
 {
-  Platform & p = GetPlatform();
-
   try
   {
-    classificator::Read(p.GetReader("drawing_rules.bin"),
-                        p.GetReader("classificator.txt"),
-                        p.GetReader("visibility.txt"),
-                        p.GetReader("types.txt"));
+    classificator::Load();
   }
   catch (FileAbsentException const & e)
   {