[platform][indexer] Do not register old mwms with 0 version (from data root).

indexer/data_source.cpp

@@ -157,7 +157,7 @@ unique_ptr<MwmInfo> DataSource::CreateInfo(platform::LocalCountryFile const & lo
 {
   MwmValue value(localFile);
 
-  if (!version::IsSingleMwm(value.GetMwmVersion().GetVersion()))
+  if (version::GetMwmType(value.GetMwmVersion()) != version::MwmType::SingleMwm)
     return nullptr;
 
   feature::DataHeader const & h = value.GetHeader();
@@ -183,6 +183,9 @@ unique_ptr<MwmSet::MwmValueBase> DataSource::CreateValue(MwmInfo & info) const
   // Create a section with rank table if it does not exist.
   platform::LocalCountryFile const & localFile = info.GetLocalFile();
   unique_ptr<MwmValue> p(new MwmValue(localFile));
+  if (!p || version::GetMwmType(p->GetMwmVersion()) != version::MwmType::SingleMwm)
+    return nullptr;
+
   p->SetTable(dynamic_cast<MwmInfoEx &>(info));
   ASSERT(p->GetHeader().IsMWMSuitable(), ());
   return unique_ptr<MwmSet::MwmValueBase>(move(p));

platform/mwm_version.cpp

@@ -105,4 +105,15 @@ bool IsSingleMwm(int64_t version)
   int64_t constexpr kMinSingleMwmVersion = 160302;
   return version >= kMinSingleMwmVersion || version == 0 /* Version of mwm in the root directory. */;
 }
+
+MwmType GetMwmType(MwmVersion const & version)
+{
+  if (!IsSingleMwm(version.GetVersion()))
+    return MwmType::SeparateMwms;
+  if (version.GetFormat() < Format::v8)
+    return MwmType::SeparateMwms;
+  if (version.GetFormat() > Format::v8)
+    return MwmType::SingleMwm;
+  return MwmType::Unknown;
+}
 }  // namespace version

platform/mwm_version.hpp

@@ -26,6 +26,13 @@ enum class Format
   lastFormat = v9
 };
 
+enum class MwmType
+{
+  SeparateMwms,
+  SingleMwm,
+  Unknown
+};
+
 std::string DebugPrint(Format f);
 
 class MwmVersion
@@ -62,8 +69,12 @@ uint32_t ReadVersionDate(ModelReaderPtr const & reader);
 
 /// \returns true if version is version of an mwm which was generated after small mwm update.
 /// This means it contains routing file as well.
+/// Always returns true for mwms with version 0 (located in root directory).
 bool IsSingleMwm(int64_t version);
 
+/// Returns MwmType (SeparateMwms/SingleMwm/Unknown) on the basis of mwm version and format.
+MwmType GetMwmType(MwmVersion const & version);
+
 /// \brief This enum sets constants which are used for writing test to set a version of mwm
 /// which should be processed as either single or two components (mwm and routing) mwms.
 enum ForTesting