[platform] Fixed World/WorldCoasts lookup on non-Android platforms.

android/jni/com/mapswithme/maps/Framework.cpp

@@ -580,7 +580,7 @@ namespace android
       }
       try
       {
-        FilesContainerR cont(pl.GetCountryReader(localFile, TMapOptions::EMap));
+        FilesContainerR cont(platform::GetCountryReader(localFile, TMapOptions::EMap));
         if (!cont.IsExist(SEARCH_INDEX_FILE_TAG))
           out.push_back(countryFile.GetNameWithoutExt());
       }

indexer/index.cpp

@@ -1,13 +1,13 @@
 #include "indexer/index.hpp"
 
 #include "platform/platform.hpp"
+#include "platform/local_country_file_utils.hpp"
 
 #include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 
 #include "base/logging.hpp"
 
-
 using platform::CountryFile;
 using platform::LocalCountryFile;
 
@@ -16,8 +16,9 @@ using platform::LocalCountryFile;
 //////////////////////////////////////////////////////////////////////////////////
 
 MwmValue::MwmValue(LocalCountryFile const & localFile)
-    : m_cont(GetPlatform().GetCountryReader(localFile, TMapOptions::EMap)),
-      m_countryFile(localFile.GetCountryFile()), m_table(0)
+    : m_cont(platform::GetCountryReader(localFile, TMapOptions::EMap)),
+      m_countryFile(localFile.GetCountryFile()),
+      m_table(0)
 {
   m_factory.Load(m_cont);
 }

map/mwm_tests/mwm_foreach_test.cpp

@@ -1,7 +1,5 @@
 #include "testing/testing.hpp"
 
-#include "platform/platform.hpp"
-
 #include "map/feature_vec_model.hpp"
 
 #include "indexer/data_header.hpp"
@@ -10,6 +8,8 @@
 #include "indexer/feature_processor.hpp"
 #include "indexer/classificator.hpp"
 
+#include "platform/local_country_file_utils.hpp"
+
 #include "geometry/rect_intersect.hpp"
 #include "geometry/robust_orientation.hpp"
 
@@ -258,7 +258,7 @@ void RunTest(string const & countryFileName)
   vector<m2::RectD> rects;
   rects.push_back(src1.GetWorldRect());
 
-  ModelReaderPtr reader = GetPlatform().GetCountryReader(localFile, TMapOptions::EMap);
+  ModelReaderPtr reader = platform::GetCountryReader(localFile, TMapOptions::EMap);
 
   while (!rects.empty())
   {

platform/local_country_file.hpp

@@ -10,6 +10,18 @@ namespace platform
 {
 // This class represents a path to disk files corresponding to some
 // country region.
+//
+// This class also wraps World.mwm and WorldCoasts.mwm
+// files from resource bundle, when they can't be found in a data
+// directory. In this exceptional case, directory will be empty and
+// SyncWithDisk()/DeleteFromDisk()/GetPath()/GetSize() will return
+// incorrect results.
+//
+// TODO (@gorshenin): fix this hack somehow
+// (https://trello.com/c/qcveFw3M/27-world-worldcoasts-mwm-localcountryfile)
+//
+// In any case, when you're going to read a file LocalCountryFile points to,
+// use GetCountryReader().
 class LocalCountryFile
 {
 public:
@@ -69,6 +81,7 @@ public:
 private:
   friend string DebugPrint(LocalCountryFile const &);
   friend void UnitTest_LocalCountryFile_DirectoryLookup();
+  friend void FindAllLocalMaps(vector<LocalCountryFile> & localFiles);
 
   string m_directory;
   CountryFile m_countryFile;

platform/local_country_file_utils.cpp

@@ -4,6 +4,7 @@
 
 #include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
+#include "coding/reader.hpp"
 
 #include "base/string_utils.hpp"
 #include "base/logging.hpp"
@@ -13,7 +14,6 @@
 #include "std/sstream.hpp"
 #include "std/unique_ptr.hpp"
 
-
 namespace platform
 {
 namespace
@@ -58,6 +58,15 @@ bool MkDirChecked(string const & directory)
       return false;
   }
 }
+
+string GetSpecialFilesSearchScope()
+{
+#if defined(OMIM_OS_ANDROID)
+  return "er";
+#else
+  return "r";
+#endif  // defined(OMIM_OS_ANDROID)
+}
 }  // namespace
 
 void CleanupMapsDirectory()
@@ -162,11 +171,12 @@ void FindAllLocalMaps(vector<LocalCountryFile> & localFiles)
 
     try
     {
-      unique_ptr<ModelReader> guard(platform.GetReader(file + DATA_FILE_EXTENSION, "er"));
+      unique_ptr<ModelReader> guard(platform.GetReader(file + DATA_FILE_EXTENSION, GetSpecialFilesSearchScope()));
       UNUSED_VALUE(guard);
 
       // Assume that empty path means the resource file.
       LocalCountryFile worldFile(string(), CountryFile(file), 0 /* version */);
+      worldFile.m_files = TMapOptions::EMap;
       if (i != localFiles.end())
       {
         // Always use resource World files instead of local on disk.
@@ -212,6 +222,15 @@ shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(CountryFile const & cou
   return make_shared<LocalCountryFile>(directory, countryFile, version);
 }
 
+ModelReader * GetCountryReader(platform::LocalCountryFile const & file, TMapOptions options)
+{
+  Platform & platform = GetPlatform();
+  // See LocalCountryFile comment for explanation.
+  if (file.GetDirectory().empty())
+    return platform.GetReader(file.GetCountryName() + DATA_FILE_EXTENSION, GetSpecialFilesSearchScope());
+  return platform.GetReader(file.GetPath(options), "f");
+}
+
 // static
 bool CountryIndexes::PreparePlaceOnDisk(LocalCountryFile const & localFile)
 {

platform/local_country_file_utils.hpp

@@ -7,6 +7,8 @@
 #include "std/utility.hpp"
 #include "std/vector.hpp"
 
+class ModelReader;
+
 namespace platform
 {
 // Removes partially downloaded maps, empty directories and old
@@ -46,6 +48,9 @@ bool ParseVersion(string const & s, int64_t & version);
 // directory with name equal to decimal representation of version.
 shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(CountryFile const & countryFile,
                                                          int64_t version);
+
+ModelReader * GetCountryReader(LocalCountryFile const & file, TMapOptions options);
+
 // An API for managing country indexes.
 class CountryIndexes
 {

platform/platform.cpp

@@ -145,12 +145,3 @@ void Platform::SetResourceDir(string const & path)
 {
   m_resourcesDir = my::AddSlashIfNeeded(path);
 }
-
-ModelReader * Platform::GetCountryReader(platform::LocalCountryFile const & file,
-                                         TMapOptions options) const
-{
-  if (file.GetDirectory().empty())
-    return GetReader(file.GetCountryName() + DATA_FILE_EXTENSION, "er");
-  else
-    return GetReader(file.GetPath(options), "f");
-}

platform/platform.hpp

@@ -120,9 +120,6 @@ public:
   /// @return full path to file in the settings directory
   string SettingsPathForFile(string const & file) const { return SettingsDir() + file; }
 
-  ModelReader * GetCountryReader(platform::LocalCountryFile const & file,
-                                 TMapOptions options) const;
-
   /// @return reader for file decriptor.
   /// @throws FileAbsentException
   /// @param[in] file name or full path which we want to read, don't forget to free memory or wrap it to ReaderPtr