diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp')
3 files changed, 21 insertions, 10 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java index 1a9d3d300b..2493aa00e5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.testapp.activity.maplayout; import android.graphics.Color; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import android.view.Gravity; import android.view.Menu; @@ -76,25 +77,30 @@ public class LatLngBoundsForCameraActivity extends AppCompatActivity implements case R.id.menu_action_cross_idl: setupBounds(CROSS_IDL_BOUNDS); return true; + case R.id.menu_action_reset: + setupBounds(null); + return true; } return super.onOptionsItemSelected(item); } - private void setupBounds(LatLngBounds bounds) { + private void setupBounds(@Nullable LatLngBounds bounds) { mapboxMap.setLatLngBoundsForCameraTarget(bounds); showBoundsArea(bounds); } - private void showBoundsArea(LatLngBounds bounds) { + private void showBoundsArea(@Nullable LatLngBounds bounds) { mapboxMap.clear(); - PolygonOptions boundsArea = new PolygonOptions() - .add(bounds.getNorthWest()) - .add(bounds.getNorthEast()) - .add(bounds.getSouthEast()) - .add(bounds.getSouthWest()); - boundsArea.alpha(0.25f); - boundsArea.fillColor(Color.RED); - mapboxMap.addPolygon(boundsArea); + if (bounds != null) { + PolygonOptions boundsArea = new PolygonOptions() + .add(bounds.getNorthWest()) + .add(bounds.getNorthEast()) + .add(bounds.getSouthEast()) + .add(bounds.getSouthWest()); + boundsArea.alpha(0.25f); + boundsArea.fillColor(Color.RED); + mapboxMap.addPolygon(boundsArea); + } } private void showCrosshair() { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml index db7aad6d1f..4b39a392a0 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml @@ -9,4 +9,8 @@ android:id="@+id/menu_action_cross_idl" android:title="@string/restrict_across_idl" app:showAsAction="never"/> + <item + android:id="@+id/menu_action_reset" + android:title="@string/restrict_reset" + app:showAsAction="never"/> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml index 7513baaa36..d36c741c50 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml @@ -90,4 +90,5 @@ <string name="zoom_to_4">Zoom to 4</string> <string name="restrict_almost_worldview">Restrict almost worldview</string> <string name="restrict_across_idl">Restrict across IDL</string> + <string name="restrict_reset">Reset bounds</string> </resources>
\ No newline at end of file |