[android] - remove unique LatLng validation of LatLngBounds builder

2 files changed, 35 insertions, 35 deletions

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 c639e49013..d234250770 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
@@ -5,7 +5,6 @@ import android.os.Parcelable;
 import android.support.annotation.FloatRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-
 import com.mapbox.mapboxsdk.constants.GeometryConstants;
 import com.mapbox.mapboxsdk.exceptions.InvalidLatLngBoundsException;
 
@@ -435,7 +434,8 @@ public class LatLngBounds implements Parcelable {
    * @param bounds LatLngBounds to add
    * @return LatLngBounds
    */
-  public @NonNull LatLngBounds union(@NonNull LatLngBounds bounds) {
+  @NonNull
+  public LatLngBounds union(@NonNull LatLngBounds bounds) {
     return unionNoParamCheck(bounds.getLatNorth(), bounds.getLonEast(), bounds.getLatSouth(), bounds.getLonWest());
   }
 
@@ -458,26 +458,24 @@ public class LatLngBounds implements Parcelable {
    * @param westLon  Western Longitude corner point
    * @return LatLngBounds
    */
-  public @NonNull LatLngBounds union(
-    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE)double northLat,
+  @NonNull
+  public LatLngBounds union(
+    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double northLat,
     double eastLon,
     @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double southLat,
     double westLon) {
-
     checkParams(northLat, eastLon, southLat, westLon);
-
     return unionNoParamCheck(northLat, eastLon, southLat, westLon);
   }
 
-  private @NonNull LatLngBounds unionNoParamCheck(
-    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE)double northLat,
+  @NonNull
+  private LatLngBounds unionNoParamCheck(
+    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double northLat,
     double eastLon,
     @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double southLat,
     double westLon) {
-
     northLat = (this.latitudeNorth < northLat) ? northLat : this.latitudeNorth;
     southLat = (this.latitudeSouth > southLat) ? southLat : this.latitudeSouth;
-
     eastLon = LatLng.wrap(eastLon, GeometryConstants.MIN_LONGITUDE, GeometryConstants.MAX_LONGITUDE);
     westLon = LatLng.wrap(westLon, GeometryConstants.MIN_LONGITUDE, GeometryConstants.MAX_LONGITUDE);
 
@@ -531,7 +529,8 @@ public class LatLngBounds implements Parcelable {
    * @param box LatLngBounds to intersect with
    * @return LatLngBounds
    */
-  public @Nullable LatLngBounds intersect(@NonNull LatLngBounds box) {
+  @Nullable
+  public LatLngBounds intersect(@NonNull LatLngBounds box) {
     return intersectNoParamCheck(box.getLatNorth(), box.getLonEast(), box.getLatSouth(), box.getLonWest());
   }
 
@@ -548,13 +547,14 @@ public class LatLngBounds implements Parcelable {
    * see {@link GeometryConstants#MIN_LONGITUDE} and {@link GeometryConstants#MAX_LONGITUDE}
    *
    * @param northLat Northern Latitude corner point
-   * @param eastLon Eastern Longitude corner point
+   * @param eastLon  Eastern Longitude corner point
    * @param southLat Southern Latitude corner point
-   * @param westLon Western Longitude corner point
+   * @param westLon  Western Longitude corner point
    * @return LatLngBounds
    */
-  public @Nullable LatLngBounds intersect(
-    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE)double northLat,
+  @Nullable
+  public LatLngBounds intersect(
+    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double northLat,
     double eastLon,
     @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double southLat,
     double westLon) {
@@ -564,8 +564,9 @@ public class LatLngBounds implements Parcelable {
     return intersectNoParamCheck(northLat, eastLon, southLat, westLon);
   }
 
-  private @Nullable LatLngBounds intersectNoParamCheck(
-    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE)double northLat,
+  @Nullable
+  private LatLngBounds intersectNoParamCheck(
+    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double northLat,
     double eastLon,
     @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double southLat,
     double westLon) {
@@ -682,14 +683,7 @@ public class LatLngBounds implements Parcelable {
    */
   public static final class Builder {
 
-    private List<LatLng> latLngList;
-
-    /**
-     * Constructs a builder to compose LatLng objects to a LatLngBounds.
-     */
-    public Builder() {
-      latLngList = new ArrayList<>();
-    }
+    private final List<LatLng> latLngList = new ArrayList<>();
 
     /**
      * Builds a new LatLngBounds.
@@ -713,9 +707,7 @@ public class LatLngBounds implements Parcelable {
      * @return this
      */
     public Builder includes(List<LatLng> latLngs) {
-      for (LatLng point : latLngs) {
-        include(point);
-      }
+      latLngList.addAll(latLngs);
       return this;
     }
 
@@ -726,9 +718,7 @@ public class LatLngBounds implements Parcelable {
      * @return this
      */
     public Builder include(@NonNull LatLng latLng) {
-      if (!latLngList.contains(latLng)) {
-        latLngList.add(latLng);
-      }
+      latLngList.add(latLng);
       return this;
     }
   }
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 789a1b2b37..34fa08b472 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
@@ -1,11 +1,9 @@
 package com.mapbox.mapboxsdk.geometry;
 
 import android.os.Parcelable;
-
 import com.mapbox.mapboxsdk.constants.GeometryConstants;
 import com.mapbox.mapboxsdk.exceptions.InvalidLatLngBoundsException;
 import com.mapbox.mapboxsdk.utils.MockParcel;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -183,6 +181,18 @@ public class LatLngBoundsTest {
   }
 
   @Test
+  public void includeSameLatLngs() {
+    latLngBounds = new LatLngBounds.Builder()
+      .include(LAT_LNG_NOT_NULL_ISLAND)
+      .include(LAT_LNG_NOT_NULL_ISLAND)
+      .include(LAT_LNG_NULL_ISLAND)
+      .include(LAT_LNG_NULL_ISLAND)
+      .build();
+    assertEquals(latLngBounds.getNorthEast(), LAT_LNG_NOT_NULL_ISLAND);
+    assertEquals(latLngBounds.getSouthWest(), LAT_LNG_NULL_ISLAND);
+  }
+
+  @Test
   public void toLatLngs() {
     latLngBounds = new LatLngBounds.Builder()
       .include(LAT_LNG_NOT_NULL_ISLAND)
@@ -554,7 +564,7 @@ public class LatLngBoundsTest {
   @Test
   public void unionOverDateLineReturnWorldLonSpan() {
     LatLngBounds latLngBounds1 = LatLngBounds.from(10, -160, -10, -10);
-    LatLngBounds latLngBounds2 =  LatLngBounds.from(10, 10, -10, 160);
+    LatLngBounds latLngBounds2 = LatLngBounds.from(10, 10, -10, 160);
 
     LatLngBounds union1 = latLngBounds1.union(latLngBounds2);
     LatLngBounds union2 = latLngBounds2.union(latLngBounds1);
@@ -569,7 +579,7 @@ public class LatLngBoundsTest {
     exception.expectMessage("latitude must be between -90 and 90");
     LatLngBounds unionLatLngBounds =
       LatLngBounds.from(10, 10, 0, 0)
-      .union(200, 200, 0, 0);
+        .union(200, 200, 0, 0);
   }
 
   @Test