summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-08-17 22:23:32 +0200
committerTobrun <tobrun@mapbox.com>2018-08-21 17:27:09 +0200
commit7ce6af3f55d94e5e271aeafff44a11508b79dead (patch)
treea3955c36afcca78405aff7da7c10af0b005546bd /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
parent5ce64b786cfd2fbfdc28ccfbcf9c1a5216346281 (diff)
downloadqtlocation-mapboxgl-7ce6af3f55d94e5e271aeafff44a11508b79dead.tar.gz
[android] - expose stylejsoon confiugration on MapboxMapOptions and MapView attributes
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 97e2e50525..45e54a3d14 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -95,6 +95,7 @@ public final class MapboxMap {
setDebugActive(options.getDebugActive());
setApiBaseUrl(options);
setStyleUrl(options);
+ setStyleJson(options);
setPrefetchesTiles(options);
}
@@ -1058,7 +1059,7 @@ public final class MapboxMap {
* @param options the object containing the style url
*/
private void setStyleUrl(@NonNull MapboxMapOptions options) {
- String style = options.getStyle();
+ String style = options.getStyleUrl();
if (!TextUtils.isEmpty(style)) {
setStyleUrl(style, null);
}
@@ -1087,6 +1088,18 @@ public final class MapboxMap {
}
/**
+ * Loads a new map style json from MapboxMapOptions if available.
+ *
+ * @param options the object containing the style json
+ */
+ private void setStyleJson(@NonNull MapboxMapOptions options) {
+ String styleJson = options.getStyleJson();
+ if (!TextUtils.isEmpty(styleJson)) {
+ setStyleJson(styleJson);
+ }
+ }
+
+ /**
* Returns the map style json currently displayed in the map view.
*
* @return The json of the map style