AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Remove deprecated GetIndexFileName from platform

Browse source
This commit is contained in:
Lev Dragunov 2015-07-16 13:15:32 +03:00 • committed by Alex Zolotarev
parent 45faef6be3
commit b9e7cc9fbc
3 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
indexer/indexer_tests/features_offsets_table_test.cpp
View file

@ -93,8 +93,11 @@ namespace feature
{
string const testFileName = "test_file";
Platform & p = GetPlatform();
platform::CountryFile country("minsk-pass");
platform::LocalCountryFile localFile(p.WritableDir(), country, 0 /* version */);
localFile.SyncWithDisk();
FilesContainerR baseContainer(p.GetReader("minsk-pass" DATA_FILE_EXTENSION));
const string indexFile = p.GetIndexFileName(testFileName, FEATURES_OFFSETS_TABLE_FILE_EXT);
const string indexFile = CountryIndexes::GetPath(localFile, CountryIndexes::Index::Offsets);
feature::DataHeader header;
header.Load(baseContainer.GetReader(HEADER_FILE_TAG));

16
platform/platform.cpp
View file

@ -133,22 +133,6 @@ string Platform::DeviceName() const
return OMIM_OS_NAME;
}
string Platform::WritablePathForCountryIndexes(string const & mwmName) const
{
string const dir = WritableDir() + mwmName + my::GetNativeSeparator();
if (!IsFileExistsByFullPath(dir))
{
if (MkDir(dir) != Platform::ERR_OK)
MYTHROW(Writer::CreateDirException, ("Can't create directory:", dir));
}
return dir;
}
string Platform::GetIndexFileName(string const & mwmName, string const & extension) const
{
return GetPlatform().WritablePathForCountryIndexes(mwmName) + mwmName + extension;
}
void Platform::SetWritableDirForTests(string const & path)
{
m_writableDir = my::AddSlashIfNeeded(path);

5
platform/platform.hpp
View file

@ -91,11 +91,6 @@ public:
void SetWritableDirForTests(string const & path);
/// @return full path to file in user's writable directory
string WritablePathForFile(string const & file) const { return WritableDir() + file; }
/// @return full path to indexes directory for country file.
/// Creates directory if it's not exists. Throw Writer::CreateDirException if can't create.
string WritablePathForCountryIndexes(string const & mwmName) const;
/// @return generate full path to index based on mwmName and index extension
string GetIndexFileName(string const & mwmName, string const & extension) const;
/// @return resource dir (on some platforms it's differ from Writable dir)
string ResourcesDir() const { return m_resourcesDir; }