From 3032c877962947de4935e97704ee535895516c06 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sat, 22 Jan 2011 23:14:32 +0200 Subject: [PATCH] Simplified code to load cell tiles - now only 8 bucketing level is supported --- storage/country.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/storage/country.cpp b/storage/country.cpp index ae66c83a64..0bee99250d 100644 --- a/storage/country.cpp +++ b/storage/country.cpp @@ -128,21 +128,8 @@ namespace storage TTilesContainer::const_iterator const first = sortedTiles.begin(); TTilesContainer::const_iterator const last = sortedTiles.end(); TTilesContainer::const_iterator found = lower_bound(first, last, TTile(line, 0)); - // @TODO current implementation supports only cellId level 8 and 7 - if (!(found != last && !(line < found->first)) && IsCellId(line)) - { - line.resize(line.size() - 1); - found = lower_bound(first, last, TTile(line, 0)); - } - if (found != last && !(line < found->first)) - { - // fix extension for data files - if (found->first.find_last_of(DATA_FILE_EXTENSION) == string::npos) - currentCountry->AddTile(TTile(found->first + DATA_FILE_EXTENSION, found->second)); - else - currentCountry->AddTile(*found); - } + currentCountry->AddTile(TTile(found->first + DATA_FILE_EXTENSION, found->second)); } break; case 1: // country group