Context menu refactor (provisional draft branch) by RZR-UA · Pull Request #5225 · osmandapp/OsmAnd-iOS

RZR-UA · 2026-03-02T11:05:34Z

* 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>

…ge_master

…eredObject

…ge_master # Conflicts: # Sources/OsmAnd Maps-Bridging-Header.h

tigrim · 2026-03-09T12:50:18Z

+		325FDBAD2E8E9AE9006E7C07 /* AdditionalInfoBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalInfoBundle.swift; sourceTree = "<group>"; };
+		326087062F3239FD0038A34B /* AmenityInfoRowParams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmenityInfoRowParams.swift; sourceTree = "<group>"; };
+		326087082F324B270038A34B /* PoiAdditionalUiRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PoiAdditionalUiRule.swift; sourceTree = "<group>"; };
+		3260870B2F324DB00038A34B /* IPoiAdditionalRowBehavior.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPoiAdditionalRowBehavior.swift; sourceTree = "<group>"; };


PoiAdditionalRowBehavior

tigrim · 2026-03-09T12:57:14Z

                if ([_editingAddon isEnabled])
                {
-                    BOOL createNewPoi = (_targetPoint.obfId == 0 && _targetPoint.type != OATargetTransportStop && _targetPoint.type != OATargetOsmEdit) || _targetPoint.type == OATargetOsmNote;
+                    BOOL createNewPoi = (![_targetPoint isValidObfId] && _targetPoint.type != OATargetTransportStop && _targetPoint.type != OATargetOsmEdit) || _targetPoint.type == OATargetOsmNote;


tigrim · 2026-03-09T13:04:35Z

-
+
+    static func convertRenderedObjectToAmenity(_ renderedObject: OARenderedObject) -> OAPOI {
+        let am = OAPOI()


tigrim · 2026-03-09T13:07:17Z

+                    poiType = mapPoiTypes?.getPoiType(byKey: tag)
+                }
+
+                if let foundType = poiType {


if let poiType {}

tigrim · 2026-03-09T13:13:43Z

                        }

-                        BOOL isSpecial = isOldOsmRoute || isNewOsmRoute || isTravelGpx || isClickableWay;
+                      //  BOOL isSpecial = isOldOsmRoute || isNewOsmRoute || isTravelGpx || isClickableWay;


?
[Android]

boolean isSpecial = isOldOsmRoute || isNewOsmRoute || isTravelGpx || isClickableWay; boolean shouldFilterRenderedObject = renderedObject.getId() == null || !renderedObject.isVisible() || renderedObject.isDrawOnPath(); if ((isSpecial && rules.isOnlyPoints()) || (!isSpecial && shouldFilterRenderedObject)) { continue; }

@RZR-UA for you

tigrim · 2026-03-09T13:19:02Z

+        if (obj.x && obj.x.count > 0)
+        {
+            for (int i = 0; i < obj.x.count; i++)
+                points.push_back( OsmAnd::PointI(obj.x[i].intValue, obj.y[i].intValue) );


remove spaces

tigrim · 2026-03-09T13:22:49Z

+    override func applyCommonRules(params: PoiRowParams) {
+        super.applyCommonRules(params: params)
+
+        if let valueAsNumber = Int(params.value) {


valueAsNumber unused

…ttps://github.com/osmandapp/OsmAnd-ios into context_menu_gpx_appearean_tags_fix_v3_merge_master

tigrim · 2026-03-10T08:51:22Z

+    override func applyCustomRules(params: PoiRowParams) {
+        super.applyCustomRules(params: params)
+
+        if let valueAsNumber = Int(params.value) {


tigrim · 2026-03-10T08:59:30Z

+final class AmenityInfoRowParams: NSObject {
+
+    var key: String?
+    //var icon: UIImage? //TODO: delete, not needed?


tigrim · 2026-03-10T09:04:38Z

+
+                    let cuisineOrDish = key == CUISINE_TAG || key == DISH_TAG
+
+                    // TODO: here is a bug with poi type parsing


tigrim · 2026-03-10T09:28:39Z

+- (NSString *)createWikipediaArticleList:(NSDictionary<NSString *, id> *)filteredInfo
 {
-    return [ObfConstants getOsmUrlForId:self.poi];
+    //TODO: implement


tigrim · 2026-03-10T09:30:48Z

-
+
    override func getTypeStr() -> String? {
+        // TODO: RZR reuse detailed object and/or port fresh Java code


tigrim · 2026-03-10T09:49:01Z

+
    static func isOsmUrlAvailable(_ object: OAMapObject) -> Bool {
-        return object.obfId > 0
+        // TODO: test. in ios don't store negative values for objects without osm


tigrim · 2026-03-10T09:49:22Z


-    static func isIdFromRelation(_ obfId: Int64) -> Bool {
+    static func isIdFromRelation(_ obfId: UInt64) -> Bool {
+        // TODO: test


tigrim · 2026-03-10T09:49:27Z


-    static func isIdFromPropagatedNode(_ obfId: Int64) -> Bool {
+    static func isIdFromPropagatedNode(_ obfId: UInt64) -> Bool {
+        // TODO: test


tigrim · 2026-03-10T09:49:31Z


-    static func isIdFromSplit(_ obfId: Int64) -> Bool {
+    static func isIdFromSplit(_ obfId: UInt64) -> Bool {
+        // TODO: test


tigrim · 2026-03-10T09:52:31Z

 @interface OAPOI : OAMapObject

-@property (nonatomic, nullable) OAPOIType *type;
+@property (nonatomic, nullable) OAPOIType *type;    //TODO: test. in android here is category:  private PoiCategory type;


…ge_master

alex-dev-neo · 2026-03-15T12:09:38Z

 - (int) getDefaultRadiusPoi;

 - (BOOL) isVisible;
+- (int)pointOrder:(id)object;


pointsOrder

alex-dev-neo · 2026-03-15T12:42:17Z

+//  Copyright © 2026 OsmAnd. All rights reserved.
+//
+
+@interface OAOpenedHoursParser : NSObject


OAOpeningHoursParser

…rser

nnngrach and others added 30 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

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3

04212c1

crash fix. code update

2fdad13

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3

ecbd20e

crash fix

e8cf881

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3

7f46941

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3

9015197

Synchronize BaseDetailsObject

6af9b8e

Remove whitespaces

2ac4cd6

review fix

c312472

remove duplicated variable

064f559

sync with android. it can contain uninited latlon

92119c8

remove unused code

f8ccaab

review fix

572c401

review fix

4648f19

review fix

e1c3def

review fix

1418262

Add TODO for possible double call

32aa1ad

ivanPyrohivskyi and others added 10 commits March 3, 2026 16:54

Fix popular places

2a4889c

mapPanel.updateContextMenu

52d5319

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3_mer…

5104db4

…ge_master

updateTargetPoint

aa08477

fix: use detailsObject for targetMenuView (title/icon)

a8c239b

replacingNbsp

3062be2

avoid building cells twice in buildMenu for FavoriteViewController

9e5ca57

use searchDetailedObject for OATargetBaseDetailsObject | OATargetRend…

4e1cee8

…eredObject

fix transportStop visualization

4d01bf2

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3_mer…

9314ba8

…ge_master # Conflicts: # Sources/OsmAnd Maps-Bridging-Header.h

tigrim reviewed Mar 9, 2026

View reviewed changes

ivanPyrohivskyi and others added 4 commits March 9, 2026 18:39

Fix wikiwoyage merging

a087686

grooming

6661764

crash fix

1af4efe

Merge branch 'context_menu_gpx_appearean_tags_fix_v3_merge_master' of h…

80893d6

…ttps://github.com/osmandapp/OsmAnd-ios into context_menu_gpx_appearean_tags_fix_v3_merge_master

tigrim reviewed Mar 10, 2026

View reviewed changes

tigrim added 7 commits March 11, 2026 15:23

clear and grooming

d2a15d6

add row createWikipediaArticleList

a2842cb

fix parsing poiCategory for AmenityUIHelper

e36f9b7

Fix crash on OSM notes row tap

2944726

fix tap OSM nots on map

e0d8b7d

Merge branch 'master' into context_menu_gpx_appearean_tags_fix_v3_mer…

3b42403

…ge_master

grooming

69a95a2

tigrim marked this pull request as ready for review March 13, 2026 15:25

tigrim requested a review from alex-dev-neo March 13, 2026 15:25

alex-dev-neo reviewed Mar 15, 2026

View reviewed changes

pointOrder -> pointsOrder and OAOpenedHoursParser -> OAOpeningHoursPa…

2c9f34a

…rser

tigrim linked an issue Mar 17, 2026 that may be closed by this pull request

Tapping a POI is laggy and Combined context menu #4594

Open

1 task

alex-dev-neo merged commit 13bad6e into master Mar 17, 2026

alex-dev-neo deleted the context_menu_gpx_appearean_tags_fix_v3_merge_master branch March 17, 2026 09:11



		static func convertRenderedObjectToAmenity(_ renderedObject: OARenderedObject) -> OAPOI {
		let am = OAPOI()


		let cuisineOrDish = key == CUISINE_TAG \|\| key == DISH_TAG

		// TODO: here is a bug with poi type parsing



		override func getTypeStr() -> String? {
		// TODO: RZR reuse detailed object and/or port fresh Java code

Conversation

RZR-UA commented Mar 2, 2026 • 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!

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!

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!

6 participants

RZR-UA commented Mar 2, 2026 •

edited

Loading