diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations')
4 files changed, 14 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java index e57821b541..4fee9443d7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java @@ -1,5 +1,7 @@ package com.mapbox.mapboxsdk.annotations; +import android.support.annotation.Keep; + import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; @@ -10,7 +12,9 @@ import java.util.List; */ public abstract class BasePointCollection extends Annotation { + @Keep private List<LatLng> points; + @Keep private float alpha = 1.0f; protected BasePointCollection() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java index 18f74cd990..dad3d61f0c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.annotations; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; @@ -27,10 +28,12 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; */ public class Marker extends Annotation { + @Keep private LatLng position; private String snippet; private Icon icon; //Redundantly stored for JNI access + @Keep private String iconId; private String title; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java index dd2c37762a..b45c32cdae 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; +import android.support.annotation.Keep; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -13,8 +14,11 @@ import java.util.List; */ public final class Polygon extends BasePointCollection { + @Keep private int fillColor = Color.BLACK; // default fillColor is black + @Keep private int strokeColor = Color.BLACK; // default strokeColor is black + @Keep private List<List<LatLng>> holes; Polygon() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java index 6cea29ef81..41a6ef3536 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; +import android.support.annotation.Keep; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -9,7 +10,9 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; */ public final class Polyline extends BasePointCollection { + @Keep private int color = Color.BLACK; // default color is black + @Keep private float width = 10; // As specified by Google API Docs (in pixels) Polyline() { |