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 1b0b16bb7..e2dad9783 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 f6cb05662..09dee3752 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 a29d7de7c..2786ea7b9 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 8f0772904..50c70b5f5 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 3b7602f3d..5167182a4 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 014fa25d6..2c5178af0 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 4a4f0a115..94c089146 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 diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm index 302efbe9f..c8ebede43 100644 --- a/ios/app/MBXViewController.mm +++ b/ios/app/MBXViewController.mm @@ -12,6 +12,7 @@ static NSArray *const kStyleNames = @[ @"Light", @"Dark", @"Satellite", + @"Satellite-Hybrid", ]; static NSUInteger const kStyleVersion = 8; @@ -445,16 +446,16 @@ static NSUInteger const kStyleVersion = 8; { UIImage *newButtonImage; NSString *newButtonTitle; - + switch (mode) { case MGLUserTrackingModeNone: newButtonImage = [UIImage imageNamed:@"TrackingLocationOffMask.png"]; break; - + case MGLUserTrackingModeFollow: newButtonImage = [UIImage imageNamed:@"TrackingLocationMask.png"]; break; - + case MGLUserTrackingModeFollowWithHeading: newButtonImage = [UIImage imageNamed:@"TrackingHeadingMask.png"]; break; @@ -463,7 +464,7 @@ static NSUInteger const kStyleVersion = 8; newButtonTitle = @"Course"; break; } - + self.navigationItem.rightBarButtonItem.title = newButtonTitle; [UIView animateWithDuration:0.25 animations:^{ self.navigationItem.rightBarButtonItem.image = newButtonImage; diff --git a/platform/default/default_styles.cpp b/platform/default/default_styles.cpp index 9ee541497..d7199f36b 100644 --- a/platform/default/default_styles.cpp +++ b/platform/default/default_styles.cpp @@ -9,6 +9,7 @@ const std::vector> defaultStyles = { { "asset://styles/light-v8.json", "Light" }, { "asset://styles/dark-v8.json", "Dark" }, { "asset://styles/satellite-v8.json", "Satellite" } + { "asset://styles/satellite-hyrid-v8.json", "Satellite Streets" } }; } // end namespace util diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index 7352557d1..2012aeece 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -102,7 +102,7 @@ cp -pv LICENSE.md "${OUTPUT}/static" mkdir -p "${OUTPUT}/static/${NAME}.bundle" cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle" mkdir -p "${OUTPUT}/static/${NAME}.bundle/styles" -cp -pv styles/styles/{dark,emerald,light,streets,satellite}-v8.json "${OUTPUT}/static/${NAME}.bundle/styles" +cp -pv styles/styles/{dark,emerald,light,streets,satellite,satellite-hybrid}-v8.json "${OUTPUT}/static/${NAME}.bundle/styles" step "Creating API Docs..." if [ -z `which appledoc` ]; then