Refactor map objects selecting #4611

nnngrach · 2025-05-27T16:55:29Z

skipped for now:
TravelGpx
ClickableWay

tigrim · 2025-06-03T09:14:15Z

Sources/Controllers/Map/Helpers/OAClickableWay.h

+
+- (NSString *) getGpxFileName;
+
+@end


use macros in .h files

NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END

(NSString *)getGpxFileName;

tigrim · 2025-06-03T09:16:04Z

Sources/Controllers/Map/Helpers/OAClickableWayHelper.mm

+
+- (void) commonInit
+{
+    _clickableTags = [NSSet setWithObjects:@"piste:type", @"piste:difficulty", @"mtb:scale", @"dirtbike:scale", nil];


[NSSet setWithArray:@[ @"piste:type", @"piste:difficulty", @"mtb:scale", @"dirtbike:scale" ]];

tigrim · 2025-06-03T09:16:10Z

Sources/Controllers/Map/Helpers/OAClickableWayHelper.mm

+- (void) commonInit
+{
+    _clickableTags = [NSSet setWithObjects:@"piste:type", @"piste:difficulty", @"mtb:scale", @"dirtbike:scale", nil];
+    _requiredTagsAny = [NSSet setWithObjects:@"name", @"ref", @"piste:name", @"mtb:name", nil];


tigrim · 2025-06-03T09:21:35Z

Sources/Controllers/Map/Helpers/OAClickableWayHelper.mm

+
+- (BOOL) isClickableWayTags:(NSDictionary<NSString *, NSString *> *)tags
+{
+    for (NSString *forbiddenKey in _forbiddenTags.allKeys)


for-in loop over an NSDictionary iterates directly over its keys, similar to using allKeys, but more efficient because it avoids creating an intermediate array

tigrim · 2025-06-03T09:22:18Z

Sources/Controllers/Map/Helpers/OAClickableWayHelper.mm

+{
+    for (NSString *forbiddenKey in _forbiddenTags.allKeys)
+    {
+        NSString *forbiddenValue = _forbiddenTags[forbiddenKey];


add NSString *tagValue = tags[forbiddenKey];

tigrim · 2025-06-03T10:32:28Z

Sources/Controllers/TravelGuides/data/TravelObfHelper.swift

        travelGpx.file = file
+
+        //TODO: delete


// TODO: delete

tigrim · 2025-06-03T10:34:16Z

Sources/Helpers/OAUtilities.m

@@ -2771,6 +2794,29 @@ + (NSString *) createNewFileName:(NSString *)oldName
    return newName;
 }

+ (NSString *) simplifyFileName:(NSString *)filename


add example

tigrim · 2025-06-03T10:36:33Z

Sources/POI/OAPOI.mm

+        [supported addObjectsFromArray:[self getNames:CONTENT_TAG defTag:@"en"]];
+        [supported addObjectsFromArray:[self getNames:DESCRIPTION_TAG defTag:@"en"]];
+        [supported addObjectsFromArray:[self getNames:@"wiki_lang" defTag:@"en"]];
+        return supported;


[locales copy]; ?

tigrim · 2025-06-03T10:37:44Z

Sources/POI/OAPOI.mm

+- (NSArray<NSString *> *) getAdditionalInfoKeys
+{
+    NSDictionary<NSString *, NSString *> *info = [self getAdditionalInfo];
+    return info == nil ? @[] : [info allKeys];


return info ? info.allKeys : @[];

tigrim · 2025-06-03T10:38:12Z

Sources/POI/OAPOI.mm

@@ -339,6 +412,67 @@ - (NSString *)getAdditionalInfo:(NSString *)key
    return [_values objectForKey:key];
 }

+- (NSMutableDictionary<NSString *, NSString *> *)getInternalAdditionalInfoMap
+{
+    return _values ? _values : [NSMutableDictionary new];


return _values ?: [NSMutableDictionary dictionary];

tigrim · 2025-06-05T08:08:59Z

Sources/Controllers/Map/Helpers/OAMapSelectionHelper.mm

@@ -405,9 +405,9 @@ - (BOOL) isUniqueTravelGpx:(NSMutableArray<OASelectedMapObject *> *)selectedObje
            [selectedObject.provider isKindOfClass:OAGPXLayer.class])
        {
            NSArray *pair = (NSArray *)selectedObject.object;
-            if ([pair[0] isKindOfClass:OATravelGpx.class])
+            if ([pair firstObject] && [[pair firstObject] isKindOfClass:OATravelGpx.class])


It's better to extract [pair firstObject] into a let variable. Also, checking with if ([yourLet isKindOfClass:OATravelGpx.class]) {} is sufficient.

tigrim · 2025-06-05T09:06:31Z

Sources/Controllers/Map/Layers/OAOsmBugsLayer.mm

+    if ([obj isKindOfClass:OAOnlineOsmNoteWrapper.class])
+    {
+        OAOnlineOsmNoteWrapper *note = (OAOnlineOsmNoteWrapper *)obj;
+        NSString *name = note.description ? note.description : @"";


tigrim · 2025-06-05T09:06:36Z

Sources/Controllers/Map/Layers/OAOsmBugsLayer.mm

+    {
+        OAOnlineOsmNoteWrapper *note = (OAOnlineOsmNoteWrapper *)obj;
+        NSString *name = note.description ? note.description : @"";
+        NSString *typeName = note.typeName ? note.typeName : OALocalizedString(@"osn_bug_name");


tigrim · 2025-06-05T09:10:03Z

Sources/Controllers/TravelGuides/data/TravelGpx.swift

+        }
+
+        let shortLinkTiles = amenity.getTagContent(TravelGpx.ROUTE_SHORTLINK_TILES)
+        if let shortLinkTiles {


if let shortLinkTiles = amenity.getTagContent(TravelGpx.ROUTE_SHORTLINK_TILES) {}

tigrim · 2025-06-05T09:11:07Z

Sources/Controllers/TravelGuides/data/TravelGpx.swift

+        }
+
+        if activityType == nil || activityType!.isEmpty {
+            for key in amenity.getAdditionalInfoKeys() {


where key.hasPrefix(Self.ROUTE_ACTIVITY_TYPE)

tigrim · 2025-06-05T09:11:28Z

Sources/Controllers/TravelGuides/data/TravelObfHelper.swift

+
+
+    func isTravelGpxTags(_ tags: [String: String]) -> Bool {
+        return tags[ROUTE_ID] != nil &&


remove return

tigrim · 2025-06-05T09:13:55Z

Sources/Helpers/OAUtilities.m

@@ -175,6 +175,15 @@ - (void) rLineToX:(CGFloat)x y:(CGFloat)y

 @end

+@implementation NSArray (util)


- (BOOL)isEmpty { return !array || array.count == 0; }

if ([myArray isEmpty]) { // ... }

tigrim · 2025-06-05T09:14:11Z

Sources/Helpers/OAUtilities.m

+
+ (BOOL)isEmpty:(NSDictionary *)dictionary
+{
+    return !dictionary || dictionary.count == 0;


tigrim · 2025-06-05T09:14:21Z

Sources/Helpers/OAUtilities.m

@@ -495,6 +513,11 @@ - (void) setMinLineHeight:(CGFloat)height alignment:(NSTextAlignment)alignment f

 @implementation NSString (util)

+ (BOOL)isEmpty:(NSString *)string
+{
+    return !string || string.length == 0;


alex-dev-neo · 2025-06-08T08:41:24Z

Sources/Controllers/Map/Helpers/OAPlaceDetailsObject.h

@@ -0,0 +1,38 @@
+//
+//  OAPlaceDetailsObject.h


It became BaseDetailsObject in java recently altogether with some code refactoring. So looks like new changes in Android code should be reviewed and introduced in iOS.

nnngrach added 29 commits May 9, 2025 14:32

draft commit

da96403

refactor

c40fba2

bugfix

4b56e11

sync code

dc544f3

update map poi search

7e96a60

code sync

8d51b8e

refactor

41f058f

refactor

76180e7

refactor

e1a5d81

refactor

c1e2901

code sync

e50c23e

code sync

6463f4a

debug

70e63ad

debug

0d23fa7

layers selecting implementation

6e51364

wpt layer sync

d00d9a6

map markers layer sync

aa94c94

bugfix

e271dd8

add osm notes selection

0afdfc0

sync mapillary layer

2da9584

gpx layer update

6682665

refactor

d79a304

deleted old code

621d723

clean code

a478b2a

wiki point context menu fixes

12a229c

Update OAPOI.mm

0614622

Update OAPOI.mm

6954fb0

Merge branch 'master' into select_ski_tracks_on_map

3edbbad

merge conflict fix

aa2fc0a

nnngrach changed the title ~~draft~~ Refactor map objects selecting Jun 3, 2025

tigrim reviewed Jun 3, 2025

View reviewed changes

nnngrach added 6 commits June 4, 2025 20:10

review fix

e1d2efb

review fix

4ab8b34

yellow warning fix.

c3fa963

review fix

585d8e5

review fix

4b819a3

review fix

3167fa7

tigrim reviewed Jun 5, 2025

View reviewed changes

nnngrach added 3 commits June 5, 2025 15:27

review fix

deeed19

refactor isEmpty() methods

4ecbf5f

Update OAWikiMenuViewController.m

24a9451

alex-dev-neo reviewed Jun 8, 2025

View reviewed changes



		func isTravelGpxTags(_ tags: [String: String]) -> Bool {
		return tags[ROUTE_ID] != nil &&

		@@ -175,6 +175,15 @@ - (void) rLineToX:(CGFloat)x y:(CGFloat)y

		@end

		@implementation NSArray (util)

Refactor map objects selecting #4611

Are you sure you want to change the base?

Refactor map objects selecting #4611

Uh oh!

Conversation

nnngrach commented May 27, 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!

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!

Uh oh!

nnngrach commented May 27, 2025 •

edited

Loading