diff --git a/routing/routing_mapping.cpp b/routing/routing_mapping.cpp index fe40cf9b2b..70f26f7e85 100644 --- a/routing/routing_mapping.cpp +++ b/routing/routing_mapping.cpp @@ -27,8 +27,9 @@ namespace */ bool CheckMwmConsistency(LocalCountryFile const & localFile) { - if (localFile.GetPath(MapOptions::CarRouting) == localFile.GetPath(MapOptions::Map)) + if (version::IsSingleMwm(localFile.GetVersion())) return true; + ModelReaderPtr r1 = FilesContainerR(localFile.GetPath(MapOptions::CarRouting)) .GetReader(VERSION_FILE_TAG); ReaderSrc src1(r1.GetPtr()); @@ -63,14 +64,6 @@ RoutingMapping::RoutingMapping(string const & countryFile, MwmSet & index) LocalCountryFile const & localFile = m_handle.GetInfo()->GetLocalFile(); - if (version::IsSingleMwm(localFile.GetVersion())) - { - m_container.Open(localFile.GetPath(MapOptions::Map)); - m_mwmId = m_handle.GetId(); - m_error = IRouter::ResultCode::NoError; - return; - } - if (!HasOptions(localFile.GetFiles(), MapOptions::MapWithCarRouting)) { m_error = IRouter::ResultCode::RouteFileNotExist;