From f3d4c3fc1aa66d9275e4af6a8cfc31cde36d324b Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Sat, 17 Oct 2015 12:29:33 +1100 Subject: [PATCH] [android] Make Marker anchor property private Fixes #2652 --- .../java/com/mapbox/mapboxsdk/annotations/Marker.java | 8 ++++---- .../com/mapbox/mapboxsdk/annotations/MarkerOptions.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java index e369a1349..3567c1a8e 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java @@ -48,15 +48,15 @@ public final class Marker extends Annotation { return (lat == otherLat && otherLng == lng); } - public Point getAnchor() { + Point getAnchor() { return new Point((int)anchorU, (int)anchorV); } - public float getAnchorU() { + float getAnchorU() { return anchorU; } - public float getAnchorV() { + float getAnchorV() { return anchorV; } @@ -188,7 +188,7 @@ public final class Marker extends Annotation { } private void showInfoWindow(InfoWindow iw) { - iw.open(this, getPosition(), (int) anchorU, (int) anchorV + topOffsetPixels); + iw.open(this, getPosition(), 0, topOffsetPixels); iw.setBoundMarker(this); infoWindowShown = true; } 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 2fc3b54c8..77a0172cb 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 @@ -12,7 +12,7 @@ public final class MarkerOptions { marker = new Marker(); } - public MarkerOptions anchor(float u, float v) { + private MarkerOptions anchor(float u, float v) { marker.setAnchor(u, v); return this; } @@ -27,11 +27,11 @@ public final class MarkerOptions { return this; } - public float getAnchorU() { + private float getAnchorU() { return marker.getAnchorU(); } - public float getAnchorV() { + private float getAnchorV() { return marker.getAnchorV(); }