[android] - don't wrap LatLngBounds

9 files changed, 82 insertions, 79 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java
index 67385fdba4..0ca3b82a29 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeometryConstants.java
@@ -14,12 +14,12 @@ public class GeometryConstants {
   /**
    * This constant represents the lowest longitude value available to represent a geolocation.
    */
-  public static final double MIN_LONGITUDE = -180;
+  public static final double MIN_LONGITUDE = -Double.MAX_VALUE;
 
   /**
    * This constant represents the highest longitude value available to represent a geolocation.
    */
-  public static final double MAX_LONGITUDE = 180;
+  public static final double MAX_LONGITUDE = Double.MAX_VALUE;
 
   /**
    * This constant represents the lowest latitude value available to represent a geolocation.
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
index ca39c99c4a..07c56b6da7 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
@@ -297,7 +297,6 @@ public class LatLngBounds implements Parcelable {
    * latNorth should be greater or equal latSouth, otherwise  IllegalArgumentException will be thrown.
    * <p>
    * This method doesn't recalculate most east or most west boundaries.
-   * Note that lonEast and lonWest will be wrapped to be in the range of [-180, 180],
    * see {@link GeometryConstants#MIN_LONGITUDE} and {@link GeometryConstants#MAX_LONGITUDE}
    * </p>
    */
@@ -308,10 +307,6 @@ public class LatLngBounds implements Parcelable {
     double lonWest) {
 
     checkParams(latNorth, lonEast, latSouth, lonWest);
-
-    lonEast = LatLng.wrap(lonEast, GeometryConstants.MIN_LONGITUDE, GeometryConstants.MAX_LONGITUDE);
-    lonWest = LatLng.wrap(lonWest, GeometryConstants.MIN_LONGITUDE, GeometryConstants.MAX_LONGITUDE);
-
     return new LatLngBounds(latNorth, lonEast, latSouth, lonWest);
   }
 
@@ -341,6 +336,10 @@ public class LatLngBounds implements Parcelable {
     if (latNorth < latSouth) {
       throw new IllegalArgumentException("latNorth cannot be less than latSouth");
     }
+
+    if (lonEast < lonWest) {
+      throw new IllegalArgumentException("lonEast cannot be less than lonWest");
+    }
   }
 
   private static double lat_(int z, int y) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index 8c929fee63..8b6c4b7001 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -263,8 +263,7 @@ final class NativeMapView {
     if (checkState("")) {
       return new LatLng();
     }
-    // wrap longitude values coming from core
-    return nativeGetLatLng().wrap();
+    return nativeGetLatLng();
   }
 
   public CameraPosition getCameraForLatLngBounds(LatLngBounds bounds, int[] padding, double bearing, double tilt) {
@@ -619,7 +618,7 @@ final class NativeMapView {
       return new LatLng();
     }
     return nativeLatLngForProjectedMeters(projectedMeters.getNorthing(),
-      projectedMeters.getEasting()).wrap();
+      projectedMeters.getEasting());
   }
 
   @NonNull
@@ -636,7 +635,7 @@ final class NativeMapView {
     if (checkState("latLngForPixel")) {
       return new LatLng();
     }
-    return nativeLatLngForPixel(pixel.x / pixelRatio, pixel.y / pixelRatio).wrap();
+    return nativeLatLngForPixel(pixel.x / pixelRatio, pixel.y / pixelRatio);
   }
 
   public double getTopOffsetPixelsForAnnotationSymbol(String symbolName) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
index a45728c494..8ba166e62d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
@@ -388,34 +388,18 @@ public class LatLngBoundsTest {
   public void intersectSouthLessThanNorthCheck() {
     exception.expect(IllegalArgumentException.class);
     exception.expectMessage("latNorth cannot be less than latSouth");
-
     LatLngBounds intersectLatLngBounds =
       LatLngBounds.from(10, 10, 0, 0)
         .intersect(0, 200, 20, 0);
   }
 
-
   @Test
-  public void intersectEastWrapCheck() {
-
-    LatLngBounds latLngBounds1 = LatLngBounds.from(10, -150, 0, 0);
-    LatLngBounds latLngBounds2 = LatLngBounds.from(90, 200, 0, 0);
-
-    LatLngBounds intersectLatLngBounds = LatLngBounds.from(10, -160, 0, 0);
-
-    assertEquals(latLngBounds1.intersect(latLngBounds2), intersectLatLngBounds);
-    assertEquals(latLngBounds2.intersect(latLngBounds1), intersectLatLngBounds);
-  }
-
-  @Test
-  public void intersectWestWrapCheck() {
-    LatLngBounds latLngBounds1 = LatLngBounds.from(0, 0, -10, 150);
-    LatLngBounds latLngBounds2 = LatLngBounds.from(0, 0, -90, -200);
-
-    LatLngBounds intersectLatLngBounds = LatLngBounds.from(0, 0, -10, 160);
-
-    assertEquals(latLngBounds1.intersect(latLngBounds2), intersectLatLngBounds);
-    assertEquals(latLngBounds2.intersect(latLngBounds1), intersectLatLngBounds);
+  public void intersectEastLessThanWestCheck() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("lonEast cannot be less than lonWest");
+    LatLngBounds intersectLatLngBounds =
+      LatLngBounds.from(10, -10, 0, 0)
+        .intersect(0, 200, 20, 0);
   }
 
   @Test
@@ -592,39 +576,6 @@ public class LatLngBoundsTest {
   }
 
   @Test
-  public void unionSouthLessThanNorthCheck() {
-    exception.expect(IllegalArgumentException.class);
-    exception.expectMessage("latNorth cannot be less than latSouth");
-
-    LatLngBounds unionLatLngBounds =
-      LatLngBounds.from(10, 10, 0, 0)
-        .union(0, 200, 20, 0);
-  }
-
-
-  @Test
-  public void unionEastWrapCheck() {
-
-    LatLngBounds latLngBounds1 = LatLngBounds.from(10, 10, 0, 0);
-    LatLngBounds latLngBounds2 = LatLngBounds.from(90, 200, 0, 0);
-    LatLngBounds unionLatLngBounds = LatLngBounds.from(90, -160, 0, 0);
-
-    assertEquals(latLngBounds1.union(latLngBounds2), unionLatLngBounds);
-    assertEquals(latLngBounds2.union(latLngBounds1), unionLatLngBounds);
-  }
-
-  @Test
-  public void unionWestWrapCheck() {
-    LatLngBounds latLngBounds1 = LatLngBounds.from(0, 0, -10, -10);
-    LatLngBounds latLngBounds2 = LatLngBounds.from(0, 0, -90, -200);
-
-    LatLngBounds unionLatLngBounds = LatLngBounds.from(0, 0, -90, 160);
-
-    assertEquals(latLngBounds1.union(latLngBounds2), unionLatLngBounds);
-    assertEquals(latLngBounds2.union(latLngBounds1), unionLatLngBounds);
-  }
-
-  @Test
   public void northWest() {
     double minLat = 5;
     double minLon = 6;
@@ -789,4 +740,11 @@ public class LatLngBoundsTest {
     exception.expectMessage("latNorth cannot be less than latSouth");
     LatLngBounds.from(0, 20, 20, 0);
   }
+
+  @Test
+  public void testConstructorCheckLonEastGreaterLonWest() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("lonEast cannot be less than lonWest");
+    LatLngBounds.from(30, 20, 20, 30);
+  }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java
index 7aaca370b2..0fdae6fcda 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/LatLngBoundsTest.java
@@ -6,7 +6,6 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.feature.QueryRenderedFeaturesBoxHighlightActivity;
-
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 import org.junit.Test;
 
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 5e6e828856..1a9d3d300b 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
@@ -5,9 +5,10 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.FrameLayout;
-
 import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
@@ -18,7 +19,7 @@ import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.mapboxsdk.testapp.R;
 
 /**
- * Test activity showcasing restricting user gestures to a bounds around Iceland.
+ * Test activity showcasing restricting user gestures to a bounds around Iceland, almost worldview and IDL.
  */
 public class LatLngBoundsForCameraActivity extends AppCompatActivity implements OnMapReadyCallback {
 
@@ -27,6 +28,16 @@ public class LatLngBoundsForCameraActivity extends AppCompatActivity implements
     .include(new LatLng(62.985661, -12.626277))
     .build();
 
+  private static final LatLngBounds ALMOST_WORLD_BOUNDS = new LatLngBounds.Builder()
+    .include(new LatLng(20.0, 170.0))
+    .include(new LatLng(-20, -170.0))
+    .build();
+
+  private static final LatLngBounds CROSS_IDL_BOUNDS = new LatLngBounds.Builder()
+    .include(new LatLng(20.0, 170.0))
+    .include(new LatLng(-20, 190.0))
+    .build();
+
   private MapView mapView;
   private MapboxMap mapboxMap;
 
@@ -35,7 +46,7 @@ public class LatLngBoundsForCameraActivity extends AppCompatActivity implements
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_restricted_bounds);
 
-    mapView = (MapView) findViewById(R.id.mapView);
+    mapView = findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(this);
   }
@@ -44,18 +55,43 @@ public class LatLngBoundsForCameraActivity extends AppCompatActivity implements
   public void onMapReady(@NonNull MapboxMap mapboxMap) {
     this.mapboxMap = mapboxMap;
     mapboxMap.setStyle(Style.SATELLITE_STREETS);
-    mapboxMap.setLatLngBoundsForCameraTarget(ICELAND_BOUNDS);
     mapboxMap.setMinZoomPreference(2);
-    showBoundsArea();
+    mapboxMap.getUiSettings().setFlingVelocityAnimationEnabled(false);
     showCrosshair();
+    setupBounds(ICELAND_BOUNDS);
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    getMenuInflater().inflate(R.menu.menu_bounds, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case R.id.menu_action_allmost_world_bounds:
+        setupBounds(ALMOST_WORLD_BOUNDS);
+        return true;
+      case R.id.menu_action_cross_idl:
+        setupBounds(CROSS_IDL_BOUNDS);
+        return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+
+  private void setupBounds(LatLngBounds bounds) {
+    mapboxMap.setLatLngBoundsForCameraTarget(bounds);
+    showBoundsArea(bounds);
   }
 
-  private void showBoundsArea() {
+  private void showBoundsArea(LatLngBounds bounds) {
+    mapboxMap.clear();
     PolygonOptions boundsArea = new PolygonOptions()
-      .add(ICELAND_BOUNDS.getNorthWest())
-      .add(ICELAND_BOUNDS.getNorthEast())
-      .add(ICELAND_BOUNDS.getSouthEast())
-      .add(ICELAND_BOUNDS.getSouthWest());
+      .add(bounds.getNorthWest())
+      .add(bounds.getNorthEast())
+      .add(bounds.getSouthEast())
+      .add(bounds.getSouthWest());
     boundsArea.alpha(0.25f);
     boundsArea.fillColor(Color.RED);
     mapboxMap.addPolygon(boundsArea);
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml
new file mode 100644
index 0000000000..db7aad6d1f
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+            android:id="@+id/menu_action_allmost_world_bounds"
+            android:title="@string/restrict_almost_worldview"
+            app:showAsAction="never"/>
+    <item
+            android:id="@+id/menu_action_cross_idl"
+            android:title="@string/restrict_across_idl"
+            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 e3cdc06dc1..7513baaa36 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
@@ -88,4 +88,6 @@
     <string name="zoom_by_2">Zoom by 2</string>
     <string name="zoom_to_point">Zoom to point</string>
     <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>
 </resources>
\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_bounds.cpp b/platform/android/src/geometry/lat_lng_bounds.cpp
index d76ff5b365..cf534a06e4 100644
--- a/platform/android/src/geometry/lat_lng_bounds.cpp
+++ b/platform/android/src/geometry/lat_lng_bounds.cpp
@@ -19,8 +19,6 @@ mbgl::LatLngBounds LatLngBounds::getLatLngBounds(jni::JNIEnv& env, const jni::Ob
     mbgl::LatLng sw = { bounds.Get(env, swLatField), bounds.Get(env, swLonField) };
     mbgl::LatLng ne = { bounds.Get(env, neLatField), bounds.Get(env, neLonField) };
 
-    sw.unwrapForShortestPath(ne);
-
     return mbgl::LatLngBounds::hull(sw, ne);
 }