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

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2015-07-03 13:58:58 +03:00 • committed by Alex Zolotarev
parent bafab099f8
commit 9cfb43a2c1
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/local_country_file.cpp
View file

@ -49,10 +49,7 @@ void LocalCountryFile::DeleteFromDisk(TMapOptions files) const
if (OnDisk(file) && HasOptions(files, file))
{
if (!my::DeleteFileX(GetPath(file)))
{
LOG(LERROR, (file, "from", *this, "wasn't deleted from disk."));
ASSERT(false, ());
}
}
}
}

10
platform/local_country_file_utils.cpp
View file

@ -238,20 +238,20 @@ string CountryIndexes::GetPath(LocalCountryFile const & localFile, Index index)
{
string const directory = IndexesDir(localFile);
string const name = localFile.GetCountryFile().GetNameWithoutExt();
string file;
char const * ext = nullptr;
switch (index)
{
case Index::Bits:
file = name + ".bftsegbits";
ext = ".bftsegbits";
break;
case Index::Nodes:
file = name + ".bftsegnodes";
ext = ".bftsegnodes";
break;
case Index::Offsets:
file = name + ".offsets";
ext = ".offsets";
break;
}
return my::JoinFoldersToPath(directory, file);
return my::JoinFoldersToPath(directory, name + ext);
}
// static