mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 16:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

StationContextMenu: Fix naming of OpenStreetMap in IDs and strings.

Browse source
This commit is contained in:
Luc 2018-11-11 12:18:58 +00:00 • committed by Andreas Schildbach
parent 099d1cb9b0
commit 7c673419c2
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oeffi/res/menu/station_map_context.xml
View file

@ -11,9 +11,9 @@
android:orderInCategory="1" android:orderInCategory="1"
android:title="@string/map_dialog_amazon_maps" /> android:title="@string/map_dialog_amazon_maps" />
<item <item
android:id="@+id/station_map_context_open_street_maps" android:id="@+id/station_map_context_openstreetmap"
android:orderInCategory="1" android:orderInCategory="1"
android:title="@string/map_dialog_open_street_maps" /> android:title="@string/map_dialog_openstreetmap" />
<item <item
android:id="@+id/station_map_context_google_street_view" android:id="@+id/station_map_context_google_street_view"
android:orderInCategory="1" android:orderInCategory="1"

2
oeffi/res/values-de/select_map.xml
View file

@ -3,7 +3,7 @@
<string name="map_dialog_google_maps">Google Maps</string> <string name="map_dialog_google_maps">Google Maps</string>
<string name="map_dialog_amazon_maps">Amazon 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_street_view">Street View</string>
<string name="map_dialog_google_navigation">Navigation für Fußgänger</string> <string name="map_dialog_google_navigation">Navigation für Fußgänger</string>

2
oeffi/res/values/select_map.xml
View file

@ -3,7 +3,7 @@
<string name="map_dialog_google_maps">Google Maps</string> <string name="map_dialog_google_maps">Google Maps</string>
<string name="map_dialog_amazon_maps">Amazon 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_street_view">Street View</string>
<string name="map_dialog_google_navigation">Walking Directions</string> <string name="map_dialog_google_navigation">Walking Directions</string>

8
oeffi/src/de/schildbach/oeffi/stations/StationContextMenu.java
View file

@ -123,7 +123,7 @@ public class StationContextMenu extends PopupMenu {
new MenuInflater(context).inflate(R.menu.station_map_context, menu); new MenuInflater(context).inflate(R.menu.station_map_context, menu);
final MenuItem googleMapsItem = menu.findItem(R.id.station_map_context_google_maps); 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 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 googleStreetViewItem = menu.findItem(R.id.station_map_context_google_street_view);
final MenuItem googleNavigationItem = menu.findItem(R.id.station_map_context_google_navigation); 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")); "com.amazon.geo.client.renderer.MapsAppActivityDuke"));
prepareMapMenuItem(context, amazonMapsItem, amazonMapsIntent); 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, Uri.parse(String.format(Locale.ENGLISH, "osmand.geo:%.6f,%.6f?q=%.6f,%.6f%s", lat, lon, lat, lon,
name != null ? '(' + URLEncoder.encode(name.replaceAll("[()]", "")) + ')' : ""))); name != null ? '(' + URLEncoder.encode(name.replaceAll("[()]", "")) + ')' : "")));
prepareMapMenuItem(context, openStreetMapsItem, openStreetMapsIntent); prepareMapMenuItem(context, openStreetMapItem, openStreetMapIntent);
final Intent googleStreetViewIntent = new Intent(Intent.ACTION_VIEW, final Intent googleStreetViewIntent = new Intent(Intent.ACTION_VIEW,
Uri.parse(String.format(Locale.ENGLISH, "google.streetview:cbll=%.6f,%.6f", lat, lon))); Uri.parse(String.format(Locale.ENGLISH, "google.streetview:cbll=%.6f,%.6f", lat, lon)));
@ -166,7 +166,7 @@ public class StationContextMenu extends PopupMenu {
} else { } else {
googleMapsItem.setVisible(false); googleMapsItem.setVisible(false);
amazonMapsItem.setVisible(false); amazonMapsItem.setVisible(false);
openStreetMapsItem.setVisible(false); openStreetMapItem.setVisible(false);
googleStreetViewItem.setVisible(false); googleStreetViewItem.setVisible(false);
googleNavigationItem.setVisible(false); googleNavigationItem.setVisible(false);
} }