[android] #5087 - Fixing Satellite Streets URL for V9 while still supporting V8

This commit is contained in:
Brad Leege
2016-05-20 17:49:54 -07:00
parent 7004932fcd
commit 251c41f528

View File

@@ -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";
}