From b891ecd5bb9d8584344bf4f79519a755afb40259 Mon Sep 17 00:00:00 2001 From: Aleksey Belousov Date: Thu, 28 May 2020 16:43:42 +0300 Subject: [PATCH] [iOS] open route on map from catalog https://jira.mail.ru/browse/MAPSME-13813 --- .../CoreApi/Framework/MWMFrameworkHelper.h | 1 + .../CoreApi/Framework/MWMFrameworkHelper.mm | 4 +++ .../Catalog/CatalogWebViewController.swift | 34 ++++++++++++++----- iphone/Maps/Categories/URL+Query.swift | 8 +++++ iphone/Maps/Maps.xcodeproj/project.pbxproj | 4 +++ 5 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 iphone/Maps/Categories/URL+Query.swift diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h index b8c1d44b6a..5190b9d048 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h @@ -39,6 +39,7 @@ NS_SWIFT_NAME(FrameworkHelper) inputLocale:(NSString *)locale completion:(SearchInDownloaderCompletions)completion; + (BOOL)canEditMap; ++ (void)showOnMap:(MWMMarkGroupID)categoryId; @end NS_ASSUME_NONNULL_END diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index a228007cd9..607036d33b 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -170,4 +170,8 @@ return GetFramework().CanEditMap(); } ++ (void)showOnMap:(MWMMarkGroupID)categoryId { + GetFramework().ShowBookmarkCategory(categoryId); +} + @end diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index 8985984ba5..9d481ea2d2 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -162,20 +162,33 @@ final class CatalogWebViewController: WebViewController { decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) { let subscribePath = "subscribe" + let showOnMapPath = "map" guard let url = navigationAction.request.url, - url.scheme == "mapsme" || url.path.contains("buy_kml") || url.path.contains(subscribePath) else { - super.webView(webView, decidePolicyFor: navigationAction, decisionHandler: decisionHandler) - return + url.scheme == "mapsme" || + url.path.contains("buy_kml") || + url.path.contains(subscribePath) || + url.path.contains(showOnMapPath) else { + super.webView(webView, decidePolicyFor: navigationAction, decisionHandler: decisionHandler) + return + } + + defer { + decisionHandler(.cancel); } if url.path.contains(subscribePath) { showSubscribe(type: SubscriptionGroupType(catalogURL: url)) - decisionHandler(.cancel); + return + } + + if url.path.contains(showOnMapPath) { + guard let components = url.queryParams() else { return } + guard let serverId = components["server_id"] else { return } + showOnMap(serverId) return } processDeeplink(url) - decisionHandler(.cancel); } override func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) { @@ -212,6 +225,12 @@ final class CatalogWebViewController: WebViewController { present(subscribeViewController, animated: true) } + private func showOnMap(_ serverId: String) { + let groupId = MWMBookmarksManager.shared().getGroupId(serverId) + FrameworkHelper.show(onMap: groupId) + navigationController?.popToRootViewController(animated: true) + } + private func buildHeaders(completion: @escaping ([String : String]?) -> Void) { billing.requestProducts(Set(MWMPurchaseManager.bookmarkInappIds()), completion: { (products, error) in var productsInfo: [String : [String: String]] = [:] @@ -269,10 +288,7 @@ final class CatalogWebViewController: WebViewController { } private func parseUrl(_ url: URL) -> CatalogCategoryInfo? { - guard let urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false) else { return nil } - guard let components = urlComponents.queryItems?.reduce(into: [:], { $0[$1.name] = $1.value }) - else { return nil } - + guard let components = url.queryParams() else { return nil } return CatalogCategoryInfo(components, type: SubscriptionGroupType(catalogURL: url)) } diff --git a/iphone/Maps/Categories/URL+Query.swift b/iphone/Maps/Categories/URL+Query.swift new file mode 100644 index 0000000000..a6a1b391ac --- /dev/null +++ b/iphone/Maps/Categories/URL+Query.swift @@ -0,0 +1,8 @@ +import Foundation + +extension URL { + func queryParams() -> [String : String]? { + guard let urlComponents = URLComponents(url: self, resolvingAgainstBaseURL: false) else { return nil } + return urlComponents.queryItems?.reduce(into: [:], { $0[$1.name] = $1.value }) + } +} diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 30db2fc4a5..f5f55eeb1a 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -329,6 +329,7 @@ 4719A645219CBD65009F9AA7 /* IPendingTransactionsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A644219CBD65009F9AA7 /* IPendingTransactionsHandler.swift */; }; 4719A647219CBD7F009F9AA7 /* IBillingPendingTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A646219CBD7F009F9AA7 /* IBillingPendingTransaction.swift */; }; 4719A64E21A30C3B009F9AA7 /* PaidRouteStatistics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A64D21A30C3B009F9AA7 /* PaidRouteStatistics.swift */; }; + 471A7BB8247FE3C300A0D4C1 /* URL+Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471A7BB7247FE3C300A0D4C1 /* URL+Query.swift */; }; 471AB98923AA8A3500F56D49 /* IDownloaderDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471AB98823AA8A3500F56D49 /* IDownloaderDataSource.swift */; }; 471AB99423ABA3BD00F56D49 /* SearchMapsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471AB99323ABA3BD00F56D49 /* SearchMapsDataSource.swift */; }; 471BBD942130390F00EB17C9 /* TutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471BBD932130390F00EB17C9 /* TutorialViewController.swift */; }; @@ -1445,6 +1446,7 @@ 4719A644219CBD65009F9AA7 /* IPendingTransactionsHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPendingTransactionsHandler.swift; sourceTree = ""; }; 4719A646219CBD7F009F9AA7 /* IBillingPendingTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IBillingPendingTransaction.swift; sourceTree = ""; }; 4719A64D21A30C3B009F9AA7 /* PaidRouteStatistics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRouteStatistics.swift; sourceTree = ""; }; + 471A7BB7247FE3C300A0D4C1 /* URL+Query.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Query.swift"; sourceTree = ""; }; 471AB98823AA8A3500F56D49 /* IDownloaderDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IDownloaderDataSource.swift; sourceTree = ""; }; 471AB99323ABA3BD00F56D49 /* SearchMapsDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchMapsDataSource.swift; sourceTree = ""; }; 471BBD932130390F00EB17C9 /* TutorialViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TutorialViewController.swift; sourceTree = ""; }; @@ -2828,6 +2830,7 @@ 47699A0721F08E37009E6585 /* NSDate+TimeDistance.m */, 99E2B0112368A8C700FFABC5 /* MWMCategory+PlacesCountTitle.swift */, 9957FAE0237AE04900855F48 /* MWMMapViewControlsManager+AddPlace.h */, + 471A7BB7247FE3C300A0D4C1 /* URL+Query.swift */, ); path = Categories; sourceTree = ""; @@ -5352,6 +5355,7 @@ 993DF11E23F6BDB100AC231A /* UITextViewRenderer.swift in Sources */, 349FC5481F680DAE00968C9F /* ExpandableReviewView.swift in Sources */, F6E2FF5A1E097BA00083EBEC /* MWMNightModeController.m in Sources */, + 471A7BB8247FE3C300A0D4C1 /* URL+Query.swift in Sources */, 47F86D0120C93D8D00FEE291 /* TabViewController.swift in Sources */, 99536113235DB86C008B218F /* InsetsLabel.swift in Sources */, 6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */,