Poi share link #5113
Merged
Poi share link #5113
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… POI_share_link
… POI_share_link
… POI_share_link
Open
12 tasks
tigrim
reviewed
Dec 15, 2025
Sources/Helpers/ShareLinkItem.swift
Outdated
| let metadata = LPLinkMetadata() | ||
| metadata.originalURL = url | ||
| metadata.url = url | ||
| if let title = title, !title.isEmpty { |
Sources/Helpers/ShareLinkItem.swift
Outdated
| metadata.title = title | ||
| } | ||
|
|
||
| if let icon = icon, icon.size.width > 0, icon.size.height > 0 { |
Sources/Views/OATargetPointView.mm
Outdated
| int zoom = _mapView.zoomLevel; | ||
| NSString *poiName = [self.customController encodedPoiNameForLink];; | ||
| NSString *poiType = [self.customController encodedPoiTypeForLink]; | ||
| NSString *httpUrlString = [self buildSharePoiUrlWithPoiName:poiName poiType:poiType lat:lat lon:lon zoom:zoom]; |
Sources/Views/OATargetPointView.mm
Outdated
| NSString *poiName = [self.customController encodedPoiNameForLink];; | ||
| NSString *poiType = [self.customController encodedPoiTypeForLink]; | ||
| NSString *httpUrlString = [self buildSharePoiUrlWithPoiName:poiName poiType:poiType lat:lat lon:lon zoom:zoom]; | ||
| NSURL *httpUrl = [NSURL URLWithString:httpUrlString]; |
Sources/AppHost/SceneDelegate.mm
Outdated
| if (amenity == nil) | ||
| return NO; | ||
|
|
||
| OATargetPoint*targetPoint=[_rootViewController.mapPanel.mapViewController.mapLayers.poiLayer getTargetPoint:[amenity syntheticAmenity]]; |
Contributor
There was a problem hiding this comment.
Did you run out of spaces on your keyboard? )
|
|
||
| - (NSString *)encodedPoiTypeForLink | ||
| { | ||
| NSString *shareType = @""; |
Contributor
Author
There was a problem hiding this comment.
Implemented in OAPOIViewController since it complies with Android.
Methods should also be overridden in OAFavoriteViewController
Support Files/OA-Prefix.pch
Outdated
| #define kLastMapUsedTime @"kLastMapUsedTime" | ||
|
|
||
| #define kShareLinkTemplate @"https://osmand.net/map?pin=%.6f,%.6f#%d/%.4f/%.4f\nThe location was shared with you by OsmAnd" | ||
| #define kSharePoiBaseUrl @"https://osmand.net/map/poi/" |
Contributor
There was a problem hiding this comment.
use static NSString * const
| for (OAPOI *amenity in amenities) | ||
| { | ||
| if (amenity.obfId > 0) | ||
| if (amenity.obfId != 0) |
Contributor
There was a problem hiding this comment.
i saw a similar change somewhere by @nnngrach. We need to check if there’s a conflict
Contributor
Author
There was a problem hiding this comment.
I didn't find an identical check in the project.
Sources/AppHost/SceneDelegate.mm
Outdated
| OAFavoriteItem *point = [OAFavoritesHelper getVisibleFavByLat:lat lon:lon]; | ||
| if (point && [name isEqualToString:[point getName]]) | ||
| { | ||
| OATargetPoint*targetPoint = [_rootViewController.mapPanel.mapViewController.mapLayers.favoritesLayer getTargetPoint:point]; |
Sources/AppHost/SceneDelegate.mm
Outdated
| return NO; | ||
| } | ||
|
|
||
| - (BOOL)handleIncomingMapPoiURL:(NSURL *)url |
Contributor
There was a problem hiding this comment.
There shouldn’t be any link-parsing code in the SceneDelegate class. All parsing should be moved to the DeepLinkParser class
Contributor
There was a problem hiding this comment.
You need to introduce the following structure:
@objcMembers
final class DeepLinkManager: NSObject {
static let shared = DeepLinkManager()
private let deepLinkParser = DeepLinkParser()
func handleDeepLink(url: URL) -> Bool {
deepLinkParser.parseDeepLink(url)
}
}
This logic should be moved into DeepLinkParser:
return [self handleIncomingFileURL:url]
|| [self handleIncomingActionsURL:url]
|| [self handleIncomingNavigationURL:url]
|| [self handleIncomingSetPinOnMapURL:url]
|| [self handleIncomingMoveMapToLocationURL:url]
|| [self handleIncomingOpenLocationMenuURL:url]
|| [self handleIncomingTileSourceURL:url]
|| [self handleIncomingOsmAndCloudURL:url];
tigrim
reviewed
Dec 16, 2025
Sources/Helpers/OAFavoritesBridge.h
Outdated
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @class OAFavoriteItem; |
Sources/POI/OAPOI.mm
Outdated
| if (wikidata.length == 0) | ||
| return @""; | ||
|
|
||
| if ([wikidata hasPrefix:@"Q"] || [wikidata hasPrefix:@"q"]) |
Contributor
There was a problem hiding this comment.
unichar firstChar = [wikidata characterAtIndex:0];
if (firstChar == 'Q' || firstChar == 'q') {}
Contributor
There was a problem hiding this comment.
or use lowercase for wikidata
Sources/AppHost/SceneDelegate.mm
Outdated
|
|
||
| - (BOOL)handleIncomingSetPinOnMapURL:(NSURL *)url | ||
| { | ||
| if ([DeepLinkParser handleIncomingMapPoiURL:url rootViewController:_rootViewController]) |
Contributor
There was a problem hiding this comment.
We can move all this logic into DeepLinkParser
Sources/AppHost/SceneDelegate.mm
Outdated
|
|
||
| if ([OAUtilities isOsmAndSite:url] && [OAUtilities isPathPrefix:url pathPrefix:@"/map/poi"]) | ||
| { | ||
| __weak __typeof(self) weakSelf = self; |
Contributor
There was a problem hiding this comment.
Refactor to the following pattern:
__weak typeof(self) weakSelf = self;
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf someMethod];
});
tigrim
reviewed
Dec 17, 2025
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @class OARootViewController, OATargetPoint; |
Sources/POI/DeepLinkParser.swift
Outdated
| } | ||
|
|
||
| let startLatLon: CLLocation? = { | ||
| guard let startParam = startLatLonParam, !startParam.isEmpty else { return nil } |
Sources/POI/DeepLinkParser.swift
Outdated
| } | ||
|
|
||
| let appMode = OAApplicationMode.value(ofStringKey: appModeKeyParam, def: nil) | ||
| if let key = appModeKeyParam, !key.isEmpty, appMode == nil { |
Sources/POI/DeepLinkParser.swift
Outdated
| let vc = rootViewController.navigationController?.visibleViewController | ||
| if let verificationVC = vc as? OACloudAccountVerificationViewController { | ||
| let isValidToken: Bool = { | ||
| guard let token = tokenParam else { return false } |
Sources/POI/DeepLinkParser.swift
Outdated
| return BackupUtils.isTokenValid(token) | ||
| }() | ||
|
|
||
| if isValidToken, let token = tokenParam { |
| return rootViewController.handleIncomingURL(url) | ||
| } | ||
|
|
||
| private func handleIncomingActionsURL(_ url: URL, rootViewController: OARootViewController?) -> Bool { |
Contributor
There was a problem hiding this comment.
You lost the example URL. It needs to be migrated as well
… POI_share_link # Conflicts: # Sources/OsmAnd Maps-Bridging-Header.h
tigrim
approved these changes
Dec 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.