[android] #2631 - Removing AnnotationsOptions and MultiPointOptions in favor of concrete implementation

6 files changed, 68 insertions, 41 deletions

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/AnnotationOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/AnnotationOptions.java
deleted file mode 100644
index 5962e25c77..0000000000
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/AnnotationOptions.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mapbox.mapboxsdk.annotations;
-
-public abstract class AnnotationOptions {
-
-    protected Annotation annotation;
-
-    public AnnotationOptions() {}
-
-    public AnnotationOptions alpha(float alpha) {
-        annotation.alpha = alpha;
-        return this;
-    }
-
-    public float getAlpha() {
-        return annotation.alpha;
-    }
-
-    public boolean isVisible() {
-        return annotation.visible;
-    }
-
-}
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/CircleOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/CircleOptions.java
index 9eb6e7ca3a..9e542c8aec 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/CircleOptions.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/CircleOptions.java
@@ -9,7 +9,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
  * https://github.com/mapbox/mapbox-gl-native/issues/1882
  * https://github.com/mapbox/mapbox-gl-native/issues/1726
  */
-public class CircleOptions extends AnnotationOptions {
+public class CircleOptions {
 
     private Circle circle;
 
@@ -61,4 +61,16 @@ public class CircleOptions extends AnnotationOptions {
         return this;
     }
 
+    public CircleOptions alpha(float alpha) {
+        circle.alpha = alpha;
+        return this;
+    }
+
+    public float getAlpha() {
+        return circle.alpha;
+    }
+
+    public boolean isVisible() {
+        return circle.visible;
+    }
 }
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
index 67700851b2..7dc55f2567 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
@@ -4,7 +4,9 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 
-public class MarkerOptions extends AnnotationOptions {
+public class MarkerOptions {
+
+    protected Annotation annotation;
 
     public MarkerOptions() {
         annotation = new Marker();
@@ -119,6 +121,14 @@ public class MarkerOptions extends AnnotationOptions {
         return this;
     }
 
+    public MarkerOptions alpha(float alpha) {
+        annotation.setAlpha(alpha);
+        return this;
+    }
+
+    public float getAlpha() {
+        return annotation.alpha;
+    }
 
     // TODO: Implement this method of Google Maps Android API
 //    public MarkerOptions icon(BitmapDescriptor icon) {
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPointOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPointOptions.java
deleted file mode 100644
index b201cb2aae..0000000000
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPointOptions.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mapbox.mapboxsdk.annotations;
-
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-import java.util.List;
-
-public abstract class MultiPointOptions extends AnnotationOptions {
-
-    public MultiPointOptions() {}
-
-    public List<LatLng> getPoints() {
-        // the getter gives us a copy, which is the safe thing to do...
-        return ((MultiPoint)annotation).getPoints();
-    }
-}
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
index 12f482776e..000c96f24c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
@@ -6,7 +6,9 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PolygonOptions extends MultiPointOptions {
+public class PolygonOptions {
+
+    protected Annotation annotation;
 
     public PolygonOptions() {
         annotation = new Polygon();
@@ -47,6 +49,15 @@ public class PolygonOptions extends MultiPointOptions {
         return this;
     }
 
+    public PolygonOptions alpha(float alpha) {
+        annotation.alpha = alpha;
+        return this;
+    }
+
+    public float getAlpha() {
+        return annotation.alpha;
+    }
+
     /**
      * Sets the color of the polygon.
      *
@@ -117,6 +128,15 @@ public class PolygonOptions extends MultiPointOptions {
         return this;
     }
 
+    public boolean isVisible() {
+        return annotation.visible;
+    }
+
+    public List<LatLng> getPoints() {
+        // the getter gives us a copy, which is the safe thing to do...
+        return ((MultiPoint)annotation).getPoints();
+    }
+
     // TODO: Implement writeToParcel of Google Maps Android API
 //    public void writeToParcel(Parcel out, int flags) {
 //
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
index 3d1ea6c609..cd80798d73 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
@@ -2,7 +2,11 @@ package com.mapbox.mapboxsdk.annotations;
 
 import com.mapbox.mapboxsdk.geometry.LatLng;
 
-public class PolylineOptions extends MultiPointOptions {
+import java.util.List;
+
+public class PolylineOptions {
+
+    protected Annotation annotation;
 
     public PolylineOptions() {
         annotation = new Polyline();
@@ -27,6 +31,15 @@ public class PolylineOptions extends MultiPointOptions {
         return this;
     }
 
+    public PolylineOptions alpha(float alpha) {
+        annotation.alpha = alpha;
+        return this;
+    }
+
+    public float getAlpha() {
+        return annotation.alpha;
+    }
+
     /**
      * Sets the color of the polyline.
      *
@@ -54,6 +67,10 @@ public class PolylineOptions extends MultiPointOptions {
         return this;
     }
 
+    public boolean isVisible() {
+        return annotation.visible;
+    }
+
     /**
      * Sets the width of the polyline.
      *
@@ -65,6 +82,11 @@ public class PolylineOptions extends MultiPointOptions {
         return this;
     }
 
+    public List<LatLng> getPoints() {
+        // the getter gives us a copy, which is the safe thing to do...
+        return ((MultiPoint)annotation).getPoints();
+    }
+
     // TODO: Implement writeToParcel of Google Maps Android API
 //    public void writeToParcel(Parcel out, int flags) {
 //