From 168592c349375cf153702a3ecf13377a74b8e8a3 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Thu, 29 Jun 2017 18:40:57 +0300 Subject: [PATCH] [partners_api] dummies for platforms --- .../jni/com/mapswithme/maps/UserMarkHelper.cpp | 15 ++++++++------- iphone/Maps/UI/PlacePage/MWMPlacePageData.mm | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp index 7ee1297db5..931b7b1ec6 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp @@ -116,8 +116,9 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) env->NewObject(g_bookmarkClazz, ctorId, jMwmName.get(), info.GetID().GetMwmVersion(), info.GetID().m_index, static_cast(info.m_bac.m_categoryIndex), static_cast(info.m_bac.m_bookmarkIndex), jName.get(), jTitle.get(), - jSecondaryTitle.get(), jbanners.get(), info.IsReachableByTaxi(), - jBookingSearchUrl.get(), localAdInfo.get(), routingPointInfo.get()); + jSecondaryTitle.get(), jbanners.get(), + !info.ReachableByTaxiProviders().empty(), jBookingSearchUrl.get(), + localAdInfo.get(), routingPointInfo.get()); if (info.IsFeature()) InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata()); return mapObject; @@ -135,7 +136,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) info.GetID().m_index, kMyPosition, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), {}, "", jbanners.get(), - info.IsReachableByTaxi(), info.GetBookingSearchUrl(), + !info.ReachableByTaxiProviders().empty(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get()); } @@ -145,16 +146,16 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) info.GetID().m_index, kApiPoint, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), info.GetMetadata(), info.GetApiUrl(), - jbanners.get(), info.IsReachableByTaxi(), info.GetBookingSearchUrl(), - localAdInfo.get(), routingPointInfo.get()); + jbanners.get(), !info.ReachableByTaxiProviders().empty(), + info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get()); } return CreateMapObject(env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, kPoi, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), info.IsFeature() ? info.GetMetadata() : Metadata(), "", jbanners.get(), - info.IsReachableByTaxi(), info.GetBookingSearchUrl(), localAdInfo.get(), - routingPointInfo.get()); + !info.ReachableByTaxiProviders().empty(), info.GetBookingSearchUrl(), + localAdInfo.get(), routingPointInfo.get()); } jobjectArray ToBannersArray(JNIEnv * env, vector const & banners) diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index 0fca5ce22f..cac326fc37 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -86,7 +86,7 @@ using namespace place_page; m_sections.push_back(Sections::Metainfo); [self fillMetaInfoSection]; - if (m_info.IsReachableByTaxi()) + if (!m_info.ReachableByTaxiProviders().empty()) { m_sections.push_back(Sections::Ad); m_adRows.push_back(AdRows::Taxi);