1 files changed, 16 insertions, 28 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
index a83a6991b2..5cc54cd1ca 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
@@ -12,9 +12,9 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
  * <p>
  * Builder for composing {@link com.mapbox.mapboxsdk.annotations.Marker} objects.
  * </p>
- *
+ * <p/>
  * <h3>Example</h3>
- *
+ * <p/>
  * <pre>
  * mMapView.addMarker(new MarkerOptions()
  *   .title("Intersection")
@@ -22,7 +22,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
  *   .position(new LatLng(38.9002073, -77.03364419)));
  * </pre>
  */
-public final class MarkerOptions implements Parcelable {
+public final class MarkerOptions extends BaseMarkerOptions<Marker, MarkerOptions> implements Parcelable {
 
     public static final Parcelable.Creator<MarkerOptions> CREATOR
             = new Parcelable.Creator<MarkerOptions>() {
@@ -47,6 +47,11 @@ public final class MarkerOptions implements Parcelable {
     }
 
     @Override
+    public MarkerOptions getThis() {
+        return this;
+    }
+
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -72,43 +77,27 @@ public final class MarkerOptions implements Parcelable {
      * @return Marker The build marker
      */
     public Marker getMarker() {
+        marker.setPosition(position);
+        marker.setSnippet(snippet);
+        marker.setTitle(title);
+        marker.setIcon(icon);
         return marker;
     }
 
     public LatLng getPosition() {
-        return marker.getPosition();
+        return position;
     }
 
     public String getSnippet() {
-        return marker.getSnippet();
+        return snippet;
     }
 
     public String getTitle() {
-        return marker.getTitle();
+        return title;
     }
 
     public Icon getIcon() {
-        return marker.getIcon();
-    }
-
-    public MarkerOptions position(LatLng position) {
-        marker.setPosition(position);
-        return this;
-    }
-
-    public MarkerOptions snippet(String snippet) {
-        marker.setSnippet(snippet);
-        return this;
-    }
-
-    public MarkerOptions icon(@Nullable Icon icon) {
-        marker.setIcon(icon);
-        return this;
-    }
-
-    public MarkerOptions title(String title) {
-        marker.setTitle(title);
-        return this;
+        return icon;
     }
 
     @Override
@@ -125,7 +114,6 @@ public final class MarkerOptions implements Parcelable {
         if (getIcon() != null ? !getIcon().equals(marker.getIcon()) : marker.getIcon() != null)
             return false;
         return !(getTitle() != null ? !getTitle().equals(marker.getTitle()) : marker.getTitle() != null);
-
     }
 
     @Override