diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java index c30077d7b..88008d64f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java @@ -7,6 +7,7 @@ import android.support.annotation.Nullable; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.Menu; import android.view.MenuItem; import com.mapbox.mapboxsdk.annotations.MarkerOptions; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; @@ -22,6 +23,7 @@ import java.util.ArrayList; public class PressForMarkerActivity extends AppCompatActivity { private MapView mapView; + private MapboxMap mapboxMap; private ArrayList mMarkerList = new ArrayList<>(); private static final DecimalFormat LAT_LON_FORMATTER = new DecimalFormat("#.#####"); @@ -46,9 +48,10 @@ public class PressForMarkerActivity extends AppCompatActivity { mapView.onCreate(savedInstanceState); mapView.getMapAsync(new OnMapReadyCallback() { @Override - public void onMapReady(final MapboxMap mapboxMap) { + public void onMapReady(final MapboxMap map) { + mapboxMap = map; mapboxMap.setStyleUrl(Style.getOutdoorsStyleUrl(9)); - mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(45.1855569, 5.7215506), 11)); + resetMap(); mapboxMap.setOnMapLongClickListener(new MapboxMap.OnMapLongClickListener() { @Override @@ -76,6 +79,20 @@ public class PressForMarkerActivity extends AppCompatActivity { }); } + private void resetMap() { + if (mapboxMap == null) { + return; + } + mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(45.1855569, 5.7215506), 11)); + mapboxMap.removeAnnotations(); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_press_for_marker, menu); + return true; + } + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); @@ -114,6 +131,9 @@ public class PressForMarkerActivity extends AppCompatActivity { case android.R.id.home: onBackPressed(); return true; + case R.id.menuItemReset: + resetMap(); + return true; default: return super.onOptionsItemSelected(item); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml new file mode 100644 index 000000000..0b3a8e797 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml @@ -0,0 +1,9 @@ + + + + diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 0fd16eeed..835b1479f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -80,6 +80,7 @@ Concurrent Open InfoWindowsr Dismiss location tracking on gesture Dismiss bearing tracking on gesture + Reset category Annotation