diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources')
9 files changed, 55 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java index ddc4c58cf1..a418cb61a9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CannotAddSourceException.java @@ -1,8 +1,11 @@ package com.mapbox.mapboxsdk.style.sources; +import android.support.annotation.Keep; + /** * Thrown when adding a source to a map twice */ +@Keep public class CannotAddSourceException extends RuntimeException { public CannotAddSourceException(String message) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java index 469bfa8f39..1f6029e2a2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.style.sources; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -108,17 +109,23 @@ public class CustomGeometrySource extends Source { return features != null ? Arrays.asList(features) : new ArrayList<Feature>(); } + @Keep protected native void initialize(String sourceId, Object options); + @Keep private native Feature[] querySourceFeatures(Object[] filter); + @Keep private native void nativeSetTileData(int z, int x, int y, FeatureCollection data); + @Keep private native void nativeInvalidateTile(int z, int x, int y); + @Keep private native void nativeInvalidateBounds(LatLngBounds bounds); @Override + @Keep protected native void finalize() throws Throwable; private void setTileData(TileID tileId, FeatureCollection data) { @@ -127,6 +134,7 @@ public class CustomGeometrySource extends Source { } @WorkerThread + @Keep private void fetchTile(int z, int x, int y) { AtomicBoolean cancelFlag = new AtomicBoolean(false); TileID tileID = new TileID(z, x, y); @@ -136,6 +144,7 @@ public class CustomGeometrySource extends Source { } @WorkerThread + @Keep private void cancelTile(int z, int x, int y) { AtomicBoolean cancelFlag = cancelledTileRequests.get(new TileID(z, x, y)); if (cancelFlag != null) { 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 9ecc70e123..33d8ba03ee 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 @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.style.sources; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -27,6 +28,7 @@ public class GeoJsonSource extends Source { * * @param nativePtr - pointer to native peer */ + @Keep public GeoJsonSource(long nativePtr) { super(nativePtr); } @@ -267,23 +269,32 @@ public class GeoJsonSource extends Source { return features != null ? Arrays.asList(features) : new ArrayList<Feature>(); } + @Keep protected native void initialize(String layerId, Object options); + @Keep protected native void nativeSetUrl(String url); + @Keep protected native String nativeGetUrl(); + @Keep private native void nativeSetGeoJsonString(String geoJson); + @Keep private native void nativeSetFeatureCollection(FeatureCollection geoJson); + @Keep private native void nativeSetFeature(Feature feature); + @Keep private native void nativeSetGeometry(Geometry geometry); + @Keep private native Feature[] querySourceFeatures(Object[] filter); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java index 2faf0d67ae..d84105a05c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java @@ -5,6 +5,7 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.support.annotation.DrawableRes; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -33,6 +34,7 @@ public class ImageSource extends Source { * * @param nativePtr - pointer to native peer */ + @Keep public ImageSource(long nativePtr) { super(nativePtr); } @@ -141,16 +143,22 @@ public class ImageSource extends Source { nativeSetCoordinates(latLngQuad); } + @Keep protected native void initialize(String layerId, LatLngQuad payload); + @Keep protected native void nativeSetUrl(String url); + @Keep protected native String nativeGetUrl(); + @Keep protected native void nativeSetImage(Bitmap bitmap); + @Keep protected native void nativeSetCoordinates(LatLngQuad latLngQuad); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java index 0c510f7594..dc3635ca86 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.style.sources; +import android.support.annotation.Keep; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -19,6 +20,7 @@ public class RasterDemSource extends Source { * * @param nativePtr - pointer to native peer */ + @Keep private RasterDemSource(long nativePtr) { super(nativePtr); } @@ -88,11 +90,14 @@ public class RasterDemSource extends Source { return nativeGetUrl(); } + @Keep protected native void initialize(String layerId, Object payload, int tileSize); @Override + @Keep protected native void finalize() throws Throwable; + @Keep protected native String nativeGetUrl(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java index f1f4cc1ff1..6bd0456e0c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.style.sources; +import android.support.annotation.Keep; import android.support.annotation.Nullable; import java.net.URL; @@ -17,6 +18,7 @@ public class RasterSource extends Source { * * @param nativePtr - pointer to native peer */ + @Keep public RasterSource(long nativePtr) { super(nativePtr); } @@ -87,11 +89,14 @@ public class RasterSource extends Source { return nativeGetUrl(); } + @Keep protected native void initialize(String layerId, Object payload, int tileSize); @Override + @Keep protected native void finalize() throws Throwable; + @Keep protected native String nativeGetUrl(); } 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 6a0939569a..53c8148580 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 @@ -1,5 +1,7 @@ package com.mapbox.mapboxsdk.style.sources; +import android.support.annotation.Keep; + import com.mapbox.mapboxsdk.utils.ThreadUtils; /** @@ -7,6 +9,7 @@ import com.mapbox.mapboxsdk.utils.ThreadUtils; */ public abstract class Source { + @Keep private long nativePtr; /** @@ -14,6 +17,7 @@ public abstract class Source { * * @param nativePtr - pointer to native peer */ + @Keep public Source(long nativePtr) { checkThread(); this.nativePtr = nativePtr; @@ -62,7 +66,9 @@ public abstract class Source { return nativePtr; } + @Keep protected native String nativeGetId(); + @Keep protected native String nativeGetAttribution(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java index 4a97d71f9a..8135b055db 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/UnknownSource.java @@ -1,11 +1,13 @@ package com.mapbox.mapboxsdk.style.sources; +import android.support.annotation.Keep; import android.support.annotation.UiThread; /** * An unknown type of source */ @UiThread +@Keep public class UnknownSource extends Source { /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java index 0df17572e9..393d8c2b81 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.style.sources; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.Size; @@ -26,6 +27,7 @@ public class VectorSource extends Source { * * @param nativePtr - pointer to native peer */ + @Keep public VectorSource(long nativePtr) { super(nativePtr); } @@ -88,13 +90,17 @@ public class VectorSource extends Source { return nativeGetUrl(); } + @Keep protected native void initialize(String layerId, Object payload); @Override + @Keep protected native void finalize() throws Throwable; + @Keep protected native String nativeGetUrl(); + @Keep private native Feature[] querySourceFeatures(String[] sourceLayerId, Object[] filter); |