Fix #3702

osmandapp · May 14, 2024 · 685431d · 685431d
1 parent c8f19b6
commit 685431d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/.../Controllers/BottomSheet/MoreOptionsBottomSheet/OAMoreOptionsBottomSheetViewController.mm b/.../Controllers/BottomSheet/MoreOptionsBottomSheet/OAMoreOptionsBottomSheetViewController.mm
@@ -131,7 +131,8 @@ - (void) setupView
         {
             if ([addon.addonId isEqualToString:kId_Addon_TrackRecording_Edit_Waypoint]
                 && _iapHelper.trackRecording.isActive
-                && (_targetPoint.type == OATargetWpt) && [_targetPoint.targetObj isKindOfClass:[OAGpxWptItem class]]) {
+                && (_targetPoint.type == OATargetWpt) && [_targetPoint.targetObj isKindOfClass:[OAGpxWptItem class]] && !((OAGpxWptItem *)_targetPoint.targetObj).routePoint)
+            {
                 [arr addObject:@{ @"title" : addon.titleShort,
                                   @"key" : @"addon_edit_waypoint",
                                   @"img" : addon.imageName,

diff --git a/Sources/Controllers/Map/Layers/OAGPXLayer.mm b/Sources/Controllers/Map/Layers/OAGPXLayer.mm
@@ -1298,7 +1298,12 @@ - (void) collectObjectsFromPoint:(CLLocationCoordinate2D)point touchPoint:(CGPoi
 
 - (BOOL) isObjectMovable:(id)object
 {
-    return [object isKindOfClass:OAGpxWptItem.class];
+    if ([object isKindOfClass:OAGpxWptItem.class])
+    {
+        OAGpxWptItem *item = (OAGpxWptItem *)object;
+        return !item.routePoint;
+    }
+    return NO;
 }
 
 - (void) applyNewObjectPosition:(id)object position:(CLLocationCoordinate2D)position

diff --git a/Sources/Controllers/Map/Layers/OAGPXRecLayer.mm b/Sources/Controllers/Map/Layers/OAGPXRecLayer.mm
@@ -44,11 +44,12 @@ - (void) collectObjectsFromPoint:(CLLocationCoordinate2D)point touchPoint:(CGPoi
 
 - (BOOL)isObjectMovable:(id)object
 {
-    BOOL movable = NO;
     if ([object isKindOfClass:OAGpxWptItem.class])
-        movable = ((OAGpxWptItem *)object).docPath == nil;
-
-    return movable;
+    {
+        OAGpxWptItem *item = (OAGpxWptItem *)object;
+        return item.docPath == nil && !item.routePoint;
+    }
+    return NO;
 }
 
 @end
diff --git a/Sources/Controllers/TargetMenu/GPX/TrackMenu/OATrackMenuHudViewController.mm b/Sources/Controllers/TargetMenu/GPX/TrackMenu/OATrackMenuHudViewController.mm
@@ -694,6 +694,7 @@ - (void)updateWaypointsData
         for (OAWptPt *rtePt in [self.doc getRoutePoints])
         {
             OAGpxWptItem *rtePtItem = [OAGpxWptItem withGpxWpt:rtePt];
+            rtePtItem.routePoint = YES;
             NSMutableArray<OAGpxWptItem *> *rtePtsGroup = _waypointGroups[OALocalizedString(@"route_points")];
             if (!rtePtsGroup)
             {

diff --git a/Sources/Models/OAGpxWptItem.h b/Sources/Models/OAGpxWptItem.h
@@ -22,6 +22,7 @@
 @property (nonatomic) NSString* distance;
 @property (nonatomic, assign) double distanceMeters;
 @property (nonatomic, assign) BOOL selected;
+@property (nonatomic, assign) BOOL routePoint;
 
 @property (nonatomic) NSString *docPath;