[new downloader] Moving new developed map downloader functionality to new map downloader branch.

1 files changed, 26 insertions, 10 deletions

diff --git a/platform/country_file.cpp b/platform/country_file.cpp
index 41ace2a248..f2de49ba75 100644
--- a/platform/country_file.cpp
+++ b/platform/country_file.cpp
@@ -1,30 +1,39 @@
 #include "platform/country_file.hpp"
+#include "platform/mwm_version.hpp"
 
 #include "defines.hpp"
+
 #include "base/assert.hpp"
+
 #include "std/sstream.hpp"
 
-namespace platform
+namespace
 {
-CountryFile::CountryFile() : m_mapSize(0), m_routingSize(0) {}
-
-CountryFile::CountryFile(string const & name) : m_name(name), m_mapSize(0), m_routingSize(0) {}
-
-string const & CountryFile::GetNameWithoutExt() const { return m_name; }
-
-string CountryFile::GetNameWithExt(MapOptions file) const
+/// \returns file name (m_name) with extension dependent on the file param.
+/// The extension could be .mwm.routing or just .mwm.
+/// The method is used for old (two components) mwm support.
+string GetNameWithExt(string const & countryFile, MapOptions file)
 {
   switch (file)
   {
     case MapOptions::Map:
-      return m_name + DATA_FILE_EXTENSION;
+      return countryFile + DATA_FILE_EXTENSION;
     case MapOptions::CarRouting:
-      return m_name + DATA_FILE_EXTENSION + ROUTING_FILE_EXTENSION;
+      return countryFile + DATA_FILE_EXTENSION + ROUTING_FILE_EXTENSION;
     default:
       ASSERT(false, ("Can't get name for:", file));
       return string();
   }
 }
+} //  namespace
+
+namespace platform
+{
+CountryFile::CountryFile() : m_mapSize(0), m_routingSize(0) {}
+
+CountryFile::CountryFile(string const & name) : m_name(name), m_mapSize(0), m_routingSize(0) {}
+
+string const & CountryFile::GetName() const { return m_name; }
 
 void CountryFile::SetRemoteSizes(uint32_t mapSize, uint32_t routingSize)
 {
@@ -42,6 +51,13 @@ uint32_t CountryFile::GetRemoteSize(MapOptions filesMask) const
   return size;
 }
 
+
+string GetFileName(string const & countryFile, MapOptions opt, int64_t version)
+{
+  return version::IsSingleMwm(version) ? GetNameWithExt(countryFile, MapOptions::Map)
+                                       : GetNameWithExt(countryFile, opt);
+}
+
 string DebugPrint(CountryFile const & file)
 {
   ostringstream os;