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
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/country_defines.cpp28
-rw-r--r--platform/country_defines.hpp14
-rw-r--r--platform/country_file.cpp12
-rw-r--r--platform/country_file.hpp4
-rw-r--r--platform/local_country_file.cpp26
-rw-r--r--platform/local_country_file.hpp12
-rw-r--r--platform/local_country_file_utils.cpp6
-rw-r--r--platform/local_country_file_utils.hpp2
-rw-r--r--platform/platform_tests/country_file_tests.cpp20
-rw-r--r--platform/platform_tests/local_country_file_tests.cpp78
-rw-r--r--platform/platform_tests_support/scoped_file.cpp2
-rw-r--r--platform/platform_tests_support/scoped_file.hpp2
12 files changed, 103 insertions, 103 deletions
diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp
index 05605e7ee0..bbbf933a2a 100644
--- a/platform/country_defines.cpp
+++ b/platform/country_defines.cpp
@@ -2,43 +2,43 @@
#include "base/assert.hpp"
-bool HasOptions(TMapOptions mask, TMapOptions options)
+bool HasOptions(MapOptions mask, MapOptions options)
{
return (static_cast<uint8_t>(mask) & static_cast<uint8_t>(options)) ==
static_cast<uint8_t>(options);
}
-TMapOptions IntersectOptions(TMapOptions lhs, TMapOptions rhs)
+MapOptions IntersectOptions(MapOptions lhs, MapOptions rhs)
{
- return static_cast<TMapOptions>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs));
+ return static_cast<MapOptions>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs));
}
-TMapOptions SetOptions(TMapOptions mask, TMapOptions options)
+MapOptions SetOptions(MapOptions mask, MapOptions options)
{
- return static_cast<TMapOptions>(static_cast<uint8_t>(mask) | static_cast<uint8_t>(options));
+ return static_cast<MapOptions>(static_cast<uint8_t>(mask) | static_cast<uint8_t>(options));
}
-TMapOptions UnsetOptions(TMapOptions mask, TMapOptions options)
+MapOptions UnsetOptions(MapOptions mask, MapOptions options)
{
- return static_cast<TMapOptions>(static_cast<uint8_t>(mask) & ~static_cast<uint8_t>(options));
+ return static_cast<MapOptions>(static_cast<uint8_t>(mask) & ~static_cast<uint8_t>(options));
}
-TMapOptions LeastSignificantOption(TMapOptions mask)
+MapOptions LeastSignificantOption(MapOptions mask)
{
- return static_cast<TMapOptions>(static_cast<uint8_t>(mask) & -static_cast<uint8_t>(mask));
+ return static_cast<MapOptions>(static_cast<uint8_t>(mask) & -static_cast<uint8_t>(mask));
}
-string DebugPrint(TMapOptions options)
+string DebugPrint(MapOptions options)
{
switch (options)
{
- case TMapOptions::Nothing:
+ case MapOptions::Nothing:
return "Nothing";
- case TMapOptions::Map:
+ case MapOptions::Map:
return "MapOnly";
- case TMapOptions::CarRouting:
+ case MapOptions::CarRouting:
return "CarRouting";
- case TMapOptions::MapWithCarRouting:
+ case MapOptions::MapWithCarRouting:
return "MapWithCarRouting";
}
}
diff --git a/platform/country_defines.hpp b/platform/country_defines.hpp
index 7ba1428fa8..d2f46dd409 100644
--- a/platform/country_defines.hpp
+++ b/platform/country_defines.hpp
@@ -2,7 +2,7 @@
#include "std/string.hpp"
-enum class TMapOptions : uint8_t
+enum class MapOptions : uint8_t
{
Nothing = 0x0,
Map = 0x1,
@@ -10,14 +10,14 @@ enum class TMapOptions : uint8_t
MapWithCarRouting = 0x3
};
-bool HasOptions(TMapOptions mask, TMapOptions options);
+bool HasOptions(MapOptions mask, MapOptions options);
-TMapOptions IntersectOptions(TMapOptions lhs, TMapOptions rhs);
+MapOptions IntersectOptions(MapOptions lhs, MapOptions rhs);
-TMapOptions SetOptions(TMapOptions mask, TMapOptions options);
+MapOptions SetOptions(MapOptions mask, MapOptions options);
-TMapOptions UnsetOptions(TMapOptions mask, TMapOptions options);
+MapOptions UnsetOptions(MapOptions mask, MapOptions options);
-TMapOptions LeastSignificantOption(TMapOptions mask);
+MapOptions LeastSignificantOption(MapOptions mask);
-string DebugPrint(TMapOptions options);
+string DebugPrint(MapOptions options);
diff --git a/platform/country_file.cpp b/platform/country_file.cpp
index c030f4759c..41ace2a248 100644
--- a/platform/country_file.cpp
+++ b/platform/country_file.cpp
@@ -12,13 +12,13 @@ CountryFile::CountryFile(string const & name) : m_name(name), m_mapSize(0), m_ro
string const & CountryFile::GetNameWithoutExt() const { return m_name; }
-string CountryFile::GetNameWithExt(TMapOptions file) const
+string CountryFile::GetNameWithExt(MapOptions file) const
{
switch (file)
{
- case TMapOptions::Map:
+ case MapOptions::Map:
return m_name + DATA_FILE_EXTENSION;
- case TMapOptions::CarRouting:
+ case MapOptions::CarRouting:
return m_name + DATA_FILE_EXTENSION + ROUTING_FILE_EXTENSION;
default:
ASSERT(false, ("Can't get name for:", file));
@@ -32,12 +32,12 @@ void CountryFile::SetRemoteSizes(uint32_t mapSize, uint32_t routingSize)
m_routingSize = routingSize;
}
-uint32_t CountryFile::GetRemoteSize(TMapOptions filesMask) const
+uint32_t CountryFile::GetRemoteSize(MapOptions filesMask) const
{
uint32_t size = 0;
- if (HasOptions(filesMask, TMapOptions::Map))
+ if (HasOptions(filesMask, MapOptions::Map))
size += m_mapSize;
- if (HasOptions(filesMask, TMapOptions::CarRouting))
+ if (HasOptions(filesMask, MapOptions::CarRouting))
size += m_routingSize;
return size;
}
diff --git a/platform/country_file.hpp b/platform/country_file.hpp
index e23a81e85e..d0fed2bfe7 100644
--- a/platform/country_file.hpp
+++ b/platform/country_file.hpp
@@ -17,10 +17,10 @@ public:
explicit CountryFile(string const & name);
string const & GetNameWithoutExt() const;
- string GetNameWithExt(TMapOptions file) const;
+ string GetNameWithExt(MapOptions file) const;
void SetRemoteSizes(uint32_t mapSize, uint32_t routingSize);
- uint32_t GetRemoteSize(TMapOptions filesMask) const;
+ uint32_t GetRemoteSize(MapOptions filesMask) const;
inline bool operator<(const CountryFile & rhs) const { return m_name < rhs.m_name; }
inline bool operator==(const CountryFile & rhs) const { return m_name == rhs.m_name; }
diff --git a/platform/local_country_file.cpp b/platform/local_country_file.cpp
index da171ebaf8..bc93513812 100644
--- a/platform/local_country_file.cpp
+++ b/platform/local_country_file.cpp
@@ -12,7 +12,7 @@
namespace platform
{
LocalCountryFile::LocalCountryFile()
- : m_version(0), m_files(TMapOptions::Nothing), m_mapSize(0), m_routingSize()
+ : m_version(0), m_files(MapOptions::Nothing), m_mapSize(0), m_routingSize()
{
}
@@ -21,7 +21,7 @@ LocalCountryFile::LocalCountryFile(string const & directory, CountryFile const &
: m_directory(directory),
m_countryFile(countryFile),
m_version(version),
- m_files(TMapOptions::Nothing),
+ m_files(MapOptions::Nothing),
m_mapSize(0),
m_routingSize(0)
{
@@ -29,23 +29,23 @@ LocalCountryFile::LocalCountryFile(string const & directory, CountryFile const &
void LocalCountryFile::SyncWithDisk()
{
- m_files = TMapOptions::Nothing;
+ m_files = MapOptions::Nothing;
m_mapSize = 0;
m_routingSize = 0;
Platform & platform = GetPlatform();
- if (platform.GetFileSizeByFullPath(GetPath(TMapOptions::Map), m_mapSize))
- m_files = SetOptions(m_files, TMapOptions::Map);
+ if (platform.GetFileSizeByFullPath(GetPath(MapOptions::Map), m_mapSize))
+ m_files = SetOptions(m_files, MapOptions::Map);
- string const routingPath = GetPath(TMapOptions::CarRouting);
+ string const routingPath = GetPath(MapOptions::CarRouting);
if (platform.GetFileSizeByFullPath(routingPath, m_routingSize))
- m_files = SetOptions(m_files, TMapOptions::CarRouting);
+ m_files = SetOptions(m_files, MapOptions::CarRouting);
}
-void LocalCountryFile::DeleteFromDisk(TMapOptions files) const
+void LocalCountryFile::DeleteFromDisk(MapOptions files) const
{
- for (TMapOptions file : {TMapOptions::Map, TMapOptions::CarRouting})
+ for (MapOptions file : {MapOptions::Map, MapOptions::CarRouting})
{
if (OnDisk(file) && HasOptions(files, file))
{
@@ -55,17 +55,17 @@ void LocalCountryFile::DeleteFromDisk(TMapOptions files) const
}
}
-string LocalCountryFile::GetPath(TMapOptions file) const
+string LocalCountryFile::GetPath(MapOptions file) const
{
return my::JoinFoldersToPath(m_directory, m_countryFile.GetNameWithExt(file));
}
-uint32_t LocalCountryFile::GetSize(TMapOptions filesMask) const
+uint32_t LocalCountryFile::GetSize(MapOptions filesMask) const
{
uint64_t size64 = 0;
- if (HasOptions(filesMask, TMapOptions::Map))
+ if (HasOptions(filesMask, MapOptions::Map))
size64 += m_mapSize;
- if (HasOptions(filesMask, TMapOptions::CarRouting))
+ if (HasOptions(filesMask, MapOptions::CarRouting))
size64 += m_routingSize;
uint32_t const size32 = static_cast<uint32_t>(size64);
ASSERT_EQUAL(size32, size64, ());
diff --git a/platform/local_country_file.hpp b/platform/local_country_file.hpp
index b248f0eaf8..9bf7939781 100644
--- a/platform/local_country_file.hpp
+++ b/platform/local_country_file.hpp
@@ -39,23 +39,23 @@ public:
// Removes specified files from disk if they're known for LocalCountryFile, i.e.
// were found by previous SyncWithDisk() call.
- void DeleteFromDisk(TMapOptions files) const;
+ void DeleteFromDisk(MapOptions files) const;
// Returns path to a file. Return value may be empty until
// SyncWithDisk() is called.
- string GetPath(TMapOptions file) const;
+ string GetPath(MapOptions file) const;
// Returns size of a file. Return value may be zero until
// SyncWithDisk() is called.
- uint32_t GetSize(TMapOptions filesMask) const;
+ uint32_t GetSize(MapOptions filesMask) const;
// Returns a mask of all known country files. Return value may be
// empty until SyncWithDisk() is called.
- inline TMapOptions GetFiles() const { return m_files; }
+ inline MapOptions GetFiles() const { return m_files; }
// Checks whether files specified in filesMask are on disk. Return
// value will be false until SyncWithDisk() is called.
- inline bool OnDisk(TMapOptions filesMask) const
+ inline bool OnDisk(MapOptions filesMask) const
{
return (static_cast<unsigned>(m_files) & static_cast<unsigned>(filesMask)) ==
static_cast<unsigned>(filesMask);
@@ -86,7 +86,7 @@ private:
string m_directory;
CountryFile m_countryFile;
int64_t m_version;
- TMapOptions m_files;
+ MapOptions m_files;
uint64_t m_mapSize;
uint64_t m_routingSize;
diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp
index 2f9bf2fdf4..963f9bc63a 100644
--- a/platform/local_country_file_utils.cpp
+++ b/platform/local_country_file_utils.cpp
@@ -96,7 +96,7 @@ void CleanupMapsDirectory()
if (countryName == "Japan" || countryName == "Brazil")
{
localFile.SyncWithDisk();
- localFile.DeleteFromDisk(TMapOptions::MapWithCarRouting);
+ localFile.DeleteFromDisk(MapOptions::MapWithCarRouting);
}
}
}
@@ -176,7 +176,7 @@ void FindAllLocalMaps(vector<LocalCountryFile> & localFiles)
// Assume that empty path means the resource file.
LocalCountryFile worldFile(string(), CountryFile(file), 0 /* version */);
- worldFile.m_files = TMapOptions::Map;
+ worldFile.m_files = MapOptions::Map;
if (i != localFiles.end())
{
// Always use resource World files instead of local on disk.
@@ -222,7 +222,7 @@ shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(CountryFile const & cou
return make_shared<LocalCountryFile>(directory, countryFile, version);
}
-ModelReader * GetCountryReader(platform::LocalCountryFile const & file, TMapOptions options)
+ModelReader * GetCountryReader(platform::LocalCountryFile const & file, MapOptions options)
{
Platform & platform = GetPlatform();
// See LocalCountryFile comment for explanation.
diff --git a/platform/local_country_file_utils.hpp b/platform/local_country_file_utils.hpp
index 3bfb199a8e..ef81bf2374 100644
--- a/platform/local_country_file_utils.hpp
+++ b/platform/local_country_file_utils.hpp
@@ -49,7 +49,7 @@ bool ParseVersion(string const & s, int64_t & version);
shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(CountryFile const & countryFile,
int64_t version);
-ModelReader * GetCountryReader(LocalCountryFile const & file, TMapOptions options);
+ModelReader * GetCountryReader(LocalCountryFile const & file, MapOptions options);
// An API for managing country indexes.
class CountryIndexes
diff --git a/platform/platform_tests/country_file_tests.cpp b/platform/platform_tests/country_file_tests.cpp
index e12d8d5298..991aaf65b7 100644
--- a/platform/platform_tests/country_file_tests.cpp
+++ b/platform/platform_tests/country_file_tests.cpp
@@ -9,20 +9,20 @@ UNIT_TEST(CountryFile_Smoke)
{
CountryFile countryFile("TestCountry");
TEST_EQUAL("TestCountry", countryFile.GetNameWithoutExt(), ());
- TEST_EQUAL("TestCountry" DATA_FILE_EXTENSION, countryFile.GetNameWithExt(TMapOptions::Map), ());
+ TEST_EQUAL("TestCountry" DATA_FILE_EXTENSION, countryFile.GetNameWithExt(MapOptions::Map), ());
TEST_EQUAL("TestCountry" DATA_FILE_EXTENSION ROUTING_FILE_EXTENSION,
- countryFile.GetNameWithExt(TMapOptions::CarRouting), ());
+ countryFile.GetNameWithExt(MapOptions::CarRouting), ());
- TEST_EQUAL(0, countryFile.GetRemoteSize(TMapOptions::Nothing), ());
- TEST_EQUAL(0, countryFile.GetRemoteSize(TMapOptions::Map), ());
- TEST_EQUAL(0, countryFile.GetRemoteSize(TMapOptions::CarRouting), ());
- TEST_EQUAL(0, countryFile.GetRemoteSize(TMapOptions::MapWithCarRouting), ());
+ TEST_EQUAL(0, countryFile.GetRemoteSize(MapOptions::Nothing), ());
+ TEST_EQUAL(0, countryFile.GetRemoteSize(MapOptions::Map), ());
+ TEST_EQUAL(0, countryFile.GetRemoteSize(MapOptions::CarRouting), ());
+ TEST_EQUAL(0, countryFile.GetRemoteSize(MapOptions::MapWithCarRouting), ());
countryFile.SetRemoteSizes(1 /* mapSize */, 2 /* routingSize */);
- TEST_EQUAL(0, countryFile.GetRemoteSize(TMapOptions::Nothing), ());
- TEST_EQUAL(1, countryFile.GetRemoteSize(TMapOptions::Map), ());
- TEST_EQUAL(2, countryFile.GetRemoteSize(TMapOptions::CarRouting), ());
- TEST_EQUAL(3, countryFile.GetRemoteSize(TMapOptions::MapWithCarRouting), ());
+ TEST_EQUAL(0, countryFile.GetRemoteSize(MapOptions::Nothing), ());
+ TEST_EQUAL(1, countryFile.GetRemoteSize(MapOptions::Map), ());
+ TEST_EQUAL(2, countryFile.GetRemoteSize(MapOptions::CarRouting), ());
+ TEST_EQUAL(3, countryFile.GetRemoteSize(MapOptions::MapWithCarRouting), ());
}
} // namespace platform
diff --git a/platform/platform_tests/local_country_file_tests.cpp b/platform/platform_tests/local_country_file_tests.cpp
index 148fb03a02..d546cfda2c 100644
--- a/platform/platform_tests/local_country_file_tests.cpp
+++ b/platform/platform_tests/local_country_file_tests.cpp
@@ -68,26 +68,26 @@ UNIT_TEST(LocalCountryFile_Smoke)
LocalCountryFile localFile("/test-dir", countryFile, 150309);
- TEST_EQUAL("/test-dir/TestCountry" DATA_FILE_EXTENSION, localFile.GetPath(TMapOptions::Map), ());
+ TEST_EQUAL("/test-dir/TestCountry" DATA_FILE_EXTENSION, localFile.GetPath(MapOptions::Map), ());
TEST_EQUAL("/test-dir/TestCountry" DATA_FILE_EXTENSION ROUTING_FILE_EXTENSION,
- localFile.GetPath(TMapOptions::CarRouting), ());
+ localFile.GetPath(MapOptions::CarRouting), ());
// Not synced with disk yet.
- TEST_EQUAL(TMapOptions::Nothing, localFile.GetFiles(), ());
+ TEST_EQUAL(MapOptions::Nothing, localFile.GetFiles(), ());
// Any statement is true about elements of an empty set.
- TEST(localFile.OnDisk(TMapOptions::Nothing), ());
+ TEST(localFile.OnDisk(MapOptions::Nothing), ());
- TEST(!localFile.OnDisk(TMapOptions::Map), ());
- TEST(!localFile.OnDisk(TMapOptions::CarRouting), ());
- TEST(!localFile.OnDisk(TMapOptions::MapWithCarRouting), ());
+ TEST(!localFile.OnDisk(MapOptions::Map), ());
+ TEST(!localFile.OnDisk(MapOptions::CarRouting), ());
+ TEST(!localFile.OnDisk(MapOptions::MapWithCarRouting), ());
TEST_EQUAL("/test-dir", localFile.GetDirectory(), ());
- TEST_EQUAL(0, localFile.GetSize(TMapOptions::Nothing), ());
- TEST_EQUAL(0, localFile.GetSize(TMapOptions::Map), ());
- TEST_EQUAL(0, localFile.GetSize(TMapOptions::CarRouting), ());
- TEST_EQUAL(0, localFile.GetSize(TMapOptions::MapWithCarRouting), ());
+ TEST_EQUAL(0, localFile.GetSize(MapOptions::Nothing), ());
+ TEST_EQUAL(0, localFile.GetSize(MapOptions::Map), ());
+ TEST_EQUAL(0, localFile.GetSize(MapOptions::CarRouting), ());
+ TEST_EQUAL(0, localFile.GetSize(MapOptions::MapWithCarRouting), ());
TEST_EQUAL(150309, localFile.GetVersion(), ());
}
@@ -102,29 +102,29 @@ UNIT_TEST(LocalCountryFile_DiskFiles)
countryFile.SetRemoteSizes(1 /* mapSize */, 2 /* routingSize */);
LocalCountryFile localFile(platform.WritableDir(), countryFile, 0 /* version */);
- TEST(!localFile.OnDisk(TMapOptions::Map), ());
- TEST(!localFile.OnDisk(TMapOptions::CarRouting), ());
- TEST(!localFile.OnDisk(TMapOptions::MapWithCarRouting), ());
+ TEST(!localFile.OnDisk(MapOptions::Map), ());
+ TEST(!localFile.OnDisk(MapOptions::CarRouting), ());
+ TEST(!localFile.OnDisk(MapOptions::MapWithCarRouting), ());
- ScopedFile testMapFile(countryFile.GetNameWithExt(TMapOptions::Map), "map");
+ ScopedFile testMapFile(countryFile.GetNameWithExt(MapOptions::Map), "map");
localFile.SyncWithDisk();
- TEST(localFile.OnDisk(TMapOptions::Map), ());
- TEST(!localFile.OnDisk(TMapOptions::CarRouting), ());
- TEST(!localFile.OnDisk(TMapOptions::MapWithCarRouting), ());
- TEST_EQUAL(3, localFile.GetSize(TMapOptions::Map), ());
+ TEST(localFile.OnDisk(MapOptions::Map), ());
+ TEST(!localFile.OnDisk(MapOptions::CarRouting), ());
+ TEST(!localFile.OnDisk(MapOptions::MapWithCarRouting), ());
+ TEST_EQUAL(3, localFile.GetSize(MapOptions::Map), ());
- ScopedFile testRoutingFile(countryFile.GetNameWithExt(TMapOptions::CarRouting), "routing");
+ ScopedFile testRoutingFile(countryFile.GetNameWithExt(MapOptions::CarRouting), "routing");
localFile.SyncWithDisk();
- TEST(localFile.OnDisk(TMapOptions::Map), ());
- TEST(localFile.OnDisk(TMapOptions::CarRouting), ());
- TEST(localFile.OnDisk(TMapOptions::MapWithCarRouting), ());
- TEST_EQUAL(3, localFile.GetSize(TMapOptions::Map), ());
- TEST_EQUAL(7, localFile.GetSize(TMapOptions::CarRouting), ());
- TEST_EQUAL(10, localFile.GetSize(TMapOptions::MapWithCarRouting), ());
-
- localFile.DeleteFromDisk(TMapOptions::MapWithCarRouting);
+ TEST(localFile.OnDisk(MapOptions::Map), ());
+ TEST(localFile.OnDisk(MapOptions::CarRouting), ());
+ TEST(localFile.OnDisk(MapOptions::MapWithCarRouting), ());
+ TEST_EQUAL(3, localFile.GetSize(MapOptions::Map), ());
+ TEST_EQUAL(7, localFile.GetSize(MapOptions::CarRouting), ());
+ TEST_EQUAL(10, localFile.GetSize(MapOptions::MapWithCarRouting), ());
+
+ localFile.DeleteFromDisk(MapOptions::MapWithCarRouting);
TEST(!testMapFile.Exists(), (testMapFile, "wasn't deleted by LocalCountryFile."));
testMapFile.Reset();
@@ -162,18 +162,18 @@ UNIT_TEST(LocalCountryFile_CleanupMapFiles)
CleanupMapsDirectory();
japanLocalFile.SyncWithDisk();
- TEST_EQUAL(TMapOptions::Nothing, japanLocalFile.GetFiles(), ());
+ TEST_EQUAL(MapOptions::Nothing, japanLocalFile.GetFiles(), ());
TEST(!japanMapFile.Exists(), (japanMapFile));
japanMapFile.Reset();
brazilLocalFile.SyncWithDisk();
- TEST_EQUAL(TMapOptions::Nothing, brazilLocalFile.GetFiles(), ());
+ TEST_EQUAL(MapOptions::Nothing, brazilLocalFile.GetFiles(), ());
TEST(!brazilMapFile.Exists(), (brazilMapFile));
brazilMapFile.Reset();
irelandLocalFile.SyncWithDisk();
- TEST_EQUAL(TMapOptions::Map, irelandLocalFile.GetFiles(), ());
- irelandLocalFile.DeleteFromDisk(TMapOptions::Map);
+ TEST_EQUAL(MapOptions::Map, irelandLocalFile.GetFiles(), ());
+ irelandLocalFile.DeleteFromDisk(MapOptions::Map);
TEST(!irelandMapFile.Exists(), (irelandMapFile));
irelandMapFile.Reset();
@@ -216,9 +216,9 @@ UNIT_TEST(LocalCountryFile_DirectoryLookup)
ScopedDir testDir("test-dir");
- ScopedFile testIrelandMapFile(testDir, irelandFile, TMapOptions::Map, "Ireland-map");
- ScopedFile testNetherlandsMapFile(testDir, netherlandsFile, TMapOptions::Map, "Netherlands-map");
- ScopedFile testNetherlandsRoutingFile(testDir, netherlandsFile, TMapOptions::CarRouting,
+ ScopedFile testIrelandMapFile(testDir, irelandFile, MapOptions::Map, "Ireland-map");
+ ScopedFile testNetherlandsMapFile(testDir, netherlandsFile, MapOptions::Map, "Netherlands-map");
+ ScopedFile testNetherlandsRoutingFile(testDir, netherlandsFile, MapOptions::CarRouting,
"Netherlands-routing");
vector<LocalCountryFile> localFiles;
@@ -228,10 +228,10 @@ UNIT_TEST(LocalCountryFile_DirectoryLookup)
localFile.SyncWithDisk();
LocalCountryFile expectedIrelandFile(testDir.GetFullPath(), irelandFile, 150309);
- expectedIrelandFile.m_files = TMapOptions::Map;
+ expectedIrelandFile.m_files = MapOptions::Map;
LocalCountryFile expectedNetherlandsFile(testDir.GetFullPath(), netherlandsFile, 150309);
- expectedNetherlandsFile.m_files = TMapOptions::MapWithCarRouting;
+ expectedNetherlandsFile.m_files = MapOptions::MapWithCarRouting;
vector<LocalCountryFile> expectedLocalFiles = {expectedIrelandFile, expectedNetherlandsFile};
sort(expectedLocalFiles.begin(), expectedLocalFiles.end());
@@ -247,7 +247,7 @@ UNIT_TEST(LocalCountryFile_AllLocalFilesLookup)
CountryFile const italyFile("Italy");
ScopedDir testDir("010101");
- ScopedFile testItalyMapFile(testDir, italyFile, TMapOptions::Map, "Italy-map");
+ ScopedFile testItalyMapFile(testDir, italyFile, MapOptions::Map, "Italy-map");
vector<LocalCountryFile> localFiles;
FindAllLocalMaps(localFiles);
@@ -365,7 +365,7 @@ UNIT_TEST(LocalCountryFile_MakeTemporary)
{
string const path = GetPlatform().WritablePathForFile("minsk-pass" DATA_FILE_EXTENSION);
LocalCountryFile file = LocalCountryFile::MakeTemporary(path);
- TEST_EQUAL(file.GetPath(TMapOptions::Map), path, ());
+ TEST_EQUAL(file.GetPath(MapOptions::Map), path, ());
}
} // namespace platform
diff --git a/platform/platform_tests_support/scoped_file.cpp b/platform/platform_tests_support/scoped_file.cpp
index 420b972b4f..1f8a6e9340 100644
--- a/platform/platform_tests_support/scoped_file.cpp
+++ b/platform/platform_tests_support/scoped_file.cpp
@@ -27,7 +27,7 @@ ScopedFile::ScopedFile(string const & relativePath, string const & contents)
TEST(Exists(), ("Can't create test file", GetFullPath()));
}
-ScopedFile::ScopedFile(ScopedDir const & dir, CountryFile const & countryFile, TMapOptions file,
+ScopedFile::ScopedFile(ScopedDir const & dir, CountryFile const & countryFile, MapOptions file,
string const & contents)
: ScopedFile(my::JoinFoldersToPath(dir.GetRelativePath(), countryFile.GetNameWithExt(file)),
contents)
diff --git a/platform/platform_tests_support/scoped_file.hpp b/platform/platform_tests_support/scoped_file.hpp
index de5bb1d76a..f55e0722c9 100644
--- a/platform/platform_tests_support/scoped_file.hpp
+++ b/platform/platform_tests_support/scoped_file.hpp
@@ -20,7 +20,7 @@ class ScopedFile
public:
ScopedFile(string const & relativePath, string const & contents);
- ScopedFile(ScopedDir const & dir, CountryFile const & countryFile, TMapOptions file,
+ ScopedFile(ScopedDir const & dir, CountryFile const & countryFile, MapOptions file,
string const & contents);
~ScopedFile();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 01:32:26 +0300