From f71d61fa912f27fa3ccbbdc42f4925f3f94ff01a Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Fri, 23 Oct 2015 10:31:27 +1100 Subject: [android] Add missing satellite streets style to Android and iOS. As well as default_styles.cpp Fixes #2739 Fixes #2740 --- .../java/com/mapbox/mapboxsdk/constants/Style.java | 17 +++++++++++------ .../src/main/res-public/values/public.xml | 1 + .../src/main/res/values/strings.xml | 1 + .../com/mapbox/mapboxsdk/testapp/MainActivity.java | 5 +++++ .../src/main/res/menu/menu_drawer.xml | 20 +++++++++++++------- .../src/main/res/menu/menu_main.xml | 4 ++-- .../src/main/res/values/strings.xml | 1 + 7 files changed, 34 insertions(+), 15 deletions(-) (limited to 'android') diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java index 1b0b16bb7b..e2dad97832 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java @@ -18,7 +18,7 @@ public class Style { /** * Indicates the parameter accepts one of the values from {@link Style}. */ - @StringDef({MAPBOX_STREETS, EMERALD, LIGHT, DARK, SATELLITE}) + @StringDef({MAPBOX_STREETS, EMERALD, LIGHT, DARK, SATELLITE, SATELLITE_STREETS}) @Retention(RetentionPolicy.SOURCE) public @interface StyleUrl { } @@ -26,24 +26,29 @@ public class Style { // IMPORTANT: If you change any of these you also need to edit them in strings.xml /** - * Mapbox Streets: Our signature style. + * Mapbox Streets: A complete basemap, perfect for incorporating your own data. */ public static final String MAPBOX_STREETS = "asset://styles/streets-v8.json"; /** - * Emerald: Great for transportation and outdoor terrain. + * Emerald: A versatile style, with emphasis on road networks and public transit. */ public static final String EMERALD = "asset://styles/emerald-v8.json"; /** - * Light: Light-colored style that is great for data overlay. + * Light: Subtle light backdrop for data visualizations. */ public static final String LIGHT = "asset://styles/light-v8.json"; /** - * Dark: Dark-colored style that is great for data overlay. + * Dark: Subtle dark backdrop for data visualizations. */ public static final String DARK = "asset://styles/dark-v8.json"; /** - * Satellite: The best-looking, most accurate, and most up-to-date satellite imagery available anywhere. + * Satellite: A beautiful global satellite and aerial imagery layer. */ public static final String SATELLITE = "asset://styles/satellite-v8.json"; + /** + * Satellite Streets: Global satellite and aerial imagery with unobtrusive labels. + */ + public static final String SATELLITE_STREETS = "asset://styles/satellite-hybrid-v8.json"; + } diff --git a/android/java/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/android/java/MapboxGLAndroidSDK/src/main/res-public/values/public.xml index f6cb05662d..09dee3752a 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/android/java/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -8,6 +8,7 @@ + diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml index a29d7de7ce..2786ea7b97 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -14,4 +14,5 @@ asset://styles/light-v8.json asset://styles/dark-v8.json asset://styles/satellite-v8.json + asset://styles/satellite-hybrid-v8.json diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java index 8f07729049..50c70b5f5e 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java @@ -382,6 +382,11 @@ public class MainActivity extends AppCompatActivity { mSelectedStyle = id; return true; + case R.id.actionStyleSatelliteStreets: + mMapView.setStyle(Style.SATELLITE_STREETS); + mSelectedStyle = id; + return true; + default: return false; } diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml index 3b7602f3d6..5167182a44 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml @@ -1,8 +1,9 @@ - + - - + @@ -50,6 +51,10 @@ android:id="@+id/actionStyleSatellite" android:title="@string/styleSatellite" /> + + @@ -68,9 +73,10 @@ --> - + - diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml index 014fa25d67..2c5178af08 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml @@ -1,3 +1,3 @@ - - + diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 4a4f0a115d..94c089146a 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -36,6 +36,7 @@ Light Dark Satellite + Satellite Streets Day -- cgit v1.2.1