From 10d7781766d7d2556db7c8a42d9c3bcf89da0a22 Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Tue, 25 Nov 2014 16:22:11 -0800 Subject: [PATCH] move to just a single Outdoors style --- .../java/com/mapbox/mapboxgl/app/MainActivity.java | 13 ++++--------- android/java/app/src/main/res/values/strings.xml | 3 +-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java index ace2ac6dd..7d25c438f 100644 --- a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java +++ b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java @@ -132,28 +132,23 @@ public class MainActivity extends ActionBarActivity { mMapFragment.getMap().setStyleUrl("asset://styles/styles/basic-v6.json"); break; - // Outdoors (Vector) + // Outdoors case 2: mMapFragment.getMap().setStyleUrl("asset://styles/styles/outdoors-v6.json"); break; - // Outdoors (Raster) - case 3: - mMapFragment.getMap().setStyleUrl("asset://styles/styles/outdoors-raster-v6.json"); - break; - // Satellite - case 4: + case 3: mMapFragment.getMap().setStyleUrl("asset://styles/styles/satellite-v6.json"); break; // Pencil - case 5: + case 4: mMapFragment.getMap().setStyleUrl("asset://styles/styles/pencil-v6.json"); break; // Empty - case 6: + case 5: mMapFragment.getMap().setStyleUrl("asset://styles/styles/empty-v6.json"); break; diff --git a/android/java/app/src/main/res/values/strings.xml b/android/java/app/src/main/res/values/strings.xml index 03dcf4ece..2661ce8a5 100644 --- a/android/java/app/src/main/res/values/strings.xml +++ b/android/java/app/src/main/res/values/strings.xml @@ -8,8 +8,7 @@ Bright Basic - Outdoors (Vector) - Outdoors (Raster) + Outdoors Satellite