From cd9e040f5c16da86061322b2437c770eb496bbc6 Mon Sep 17 00:00:00 2001
From: Serge Helfrich <serge.helfrich@gmail.com>
Date: Fri, 15 May 2026 10:35:02 +0200
Subject: [PATCH 1/3] Add dedicated remove GPX menu action

---
 app/src/main/java/org/nitri/opentopo/MapFragment.kt | 5 +++++
 app/src/main/res/menu/menu_main.xml                 | 5 +++++
 app/src/main/res/values/strings.xml                 | 1 +
 3 files changed, 11 insertions(+)

diff --git a/app/src/main/java/org/nitri/opentopo/MapFragment.kt b/app/src/main/java/org/nitri/opentopo/MapFragment.kt
index a44ef37..a6f84cf 100644
--- a/app/src/main/java/org/nitri/opentopo/MapFragment.kt
+++ b/app/src/main/java/org/nitri/opentopo/MapFragment.kt
@@ -884,6 +884,7 @@ class MapFragment : Fragment(), LocationListener, PopupMenu.OnMenuItemClickListe
         val gpxVisible = gpxDisplayState != GpxDisplayState.IDLE
         menu.findItem(R.id.action_gpx_details).isVisible = gpxVisible
         menu.findItem(R.id.action_gpx_zoom).isVisible = gpxVisible
+        menu.findItem(R.id.action_gpx_remove).isVisible = gpxVisible
 
         listener?.let {
             menu.findItem(R.id.action_privacy_settings).isVisible = it.isPrivacyOptionsRequired()
@@ -956,6 +957,10 @@ class MapFragment : Fragment(), LocationListener, PopupMenu.OnMenuItemClickListe
                 listener?.let { zoomToBounds(Utils.area(it.getGpx())) }
                 return true
             }
+            R.id.action_gpx_remove -> {
+                showGpxDialog()
+                return true
+            }
             R.id.action_layers -> {
                 activity?.let {
                     val anchorView = it.findViewById<View>(R.id.popupAnchorView)
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index a6b5e42..011000b 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -35,6 +35,11 @@
         android:title="@string/gpx_zoom"
         android:visible="false"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_gpx_remove"
+        android:title="@string/gpx_remove"
+        android:visible="false"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_layers"
         android:icon="@drawable/ic_action_layers"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be8e5cd..7a11dff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="discard_current_gpx">The current GPX will be discarded.</string>
     <string name="gpx_details">GPX details</string>
     <string name="gpx_zoom">Zoom to GPX</string>
+    <string name="gpx_remove">Remove GPX</string>
 
     <string name="location_details">Location detail</string>
     <string name="label_latitude">Latitude:</string>

From e432008bf2bda161804a3a0d7131b732402e5b17 Mon Sep 17 00:00:00 2001
From: Pygmalion69 <pygmalion@xs4all.nl>
Date: Fri, 15 May 2026 10:54:29 +0200
Subject: [PATCH 2/3] Add icon and translations

---
 .../res/drawable-anydpi/ic_action_delete.xml  | 20 +++++++++++++++++++
 app/src/main/res/menu/menu_main.xml           |  1 +
 app/src/main/res/values-de/strings.xml        |  1 +
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values-it/strings.xml        |  1 +
 app/src/main/res/values-nl/strings.xml        |  1 +
 7 files changed, 26 insertions(+)
 create mode 100644 app/src/main/res/drawable-anydpi/ic_action_delete.xml

diff --git a/app/src/main/res/drawable-anydpi/ic_action_delete.xml b/app/src/main/res/drawable-anydpi/ic_action_delete.xml
new file mode 100644
index 0000000..8185bf2
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_action_delete.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright (C) 2026 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+    
+</vector>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 011000b..425da47 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -37,6 +37,7 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_gpx_remove"
+        android:icon="@drawable/ic_action_delete"
         android:title="@string/gpx_remove"
         android:visible="false"
         app:showAsAction="never" />
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 836c922..403bed3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,6 +10,7 @@
     <string name="discard_current_gpx">Die aktuelle GPX wird verworfen.</string>
     <string name="gpx_details">GPX Details</string>
     <string name="gpx_zoom">Zoom zu GPX</string>
+    <string name="gpx_remove">GPX entfernen</string>
 
     <string name="location_details">Standortdetails</string>
     <string name="label_latitude">Breitengrad:</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d6ccce0..c07db3f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -10,6 +10,7 @@
     <string name="discard_current_gpx">El GPX actual será descartado.</string>
     <string name="gpx_details">Detalles del GPX</string>
     <string name="gpx_zoom">Zoom al GPX</string>
+    <string name="gpx_remove">Eliminar GPX</string>
 
     <string name="location_details">Detalle de la ubicación</string>
     <string name="label_latitude">Latitud:</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2ab1923..6539ece 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -10,6 +10,7 @@
     <string name="discard_current_gpx">Le GPX actuel sera supprimé.</string>
     <string name="gpx_details">Détails du GPX</string>
     <string name="gpx_zoom">Zoom sur le GPX</string>
+    <string name="gpx_remove">Supprimer le GPX</string>
 
     <string name="location_details">Détail de la position</string>
     <string name="label_latitude">Latitude :</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d85295f..14a20c5 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -10,6 +10,7 @@
     <string name="discard_current_gpx">Il GPX caricato verrà sostituito</string>
     <string name="gpx_details">Dettagli GPX</string>
     <string name="gpx_zoom">Centra GPX</string>
+    <string name="gpx_remove">Rimuovi GPX</string>
 
     <string name="location_details">Dettagli posizione</string>
     <string name="label_latitude">Latitudine:</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 86a4d12..a1c937b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -10,6 +10,7 @@
     <string name="discard_current_gpx">De huidige GPX wordt verwijderd.</string>
     <string name="gpx_details">GPX details</string>
     <string name="gpx_zoom">Zoom naar GPX</string>
+    <string name="gpx_remove">GPX verwijderen</string>
 
     <string name="location_details">Locatie-detail</string>
     <string name="label_latitude">Breedtegraad:</string>

From 660bc41db88dacfe36f3bc748d59198592d77a70 Mon Sep 17 00:00:00 2001
From: Pygmalion69 <pygmalion@xs4all.nl>
Date: Fri, 15 May 2026 11:13:56 +0200
Subject: [PATCH 3/3] Clear GPX and route points

---
 app/src/main/java/org/nitri/opentopo/MapFragment.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/nitri/opentopo/MapFragment.kt b/app/src/main/java/org/nitri/opentopo/MapFragment.kt
index a6f84cf..7fb97e2 100644
--- a/app/src/main/java/org/nitri/opentopo/MapFragment.kt
+++ b/app/src/main/java/org/nitri/opentopo/MapFragment.kt
@@ -958,7 +958,12 @@ class MapFragment : Fragment(), LocationListener, PopupMenu.OnMenuItemClickListe
                 return true
             }
             R.id.action_gpx_remove -> {
-                showGpxDialog()
+                showGpxDialog {
+                    markerViewModel.markers.value?.forEach {
+                        it.routeWaypoint = false
+                    }
+                    listener?.clearGpx()
+                }
                 return true
             }
             R.id.action_layers -> {