Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Yershov <yershov@corp.mail.ru>2016-02-25 15:47:43 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:49:14 +0300
commit0339e0a905d8feba8ac8c6025b444b09c167a2b3 (patch)
treea4ca72017a700c3972a11c9960c72e0439373bd7 /platform
parent3fde46a7d0d718dbdfbb843c6cb00c5171e442fe (diff)
[new downloader] Switch suffixes for files using in migration from 'migrate' to 'obsolete'
Diffstat (limited to 'platform')
-rw-r--r--platform/local_country_file_utils.cpp2
-rw-r--r--platform/platform_android.cpp2
-rw-r--r--platform/platform_tests/local_country_file_tests.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp
index 7e6a0a56b3..18b4a3de75 100644
--- a/platform/local_country_file_utils.cpp
+++ b/platform/local_country_file_utils.cpp
@@ -254,7 +254,7 @@ void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir,
// World and WorldCoasts can be stored in app bundle or in resources
// directory, thus it's better to get them via Platform.
for (string const & file : { WORLD_FILE_NAME,
- (migrate::NeedMigrate() ? WORLD_COASTS_FILE_NAME : WORLD_COASTS_MIGRATE_FILE_NAME) })
+ (migrate::NeedMigrate() ? WORLD_COASTS_OBSOLETE_FILE_NAME : WORLD_COASTS_FILE_NAME) })
{
auto i = localFiles.begin();
for (; i != localFiles.end(); ++i)
diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index ad852af6ff..d0cf6843cd 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -37,7 +37,7 @@ bool IsResource(string const & file, string const & ext)
if (ext == DATA_FILE_EXTENSION)
{
return (strings::StartsWith(file, WORLD_COASTS_FILE_NAME) ||
- strings::StartsWith(file, WORLD_COASTS_MIGRATE_FILE_NAME) ||
+ strings::StartsWith(file, WORLD_COASTS_OBSOLETE_FILE_NAME) ||
strings::StartsWith(file, WORLD_FILE_NAME));
}
else if (ext == BOOKMARKS_FILE_EXTENSION ||
diff --git a/platform/platform_tests/local_country_file_tests.cpp b/platform/platform_tests/local_country_file_tests.cpp
index 9b92b8e3ff..1fb9a25a5c 100644
--- a/platform/platform_tests/local_country_file_tests.cpp
+++ b/platform/platform_tests/local_country_file_tests.cpp
@@ -295,7 +295,7 @@ UNIT_TEST(LocalCountryFile_AllLocalFilesLookup)
worldFound = true;
TEST_NOT_EQUAL(0, file.GetVersion(), (file));
}
- if (file.GetCountryName() == WORLD_COASTS_FILE_NAME)
+ if (file.GetCountryName() == WORLD_COASTS_OBSOLETE_FILE_NAME)
{
worldCoastsFound = true;
TEST_NOT_EQUAL(0, file.GetVersion(), (file));