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

Added countries_poly.txt parsing for simple countries list, without cell tiles

Browse source
This commit is contained in:
Alex Zolotarev 2011-01-20 00:43:49 +02:00 • committed by Alex Zolotarev
parent 24e8703645
commit 7bb3d5f513
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
storage/country.cpp
View file

@ -99,6 +99,9 @@ namespace storage
bool LoadCountries(string const & countriesFile, TTilesContainer const & sortedTiles,
TCountriesContainer & countries)
{
// small prediction - are we using cells or simple countries?
bool const cellsAreUsed = sortedTiles.size() > 1000;
countries.Clear();
ifstream stream(countriesFile.c_str());
std::string line;
@ -145,7 +148,20 @@ namespace storage
case 1: // country group
case 2: // country name
case 3: // region
currentCountry = &countries.AddAtDepth(spaces - 1, Country(line.substr(spaces)));
{
string const name = line.substr(spaces);
currentCountry = &countries.AddAtDepth(spaces - 1, Country(name));
if (!cellsAreUsed)
{ // we trying to load countries by name instead of square cell tiles
TTilesContainer::const_iterator const first = sortedTiles.begin();
TTilesContainer::const_iterator const last = sortedTiles.end();
string const nameWithExt = name + DATA_FILE_EXTENSION;
TTilesContainer::const_iterator found = lower_bound(
first, last, TTile(nameWithExt, 0));
if (found != last && !(nameWithExt < found->first))
currentCountry->AddTile(*found);
}
}
break;
default:
return false;