mapbox#894 - Initial port of iOS method for aligning infowindows over…

… markers
AndwareSsj · Sep 7, 2015 · 68a250d · 68a250d
1 parent cd6fd82
commit 68a250d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...oid/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/InfoWindow.java b/...oid/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/InfoWindow.java
@@ -85,10 +85,12 @@ public InfoWindow open(Marker object, LatLng position, int offsetX, int offsetY)
         MapView.LayoutParams lp = new MapView.LayoutParams(MapView.LayoutParams.WRAP_CONTENT, MapView.LayoutParams.WRAP_CONTENT);
         PointF coords = mMapView.toScreenLocation(position);
 
+        double y = mMapView.getTopOffsetPixelsForAnnotationSymbol(object.sprite);
+
         // Flip y coordinate as Android view origin is upper left corner
         coords.y = mMapView.getHeight() - coords.y;
-        lp.leftMargin = (int) coords.x;
-        lp.topMargin = (int) coords.y;
+        lp.leftMargin = (int) coords.x - 1;
+        lp.topMargin = (int) coords.y + (int) y;
 
         close(); //if it was already opened
         mMapView.addView(mView, lp);

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
@@ -728,7 +728,11 @@ public PointF toScreenLocation(LatLng location) {
         return new PointF(point.x * mScreenDensity, point.y * mScreenDensity);
     }
 
-    //
+    public double getTopOffsetPixelsForAnnotationSymbol(@NonNull String symbolName) {
+        return mNativeMapView.getTopOffsetPixelsForAnnotationSymbol(symbolName);
+    }
+
+        //
     // Lifecycle events
     //