diff options
author | gorshenin <y.gorshenin@corp.mail.ru> | 2015-07-01 16:48:58 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:53:27 +0300 |
commit | a7bcdb5ae8b8e75c1a3806b00b19f3b80c72c5b3 (patch) | |
tree | e24caedef110b579fcedc15d29c62cc43e3f6d9c /map/benchmark_tool | |
parent | e0470160313b3ed0bc396ffec72b16fded6b8520 (diff) |
Revert "[storage, framework, index] Storage redesign. Plain strings are replaced to CountryFile and LocalCountryFile."
Diffstat (limited to 'map/benchmark_tool')
-rw-r--r-- | map/benchmark_tool/features_loading.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/map/benchmark_tool/features_loading.cpp b/map/benchmark_tool/features_loading.cpp index a316188916..c9fd84ab7d 100644 --- a/map/benchmark_tool/features_loading.cpp +++ b/map/benchmark_tool/features_loading.cpp @@ -9,8 +9,6 @@ #include "platform/platform.hpp" -#include "coding/file_name_utils.hpp" - #include "base/macros.hpp" #include "base/timer.hpp" @@ -99,20 +97,8 @@ namespace void RunFeaturesLoadingBenchmark(string const & file, pair<int, int> scaleR, AllResult & res) { - string baseName = file; - my::GetNameFromFullPath(baseName); - - // Check that file is relative to maps dir. - ASSERT_EQUAL(file, baseName, ()); - - string countryFileName = baseName; - my::GetNameWithoutExt(countryFileName); - - platform::LocalCountryFile localFile = - platform::LocalCountryFile::MakeForTesting(countryFileName); - feature::DataHeader header; - LoadMapHeader(GetPlatform().GetCountryReader(localFile, TMapOptions::EMap), header); + LoadMapHeader(GetPlatform().GetReader(file), header); pair<int, int> const r = header.GetScaleRange(); if (r.first > scaleR.first) @@ -124,7 +110,7 @@ void RunFeaturesLoadingBenchmark(string const & file, pair<int, int> scaleR, All return; model::FeaturesFetcher src; - UNUSED_VALUE(src.RegisterMap(platform::LocalCountryFile::MakeForTesting(countryFileName))); + UNUSED_VALUE(src.RegisterMap(file)); RunBenchmark(src, header.GetBounds(), scaleR, res); } |