diff options
| author | Alex Zolotarev <alex@maps.me> | 2016-02-05 16:46:11 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:16:52 +0300 |
| commit | 5e80faf98ea21ed334499c5052aac5b7d0ecc434 (patch) | |
| tree | 667970e1d52546d5b3d0d98f6ad2e6e195699991 /map/map_tests | |
| parent | 8d425df9d52b09a530d6e5b266b04cfea555fa61 (diff) | |
Renamed methods by removing pretty obvious Mercator word.
Diffstat (limited to 'map/map_tests')
| -rw-r--r-- | map/map_tests/bookmarks_test.cpp | 2 | ||||
| -rw-r--r-- | map/map_tests/feature_getters_tests.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp index c52c5db7f3..7e652c8935 100644 --- a/map/map_tests/bookmarks_test.cpp +++ b/map/map_tests/bookmarks_test.cpp @@ -394,7 +394,7 @@ namespace void CheckPlace(Framework const & fm, double lat, double lon, POIInfo const & poi) { - search::AddressInfo const info = fm.GetMercatorAddressInfo(MercatorBounds::FromLatLon(lat, lon)); + search::AddressInfo const info = fm.GetAddressInfoAtPoint(MercatorBounds::FromLatLon(lat, lon)); TEST_EQUAL(info.m_street, poi.m_street, ()); TEST_EQUAL(info.m_house, poi.m_house, ()); diff --git a/map/map_tests/feature_getters_tests.cpp b/map/map_tests/feature_getters_tests.cpp index ba9b977c4c..9e4f9309d1 100644 --- a/map/map_tests/feature_getters_tests.cpp +++ b/map/map_tests/feature_getters_tests.cpp @@ -11,7 +11,7 @@ #include "std/algorithm.hpp" #include "std/vector.hpp" -UNIT_TEST(Framework_ForEachFeatureAtMercatorPoint_And_Others) +UNIT_TEST(Framework_ForEachFeatureAtPoint_And_Others) { Framework frm; frm.DeregisterAllMaps(); @@ -25,7 +25,7 @@ UNIT_TEST(Framework_ForEachFeatureAtMercatorPoint_And_Others) "amenity|parking|", "barrier|lift_gate|" }; - TEST_EQUAL(4, frm.ForEachFeatureAtMercatorPoint([&](FeatureType & ft) + TEST_EQUAL(4, frm.ForEachFeatureAtPoint([&](FeatureType & ft) { ft.ForEachType([&types](uint32_t type) { @@ -40,7 +40,7 @@ UNIT_TEST(Framework_ForEachFeatureAtMercatorPoint_And_Others) ftypes::IsBuildingChecker const & isBuilding = ftypes::IsBuildingChecker::Instance(); { // Restaurant in the building. - auto const feature = frm.GetFeatureAtMercatorPoint(MercatorBounds::FromLatLon(53.89395, 27.567365)); + auto const feature = frm.GetFeatureAtPoint(MercatorBounds::FromLatLon(53.89395, 27.567365)); string name; TEST(feature->GetName(FeatureType::DEFAULT_LANG, name), ()); TEST_EQUAL("Родны Кут", name, ()); @@ -49,7 +49,7 @@ UNIT_TEST(Framework_ForEachFeatureAtMercatorPoint_And_Others) { // Same building as above, very close to the restaurant. - auto const feature = frm.GetFeatureAtMercatorPoint(MercatorBounds::FromLatLon(53.893603, 27.567032)); + auto const feature = frm.GetFeatureAtPoint(MercatorBounds::FromLatLon(53.893603, 27.567032)); TEST(feature, ()); TEST(isBuilding(*feature), ()); } |