1 files changed, 21 insertions, 21 deletions

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 c2683cbb56..16b219684f 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
@@ -4,16 +4,16 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.View;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 
 /**
  * Marker is an annotation that shows an icon image at a geographical location.
- * </p>
+ * <p>
  * An {@link InfoWindow} can be shown when a Marker is pressed
- * <p/>
+ * </p>
  */
 public class Marker extends Annotation {
 
@@ -21,9 +21,12 @@ public class Marker extends Annotation {
     private String snippet;
     private Icon icon;
     private String title;
-    private InfoWindow infoWindow = null;
-    private boolean infoWindowShown = false;
+
+    private InfoWindow infoWindow;
+    private boolean infoWindowShown;
+
     private int topOffsetPixels;
+    private int rightOffsetPixels;
 
     /**
      * Constructor
@@ -39,6 +42,13 @@ public class Marker extends Annotation {
         title = baseMarkerOptions.title;
     }
 
+    Marker(BaseMarkerViewOptions baseMarkerViewOptions){
+        position = baseMarkerViewOptions.position;
+        snippet = baseMarkerViewOptions.snippet;
+        icon = baseMarkerViewOptions.icon;
+        title = baseMarkerViewOptions.title;
+    }
+
     public LatLng getPosition() {
         return position;
     }
@@ -130,7 +140,7 @@ public class Marker extends Annotation {
     }
 
     private InfoWindow showInfoWindow(InfoWindow iw, MapView mapView) {
-        iw.open(mapView, this, getPosition(), 0, topOffsetPixels);
+        iw.open(mapView, this, getPosition(), rightOffsetPixels, topOffsetPixels);
         infoWindowShown = true;
         return iw;
     }
@@ -149,21 +159,11 @@ public class Marker extends Annotation {
         this.topOffsetPixels = topOffsetPixels;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        Marker marker = (Marker) o;
-        return !(getPosition() != null ? !getPosition().equals(marker.getPosition()) : marker.getPosition() != null);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + (getPosition() != null ? getPosition().hashCode() : 0);
-        return result;
+    /**
+     * Do not use this method. Used internally by the SDK.
+     */
+    public void setRightOffsetPixels(int rightOffsetPixels) {
+        this.rightOffsetPixels = rightOffsetPixels;
     }
 
     @Override