From 7c673419c2fa36cb5591411fb7bd8cb61fd1f2de Mon Sep 17 00:00:00 2001
From: Luc <gitlab.com@lucgommans.nl>
Date: Sun, 11 Nov 2018 12:18:58 +0000
Subject: [PATCH] StationContextMenu: Fix naming of OpenStreetMap in IDs and
 strings.

---
 oeffi/res/menu/station_map_context.xml                    | 4 ++--
 oeffi/res/values-de/select_map.xml                        | 2 +-
 oeffi/res/values/select_map.xml                           | 2 +-
 .../de/schildbach/oeffi/stations/StationContextMenu.java  | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/oeffi/res/menu/station_map_context.xml b/oeffi/res/menu/station_map_context.xml
index ec816b3..2926ee0 100644
--- a/oeffi/res/menu/station_map_context.xml
+++ b/oeffi/res/menu/station_map_context.xml
@@ -11,9 +11,9 @@
         android:orderInCategory="1"
         android:title="@string/map_dialog_amazon_maps" />
     <item
-        android:id="@+id/station_map_context_open_street_maps"
+        android:id="@+id/station_map_context_openstreetmap"
         android:orderInCategory="1"
-        android:title="@string/map_dialog_open_street_maps" />
+        android:title="@string/map_dialog_openstreetmap" />
     <item
         android:id="@+id/station_map_context_google_street_view"
         android:orderInCategory="1"
diff --git a/oeffi/res/values-de/select_map.xml b/oeffi/res/values-de/select_map.xml
index 7fed9db..a352113 100644
--- a/oeffi/res/values-de/select_map.xml
+++ b/oeffi/res/values-de/select_map.xml
@@ -3,7 +3,7 @@
 
     <string name="map_dialog_google_maps">Google Maps</string>
     <string name="map_dialog_amazon_maps">Amazon Maps</string>
-    <string name="map_dialog_open_street_maps">Open Street Maps</string>
+    <string name="map_dialog_openstreetmap">OpenStreetMap</string>
     <string name="map_dialog_google_street_view">Street View</string>
     <string name="map_dialog_google_navigation">Navigation für Fußgänger</string>
 
diff --git a/oeffi/res/values/select_map.xml b/oeffi/res/values/select_map.xml
index c39b218..9068e4e 100644
--- a/oeffi/res/values/select_map.xml
+++ b/oeffi/res/values/select_map.xml
@@ -3,7 +3,7 @@
 
     <string name="map_dialog_google_maps">Google Maps</string>
     <string name="map_dialog_amazon_maps">Amazon Maps</string>
-    <string name="map_dialog_open_street_maps">Open Street Maps</string>
+    <string name="map_dialog_openstreetmap">OpenStreetMap</string>
     <string name="map_dialog_google_street_view">Street View</string>
     <string name="map_dialog_google_navigation">Walking Directions</string>
 
diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationContextMenu.java b/oeffi/src/de/schildbach/oeffi/stations/StationContextMenu.java
index 0f09dc0..21b780c 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/StationContextMenu.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/StationContextMenu.java
@@ -123,7 +123,7 @@ public class StationContextMenu extends PopupMenu {
         new MenuInflater(context).inflate(R.menu.station_map_context, menu);
         final MenuItem googleMapsItem = menu.findItem(R.id.station_map_context_google_maps);
         final MenuItem amazonMapsItem = menu.findItem(R.id.station_map_context_amazon_maps);
-        final MenuItem openStreetMapsItem = menu.findItem(R.id.station_map_context_open_street_maps);
+        final MenuItem openStreetMapItem = menu.findItem(R.id.station_map_context_openstreetmap);
         final MenuItem googleStreetViewItem = menu.findItem(R.id.station_map_context_google_street_view);
         final MenuItem googleNavigationItem = menu.findItem(R.id.station_map_context_google_navigation);
 
@@ -146,10 +146,10 @@ public class StationContextMenu extends PopupMenu {
                     "com.amazon.geo.client.renderer.MapsAppActivityDuke"));
             prepareMapMenuItem(context, amazonMapsItem, amazonMapsIntent);
 
-            final Intent openStreetMapsIntent = new Intent(Intent.ACTION_VIEW,
+            final Intent openStreetMapIntent = new Intent(Intent.ACTION_VIEW,
                     Uri.parse(String.format(Locale.ENGLISH, "osmand.geo:%.6f,%.6f?q=%.6f,%.6f%s", lat, lon, lat, lon,
                             name != null ? '(' + URLEncoder.encode(name.replaceAll("[()]", "")) + ')' : "")));
-            prepareMapMenuItem(context, openStreetMapsItem, openStreetMapsIntent);
+            prepareMapMenuItem(context, openStreetMapItem, openStreetMapIntent);
 
             final Intent googleStreetViewIntent = new Intent(Intent.ACTION_VIEW,
                     Uri.parse(String.format(Locale.ENGLISH, "google.streetview:cbll=%.6f,%.6f", lat, lon)));
@@ -166,7 +166,7 @@ public class StationContextMenu extends PopupMenu {
         } else {
             googleMapsItem.setVisible(false);
             amazonMapsItem.setVisible(false);
-            openStreetMapsItem.setVisible(false);
+            openStreetMapItem.setVisible(false);
             googleStreetViewItem.setVisible(false);
             googleNavigationItem.setVisible(false);
         }