diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-12-05 18:21:40 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-12-10 19:09:07 +0100 |
commit | b914a7c3f4122d69fca21cf21325f5d8be7e68be (patch) | |
tree | 576f55d64d88c278b9c9f316538c4360775e45a8 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java | |
parent | 3968f164578a2416d3345dab93ab323bd7950240 (diff) | |
download | qtlocation-mapboxgl-b914a7c3f4122d69fca21cf21325f5d8be7e68be.tar.gz |
[android] - use builder json/url for constructing style object
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java index 2ba193b412..d9561aa778 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java @@ -34,8 +34,6 @@ public class Style { private final HashMap<String, Layer> layers = new HashMap<>(); private final HashMap<String, Bitmap> images = new HashMap<>(); private final Builder builder; - private String styleUrl; - private String styleJson; private boolean styleLoaded; /** @@ -46,8 +44,6 @@ public class Style { */ private Style(@NonNull Builder builder, @NonNull NativeMapView nativeMapView) { this.builder = builder; - styleUrl = builder.styleUrl; - styleJson = builder.styleJson; this.nativeMapView = nativeMapView; } @@ -56,9 +52,9 @@ public class Style { * * @return the style url */ - @Nullable + @NonNull public String getUrl() { - return styleUrl; + return nativeMapView.getStyleUrl(); } /** @@ -66,9 +62,9 @@ public class Style { * * @return the style json */ - @Nullable + @NonNull public String getJson() { - return styleJson; + return nativeMapView.getStyleJson(); } // @@ -599,6 +595,14 @@ public class Style { return this; } + String getUrl() { + return styleUrl; + } + + String getJson() { + return styleJson; + } + /** * Build the composed style. */ |