[Refactoring] Use Reader interface everywhere, when possible. Platform class now is a Reader factory.

1 files changed, 13 insertions, 5 deletions

diff --git a/map/feature_vec_model.cpp b/map/feature_vec_model.cpp
index 8d2b93ac13..616ce07958 100644
--- a/map/feature_vec_model.cpp
+++ b/map/feature_vec_model.cpp
@@ -20,16 +20,24 @@ namespace model
 void FeaturesFetcher::InitClassificator()
 {
   Platform & p = GetPlatform();
-  classificator::Read(p.ReadPathForFile("drawing_rules.bin"),
-                      p.ReadPathForFile("classificator.txt"),
-                      p.ReadPathForFile("visibility.txt"));
+
+  try
+  {
+    classificator::Read(p.GetReader("drawing_rules.bin"),
+                        p.GetReader("classificator.txt"),
+                        p.GetReader("visibility.txt"));
+  }
+  catch (FileAbsentException const & e)
+  {
+      LOG(LERROR, ("Classificator not found ", e.what()));
+  }
 }
 
-void FeaturesFetcher::AddMap(string const & fName)
+void FeaturesFetcher::AddMap(ReaderT const & file)
 {
   try
   {
-    m_multiIndex.Add(fName);
+    m_multiIndex.Add(file);
   }
   catch (Reader::OpenException const & e)
   {