Refactor map objects selecting

OsmAnd.xcodeproj/project.pbxproj

@@ -8135,6 +8135,8 @@
 				32C1C4E92DD4C4F200A053D4 /* OAMapSelectionResult.mm */,
 				32C1C4EA2DD4C4F200A053D4 /* OAPlaceDetailsObject.h */,
 				32C1C4EB2DD4C4F200A053D4 /* OAPlaceDetailsObject.mm */,
+				DA5A7F0C26C563A400F274C7 /* OASelectedGPXHelper.h */,
+				DA5A7F1426C563A400F274C7 /* OASelectedGPXHelper.mm */,
 				32F6B4292DEDD703002DBCEE /* OASelectedGpxPoint.h */,
 				32F6B42A2DEDD709002DBCEE /* OASelectedGpxPoint.mm */,
 				32F6B4262DEDD637002DBCEE /* OASelectedMapObject.h */,
@@ -12529,8 +12531,6 @@
 			children = (
 				32C1C4EC2DD4C4F200A053D4 /* Helpers */,
 				DA5A7ECE26C563A400F274C7 /* Layers */,
-				46E32494284A6AC800F95084 /* Toolbars */,
-				DA5A7F1526C563A400F274C7 /* Widgets */,
 				DA5A7F0226C563A400F274C7 /* OADestination.h */,
 				DA5A7F1026C563A400F274C7 /* OADestination.mm */,
 				DA5A857426C5680700F274C7 /* OADestinationBarWidget.xib */,
@@ -12567,11 +12567,11 @@
 				DA21F1BA29BA101E004985BA /* OANetworkRouteDrawable.mm */,
 				DA35963029B0A00A009DF4D6 /* OARouteKey.h */,
 				DA35963129B0A00A009DF4D6 /* OARouteKey.mm */,
-				DA5A7F0C26C563A400F274C7 /* OASelectedGPXHelper.h */,
-				DA5A7F1426C563A400F274C7 /* OASelectedGPXHelper.mm */,
 				DA5A7F0F26C563A400F274C7 /* OAToolbarViewController.h */,
 				DA5A7F1126C563A400F274C7 /* OAToolbarViewController.mm */,
 				DA5A7F0026C563A400F274C7 /* OAToolbarViewController.xib */,
+				46E32494284A6AC800F95084 /* Toolbars */,
+				DA5A7F1526C563A400F274C7 /* Widgets */,
 			);
 			path = Map;
 			sourceTree = "<group>";
@@ -12584,6 +12584,8 @@
 				DA5A7EE326C563A400F274C7 /* OAContextMenuLayer.h */,
 				DA5A7EEF26C563A400F274C7 /* OAContextMenuLayer.mm */,
 				DA5A7EF426C563A400F274C7 /* OAContextMenuProvider.h */,
+				C5DF39B32DBB6CA800332496 /* OACoordinatesGridLayer.h */,
+				C5DF39B42DBB6CA800332496 /* OACoordinatesGridLayer.mm */,
 				DA5A7EEA26C563A400F274C7 /* OADestinationsLayer.h */,
 				DA5A7EE626C563A400F274C7 /* OADestinationsLayer.mm */,
 				DA5A7EF626C563A400F274C7 /* OADownloadedRegionsLayer.h */,
@@ -12637,8 +12639,6 @@
 				8A3BE84E27DBB2AC00C5DFE2 /* OAWeatherContourLayer.mm */,
 				8AE943B127A28BE900961319 /* OAWeatherRasterLayer.h */,
 				8AE943B227A28BE900961319 /* OAWeatherRasterLayer.mm */,
-				C5DF39B32DBB6CA800332496 /* OACoordinatesGridLayer.h */,
-				C5DF39B42DBB6CA800332496 /* OACoordinatesGridLayer.mm */,
 			);
 			path = Layers;
 			sourceTree = "<group>";

Sources/Controllers/Map/Helpers/OAClickableWay.h

@@ -6,10 +6,16 @@
 //  Copyright © 2025 OsmAnd. All rights reserved.
 //
 
+NS_ASSUME_NONNULL_BEGIN
+
+
 @interface OAClickableWay : NSObject
 
 @property (nonatomic) long long osmId;
 
-- (NSString *) getGpxFileName;
+- (NSString *)getGpxFileName;
 
 @end
+
+
+NS_ASSUME_NONNULL_END

Sources/Controllers/Map/Helpers/OAClickableWayHelper+cpp.h

@@ -12,8 +12,8 @@
 
 @interface OAClickableWayHelper(cpp)
 
-- (BOOL) isClickableWay:(const std::shared_ptr<const OsmAnd::MapObject>)obfMapObject tags:(NSDictionary<NSString *, NSString *> *)tags;
+- (BOOL)isClickableWay:(const std::shared_ptr<const OsmAnd::MapObject>)obfMapObject tags:(NSDictionary<NSString *, NSString *> *)tags;
 
-- (OAClickableWay *) loadClickableWay:(CLLocation *)selectedLatLon obfMapObject:(const std::shared_ptr<const OsmAnd::MapObject>)obfMapObject tags:(NSDictionary<NSString *, NSString *> *)tags;
+- (OAClickableWay *)loadClickableWay:(CLLocation *)selectedLatLon obfMapObject:(const std::shared_ptr<const OsmAnd::MapObject>)obfMapObject tags:(NSDictionary<NSString *, NSString *> *)tags;
 
 @end

Sources/Controllers/Map/Helpers/OAClickableWayHelper.h

@@ -8,12 +8,18 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
+
 @class OAClickableWay, OARenderedObject;
 
 @interface OAClickableWayHelper : NSObject
 
-- (id) getContextMenuProvider;
+- (id)getContextMenuProvider;
 
-- (BOOL) isClickableWay:(OARenderedObject *)renderedObject;
+- (BOOL)isClickableWay:(OARenderedObject *)renderedObject;
 
 @end
+
+
+NS_ASSUME_NONNULL_END

Sources/Controllers/Map/Helpers/OAClickableWayHelper.mm

@@ -35,8 +35,20 @@ - (instancetype) init
 
 - (void) commonInit
 {
-    _clickableTags = [NSSet setWithObjects:@"piste:type", @"piste:difficulty", @"mtb:scale", @"dirtbike:scale", nil];
-    _requiredTagsAny = [NSSet setWithObjects:@"name", @"ref", @"piste:name", @"mtb:name", nil];
+    _clickableTags = [NSSet setWithArray:@[
+        @"piste:type",
+        @"piste:difficulty",
+        @"mtb:scale",
+        @"dirtbike:scale"
+    ]];
+
+    _requiredTagsAny = [NSSet setWithArray:@[
+        @"name",
+        @"ref",
+        @"piste:name",
+        @"mtb:name"
+    ]];
+
     _forbiddenTags = @{
         @"area": @"yes",
         @"access": @"no",
@@ -89,11 +101,12 @@ - (OAClickableWay *) loadClickableWay:(CLLocation *)selectedLatLon obfMapObject:
 
 - (BOOL) isClickableWayTags:(NSDictionary<NSString *, NSString *> *)tags
 {
-    for (NSString *forbiddenKey in _forbiddenTags.allKeys)
+    for (NSString *forbiddenKey in _forbiddenTags)
     {
         NSString *forbiddenValue = _forbiddenTags[forbiddenKey];
-        if ([forbiddenValue isEqualToString:tags[forbiddenKey]] ||
-            ([@"*" isEqualToString:forbiddenValue] && tags[forbiddenKey]))
+        NSString *tagValue = tags[forbiddenKey];
+        if ([forbiddenValue isEqualToString:tagValue] ||
+            ([@"*" isEqualToString:forbiddenValue] && tagValue))
         {
             return  NO;
         }
@@ -103,7 +116,7 @@ - (BOOL) isClickableWayTags:(NSDictionary<NSString *, NSString *> *)tags
     {
         if (tags[required])
         {
-            for (NSString *key in tags.allKeys)
+            for (NSString *key in tags)
             {
                 if ([_clickableTags containsObject:key])
                     return YES;

Sources/Controllers/Map/Helpers/OAMapSelectionHelper.h

@@ -6,17 +6,22 @@
 //  Copyright © 2025 OsmAnd. All rights reserved.
 //
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class OAMapSelectionResult, OAPOI;
 
 @interface OAMapSelectionHelper : NSObject
 
-- (OAMapSelectionResult *) collectObjectsFromMap:(CGPoint)point showUnknownLocation:(BOOL)showUnknownLocation;
+- (OAMapSelectionResult *)collectObjectsFromMap:(CGPoint)point showUnknownLocation:(BOOL)showUnknownLocation;
 
-+ (OAPOI *) findAmenity:(CLLocation *)latLon names:(NSArray<NSString *> *)names obfId:(uint64_t)obfId;
-+ (OAPOI *) findAmenity:(CLLocation *)latLon names:(NSArray<NSString *> *)names obfId:(uint64_t)obfId radius:(int)radius;
-+ (NSArray<OAPOI *> *) findAmenities:(CLLocation *)latLon;
-+ (OAPOI *) findAmenityByOsmId:(CLLocation *)latLon obfId:(uint64_t)obfId;
-+ (OAPOI *) findAmenityByOsmId:(NSArray<OAPOI *> *)amenities obfId:(uint64_t)obfId point:(CLLocation *)point;
-+ (OAPOI *) findAmenityByName:(NSArray<OAPOI *> *)amenities names:(NSArray<NSString *> *)names;
++ (OAPOI *)findAmenity:(CLLocation *)latLon names:(NSArray<NSString *> *)names obfId:(uint64_t)obfId;
++ (OAPOI *)findAmenity:(CLLocation *)latLon names:(NSArray<NSString *> *)names obfId:(uint64_t)obfId radius:(int)radius;
++ (NSArray<OAPOI *> *)findAmenities:(CLLocation *)latLon;
++ (OAPOI *)findAmenityByOsmId:(CLLocation *)latLon obfId:(uint64_t)obfId;
++ (OAPOI *)findAmenityByOsmId:(NSArray<OAPOI *> *)amenities obfId:(uint64_t)obfId point:(CLLocation *)point;
++ (OAPOI *)findAmenityByName:(NSArray<OAPOI *> *)amenities names:(NSArray<NSString *> *)names;
 
 @end
+
+
+NS_ASSUME_NONNULL_END

Sources/Controllers/Map/Helpers/OAMapSelectionHelper.mm

@@ -91,7 +91,7 @@ - (void) collectObjectsFromLayers:(OAMapSelectionResult *)result unknownLocation
 
     for (OAMapLayer *layer in layers)
     {
-        //Android doesn't have that layer here
+        // Android doesn't have that layer here
         if ([layer isKindOfClass:OAOsmBugsLayer.class])
             continue;
 
@@ -251,7 +251,7 @@ - (CLLocation *) parsePoiLatLon:(NSString *)value
     if (!value)
         return nil;
 
-    OASKGeoParsedPoint * p = [OASKMapUtils.shared decodeShortLinkStringS:value];
+    OASKGeoParsedPoint *p = [OASKMapUtils.shared decodeShortLinkStringS:value];
     return [[CLLocation alloc] initWithLatitude:p.getLatitude longitude:p.getLongitude];
 }
 
@@ -303,7 +303,7 @@ - (void) addRenderedObject:(OAMapSelectionResult *)result symbolInfo:(OsmAnd::IM
         {
             [renderedObject setIconRes:rasterMapSymbol->content.toNSString()];
         }
-        for (NSString *key in tags.allKeys)
+        for (NSString *key in tags)
         {
             renderedObject.tags[key] = tags[key];
 
@@ -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])
             {
-                OATravelGpx *gpx = pair[0];
+                OATravelGpx *gpx = [pair firstObject];
 
                 // TODO: test this isEqual method
                 if (travelGpx == gpx)
@@ -555,7 +555,7 @@ - (void) processTransportStops:(NSMutableArray<OASelectedMapObject *> *)selected
     return tagsMap;
 }
 
-+ (OAPOI *) findAmenity:(CLLocation *)latLon names:(NSMutableArray<NSString *> *)names obfId:(uint64_t)obfId
++ (OAPOI *) findAmenity:(CLLocation *)latLon names:(NSArray<NSString *> *)names obfId:(uint64_t)obfId
 {
     int searchRadius = [ObfConstants isIdFromRelation:obfId >> AMENITY_ID_RIGHT_SHIFT] ?
         AMENITY_SEARCH_RADIUS_FOR_RELATION :
@@ -570,7 +570,8 @@ + (OAPOI *) findAmenity:(CLLocation *)latLon names:(NSArray<NSString *> *)names
     OsmAnd::PointI point31 = OsmAnd::Utilities::convertLatLonTo31(OsmAnd::LatLon(latLon.coordinate.latitude, latLon.coordinate.longitude));
     OsmAnd::AreaI rect = (OsmAnd::AreaI)OsmAnd::Utilities::boundingBox31FromAreaInMeters(radius, point31);
 
-    NSArray<OAPOI *> *amenities = [OAPOIHelper findPOI:OASearchPoiTypeFilter.acceptAllPoiTypeFilter additionalFilter:nil bbox31:rect currentLocation:point31 includeTravel:YES matcher:nil publish:nil];
+    BOOL (^nilBlock)(OAPOI *poi) = nil;
+    NSArray<OAPOI *> *amenities = [OAPOIHelper findPOI:OASearchPoiTypeFilter.acceptAllPoiTypeFilter additionalFilter:nil bbox31:rect currentLocation:point31 includeTravel:YES matcher:nil publish:nilBlock];
     OAPOI *amenity = [self findAmenityByOsmId:amenities obfId:osmId point:latLon];
 
     if (!amenity && names.count > 0)
@@ -584,7 +585,8 @@ + (OAPOI *) findAmenity:(CLLocation *)latLon names:(NSArray<NSString *> *)names
 {
     OsmAnd::PointI point31 = OsmAnd::Utilities::convertLatLonTo31(OsmAnd::LatLon(latLon.coordinate.latitude, latLon.coordinate.longitude));
     OsmAnd::AreaI rect = (OsmAnd::AreaI)OsmAnd::Utilities::boundingBox31FromAreaInMeters(AMENITY_SEARCH_RADIUS, point31);
-    return [OAPOIHelper findPOI:OASearchPoiTypeFilter.acceptAllPoiTypeFilter additionalFilter:nil bbox31:rect currentLocation:point31 includeTravel:YES matcher:nil publish:nil];
+    BOOL (^nilBlock)(OAPOI *poi) = nil;
+    return [OAPOIHelper findPOI:[OASearchPoiTypeFilter acceptAllPoiTypeFilter] additionalFilter:nil bbox31:rect currentLocation:point31 includeTravel:YES matcher:nil publish:nilBlock];
 }
 
 + (OAPOI *) findAmenityByOsmId:(CLLocation *)latLon obfId:(uint64_t)obfId

Sources/Controllers/Map/Helpers/OAMapSelectionResult.h

@@ -8,17 +8,23 @@
 
 #import "OAContextMenuProvider.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
+
 @interface OAMapSelectionResult : NSObject
 
 @property CLLocation *objectLatLon;
 
-- (instancetype) initWithPoint:(CGPoint)point;
-- (CGPoint) getPoint;
-- (CLLocation *) getPointLatLon;
-- (NSMutableArray<OASelectedMapObject *> *) getAllObjects;
-- (NSMutableArray<OASelectedMapObject *> *) getProcessedObjects;
-- (void) collect:(id)object provider:(id)provider;
-- (void) groupByOsmIdAndWikidataId;
-- (BOOL) isEmpty;
+- (instancetype)initWithPoint:(CGPoint)point;
+- (CGPoint)getPoint;
+- (CLLocation *)getPointLatLon;
+- (NSMutableArray<OASelectedMapObject *> *)getAllObjects;
+- (NSMutableArray<OASelectedMapObject *> *)getProcessedObjects;
+- (void)collect:(id)object provider:(id _Nullable)provider;
+- (void)groupByOsmIdAndWikidataId;
+- (BOOL)isEmpty;
 
 @end
+
+
+NS_ASSUME_NONNULL_END

Sources/Controllers/Map/Helpers/OAPlaceDetailsObject.h

@@ -8,6 +8,9 @@
 
 #import "OAContextMenuProvider.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
+
 @class OAPOI, OASelectedMapObject, OAPlaceDetailsObject;
 
 @interface OAPlaceDetailsObject : NSObject
@@ -16,17 +19,20 @@
 @property (nonatomic, readonly) NSMutableSet<NSString *> *wikidataIds;
 @property (nonatomic, readonly) NSMutableArray<OASelectedMapObject *> *selectedObjects;
 
-- (instancetype) initWithObject:(id<OAContextMenuProvider>)object provider:(id<OAContextMenuProvider>)provider;
+- (instancetype)initWithObject:(id<OAContextMenuProvider>)object provider:(id<OAContextMenuProvider>)provider;
 
-- (OAPOI *) getSyntheticAmenity;
-- (CLLocation *) getLocation;
-- (NSMutableArray<OASelectedMapObject *> *) getSelectedObjects;
-- (void) addObject:(id)object provider:(id<OAContextMenuProvider>)provider;
-- (BOOL) overlapsWith:(id)object;
-- (void) merge:(OAPlaceDetailsObject*)other;
-- (void) combineData;
-- (void) processAmenity:(OAPOI *)amenity contentLocales:(NSMutableSet<NSString *> *)contentLocales;
+- (OAPOI *)getSyntheticAmenity;
+- (CLLocation *)getLocation;
+- (NSMutableArray<OASelectedMapObject *> *)getSelectedObjects;
+- (void)addObject:(id)object provider:(id<OAContextMenuProvider>)provider;
+- (BOOL)overlapsWith:(id)object;
+- (void)merge:(OAPlaceDetailsObject*)other;
+- (void)combineData;
+- (void)processAmenity:(OAPOI *)amenity contentLocales:(NSMutableSet<NSString *> *)contentLocales;
 
-+ (BOOL) shouldSkip:(id) object;
++ (BOOL)shouldSkip:(id) object;
 
 @end
+
+
+NS_ASSUME_NONNULL_END

Sources/Controllers/Map/Helpers/OAPlaceDetailsObject.mm

@@ -73,7 +73,7 @@ - (void) addObject:(id)object provider:(id<OAContextMenuProvider>)provider
     }
     if ([object isKindOfClass:OAPOI.class])
     {
-        OAPOI *amenity = (OAPOI*) object;
+        OAPOI *amenity = (OAPOI *) object;
         NSString *wikidata = [amenity getWikidata];
         if (![NSString isEmpty:wikidata])
         {
@@ -93,7 +93,7 @@ - (BOOL) overlapsWith:(id)object
     NSString *wikidata = nil;
     if ([object isKindOfClass:OAPOI.class])
     {
-        OAPOI *amenity = (OAPOI*) object;
+        OAPOI *amenity = (OAPOI *) object;
         wikidata = [amenity getWikidata];
         if (![NSString isEmpty:wikidata])
         {
@@ -120,7 +120,7 @@ - (void) combineData
         id object = selectedObject.object;
         if ([object isKindOfClass:OAPOI.class])
         {
-            OAPOI *amenity = (OAPOI*) object;
+            OAPOI *amenity = (OAPOI *) object;
             [self processAmenity:amenity contentLocales:contentLocales];
         }
     }
@@ -174,12 +174,12 @@ - (void) processAmenity:(OAPOI *)amenity contentLocales:(NSMutableSet<NSString *
     {
         [_syntheticAmenity setTravelEloNumber:travelElo];
     }
-    NSMutableArray<NSNumber *> * x= amenity.x;
+    NSMutableArray<NSNumber *> *x = amenity.x;
     if ([NSArray isEmpty:_syntheticAmenity.x] && ![NSArray isEmpty:x])
     {
         [_syntheticAmenity.x addObjectsFromArray:x];
     }
-    NSMutableArray<NSNumber *> * y= amenity.y;
+    NSMutableArray<NSNumber *> *y = amenity.y;
     if ([NSArray isEmpty:_syntheticAmenity.y] && ![NSArray isEmpty:y])
     {
         [_syntheticAmenity.y addObjectsFromArray:y];

Sources/Controllers/Map/OASelectedGPXHelper.h → Sources/Controllers/Map/Helpers/OASelectedGPXHelper.h

@@ -12,6 +12,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+
 @class OASGpxFile, OASWptPt;
 
 @interface OASelectedGPXHelper : NSObject
@@ -38,4 +39,5 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
 NS_ASSUME_NONNULL_END