summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2016-05-20 17:49:54 -0700
committerBrad Leege <bleege@gmail.com>2016-05-20 17:49:54 -0700
commit251c41f5283fea14df90b434a7212b695df08b9d (patch)
tree76479fda6ad11b84e75f009109ffa4f84fa6d331 /platform
parent7004932fcdff6516e0e75e632a0c3991ecc65e85 (diff)
downloadqtlocation-mapboxgl-251c41f5283fea14df90b434a7212b695df08b9d.tar.gz
[android] #5087 - Fixing Satellite Streets URL for V9 while still supporting V8
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
index 0715b04f4c..aa24d58656 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
@@ -38,7 +38,12 @@ public class Style {
/**
* Satellite Streets: Global satellite and aerial imagery with unobtrusive labels.
*/
- private static final String SATELLITE_STREETS_BASE = "mapbox://styles/mapbox/satellite-hybrid-v%d";
+ private static final String SATELLITE_STREETS_BASE = "mapbox://styles/mapbox/satellite-streets-v%d";
+
+ /**
+ * Satellite Streets: Global satellite and aerial imagery with unobtrusive labels (Version 8).
+ */
+ private static final String SATELLITE_STREETS_V8 = "mapbox://styles/mapbox/satellite-hybrid-v8";
/**
* Get versioned url of Mapbox streets style.
@@ -145,6 +150,9 @@ public class Style {
* @return uri to load style from
*/
public static String getSatelliteStreetsStyleUrl(int version) {
+ if (version == 8) {
+ return SATELLITE_STREETS_V8;
+ }
return String.format(MapboxConstants.MAPBOX_LOCALE, SATELLITE_STREETS_BASE, version);
}
@@ -207,5 +215,5 @@ public class Style {
* @deprecated use {@link #getSatelliteStreetsStyleUrl(int)} (int)} instead.
*/
@Deprecated
- public static final String SATELLITE_STREETS = "mapbox://styles/mapbox/satellite-hybrid-v9";
+ public static final String SATELLITE_STREETS = "mapbox://styles/mapbox/satellite-streets-v9";
}