diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-09-09 10:17:42 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2017-05-12 10:02:27 -0700 |
commit | 0ef1293dada1490c808ae821228d5a2f3324afdb (patch) | |
tree | 8e29572e8f2bf131da3284e94c0d67bbce8e4e7e /platform/android | |
parent | cb737362b631284e1516561caf30c2027f9bdc03 (diff) | |
download | qtlocation-mapboxgl-0ef1293dada1490c808ae821228d5a2f3324afdb.tar.gz |
[core, android, ios, macos, qt] v10 default styles
Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL.
Cherry-picked from ed54849e9909e7f7cd8724b39b2bc94f16cf9a11.
Diffstat (limited to 'platform/android')
5 files changed, 10 insertions, 10 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 d55fd4c023..fae3bdde2c 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 @@ -35,13 +35,13 @@ public class Style { * constant means your map style will always use the latest version and may change as we * improve the style. */ - public static final String MAPBOX_STREETS = "mapbox://styles/mapbox/streets-v9"; + public static final String MAPBOX_STREETS = "mapbox://styles/mapbox/streets-v10"; /** * Outdoors: A general-purpose style tailored to outdoor activities. Using this constant means * your map style will always use the latest version and may change as we improve the style. */ - public static final String OUTDOORS = "mapbox://styles/mapbox/outdoors-v9"; + public static final String OUTDOORS = "mapbox://styles/mapbox/outdoors-v10"; /** * Light: Subtle light backdrop for data visualizations. Using this constant means your map @@ -66,5 +66,5 @@ public class Style { * constant means your map style will always use the latest version and may change as we * improve the style. */ - public static final String SATELLITE_STREETS = "mapbox://styles/mapbox/satellite-streets-v9"; + public static final String SATELLITE_STREETS = "mapbox://styles/mapbox/satellite-streets-v10"; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index 0862305cfb..7adc29e2de 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -18,10 +18,10 @@ <!-- these are public --> <!-- Using one of these constants means your map style will always use the latest version and may change as we improve the style. --> - <string name="mapbox_style_mapbox_streets" translatable="false">mapbox://styles/mapbox/streets-v9</string> - <string name="mapbox_style_outdoors" translatable="false">mapbox://styles/mapbox/outdoors-v9</string> + <string name="mapbox_style_mapbox_streets" translatable="false">mapbox://styles/mapbox/streets-v10</string> + <string name="mapbox_style_outdoors" translatable="false">mapbox://styles/mapbox/outdoors-v10</string> <string name="mapbox_style_light" translatable="false">mapbox://styles/mapbox/light-v9</string> <string name="mapbox_style_dark" translatable="false">mapbox://styles/mapbox/dark-v9</string> <string name="mapbox_style_satellite" translatable="false">mapbox://styles/mapbox/satellite-v9</string> - <string name="mapbox_style_satellite_streets" translatable="false">mapbox://styles/mapbox/satellite-streets-v9</string> + <string name="mapbox_style_satellite_streets" translatable="false">mapbox://styles/mapbox/satellite-streets-v10</string> </resources> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml index 0b3fd9acdf..599ae3fa1c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml @@ -23,7 +23,7 @@ android:layout_weight="0.5" mapbox:center_latitude="38.913187" mapbox:center_longitude="-77.032546" - mapbox:style_url="mapbox://styles/mapbox/streets-v9" + mapbox:style_url="mapbox://styles/mapbox/streets-v10" mapbox:zoom="12"/> <!-- SF --> @@ -35,7 +35,7 @@ android:layout_weight="0.5" mapbox:center_latitude="37.775732" mapbox:center_longitude="-122.413985" - mapbox:style_url="mapbox://styles/mapbox/outdoors-v9" + mapbox:style_url="mapbox://styles/mapbox/outdoors-v10" mapbox:zoom="13"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml index 8241d0264f..afebfa1c47 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml @@ -13,6 +13,6 @@ mapbox:mapbox_cameraTargetLng="-122.3421" mapbox:mapbox_cameraZoom="11" mapbox:mapbox_renderTextureMode="true" - mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v9" /> + mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v10" /> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml index 8f260c46ff..44374f2c6c 100644 --- a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml +++ b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml @@ -15,7 +15,7 @@ android:layout_height="match_parent" mapbox:mapbox_cameraTargetLat="40.73581" mapbox:mapbox_cameraTargetLng="-73.99155" - mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v9" + mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v10" mapbox:mapbox_cameraZoom="11" mapbox:mapbox_uiZoomControls="false"/> |