Fixes #1211, Remove osmarender map layer

11 files changed, 0 insertions, 23 deletions

diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 2888546..24a6c11 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -389,7 +389,6 @@
   <string name="map_source_google_map">Google: Mapa</string>
   <string name="map_source_google_satellite">Google: Satélite</string>
   <string name="map_source_osm_mapnik">OSM: Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
   <string name="map_source_osm_offline">OSM: Offline</string>
 
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 7505fe1..0024977 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -417,7 +417,6 @@
   <string name="map_source_google_map">Google Maps : plan</string>
   <string name="map_source_google_satellite">Google Maps : satellite</string>
   <string name="map_source_osm_mapnik">OSM : rendu Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM : rendu Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM : pistes cyclables</string>
   <string name="map_source_osm_offline">OSM : hors-ligne</string>
 
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 6b2f613..266c59f 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -396,7 +396,6 @@
   <string name="map_source_google_map">Google: Térkép</string>
   <string name="map_source_google_satellite">Google: Műholdkép</string>
   <string name="map_source_osm_mapnik">OSM: Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM: Biciklis térkép</string>
   <string name="map_source_osm_offline">OSM: Offline</string>
 
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 0818d3d..ce2217a 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -410,7 +410,6 @@
   <string name="map_source_google_map">Google: Map</string>
   <string name="map_source_google_satellite">Google: Satellite</string>
   <string name="map_source_osm_mapnik">OSM: Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
   <string name="map_source_osm_offline">OSM: Offline</string>
 
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 1fbf49b..b60a388 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -385,7 +385,6 @@
   <string name="map_source_google_map">Google: Mapa</string>
   <string name="map_source_google_satellite">Google: Satelita</string>
   <string name="map_source_osm_mapnik">OSM: Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
   <string name="map_source_osm_offline">OSM: Offline</string>
   
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 06b8f88..e95a1b8 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -422,18 +422,9 @@
   <string name="init_default_navigation_tool_select">Ferramenta de selecção</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>@string/map_source_google_map</item>
-    <item>@string/map_source_google_satellite</item>
-    <item>@string/map_source_osm_mapnik</item>
-    <item>@string/map_source_osm_osmarender</item>
-    <item>@string/map_source_osm_cyclemap</item>
-    <item>@string/map_source_osm_offline</item>
-  </string-array>  
   <string name="map_source_google_map">Google: Mapa</string>
   <string name="map_source_google_satellite">Google: Satélite</string>
   <string name="map_source_osm_mapnik">OSM: Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
   <string name="map_source_osm_offline">OSM: Offline</string>
 
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 67065eb..14e5e82 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -438,7 +438,6 @@
   <string name="map_source_google_map">Google: Mapa</string>
   <string name="map_source_google_satellite">Google: Satelit</string>
   <string name="map_source_osm_mapnik">OSM: Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM: Cyklomapa</string>
   <string name="map_source_osm_offline">OSM: Offline</string>
 
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index a6704b2..4d262de 100755
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -441,7 +441,6 @@
   <string name="map_source_google_map">Google: Map</string>
   <string name="map_source_google_satellite">Google: Satellit</string>
   <string name="map_source_osm_mapnik">OSM: Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
   <string name="map_source_osm_offline">OSM: Offline</string>
 
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 2052dc8..7b12738 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -442,14 +442,12 @@
     <item>@string/map_source_google_map</item>
     <item>@string/map_source_google_satellite</item>
     <item>@string/map_source_osm_mapnik</item>
-    <item>@string/map_source_osm_osmarender</item>
     <item>@string/map_source_osm_cyclemap</item>
     <item>@string/map_source_osm_offline</item>
   </string-array>
   <string name="map_source_google_map">Google: Map</string>
   <string name="map_source_google_satellite">Google: Satellite</string>
   <string name="map_source_osm_mapnik">OSM: Mapnik</string>
-  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
   <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
   <string name="map_source_osm_offline">OSM: Offline</string>
 
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
index a51b04b..19c1335 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
@@ -22,7 +22,6 @@ import java.util.Map;
 public class MapsforgeMapProvider implements MapProvider {
 
     public final static int MAPNIK = 1;
-    public final static int OSMARENDER = 2;
     public final static int CYCLEMAP = 3;
     public final static int OFFLINE = 4;
 
@@ -36,7 +35,6 @@ public class MapsforgeMapProvider implements MapProvider {
 
         mapSources = new HashMap<Integer, String>();
         mapSources.put(baseId + MAPNIK, resources.getString(R.string.map_source_osm_mapnik));
-        mapSources.put(baseId + OSMARENDER, resources.getString(R.string.map_source_osm_osmarender));
         mapSources.put(baseId + CYCLEMAP, resources.getString(R.string.map_source_osm_cyclemap));
         mapSources.put(baseId + OFFLINE, resources.getString(R.string.map_source_osm_offline));
     }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
index 165a79c..9f010fb 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
@@ -166,9 +166,6 @@ public class MapsforgeMapView extends MapView implements MapViewImpl {
     public void setMapSource() {
 
         switch (MapsforgeMapProvider.getMapsforgeSource(Settings.getMapSource())) {
-            case MapsforgeMapProvider.OSMARENDER:
-                setMapViewMode(MapViewMode.OSMARENDER_TILE_DOWNLOAD);
-                break;
             case MapsforgeMapProvider.CYCLEMAP:
                 setMapViewMode(MapViewMode.OPENCYCLEMAP_TILE_DOWNLOAD);
                 break;