diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2019-05-23 18:52:33 +0200 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2019-08-01 16:58:01 +0300 |
| commit | 9c4950eccd18db713538309df863ba94dc4f203c (patch) | |
| tree | 563621bf57af952856957dceb07cc5f1360a2bf0 /platform/android/MapboxGLAndroidSDK/src | |
| parent | 04309e01ceaa267becef16ed9db6f91fcea91f59 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-empty-style.tar.gz | |
[android] - load style without url or jsonupstream/tvn-empty-style
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src')
3 files changed, 4 insertions, 2 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 ea06856e9e..8e1019b379 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 @@ -837,7 +837,7 @@ public final class MapboxMap { nativeMapView.setStyleJson(builder.getJson()); } else { // user didn't provide a `from` component, load a blank style instead - nativeMapView.setStyleJson("{}"); + nativeMapView.setStyleJson(Style.EMPTY_JSON); } } 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 a449ad8a06..a707ab13da 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 @@ -37,6 +37,8 @@ import java.util.Map; @SuppressWarnings("unchecked") public class Style { + static final String EMPTY_JSON = "{\"version\": 8,\"sources\": {},\"layers\": []}"; + private final NativeMap nativeMap; private final HashMap<String, Source> sources = new HashMap<>(); private final HashMap<String, Layer> layers = new HashMap<>(); diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt index 9a7462b8d0..d618f17500 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/StyleTest.kt @@ -48,7 +48,7 @@ class StyleTest { fun testEmptyBuilder() { val builder = Style.Builder() mapboxMap.setStyle(builder) - verify(exactly = 1) { nativeMapView.styleJson = "{}" } + verify(exactly = 1) { nativeMapView.styleJson = Style.EMPTY_JSON } } @Test |