tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Add missing satellite streets style to Android and iOS.

Browse Source 
As well as default_styles.cpp
Fixes #2739
Fixes #2740
This commit is contained in:
Leith Bade
2015-10-23 10:31:27 +11:00
parent 1f4144c65a
commit f71d61fa91
10 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
View File

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

1
android/java/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
View File

@@ -8,6 +8,7 @@
<public name="style_light" type="string" />
<public name="style_dark" type="string" />
<public name="style_satellite" type="string" />
<public name="style_satellite_streets" type="string" />
<public name="center_longitude" type="attr" />
<public name="center_latitude" type="attr" />

1
android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml
View File

@@ -14,4 +14,5 @@
<string name="style_light">asset://styles/light-v8.json</string>
<string name="style_dark">asset://styles/dark-v8.json</string>
<string name="style_satellite">asset://styles/satellite-v8.json</string>
<string name="style_satellite_streets">asset://styles/satellite-hybrid-v8.json</string>
</resources>