diff options
author | Brad Leege <bleege@gmail.com> | 2015-09-04 17:18:57 -0500 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2015-09-07 12:05:49 -0700 |
commit | 902b80888f0c4da771b0309eeb4ec4d98e5d2624 (patch) | |
tree | 70e9db0fdf3bd001609df5aa0ca03b59c463a4e2 | |
parent | 4837a247e5287a47510e80a05697a5020693513f (diff) | |
download | qtlocation-mapboxgl-902b80888f0c4da771b0309eeb4ec4d98e5d2624.tar.gz |
#894 - Initial port of selectAnnotation and removing auto display of InfoWindow on long press marker addition in TestApp
2 files changed, 15 insertions, 3 deletions
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 index b3172f5e38..ee1d210348 100644 --- 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 @@ -438,7 +438,6 @@ public class MapView extends FrameLayout implements LocationListener { marker.setId(id); // the annotation needs to know its id marker.setMapView(this); // the annotation needs to know which map view it is in mAnnotations.add(marker); - selectAnnotation(marker); return marker; } @@ -1968,8 +1967,21 @@ public class MapView extends FrameLayout implements LocationListener { private void selectAnnotation(Annotation annotation) { - // Need to deselect any currently selected annotation first + if (annotation == null) { + return; + } + + if (annotation == mSelectedAnnotation) { + return; + } + + if (annotation instanceof Marker) { + // Need to deselect any currently selected annotation first + deselectAnnotation(); + ((Marker)annotation).showInfoWindow(); + mSelectedAnnotation = annotation; + } } private void deselectAnnotation() { diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java index de52a31a49..eb5bfbc285 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java @@ -122,7 +122,7 @@ public class MainActivity extends AppCompatActivity { .position(position) .title("Dropped Pin") .snippet("Some snippet text.") - .sprite("default_marker")).showInfoWindow(); + .sprite("default_marker")); } }); |