diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2017-03-22 15:05:03 +0200 |
---|---|---|
committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-03-28 15:44:22 +0300 |
commit | fa7489fb7ea8ec85cb746e0bc497518d72c638b9 (patch) | |
tree | 477c100890466ca0093af9e101554dca530f9ae8 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style | |
parent | f70f604e5b99062a24764716ccdeda64c36320be (diff) | |
download | qtlocation-mapboxgl-fa7489fb7ea8ec85cb746e0bc497518d72c638b9.tar.gz |
[android] geojson conversion optimisation
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style')
2 files changed, 5 insertions, 30 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java index b253595713..3c1a325169 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java @@ -11,7 +11,6 @@ import com.mapbox.services.commons.geojson.FeatureCollection; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; /** @@ -133,8 +132,7 @@ public class GeoJsonSource extends Source { * @param features the GeoJSON {@link FeatureCollection} */ public void setGeoJson(FeatureCollection features) { - checkValidity(); - setGeoJson(features.toJson()); + nativeSetFeatureCollection(features); } /** @@ -143,8 +141,7 @@ public class GeoJsonSource extends Source { * @param json the raw GeoJson FeatureCollection string */ public void setGeoJson(String json) { - checkValidity(); - setRawJson(json); + nativeSetGeoJsonString(json); } /** @@ -153,7 +150,6 @@ public class GeoJsonSource extends Source { * @param url the GeoJSON FeatureCollection url */ public void setUrl(URL url) { - checkValidity(); setUrl(url.toExternalForm()); } @@ -163,7 +159,6 @@ public class GeoJsonSource extends Source { * @param url the GeoJSON FeatureCollection url */ public void setUrl(String url) { - checkValidity(); nativeSetUrl(url); } @@ -179,19 +174,13 @@ public class GeoJsonSource extends Source { return features != null ? Arrays.asList(features) : new ArrayList<Feature>(); } - protected void setRawJson(String geoJson) { - // Wrap the String in a map as an Object is expected by the - // style conversion template - HashMap<String, String> wrapper = new HashMap<>(); - wrapper.put("data", geoJson); - nativeSetGeoJson(wrapper); - } - protected native void initialize(String layerId, Object options); protected native void nativeSetUrl(String url); - private native void nativeSetGeoJson(Object geoJson); + private native void nativeSetGeoJsonString(String geoJson); + + private native void nativeSetFeatureCollection(FeatureCollection geoJson); private native Feature[] querySourceFeatures(Object[] filter); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java index 6826fed1b5..62bfcb818f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java @@ -5,7 +5,6 @@ package com.mapbox.mapboxsdk.style.sources; */ public abstract class Source { private long nativePtr; - private boolean invalidated; /** * Internal use @@ -25,7 +24,6 @@ public abstract class Source { * @return the source id */ public String getId() { - checkValidity(); return nativeGetId(); } @@ -40,16 +38,4 @@ public abstract class Source { protected native String nativeGetId(); - protected void checkValidity() { - if (invalidated) { - throw new RuntimeException("Layer has been invalidated. Request a new reference after adding"); - } - } - - /** - * Internal use - invalidates the source for further use (after adding it to the map) - */ - public final void invalidate() { - this.invalidated = true; - } } |