From 00a432ebe2dc0036a2969ad71229cf240d72b8cc Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Fri, 5 Apr 2019 15:14:14 +0300 Subject: [PATCH] [deep links] fix for search on map deep link without cll parameter --- android/src/com/mapswithme/maps/MwmActivity.java | 2 +- iphone/Maps/Classes/MapsAppDelegate.mm | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 543b9f57c5..8f74804dc0 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -1571,7 +1571,7 @@ public class MwmActivity extends BaseMwmFragmentActivity return true; case ParsedUrlMwmRequest.RESULT_SEARCH: final ParsedSearchRequest request = Framework.nativeGetParsedSearchRequest(); - if (request.mIsSearchOnMap) + if (request.mIsSearchOnMap && (request.mLat != 0.0 || request.mLon != 0.0)) { Framework.nativeStopLocationFollow(); Framework.nativeSetViewportCenter(request.mLat, request.mLon, SEARCH_IN_VIEWPORT_ZOOM); diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 90087edb26..823a497140 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -271,10 +271,15 @@ using namespace osm_auth_ios; if (request.m_isSearchOnMap) { - ASSERT([self isDrapeEngineCreated], ()); - [MapViewController setViewport:request.m_centerLat - lon:request.m_centerLon - zoomLevel:kSearchInViewportZoom]; + // Set viewport only when cll parameter was provided in url. + if (request.m_centerLat != 0.0 || request.m_centerLon != 0.0) + { + ASSERT([self isDrapeEngineCreated], ()); + [MapViewController setViewport:request.m_centerLat + lon:request.m_centerLon + zoomLevel:kSearchInViewportZoom]; + } + [manager searchTextOnMap:query forInputLocale:locale]; } else