diff --git a/android/jni/com/mapswithme/maps/promo/CityGallery.cpp b/android/jni/com/mapswithme/maps/promo/CityGallery.cpp index ba33daefc2..e3ca6fa9df 100644 --- a/android/jni/com/mapswithme/maps/promo/CityGallery.cpp +++ b/android/jni/com/mapswithme/maps/promo/CityGallery.cpp @@ -4,6 +4,8 @@ #include "partners_api/promo_api.hpp" +#include "geometry/mercator.hpp" + #include using namespace std::placeholders; @@ -124,11 +126,13 @@ jobject MakeCityGallery(JNIEnv * env, promo::CityGallery const & gallery) extern "C" { JNIEXPORT void JNICALL Java_com_mapswithme_maps_promo_Promo_nativeRequestCityGallery(JNIEnv * env, jclass, - jobject policy, jstring id) + jobject policy, jdouble lat, + jdouble lon) { PrepareClassRefs(env); + auto const point = MercatorBounds::FromLatLon(static_cast(lat), static_cast(lon)); ++g_lastRequestId; - g_framework->GetPromoCityGallery(env, policy, id, std::bind(OnSuccess, g_lastRequestId, _1), + g_framework->GetPromoCityGallery(env, policy, point, std::bind(OnSuccess, g_lastRequestId, _1), std::bind(OnError, g_lastRequestId)); } } // extern "C" diff --git a/android/src/com/mapswithme/maps/promo/Promo.java b/android/src/com/mapswithme/maps/promo/Promo.java index d1c9d6e50e..4caf92da03 100644 --- a/android/src/com/mapswithme/maps/promo/Promo.java +++ b/android/src/com/mapswithme/maps/promo/Promo.java @@ -49,5 +49,5 @@ public enum Promo mListener.onErrorReceived(); } - public native void nativeRequestCityGallery(@NonNull NetworkPolicy policy, @NonNull String id); + public native void nativeRequestCityGallery(@NonNull NetworkPolicy policy, double lat, double lon); } diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index 3d6c4502e9..1e217bd7cf 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -892,7 +892,7 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS"; }; auto appInfo = AppInfo.sharedInfo; auto locale = appInfo.twoLetterLanguageId.UTF8String; - api->GetCityGallery("", locale, resultHandler, errorHandler); + api->GetCityGallery(self.mercator, locale, resultHandler, errorHandler); }); } diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp index 4998b9f477..f80dfaa669 100644 --- a/map/place_page_info.hpp +++ b/map/place_page_info.hpp @@ -18,7 +18,6 @@ #include "indexer/ftypes_matcher.hpp" #include "indexer/map_object.hpp" -#include "geometry/latlon.hpp" #include "geometry/mercator.hpp" #include "geometry/point2d.hpp" diff --git a/partners_api/partners_api_tests/promo_tests.cpp b/partners_api/partners_api_tests/promo_tests.cpp index f9c0092871..dc9c40c7e8 100644 --- a/partners_api/partners_api_tests/promo_tests.cpp +++ b/partners_api/partners_api_tests/promo_tests.cpp @@ -144,7 +144,7 @@ UNIT_CLASS_TEST(ScopedEyeWithAsyncGuiThread, Promo_GetCityGallery) { promo::CityGallery result{}; - api.GetCityGallery(kTestId, lang, [&result](promo::CityGallery const & gallery) + api.GetCityGallery({}, lang, [&result](promo::CityGallery const & gallery) { result = gallery; testing::Notify(); diff --git a/partners_api/promo_api.cpp b/partners_api/promo_api.cpp index c9b846abb3..d329238bc5 100644 --- a/partners_api/promo_api.cpp +++ b/partners_api/promo_api.cpp @@ -207,12 +207,6 @@ std::string Api::GetMoreUrl(std::string const & id) const return m_baseUrl + "v2/mobilefront/city/" + ToSignedId(id); } -void Api::GetCityGallery(std::string const & id, std::string const & lang, - CityGalleryCallback const & onSuccess, OnError const & onError) const -{ - GetPromoCityGalleryImpl(m_baseUrl, id, lang, onSuccess, onError); -} - void Api::GetCityGallery(m2::PointD const & point, std::string const & lang, CityGalleryCallback const & onSuccess, OnError const & onError) const { diff --git a/partners_api/promo_api.hpp b/partners_api/promo_api.hpp index d7041e1fb1..ab7d749e75 100644 --- a/partners_api/promo_api.hpp +++ b/partners_api/promo_api.hpp @@ -71,8 +71,6 @@ public: std::string GetPromoLinkAfterBooking(std::string const & lang) const; std::string GetPromoLinkForDownloader(std::string const & id, std::string const & lang) const; std::string GetMoreUrl(std::string const & id) const; - void GetCityGallery(std::string const & id, std::string const & lang, - CityGalleryCallback const & onSuccess, OnError const & onError) const; void GetCityGallery(m2::PointD const & point, std::string const & lang, CityGalleryCallback const & onSuccess, OnError const & onError) const;