Context menu gpx appeareance tags fix v3 #5091

nnngrach · 2025-11-26T14:00:50Z

Old logic:

Tap on map.
Select first vector obf oblect. (OAContextMenuLayer do all work by itself)
Parse latlon and some tags.
Make poi search by latlon and name if needed.
Create poi object with parsed extensions.
Create OATargetPoint data object. targetPoint.object = poi;
OAContextMenuLayer sends created targetPoint to OAMapPanelViewController and opens context menu.
Called OAPOIVC.
OAPOIVC build context whole context menu data and ui by itself.
Context menu shows.

New logic:

Tap on map.
Find all vector obf objects in finger touch area. (OAContextMenuLayer uses MapSelector helper for it).
Parse latlon and tags for every object in list. (Poi, wiki, travelGuides, lines, polygons, data from additional user maps in area)
Force make poi search by latlon and name. Only for main poi object.
Join all founded and parsed data.
Instead of OATargetPoint.object = poi create DetailsObject.objects = @[allFoundPointsAndPolygons];
MapSelector sends DetailsObject to OAContextMenuLayer.
OAContextMenuLayer sends DetailsObject to OAMapPanelViewController and opens context menu.
Called OAPOIVC.
OAPOIVC not build all data ui itself. It AmenityUiHelper for building common poi menu.
OAPOIVC calls plugin classes (Mapillary, Wiki, TravelGuides etc) to add their menu rows to created menu data.
Context menu shows.

Temp logic. That we're used in release. Because old code was already updated. But all ui features wasn't finished. So it works like in original but using new classes:

Find all vector obf in area, join data. Create DetailsObject. But don't use it for now (ui isn't ready for it).
Force run temp processTransportStops() function to force overwrite found data with only first main poi. In result we're still using only one point data. Just like was in original code. But now with new datatypes.
Create OATargetPoint with this first poi.
MapSelectionHelper -> OAContextMenuLayer -> OAMapPanelViewController -> OAPOIVC.
Context menu shows.

In this request i deleted that temp logic. And send to ui DetailsObject with combined data, like it should be in final version. But work with ui menu buildier to build menu with that new combined data isn't finished yet.

* context_menu_gpx_appearean_tags_fix * clean code * manual add file * rewrite OAGpxAppearanceInfo to swift * remove old files * quickfix * sync GpxAppearanceInfo with android * sync with android * code review fix * Fix Bool value * Add private static func boolValue --------- Co-authored-by: Dmitry Svetlichny <svetlichny1988@icloud.com>

nnngrach · 2025-11-26T14:57:09Z

Current status.

Before.
Data only from main point. But ui works.

After.
Data from all combined sources. But ui can't use it yet.

tigrim · 2025-11-27T13:20:59Z

OsmAnd.xcodeproj/project.pbxproj

-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";


tigrim · 2025-11-27T13:22:52Z

Sources/Constants/OAIndexConstants.h


 static NSString * const ONLINE_TILES_DIR = @"OsmAnd (online tiles)";

+static NSString * const XML_COLON = @"_-_";


kXmlColon already exists

tigrim · 2025-11-27T13:28:47Z

Sources/Controllers/Map/Helpers/BaseDetailsObject.swift

+            } else {
+                processId(transportStop)
+                syntheticAmenity.copyNames(transportStop)
+                if syntheticAmenity.latitude == 0 && syntheticAmenity.longitude == 0 {


Is this logic correct? The point (0,0) is a real location in the Gulf of Guinea off the coast of Africa, so using (0,0) as a placeholder may be wrong. Maybe u should check for nil instead?

tigrim · 2025-11-27T13:29:04Z

Sources/Controllers/Map/Helpers/BaseDetailsObject.swift

+                syntheticAmenity.copyAdditionalInfo(withMap: renderedObject.tags, overwrite: false)
+            }
+            syntheticAmenity.copyNames(renderedObject)
+            if syntheticAmenity.latitude == 0 && syntheticAmenity.longitude == 0 {


tigrim · 2025-11-27T13:41:31Z

Sources/Controllers/Map/Layers/OAPOILayer.mm

+        {
+            NSString *key = entry.declaration->tagName.toNSString();
+            NSString *loc;
+            if (key.length > 8)


The logic is unclear. A comment is needed

tigrim · 2025-11-27T14:13:08Z

Sources/Controllers/TargetMenu/OATargetInfoViewController.mm

    [self clearContentForRowInfo:_onlinePhotoCardsRowInfo];
    _onlinePhotoCardsRowInfo = nearbyImagesRowInfo;
+
+    [self startLoadingImages];


Didn’t break the content loading logic? When a section is collapsed, images should not be loaded

tigrim · 2025-11-27T14:13:23Z

Sources/Controllers/TargetMenu/OATargetMenuViewController.h


 + (OATargetMenuViewController *) createMenuController:(OATargetPoint *)targetPoint activeTargetType:(OATargetPointType)activeTargetType activeViewControllerState:(OATargetMenuViewControllerState *)activeViewControllerState headerOnly:(BOOL)headerOnly;

+ (OATargetMenuViewController *) createMenuController:(OATargetPoint *)targetPoint selectedObject:(id)selectedObject activeTargetType:(OATargetPointType)activeTargetType activeViewControllerState:(OATargetMenuViewControllerState *)activeViewControllerState headerOnly:(BOOL)headerOnly;


(OATargetMenuViewController *)createMenuController:

tigrim · 2025-11-27T14:13:35Z

Sources/Controllers/TargetMenu/OATargetMenuViewController.mm

+    return [self.class createMenuController:targetPoint selectedObject:nil activeTargetType:activeTargetType activeViewControllerState:activeViewControllerState headerOnly:headerOnly];
+}
+
+ (OATargetMenuViewController *) createMenuController:(OATargetPoint *)targetPoint selectedObject:(id)selectedObject activeTargetType:(OATargetPointType)activeTargetType activeViewControllerState:(OATargetMenuViewControllerState *)activeViewControllerState headerOnly:(BOOL)headerOnly


tigrim · 2025-11-27T14:16:53Z

Sources/POI/OARenderedObject.h


 @property (nonatomic) BOOL isPolygon;

+- (NSMutableArray<NSString *> *) getOriginalNames;


tigrim · 2025-11-27T14:17:40Z

Sources/POI/OARenderedObject.mm

    return abs(_bboxRight - _bboxLeft) * abs(_bboxTop - _bboxBottom);
 }

+- (NSMutableArray<NSString *> *) getOriginalNames


Where do we use this?

ivanPyrohivskyi · 2025-12-09T15:51:28Z

Sources/Controllers/Map/Helpers/BaseDetailsObject.swift

-            return ObfConstants.getOsmObjectId(detailsObject.syntheticAmenity)
        }
-        return -1
+        return 0


Changed base logic, already use -1 in other places:
NSNumber * osmIdObj = osmId < 0 ? nil : @(osmId);

nnngrach and others added 13 commits November 18, 2025 20:35

context_menu_gpx_appearean_tags_fix

08274fe

rewrite OAGpxAppearanceInfo to swift

fcb6348

remove old files

de07e71

quickfix

275cb9f

fix conflict

9bba14d

fix conflict

7d13a53

fix conflict

df437b2

fix conflict

fd01931

merge conflicts fixed. code cleared

6f99c60

code cleared

6c64dcd

clear code

115fd06

code update

403c5cd

nnngrach changed the base branch from master to r5.2 November 26, 2025 14:37

nnngrach linked an issue Nov 26, 2025 that may be closed by this pull request

Tapping a POI is laggy and Combined context menu #4594

Open

1 task

nnngrach changed the base branch from r5.2 to master November 26, 2025 15:17

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3

04212c1

tigrim reviewed Nov 27, 2025

View reviewed changes

crash fix. code update

2fdad13

ivanPyrohivskyi reviewed Dec 9, 2025

View reviewed changes

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3

ecbd20e

RZR-UA changed the title ~~Context menu gpx appearean tags fix v3~~ Context menu gpx appeareance tags fix v3 Dec 18, 2025

crash fix

e8cf881


		static NSString * const ONLINE_TILES_DIR = @"OsmAnd (online tiles)";

		static NSString * const XML_COLON = @"_-_";


		+ (OATargetMenuViewController ) createMenuController:(OATargetPoint )targetPoint activeTargetType:(OATargetPointType)activeTargetType activeViewControllerState:(OATargetMenuViewControllerState *)activeViewControllerState headerOnly:(BOOL)headerOnly;

		+ (OATargetMenuViewController ) createMenuController:(OATargetPoint )targetPoint selectedObject:(id)selectedObject activeTargetType:(OATargetPointType)activeTargetType activeViewControllerState:(OATargetMenuViewControllerState *)activeViewControllerState headerOnly:(BOOL)headerOnly;


		@property (nonatomic) BOOL isPolygon;

		- (NSMutableArray<NSString > ) getOriginalNames;

Context menu gpx appeareance tags fix v3 #5091

Are you sure you want to change the base?

Context menu gpx appeareance tags fix v3 #5091

Uh oh!

Conversation

nnngrach commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nnngrach commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

nnngrach commented Nov 26, 2025 •

edited

Loading

nnngrach commented Nov 26, 2025 •

edited

Loading