Merge branch 'master' into rclee-async-setupupstream/rclee-async-setup

17 files changed, 635 insertions, 159 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/.gitignore b/platform/android/MapboxGLAndroidSDK/.gitignore
new file mode 100644
index 0000000000..c24bd2563a
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDK/.gitignore
@@ -0,0 +1 @@
+dependency-graph-mapbox-libraries.png
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index f82968051d..21ed25e2c2 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -1,9 +1,13 @@
 apply plugin: 'com.android.library'
 
 dependencies {
-    api dependenciesList.mapboxAndroidTelemetry
+    api (dependenciesList.mapboxAndroidTelemetry) {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
     api dependenciesList.mapboxJavaGeoJSON
-    api dependenciesList.mapboxAndroidGestures
+    api (dependenciesList.mapboxAndroidGestures) {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
     implementation dependenciesList.supportAnnotations
     implementation dependenciesList.supportFragmentV4
     implementation dependenciesList.timber
@@ -87,7 +91,7 @@ android {
                     if (abi != 'all') {
                         abiFilters abi.split(' ')
                     } else {
-                        abiFilters "armeabi", "armeabi-v7a", "mips", "x86", "arm64-v8a", "x86_64"
+                        abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
                     }
                 }
             }
@@ -111,7 +115,7 @@ android {
     }
 
     lintOptions {
-        disable 'MissingTranslation', 'TypographyQuotes', 'ObsoleteLintCustomCheck', 'MissingPermission'
+        disable 'MissingTranslation', 'TypographyQuotes', 'ObsoleteLintCustomCheck', 'MissingPermission', 'WrongThreadInterprocedural'
         checkAllWarnings true
         warningsAsErrors false
     }
@@ -145,3 +149,4 @@ apply from: "${rootDir}/gradle/gradle-javadoc.gradle"
 apply from: "${rootDir}/gradle/gradle-publish.gradle"
 apply from: "${rootDir}/gradle/gradle-checkstyle.gradle"
 apply from: "${rootDir}/gradle/gradle-tests-staticblockremover.gradle"
+apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle"
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index bdfc444454..a49ef47674 100644
--- a/platform/android/MapboxGLAndroidSDK/gradle.properties
+++ b/platform/android/MapboxGLAndroidSDK/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.mapbox.mapboxsdk
-VERSION_NAME=6.1.0-SNAPSHOT
+VERSION_NAME=6.2.0-SNAPSHOT
 
 POM_DESCRIPTION=Mapbox GL Android SDK
 POM_URL=https://github.com/mapbox/mapbox-gl-native
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 55494b72d8..c639e49013 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
@@ -28,7 +28,7 @@ public class LatLngBounds implements Parcelable {
   /**
    * Construct a new LatLngBounds based on its corners, given in NESW
    * order.
-   *
+   * <p>
    * If eastern longitude is smaller than the western one, bounds will include antimeridian.
    * For example, if the NE point is (10, -170) and the SW point is (-10, 170), then bounds will span over 20 degrees
    * and cross the antimeridian.
@@ -75,7 +75,6 @@ public class LatLngBounds implements Parcelable {
       if (longCenter >= GeometryConstants.MAX_LONGITUDE) {
         longCenter = this.longitudeEast - halfSpan;
       }
-      return new LatLng(latCenter, longCenter);
     }
 
     return new LatLng(latCenter, longCenter);
@@ -188,7 +187,6 @@ public class LatLngBounds implements Parcelable {
     return GeometryConstants.LONGITUDE_SPAN - longSpan;
   }
 
-
   static double getLongitudeSpan(final double longEast, final double longWest) {
     double longSpan = Math.abs(longEast - longWest);
     if (longEast >= longWest) {
@@ -240,6 +238,7 @@ public class LatLngBounds implements Parcelable {
         westLon = temp;
       }
     } else {
+      lonSpan = GeometryConstants.LONGITUDE_SPAN - lonSpan;
       if (westLon < eastLon) {
         double temp = eastLon;
         eastLon = westLon;
@@ -278,12 +277,11 @@ public class LatLngBounds implements Parcelable {
 
   /**
    * Constructs a LatLngBounds from doubles representing a LatLng pair.
-   *
+   * <p>
    * This values of latNorth and latSouth should be in the range of [-90, 90],
    * see {@link GeometryConstants#MIN_LATITUDE} and {@link GeometryConstants#MAX_LATITUDE},
    * otherwise IllegalArgumentException will be thrown.
    * 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],
@@ -296,6 +294,20 @@ public class LatLngBounds implements Parcelable {
     @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double latSouth,
     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);
+  }
+
+  private static void checkParams(
+    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double latNorth,
+    double lonEast,
+    @FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) double latSouth,
+    double lonWest) {
+
     if (Double.isNaN(latNorth) || Double.isNaN(latSouth)) {
       throw new IllegalArgumentException("latitude must not be NaN");
     }
@@ -316,11 +328,6 @@ public class LatLngBounds implements Parcelable {
     if (latNorth < latSouth) {
       throw new IllegalArgumentException("LatSouth cannot be less than latNorth");
     }
-
-    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);
   }
 
   private static double lat_(int z, int y) {
@@ -334,14 +341,14 @@ public class LatLngBounds implements Parcelable {
 
   /**
    * Constructs a LatLngBounds from a Tile identifier.
-   *
+   * <p>
    * Returned bounds will have latitude in the range of Mercator projection.
-   * @see GeometryConstants#MIN_MERCATOR_LATITUDE
-   * @see GeometryConstants#MAX_MERCATOR_LATITUDE
    *
    * @param z Tile zoom level.
    * @param x Tile X coordinate.
    * @param y Tile Y coordinate.
+   * @see GeometryConstants#MIN_MERCATOR_LATITUDE
+   * @see GeometryConstants#MAX_MERCATOR_LATITUDE
    */
   public static LatLngBounds from(int z, int x, int y) {
     return new LatLngBounds(lat_(z, y), lon_(z, x + 1), lat_(z, y + 1), lon_(z, x));
@@ -397,7 +404,7 @@ public class LatLngBounds implements Parcelable {
       return (longitude <= eastLon)
         && (longitude >= westLon);
     }
-    return (longitude < eastLon) || (longitude > westLon);
+    return (longitude <= eastLon) || (longitude >= westLon);
   }
 
   /**
@@ -428,36 +435,94 @@ public class LatLngBounds implements Parcelable {
    * @param bounds LatLngBounds to add
    * @return LatLngBounds
    */
-  public LatLngBounds union(LatLngBounds bounds) {
-    return union(bounds.getLatNorth(), bounds.getLonEast(), bounds.getLatSouth(), bounds.getLonWest());
+  public @NonNull LatLngBounds union(@NonNull LatLngBounds bounds) {
+    return unionNoParamCheck(bounds.getLatNorth(), bounds.getLonEast(), bounds.getLatSouth(), bounds.getLonWest());
   }
 
   /**
    * Returns a new LatLngBounds that stretches to include another LatLngBounds,
    * given by corner points.
+   * <p>
+   * This values of northLat and southLat should be in the range of [-90, 90],
+   * see {@link GeometryConstants#MIN_LATITUDE} and {@link GeometryConstants#MAX_LATITUDE},
+   * otherwise IllegalArgumentException will be thrown.
+   * northLat should be greater or equal southLat, otherwise  IllegalArgumentException will be thrown.
+   * <p>
+   * This method doesn't recalculate most east or most west boundaries.
+   * Note that eastLon and westLon will be wrapped to be in the range of [-180, 180],
+   * see {@link GeometryConstants#MIN_LONGITUDE} and {@link GeometryConstants#MAX_LONGITUDE}
    *
-   * @param latNorth Northern Latitude
-   * @param lonEast  Eastern Longitude
-   * @param latSouth Southern Latitude
-   * @param lonWest  Western Longitude
-   * @return BoundingBox
-   */
-  public LatLngBounds union(final double latNorth, final double lonEast, final double latSouth, final double lonWest) {
-    double north = (this.latitudeNorth < latNorth) ? latNorth : this.latitudeNorth;
-    double south = (this.latitudeSouth > latSouth) ? latSouth : this.latitudeSouth;
-
-    if (LatLngSpan.getLongitudeSpan(lonEast, this.longitudeWest)
-      < LatLngSpan.getLongitudeSpan(this.longitudeEast, lonWest)) {
-      return new LatLngBounds(north,
-        lonEast,
-        south,
+   * @param northLat Northern Latitude corner point
+   * @param eastLon  Eastern Longitude corner point
+   * @param southLat Southern Latitude corner point
+   * @param westLon  Western Longitude corner point
+   * @return LatLngBounds
+   */
+  public @NonNull 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,
+    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);
+
+    // longitudes match
+    if (this.longitudeEast == eastLon && this.longitudeWest == westLon) {
+      return new LatLngBounds(northLat, eastLon, southLat, westLon);
+    }
+
+    boolean eastInThis = containsLongitude(this.longitudeEast, this.longitudeWest, eastLon);
+    boolean westInThis = containsLongitude(this.longitudeEast, this.longitudeWest, westLon);
+    boolean thisEastInside = containsLongitude(eastLon, westLon, this.longitudeEast);
+    boolean thisWestInside = containsLongitude(eastLon, westLon, this.longitudeWest);
+
+    // two intersections on each end - covers entire longitude
+    if (eastInThis && westInThis && thisEastInside && thisWestInside) {
+      return new LatLngBounds(northLat, GeometryConstants.MAX_LONGITUDE, southLat, GeometryConstants.MIN_LONGITUDE);
+    }
+
+    if (eastInThis) {
+      if (westInThis) {
+        return new LatLngBounds(northLat, this.longitudeEast, southLat, this.longitudeWest);
+      }
+      return new LatLngBounds(northLat, this.longitudeEast, southLat, westLon);
+    }
+
+    if (thisEastInside) {
+      if (thisWestInside) {
+        return new LatLngBounds(northLat, eastLon, southLat, westLon);
+      }
+      return new LatLngBounds(northLat, eastLon, southLat, this.longitudeWest);
+    }
+
+    // bounds do not intersect, find where they will form shortest union
+    if (LatLngSpan.getLongitudeSpan(eastLon, this.longitudeWest)
+      < LatLngSpan.getLongitudeSpan(this.longitudeEast, westLon)) {
+      return new LatLngBounds(northLat,
+        eastLon,
+        southLat,
         this.longitudeWest);
     }
 
-    return new LatLngBounds(north,
+    return new LatLngBounds(northLat,
       this.longitudeEast,
-      south,
-      lonWest);
+      southLat,
+      westLon);
   }
 
   /**
@@ -466,32 +531,89 @@ public class LatLngBounds implements Parcelable {
    * @param box LatLngBounds to intersect with
    * @return LatLngBounds
    */
-  @Nullable
-  public LatLngBounds intersect(LatLngBounds box) {
-    double minLonWest = Math.max(getLonWest(), box.getLonWest());
-    double maxLonEast = Math.min(getLonEast(), box.getLonEast());
-    if (maxLonEast > minLonWest) {
-      double minLatSouth = Math.max(getLatSouth(), box.getLatSouth());
-      double maxLatNorth = Math.min(getLatNorth(), box.getLatNorth());
-      if (maxLatNorth > minLatSouth) {
-        return new LatLngBounds(maxLatNorth, maxLonEast, minLatSouth, minLonWest);
-      }
-    }
-    return null;
+  public @Nullable LatLngBounds intersect(@NonNull LatLngBounds box) {
+    return intersectNoParamCheck(box.getLatNorth(), box.getLonEast(), box.getLatSouth(), box.getLonWest());
   }
 
   /**
    * Returns a new LatLngBounds that is the intersection of this with another LatLngBounds
+   * <p>
+   * This values of northLat and southLat should be in the range of [-90, 90],
+   * see {@link GeometryConstants#MIN_LATITUDE} and {@link GeometryConstants#MAX_LATITUDE},
+   * otherwise IllegalArgumentException will be thrown.
+   * northLat should be greater or equal southLat, otherwise  IllegalArgumentException will be thrown.
+   * <p>
+   * This method doesn't recalculate most east or most west boundaries.
+   * Note that eastLon and westLon will be wrapped to be in the range of [-180, 180],
+   * see {@link GeometryConstants#MIN_LONGITUDE} and {@link GeometryConstants#MAX_LONGITUDE}
    *
-   * @param northLatitude Northern Longitude
-   * @param eastLongitude Eastern Latitude
-   * @param southLatitude Southern Longitude
-   * @param westLongitude Western Latitude
+   * @param northLat Northern Latitude corner point
+   * @param eastLon Eastern Longitude corner point
+   * @param southLat Southern Latitude corner point
+   * @param westLon Western Longitude corner point
    * @return LatLngBounds
    */
-  public LatLngBounds intersect(double northLatitude, double eastLongitude, double southLatitude,
-                                double westLongitude) {
-    return intersect(new LatLngBounds(northLatitude, eastLongitude, southLatitude, westLongitude));
+  public @Nullable 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) {
+
+    checkParams(northLat, eastLon, southLat, westLon);
+
+    return intersectNoParamCheck(northLat, eastLon, southLat, westLon);
+  }
+
+  private @Nullable 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) {
+
+    double maxsouthLat = Math.max(getLatSouth(), Math.min(GeometryConstants.MAX_LATITUDE, southLat));
+    double minnorthLat = Math.min(getLatNorth(), Math.max(GeometryConstants.MIN_LATITUDE, northLat));
+    if (minnorthLat < maxsouthLat) {
+      return null;
+    }
+
+    eastLon = LatLng.wrap(eastLon, GeometryConstants.MIN_LONGITUDE, GeometryConstants.MAX_LONGITUDE);
+    westLon = LatLng.wrap(westLon, GeometryConstants.MIN_LONGITUDE, GeometryConstants.MAX_LONGITUDE);
+
+    // longitudes match
+    if (this.longitudeEast == eastLon && this.longitudeWest == westLon) {
+      return new LatLngBounds(minnorthLat, eastLon, maxsouthLat, westLon);
+    }
+
+    boolean eastInThis = containsLongitude(this.longitudeEast, this.longitudeWest, eastLon);
+    boolean westInThis = containsLongitude(this.longitudeEast, this.longitudeWest, westLon);
+    boolean thisEastInside = containsLongitude(eastLon, westLon, this.longitudeEast);
+    boolean thisWestInside = containsLongitude(eastLon, westLon, this.longitudeWest);
+
+    // two intersections : find the one that has longest span
+    if (eastInThis && westInThis && thisEastInside && thisWestInside) {
+
+      if (getLongitudeSpan(eastLon, this.longitudeWest) > getLongitudeSpan(this.longitudeEast, westLon)) {
+        return new LatLngBounds(minnorthLat, eastLon, maxsouthLat, this.longitudeWest);
+      }
+
+      return new LatLngBounds(minnorthLat, this.longitudeEast, maxsouthLat, westLon);
+    }
+
+    if (eastInThis) {
+      if (westInThis) {
+        return new LatLngBounds(minnorthLat, eastLon, maxsouthLat, westLon);
+      }
+      return new LatLngBounds(minnorthLat, eastLon, maxsouthLat, this.longitudeWest);
+    }
+
+    if (thisEastInside) {
+      if (thisWestInside) {
+        return new LatLngBounds(minnorthLat, this.longitudeEast, maxsouthLat, this.longitudeWest);
+      }
+      return new LatLngBounds(minnorthLat, this.longitudeEast, maxsouthLat, westLon);
+    }
+
+    return null;
   }
 
   /**
@@ -520,7 +642,7 @@ public class LatLngBounds implements Parcelable {
     return (int) ((latitudeNorth + 90)
       + ((latitudeSouth + 90) * 1000)
       + ((longitudeEast + 180) * 1000000)
-      + ((longitudeEast + 180) * 1000000000));
+      + ((longitudeWest + 180) * 1000000000));
   }
 
   /**
@@ -548,11 +670,11 @@ public class LatLngBounds implements Parcelable {
   }
 
   private static LatLngBounds readFromParcel(final Parcel in) {
-    final double lonNorth = in.readDouble();
-    final double latEast = in.readDouble();
-    final double lonSouth = in.readDouble();
-    final double latWest = in.readDouble();
-    return new LatLngBounds(lonNorth, latEast, lonSouth, latWest);
+    final double northLat = in.readDouble();
+    final double eastLon = in.readDouble();
+    final double southLat = in.readDouble();
+    final double westLon = in.readDouble();
+    return new LatLngBounds(northLat, eastLon, southLat, westLon);
   }
 
   /**
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
index ab1191c0cc..d0e51f941f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
@@ -1,6 +1,5 @@
 package com.mapbox.mapboxsdk.http;
 
-
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.os.Build;
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
index 5fcf206a5a..280877d61a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
@@ -8,7 +8,6 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
 import com.mapbox.mapboxsdk.utils.MapFragmentUtils;
 
 import java.util.ArrayList;
@@ -31,6 +30,7 @@ import java.util.List;
 public final class MapFragment extends Fragment implements OnMapReadyCallback {
 
   private final List<OnMapReadyCallback> mapReadyCallbackList = new ArrayList<>();
+  private OnMapViewReadyCallback mapViewReadyCallback;
   private MapboxMap mapboxMap;
   private MapView map;
 
@@ -56,6 +56,19 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback {
   }
 
   /**
+   * Called when the context attaches to this fragment.
+   *
+   * @param context the context attaching
+   */
+  @Override
+  public void onAttach(Context context) {
+    super.onAttach(context);
+    if (context instanceof OnMapViewReadyCallback) {
+      mapViewReadyCallback = (OnMapViewReadyCallback) context;
+    }
+  }
+
+  /**
    * Creates the fragment view hierarchy.
    *
    * @param inflater           Inflater used to inflate content.
@@ -75,15 +88,25 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback {
    * Called when the fragment view hierarchy is created.
    *
    * @param view               The content view of the fragment
-   * @param savedInstanceState THe saved instance state of the framgnt
+   * @param savedInstanceState The saved instance state of the fragment
    */
   @Override
   public void onViewCreated(View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
     map.onCreate(savedInstanceState);
     map.getMapAsync(this);
+
+    // notify listeners about mapview creation
+    if (mapViewReadyCallback != null) {
+      mapViewReadyCallback.onMapViewReady(map);
+    }
   }
 
+  /**
+   * Called when the style of the map has successfully loaded.
+   *
+   * @param mapboxMap The public api controller of the map
+   */
   @Override
   public void onMapReady(MapboxMap mapboxMap) {
     this.mapboxMap = mapboxMap;
@@ -170,4 +193,21 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback {
       onMapReadyCallback.onMapReady(mapboxMap);
     }
   }
+
+  /**
+   * Callback to be invoked when the map fragment has inflated its MapView.
+   * <p>
+   * To use this interface the context hosting the fragment must implement this interface.
+   * That instance will be set as part of Fragment#onAttach(Context context).
+   * </p>
+   */
+  public interface OnMapViewReadyCallback {
+
+    /**
+     * Called when the map has been created.
+     *
+     * @param mapView The created mapview
+     */
+    void onMapViewReady(MapView mapView);
+  }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 4ecd7c9246..0f19965224 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -23,7 +23,6 @@ import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ZoomButtonsController;
-
 import com.mapbox.android.gestures.AndroidGesturesManager;
 import com.mapbox.android.telemetry.AppUserTurnstile;
 import com.mapbox.android.telemetry.Event;
@@ -33,6 +32,8 @@ import com.mapbox.mapboxsdk.BuildConfig;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
+import com.mapbox.mapboxsdk.camera.CameraPosition;
+import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.maps.renderer.MapRenderer;
@@ -40,9 +41,13 @@ import com.mapbox.mapboxsdk.maps.renderer.glsurfaceview.GLSurfaceViewMapRenderer
 import com.mapbox.mapboxsdk.maps.renderer.textureview.TextureViewMapRenderer;
 import com.mapbox.mapboxsdk.maps.widgets.CompassView;
 import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
+import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition;
+import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition;
 import com.mapbox.mapboxsdk.storage.FileSource;
 import com.mapbox.mapboxsdk.utils.BitmapUtils;
 
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.ref.WeakReference;
@@ -51,9 +56,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
 import static com.mapbox.mapboxsdk.maps.widgets.CompassView.TIME_MAP_NORTH_ANIMATION;
 import static com.mapbox.mapboxsdk.maps.widgets.CompassView.TIME_WAIT_IDLE;
 
@@ -96,28 +98,30 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
   @UiThread
   public MapView(@NonNull Context context) {
     super(context);
-    initialise(context, MapboxMapOptions.createFromAttributes(context, null));
+    initialize(context, MapboxMapOptions.createFromAttributes(context, null));
   }
 
   @UiThread
   public MapView(@NonNull Context context, @Nullable AttributeSet attrs) {
     super(context, attrs);
-    initialise(context, MapboxMapOptions.createFromAttributes(context, attrs));
+    initialize(context, MapboxMapOptions.createFromAttributes(context, attrs));
   }
 
   @UiThread
   public MapView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
-    initialise(context, MapboxMapOptions.createFromAttributes(context, attrs));
+    initialize(context, MapboxMapOptions.createFromAttributes(context, attrs));
   }
 
   @UiThread
   public MapView(@NonNull Context context, @Nullable MapboxMapOptions options) {
     super(context);
-    initialise(context, options == null ? MapboxMapOptions.createFromAttributes(context, null) : options);
+    initialize(context, options == null ? MapboxMapOptions.createFromAttributes(context, null) : options);
   }
 
-  private void initialise(@NonNull final Context context, @NonNull final MapboxMapOptions options) {
+  @CallSuper
+  @UiThread
+  protected void initialize(@NonNull final Context context, @NonNull final MapboxMapOptions options) {
     if (isInEditMode()) {
       // in IDE layout editor, just return
       return;
@@ -535,6 +539,35 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
     nativeMapView.setStyleUrl(url);
   }
 
+  /**
+   * Loads a new style from the specified offline region definition and moves the map camera to that region.
+   *
+   * @param definition the offline region definition
+   * @see OfflineRegionDefinition
+   */
+  public void setOfflineRegionDefinition(OfflineRegionDefinition definition) {
+    if (destroyed) {
+      return;
+    }
+
+    OfflineTilePyramidRegionDefinition regionDefinition = (OfflineTilePyramidRegionDefinition) definition;
+    setStyleUrl(regionDefinition.getStyleURL());
+    CameraPosition cameraPosition = new CameraPosition.Builder()
+      .target(regionDefinition.getBounds().getCenter())
+      .zoom(regionDefinition.getMinZoom())
+      .build();
+
+    if (!isMapInitialized()) {
+      mapboxMapOptions.camera(cameraPosition);
+      mapboxMapOptions.minZoomPreference(regionDefinition.getMinZoom());
+      mapboxMapOptions.maxZoomPreference(regionDefinition.getMaxZoom());
+      return;
+    }
+    mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
+    mapboxMap.setMinZoomPreference(regionDefinition.getMinZoom());
+    mapboxMap.setMaxZoomPreference(regionDefinition.getMaxZoom());
+  }
+
   //
   // Rendering
   //
@@ -598,10 +631,8 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    * @param listener The callback that's invoked on every frame rendered to the map view.
    * @see MapView#removeOnMapChangedListener(OnMapChangedListener)
    */
-  public void addOnMapChangedListener(@Nullable OnMapChangedListener listener) {
-    if (listener != null) {
-      onMapChangedListeners.add(listener);
-    }
+  public void addOnMapChangedListener(@NonNull OnMapChangedListener listener) {
+    onMapChangedListeners.add(listener);
   }
 
   /**
@@ -610,8 +641,8 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    * @param listener The previously added callback to remove.
    * @see MapView#addOnMapChangedListener(OnMapChangedListener)
    */
-  public void removeOnMapChangedListener(@Nullable OnMapChangedListener listener) {
-    if (listener != null && onMapChangedListeners.contains(listener)) {
+  public void removeOnMapChangedListener(@NonNull OnMapChangedListener listener) {
+    if (onMapChangedListeners.contains(listener)) {
       onMapChangedListeners.remove(listener);
     }
   }
@@ -622,13 +653,11 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    * @param callback The callback object that will be triggered when the map is ready to be used.
    */
   @UiThread
-  public void getMapAsync(final OnMapReadyCallback callback) {
-    if (!mapCallback.isInitialLoad() && callback != null) {
+  public void getMapAsync(final @NonNull OnMapReadyCallback callback) {
+    if (!mapCallback.isInitialLoad()) {
       callback.onMapReady(mapboxMap);
     } else {
-      if (callback != null) {
-        mapCallback.addOnMapReadyCallback(callback);
-      }
+      mapCallback.addOnMapReadyCallback(callback);
     }
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 5e36dd0f78..aed918cb79 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -120,7 +120,7 @@ public final class MapboxMap {
    *
    * @param outState the bundle to save the state to.
    */
-  void onSaveInstanceState(Bundle outState) {
+  void onSaveInstanceState(@NonNull Bundle outState) {
     outState.putParcelable(MapboxConstants.STATE_CAMERA_POSITION, transform.getCameraPosition());
     outState.putBoolean(MapboxConstants.STATE_DEBUG_ACTIVE, nativeMapView.getDebug());
     outState.putString(MapboxConstants.STATE_STYLE_URL, nativeMapView.getStyleUrl());
@@ -132,7 +132,7 @@ public final class MapboxMap {
    *
    * @param savedInstanceState the bundle containing the saved state
    */
-  void onRestoreInstanceState(Bundle savedInstanceState) {
+  void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
     final CameraPosition cameraPosition = savedInstanceState.getParcelable(MapboxConstants.STATE_CAMERA_POSITION);
 
     uiSettings.onRestoreInstanceState(savedInstanceState);
@@ -266,6 +266,7 @@ public final class MapboxMap {
    *
    * @return all the layers in the current style
    */
+  @NonNull
   public List<Layer> getLayers() {
     return nativeMapView.getLayers();
   }
@@ -377,6 +378,7 @@ public final class MapboxMap {
    *
    * @return all the sources in the current style
    */
+  @NonNull
   public List<Source> getSources() {
     return nativeMapView.getSources();
   }
@@ -463,10 +465,11 @@ public final class MapboxMap {
    *
    * @param name the name of the image to remove
    */
-  public void removeImage(String name) {
+  public void removeImage(@NonNull String name) {
     nativeMapView.removeImage(name);
   }
 
+  @Nullable
   public Bitmap getImage(@NonNull String name) {
     return nativeMapView.getImage(name);
   }
@@ -537,6 +540,7 @@ public final class MapboxMap {
    *
    * @return the UiSettings associated with this map
    */
+  @NonNull
   public UiSettings getUiSettings() {
     return uiSettings;
   }
@@ -551,6 +555,7 @@ public final class MapboxMap {
    *
    * @return the Projection associated with this map
    */
+  @NonNull
   public Projection getProjection() {
     return projection;
   }
@@ -564,7 +569,7 @@ public final class MapboxMap {
    *
    * @return the global light source
    */
-  @Nullable
+  @NonNull
   public Light getLight() {
     return nativeMapView.getLight();
   }
@@ -590,6 +595,7 @@ public final class MapboxMap {
    *
    * @return The current position of the Camera.
    */
+  @NonNull
   public final CameraPosition getCameraPosition() {
     return transform.getCameraPosition();
   }
@@ -612,7 +618,7 @@ public final class MapboxMap {
    *
    * @param update The change that should be applied to the camera.
    */
-  public final void moveCamera(CameraUpdate update) {
+  public final void moveCamera(@NonNull CameraUpdate update) {
     moveCamera(update, null);
   }
 
@@ -624,7 +630,8 @@ public final class MapboxMap {
    * @param update   The change that should be applied to the camera
    * @param callback the callback to be invoked when an animation finishes or is canceled
    */
-  public final void moveCamera(final CameraUpdate update, final MapboxMap.CancelableCallback callback) {
+  public final void moveCamera(@NonNull final CameraUpdate update,
+                               @Nullable final MapboxMap.CancelableCallback callback) {
     transform.moveCamera(MapboxMap.this, update, callback);
   }
 
@@ -650,7 +657,7 @@ public final class MapboxMap {
    *                   positive, otherwise an IllegalArgumentException will be thrown.
    * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
    */
-  public final void easeCamera(CameraUpdate update, int durationMs) {
+  public final void easeCamera(@NonNull CameraUpdate update, int durationMs) {
     easeCamera(update, durationMs, null);
   }
 
@@ -673,7 +680,8 @@ public final class MapboxMap {
    *                   Do not update or ease the camera from within onCancel().
    * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
    */
-  public final void easeCamera(CameraUpdate update, int durationMs, final MapboxMap.CancelableCallback callback) {
+  public final void easeCamera(@NonNull CameraUpdate update, int durationMs,
+                               @Nullable final MapboxMap.CancelableCallback callback) {
     easeCamera(update, durationMs, true, callback);
   }
 
@@ -691,7 +699,7 @@ public final class MapboxMap {
    *                           positive, otherwise an IllegalArgumentException will be thrown.
    * @param easingInterpolator True for easing interpolator, false for linear.
    */
-  public final void easeCamera(CameraUpdate update, int durationMs, boolean easingInterpolator) {
+  public final void easeCamera(@NonNull CameraUpdate update, int durationMs, boolean easingInterpolator) {
     easeCamera(update, durationMs, easingInterpolator, null);
   }
 
@@ -711,8 +719,10 @@ public final class MapboxMap {
    *                           by a later camera movement or a user gesture, onCancel() will be called.
    *                           Do not update or ease the camera from within onCancel().
    */
-  public final void easeCamera(final CameraUpdate update, final int durationMs, final boolean easingInterpolator,
-                               final MapboxMap.CancelableCallback callback) {
+  public final void easeCamera(@NonNull final CameraUpdate update,
+                               final int durationMs,
+                               final boolean easingInterpolator,
+                               @Nullable final MapboxMap.CancelableCallback callback) {
     easeCamera(update, durationMs, easingInterpolator, callback, false);
   }
 
@@ -733,8 +743,9 @@ public final class MapboxMap {
    *                           Do not update or ease the camera from within onCancel().
    * @param isDismissable      true will allow animated camera changes dismiss a tracking mode.
    */
-  public final void easeCamera(final CameraUpdate update, final int durationMs, final boolean easingInterpolator,
-                               final MapboxMap.CancelableCallback callback, final boolean isDismissable) {
+  public final void easeCamera(@NonNull final CameraUpdate update, final int durationMs,
+                               final boolean easingInterpolator, @Nullable final MapboxMap.CancelableCallback callback,
+                               final boolean isDismissable) {
 
     if (durationMs <= 0) {
       throw new IllegalArgumentException("Null duration passed into easeCamera");
@@ -751,7 +762,7 @@ public final class MapboxMap {
    * @param update The change that should be applied to the camera.
    * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
    */
-  public final void animateCamera(CameraUpdate update) {
+  public final void animateCamera(@NonNull CameraUpdate update) {
     animateCamera(update, MapboxConstants.ANIMATION_DURATION, null);
   }
 
@@ -767,7 +778,7 @@ public final class MapboxMap {
    *                 called. Do not update or animate the camera from within onCancel().
    * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
    */
-  public final void animateCamera(CameraUpdate update, MapboxMap.CancelableCallback callback) {
+  public final void animateCamera(@NonNull CameraUpdate update, @Nullable MapboxMap.CancelableCallback callback) {
     animateCamera(update, MapboxConstants.ANIMATION_DURATION, callback);
   }
 
@@ -782,7 +793,7 @@ public final class MapboxMap {
    *                   positive, otherwise an IllegalArgumentException will be thrown.
    * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
    */
-  public final void animateCamera(CameraUpdate update, int durationMs) {
+  public final void animateCamera(@NonNull CameraUpdate update, int durationMs) {
     animateCamera(update, durationMs, null);
   }
 
@@ -804,8 +815,8 @@ public final class MapboxMap {
    *                   isn't required, leave it as null.
    * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
    */
-  public final void animateCamera(final CameraUpdate update, final int durationMs,
-                                  final MapboxMap.CancelableCallback callback) {
+  public final void animateCamera(@NonNull final CameraUpdate update, final int durationMs,
+                                  @Nullable final MapboxMap.CancelableCallback callback) {
     if (durationMs <= 0) {
       throw new IllegalArgumentException("Null duration passed into animageCamera");
     }
@@ -1069,6 +1080,7 @@ public final class MapboxMap {
    *
    * @return The json of the map style
    */
+  @NonNull
   public String getStyleJson() {
     return nativeMapView.getStyleJson();
   }
@@ -1232,7 +1244,7 @@ public final class MapboxMap {
    *
    * @param polyline An updated polyline object.
    */
-  public void updatePolyline(Polyline polyline) {
+  public void updatePolyline(@NonNull Polyline polyline) {
     annotationManager.updatePolyline(polyline);
   }
 
@@ -1263,7 +1275,7 @@ public final class MapboxMap {
    *
    * @param polygon An updated polygon object
    */
-  public void updatePolygon(Polygon polygon) {
+  public void updatePolygon(@NonNull Polygon polygon) {
     annotationManager.updatePolygon(polygon);
   }
 
@@ -1468,6 +1480,7 @@ public final class MapboxMap {
    *
    * @return The currently selected marker.
    */
+  @NonNull
   public List<Marker> getSelectedMarkers() {
     return annotationManager.getSelectedMarkers();
   }
@@ -1477,6 +1490,7 @@ public final class MapboxMap {
    *
    * @return the associated MarkerViewManager
    */
+  @NonNull
   public MarkerViewManager getMarkerViewManager() {
     return annotationManager.getMarkerViewManager();
   }
@@ -1550,7 +1564,8 @@ public final class MapboxMap {
    * @param padding      the padding to apply to the bounds
    * @return the camera position that fits the bounds and padding
    */
-  public CameraPosition getCameraForLatLngBounds(@Nullable LatLngBounds latLngBounds, int[] padding) {
+  @NonNull
+  public CameraPosition getCameraForLatLngBounds(@NonNull LatLngBounds latLngBounds, int[] padding) {
     // get padded camera position from LatLngBounds
     return nativeMapView.getCameraForLatLngBounds(latLngBounds, padding);
   }
@@ -1563,6 +1578,7 @@ public final class MapboxMap {
    * @param padding  the padding to apply to the bounds
    * @return the camera position that fits the bounds and padding
    */
+  @NonNull
   public CameraPosition getCameraForGeometry(Geometry geometry, double bearing, int[] padding) {
     // get padded camera position from Geometry
     return nativeMapView.getCameraForGeometry(geometry, bearing, padding);
@@ -1591,11 +1607,7 @@ public final class MapboxMap {
    * @param bottom The bottom margin in pixels.
    */
   public void setPadding(int left, int top, int right, int bottom) {
-    setPadding(new int[] {left, top, right, bottom});
-  }
-
-  private void setPadding(int[] padding) {
-    projection.setContentPadding(padding);
+    projection.setContentPadding(new int[] {left, top, right, bottom});
     uiSettings.invalidate();
   }
 
@@ -1604,6 +1616,7 @@ public final class MapboxMap {
    *
    * @return An array with length 4 in the LTRB order.
    */
+  @NonNull
   public int[] getPadding() {
     return projection.getContentPadding();
   }
@@ -1755,6 +1768,7 @@ public final class MapboxMap {
   }
 
   // used by MapView
+  @Nullable
   OnFpsChangedListener getOnFpsChangedListener() {
     return onFpsChangedListener;
   }
@@ -1902,7 +1916,7 @@ public final class MapboxMap {
    *                                     will be added to the passed gestures manager.
    * @see <a href="https://github.com/mapbox/mapbox-gestures-android">mapbox-gestures-android library</a>
    */
-  public void setGesturesManager(AndroidGesturesManager androidGesturesManager, boolean attachDefaultListeners,
+  public void setGesturesManager(@NonNull AndroidGesturesManager androidGesturesManager, boolean attachDefaultListeners,
                                  boolean setDefaultMutuallyExclusives) {
     onGesturesManagerInteractionListener.setGesturesManager(
       androidGesturesManager, attachDefaultListeners, setDefaultMutuallyExclusives);
@@ -1914,6 +1928,7 @@ public final class MapboxMap {
    *
    * @return Current gestures manager.
    */
+  @NonNull
   public AndroidGesturesManager getGesturesManager() {
     return onGesturesManagerInteractionListener.getGesturesManager();
   }
@@ -2000,6 +2015,7 @@ public final class MapboxMap {
    *
    * @return Current active InfoWindow Click Listener
    */
+  @Nullable
   public OnInfoWindowClickListener getOnInfoWindowClickListener() {
     return annotationManager.getInfoWindowManager().getOnInfoWindowClickListener();
   }
@@ -2020,6 +2036,7 @@ public final class MapboxMap {
    *
    * @return Current active InfoWindow long Click Listener
    */
+  @Nullable
   public OnInfoWindowLongClickListener getOnInfoWindowLongClickListener() {
     return annotationManager.getInfoWindowManager().getOnInfoWindowLongClickListener();
   }
@@ -2038,6 +2055,7 @@ public final class MapboxMap {
    *
    * @return Current active InfoWindow Close Listener
    */
+  @Nullable
   public OnInfoWindowCloseListener getOnInfoWindowCloseListener() {
     return annotationManager.getInfoWindowManager().getOnInfoWindowCloseListener();
   }
@@ -2147,11 +2165,11 @@ public final class MapboxMap {
    * @see MapboxMap#addOnMoveListener(OnMoveListener)
    */
   public interface OnMoveListener {
-    void onMoveBegin(MoveGestureDetector detector);
+    void onMoveBegin(@NonNull MoveGestureDetector detector);
 
-    void onMove(MoveGestureDetector detector);
+    void onMove(@NonNull MoveGestureDetector detector);
 
-    void onMoveEnd(MoveGestureDetector detector);
+    void onMoveEnd(@NonNull MoveGestureDetector detector);
   }
 
   /**
@@ -2160,11 +2178,11 @@ public final class MapboxMap {
    * @see MapboxMap#addOnRotateListener(OnRotateListener)
    */
   public interface OnRotateListener {
-    void onRotateBegin(RotateGestureDetector detector);
+    void onRotateBegin(@NonNull RotateGestureDetector detector);
 
-    void onRotate(RotateGestureDetector detector);
+    void onRotate(@NonNull RotateGestureDetector detector);
 
-    void onRotateEnd(RotateGestureDetector detector);
+    void onRotateEnd(@NonNull RotateGestureDetector detector);
   }
 
   /**
@@ -2173,11 +2191,11 @@ public final class MapboxMap {
    * @see MapboxMap#addOnScaleListener(OnScaleListener)
    */
   public interface OnScaleListener {
-    void onScaleBegin(StandardScaleGestureDetector detector);
+    void onScaleBegin(@NonNull StandardScaleGestureDetector detector);
 
-    void onScale(StandardScaleGestureDetector detector);
+    void onScale(@NonNull StandardScaleGestureDetector detector);
 
-    void onScaleEnd(StandardScaleGestureDetector detector);
+    void onScaleEnd(@NonNull StandardScaleGestureDetector detector);
   }
 
   /**
@@ -2186,11 +2204,11 @@ public final class MapboxMap {
    * @see MapboxMap#addOnShoveListener(OnShoveListener)
    */
   public interface OnShoveListener {
-    void onShoveBegin(ShoveGestureDetector detector);
+    void onShoveBegin(@NonNull ShoveGestureDetector detector);
 
-    void onShove(ShoveGestureDetector detector);
+    void onShove(@NonNull ShoveGestureDetector detector);
 
-    void onShoveEnd(ShoveGestureDetector detector);
+    void onShoveEnd(@NonNull ShoveGestureDetector detector);
   }
 
   /**
@@ -2442,7 +2460,7 @@ public final class MapboxMap {
      *
      * @param marker The marker were the info window is attached to
      */
-    void onInfoWindowLongClick(Marker marker);
+    void onInfoWindowLongClick(@NonNull Marker marker);
   }
 
   /**
@@ -2457,7 +2475,7 @@ public final class MapboxMap {
      *
      * @param marker The marker of the info window that was closed.
      */
-    void onInfoWindowClose(Marker marker);
+    void onInfoWindowClose(@NonNull Marker marker);
   }
 
   /**
@@ -2637,7 +2655,7 @@ public final class MapboxMap {
      *
      * @param snapshot the snapshot bitmap
      */
-    void onSnapshotReady(Bitmap snapshot);
+    void onSnapshotReady(@NonNull Bitmap snapshot);
   }
 
   /**
@@ -2649,12 +2667,13 @@ public final class MapboxMap {
      *
      * @param style the style that has been loaded
      */
-    void onStyleLoaded(String style);
+    void onStyleLoaded(@NonNull String style);
   }
 
   //
   // Used for instrumentation testing
   //
+  @NonNull
   Transform getTransform() {
     return transform;
   }
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 b2d7af7687..d258064908 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
@@ -759,9 +759,13 @@ final class NativeMapView {
       return null;
     }
     Source source = getSource(sourceId);
-    return removeSource(source);
+    if (source != null) {
+      return removeSource(source);
+    }
+    return null;
   }
 
+  @Nullable
   public Source removeSource(@NonNull Source source) {
     if (isDestroyedOn("removeSource")) {
       return null;
@@ -775,8 +779,9 @@ final class NativeMapView {
       return;
     }
 
-    // Determine pixel ratio
-    nativeAddImage(name, image, image.getDensity() / DisplayMetrics.DENSITY_DEFAULT);
+    // Determine pixel ratio, cast to float to avoid rounding, see mapbox-gl-native/issues/11809
+    float pixelRatio = (float) image.getDensity() / DisplayMetrics.DENSITY_DEFAULT;
+    nativeAddImage(name, image, pixelRatio);
   }
 
   public void addImages(@NonNull HashMap<String, Bitmap> bitmapHashMap) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
index f35355533d..d5166c17b0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
@@ -43,14 +43,16 @@ public class Projection {
   /**
    * Returns the spherical Mercator projected meters for a LatLng.
    */
-  public ProjectedMeters getProjectedMetersForLatLng(LatLng latLng) {
+  @NonNull
+  public ProjectedMeters getProjectedMetersForLatLng(@NonNull LatLng latLng) {
     return nativeMapView.projectedMetersForLatLng(latLng);
   }
 
   /**
    * Returns the LatLng for a spherical Mercator projected meters.
    */
-  public LatLng getLatLngForProjectedMeters(ProjectedMeters projectedMeters) {
+  @NonNull
+  public LatLng getLatLngForProjectedMeters(@NonNull ProjectedMeters projectedMeters) {
     return nativeMapView.latLngForProjectedMeters(projectedMeters);
   }
 
@@ -77,7 +79,8 @@ public class Projection {
    * @return The LatLng corresponding to the point on the screen, or null if the ray through
    * the given screen point does not intersect the ground plane.
    */
-  public LatLng fromScreenLocation(PointF point) {
+  @NonNull
+  public LatLng fromScreenLocation(@NonNull PointF point) {
     return nativeMapView.latLngForPixel(point);
   }
 
@@ -87,6 +90,7 @@ public class Projection {
    *
    * @return The projection of the viewing frustum in its current state.
    */
+  @NonNull
   public VisibleRegion getVisibleRegion() {
     float left = 0;
     float right = nativeMapView.getWidth();
@@ -151,7 +155,8 @@ public class Projection {
    * @param location A LatLng on the map to convert to a screen location.
    * @return A Point representing the screen location in screen pixels.
    */
-  public PointF toScreenLocation(LatLng location) {
+  @NonNull
+  public PointF toScreenLocation(@NonNull LatLng location) {
     return nativeMapView.pixelForLatLng(location);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
index 8aa4c7fd09..307b33b0c7 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
@@ -31,6 +31,7 @@ import java.util.List;
 public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
 
   private final List<OnMapReadyCallback> mapReadyCallbackList = new ArrayList<>();
+  private MapFragment.OnMapViewReadyCallback mapViewReadyCallback;
   private MapboxMap mapboxMap;
   private MapView map;
 
@@ -56,6 +57,19 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
   }
 
   /**
+   * Called when the context attaches to this fragment.
+   *
+   * @param context the context attaching
+   */
+  @Override
+  public void onAttach(Context context) {
+    super.onAttach(context);
+    if (context instanceof MapFragment.OnMapViewReadyCallback) {
+      mapViewReadyCallback = (MapFragment.OnMapViewReadyCallback) context;
+    }
+  }
+
+  /**
    * Creates the fragment view hierarchy.
    *
    * @param inflater           Inflater used to inflate content.
@@ -82,6 +96,11 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
     super.onViewCreated(view, savedInstanceState);
     map.onCreate(savedInstanceState);
     map.getMapAsync(this);
+
+    // notify listeners about MapView creation
+    if (mapViewReadyCallback != null) {
+      mapViewReadyCallback.onMapViewReady(map);
+    }
   }
 
   @Override
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
index c1daebbe52..100787fbf0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
@@ -332,7 +332,7 @@ public final class UiSettings {
    *
    * @param compass the drawable to show as image compass
    */
-  public void setCompassImage(Drawable compass) {
+  public void setCompassImage(@NonNull Drawable compass) {
     compassView.setCompassImage(compass);
   }
 
@@ -409,6 +409,7 @@ public final class UiSettings {
    *
    * @return the drawable used as compass image
    */
+  @NonNull
   public Drawable getCompassImage() {
     return compassView.getCompassImage();
   }
@@ -544,7 +545,7 @@ public final class UiSettings {
    *
    * @param attributionDialogManager the manager class used for showing attribution
    */
-  public void setAttributionDialogManager(AttributionDialogManager attributionDialogManager) {
+  public void setAttributionDialogManager(@NonNull AttributionDialogManager attributionDialogManager) {
     this.attributionDialogManager = attributionDialogManager;
   }
 
@@ -553,6 +554,7 @@ public final class UiSettings {
    *
    * @return the active manager class used for showing attribution
    */
+  @NonNull
   public AttributionDialogManager getAttributionDialogManager() {
     return attributionDialogManager;
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
index f1c70325a0..fcee5bd179 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java
@@ -37,11 +37,11 @@ public abstract class MapRenderer implements MapRendererScheduler {
   }
 
   public void onPause() {
-    nativeOnPause();
+    // Implement if needed
   }
 
   public void onResume() {
-    nativeOnResume();
+    // Implement if needed
   }
 
   public void onStop() {
@@ -124,10 +124,6 @@ public abstract class MapRenderer implements MapRendererScheduler {
 
   private native void nativeRender();
 
-  private native void nativeOnResume();
-
-  private native void nativeOnPause();
-
   private long frames;
   private long timeElapsed;
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
index f0cb8d973a..929e4b4279 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
@@ -6,6 +6,8 @@ import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.os.Environment;
 import android.support.annotation.NonNull;
+import android.support.annotation.UiThread;
+
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import timber.log.Timber;
@@ -43,6 +45,7 @@ public class FileSource {
    * @param context the context to derive the cache path from
    * @return the single instance of FileSource
    */
+  @UiThread
   public static synchronized FileSource getInstance(Context context) {
     if (INSTANCE == null) {
       String cachePath = getCachePath(context);
@@ -122,6 +125,8 @@ public class FileSource {
     initialize(Mapbox.getAccessToken(), cachePath, assetManager);
   }
 
+  public native boolean isActivated();
+
   public native void activate();
 
   public native void deactivate();
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
index 4289deeda3..1dd8eddab9 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
@@ -166,7 +166,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512).
+   * Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param value a String value
    * @return property wrapper around String
@@ -176,7 +176,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512).
+   * Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param expression an expression statement
    * @return property wrapper around an expression statement
@@ -356,7 +356,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to density-independent pixels, multiply the length by the current line width.
+   * Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to density-independent pixels, multiply the length by the current line width. Note that GeoJSON sources with `lineMetrics: true` specified won't render dashed lines to the expected scale. Also note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param value a Float[] value
    * @return property wrapper around Float[]
@@ -366,7 +366,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to density-independent pixels, multiply the length by the current line width.
+   * Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to density-independent pixels, multiply the length by the current line width. Note that GeoJSON sources with `lineMetrics: true` specified won't render dashed lines to the expected scale. Also note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param expression an expression statement
    * @return property wrapper around an expression statement
@@ -376,7 +376,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Name of image in sprite to use for drawing image lines. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512).
+   * Name of image in sprite to use for drawing image lines. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param value a String value
    * @return property wrapper around String
@@ -386,7 +386,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Name of image in sprite to use for drawing image lines. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512).
+   * Name of image in sprite to use for drawing image lines. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param expression an expression statement
    * @return property wrapper around an expression statement
@@ -1156,7 +1156,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Name of image in sprite to use for drawing images on extruded fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512).
+   * Name of image in sprite to use for drawing images on extruded fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param value a String value
    * @return property wrapper around String
@@ -1166,7 +1166,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Name of image in sprite to use for drawing images on extruded fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512).
+   * Name of image in sprite to use for drawing images on extruded fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param expression an expression statement
    * @return property wrapper around an expression statement
@@ -1536,7 +1536,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Name of image in sprite to use for drawing an image background. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512).
+   * Name of image in sprite to use for drawing an image background. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param value a String value
    * @return property wrapper around String
@@ -1546,7 +1546,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Name of image in sprite to use for drawing an image background. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512).
+   * Name of image in sprite to use for drawing an image background. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.
    *
    * @param expression an expression statement
    * @return property wrapper around an expression statement
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml
new file mode 100644
index 0000000000..a292e52517
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="mapbox_compassContentDescription">지도 나침반. 지도회전를 북쪽으로 재설정합니다.</string>
+    <string name="mapbox_attributionsIconContentDescription">속성 정보. 속성 대화를 표시합니다.</string>
+    <string name="mapbox_myLocationViewContentDescription">로케이션 뷰. 지도에서 현재 위치를 보여줍니다.</string>
+    <string name="mapbox_mapActionDescription">맵박스로 생성된 지도 표시. 두 손가락으로 드래그하여 화면을 위 아래로 움직이세요. 두 손가락을 이용해 화면을 확대 축소 하세요.</string>
+    <string name="mapbox_attributionsDialogTitle">안드로이드를 위한 맵박스 맵 SDK</string>
+    <string name="mapbox_attributionTelemetryTitle">더 나은 맵박스 지도 만들기</string>
+    <string name="mapbox_attributionTelemetryMessage">당신은 익명의 사용 데이터를 제공함으로써, 오픈스트리트맵과 맵박스 향상에 기여하고 있습니다.</string>
+    <string name="mapbox_attributionTelemetryPositive">동의</string>
+    <string name="mapbox_attributionTelemetryNegative">비동의</string>
+    <string name="mapbox_attributionTelemetryNeutral">추가정보</string>
+    <string name="mapbox_attributionErrorNoBrowser">웹 브라우저가 설치 되어 있지 않아, 웹 페이지를 열 수 없습니다.</string>
+    <string name="mapbox_offline_error_region_definition_invalid">제공된 오프라인지역정의가 월드바운즈에 적합하지 않습니다: %s</string>
+    <string name="mapbox_telemetrySettings">원격 측정 설정</string>
+    </resources>
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 e072f07fb9..789a1b2b37 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
@@ -357,6 +357,58 @@ public class LatLngBoundsTest {
   }
 
   @Test
+  public void intersectNorthCheck() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("latitude must be between -90 and 90");
+    LatLngBounds intersectLatLngBounds =
+      LatLngBounds.from(10, 10, 0, 0)
+        .intersect(200, 200, 0, 0);
+  }
+
+  @Test
+  public void intersectSouthCheck() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("latitude must be between -90 and 90");
+    LatLngBounds intersectLatLngBounds =
+      LatLngBounds.from(0, 0, -10, -10)
+        .intersect(0, 0, -200, -200);
+  }
+
+  @Test
+  public void intersectSouthLessThanNorthCheck() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("LatSouth cannot be less than latNorth");
+
+    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);
+  }
+
+  @Test
   public void innerUnion() {
     LatLngBounds latLngBounds = new LatLngBounds.Builder()
       .include(new LatLng(1, 1))
@@ -391,14 +443,176 @@ public class LatLngBoundsTest {
       .include(new LatLng(-10, -160))
       .build();
 
-    assertEquals("outer union should match",
-      latLngBounds1.union(latLngBounds2),
+    LatLngBounds union1 = latLngBounds1.union(latLngBounds2);
+    LatLngBounds union2 = latLngBounds2.union(latLngBounds1);
+
+    assertEquals(union1,
+      new LatLngBounds.Builder()
+        .include(new LatLng(10, 160))
+        .include(new LatLng(-10, -160))
+        .build());
+
+    assertEquals(union1, union2);
+  }
+
+  @Test
+  public void unionOverDateLine2() {
+    LatLngBounds latLngBounds1 = new LatLngBounds.Builder()
+      .include(new LatLng(10, 170))
+      .include(new LatLng(0, 160))
+      .build();
+
+    LatLngBounds latLngBounds2 = new LatLngBounds.Builder()
+      .include(new LatLng(0, 165))
+      .include(new LatLng(-10, -160))
+      .build();
+
+    LatLngBounds union1 = latLngBounds1.union(latLngBounds2);
+    LatLngBounds union2 = latLngBounds2.union(latLngBounds1);
+
+    assertEquals(union1,
       new LatLngBounds.Builder()
         .include(new LatLng(10, 160))
         .include(new LatLng(-10, -160))
         .build());
+
+    assertEquals(union1, union2);
   }
 
+  @Test
+  public void unionOverDateLine3() {
+    LatLngBounds latLngBounds1 = new LatLngBounds.Builder()
+      .include(new LatLng(10, -165))
+      .include(new LatLng(0, 160))
+      .build();
+
+    LatLngBounds latLngBounds2 = new LatLngBounds.Builder()
+      .include(new LatLng(0, -170))
+      .include(new LatLng(-10, -160))
+      .build();
+
+    LatLngBounds union1 = latLngBounds1.union(latLngBounds2);
+    LatLngBounds union2 = latLngBounds2.union(latLngBounds1);
+
+    assertEquals(union1,
+      new LatLngBounds.Builder()
+        .include(new LatLng(10, 160))
+        .include(new LatLng(-10, -160))
+        .build());
+
+    assertEquals(union1, union2);
+  }
+
+  @Test
+  public void unionOverDateLine4() {
+    LatLngBounds latLngBounds1 = new LatLngBounds.Builder()
+      .include(new LatLng(10, -160))
+      .include(new LatLng(0, 160))
+      .build();
+
+    LatLngBounds latLngBounds2 = new LatLngBounds.Builder()
+      .include(new LatLng(0, -170))
+      .include(new LatLng(-10, -175))
+      .build();
+
+    LatLngBounds union1 = latLngBounds1.union(latLngBounds2);
+    LatLngBounds union2 = latLngBounds2.union(latLngBounds1);
+
+    assertEquals(union1,
+      new LatLngBounds.Builder()
+        .include(new LatLng(10, 160))
+        .include(new LatLng(-10, -160))
+        .build());
+
+    assertEquals(union1, union2);
+  }
+
+  @Test
+  public void unionOverDateLine5() {
+    LatLngBounds latLngBounds1 = new LatLngBounds.Builder()
+      .include(new LatLng(10, -160))
+      .include(new LatLng(0, 160))
+      .build();
+
+    LatLngBounds latLngBounds2 = new LatLngBounds.Builder()
+      .include(new LatLng(0, 170))
+      .include(new LatLng(-10, 175))
+      .build();
+
+    LatLngBounds union1 = latLngBounds1.union(latLngBounds2);
+    LatLngBounds union2 = latLngBounds2.union(latLngBounds1);
+
+    assertEquals(union1,
+      new LatLngBounds.Builder()
+        .include(new LatLng(10, 160))
+        .include(new LatLng(-10, -160))
+        .build());
+
+    assertEquals(union1, union2);
+  }
+
+  @Test
+  public void unionOverDateLineReturnWorldLonSpan() {
+    LatLngBounds latLngBounds1 = LatLngBounds.from(10, -160, -10, -10);
+    LatLngBounds latLngBounds2 =  LatLngBounds.from(10, 10, -10, 160);
+
+    LatLngBounds union1 = latLngBounds1.union(latLngBounds2);
+    LatLngBounds union2 = latLngBounds2.union(latLngBounds1);
+
+    assertEquals(union1, union2);
+    assertEquals(union1, LatLngBounds.from(10, 180, -10, -180));
+  }
+
+  @Test
+  public void unionNorthCheck() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("latitude must be between -90 and 90");
+    LatLngBounds unionLatLngBounds =
+      LatLngBounds.from(10, 10, 0, 0)
+      .union(200, 200, 0, 0);
+  }
+
+  @Test
+  public void unionSouthCheck() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("latitude must be between -90 and 90");
+    LatLngBounds unionLatLngBounds =
+      LatLngBounds.from(0, 0, -10, -10)
+        .union(0, 0, -200, -200);
+  }
+
+  @Test
+  public void unionSouthLessThanNorthCheck() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("LatSouth cannot be less than latNorth");
+
+    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() {
@@ -524,7 +738,6 @@ public class LatLngBoundsTest {
     LatLngBounds.from(0, Double.POSITIVE_INFINITY, -20, -20);
   }
 
-
   @Test
   public void testConstructorChecksSouthLatitudeNaN() {
     exception.expect(IllegalArgumentException.class);
@@ -543,7 +756,7 @@ public class LatLngBoundsTest {
   public void testConstructorChecksSouthLatitudeGreaterThan90() {
     exception.expect(IllegalArgumentException.class);
     exception.expectMessage("latitude must be between -90 and 90");
-    LatLngBounds.from(20, 20,95, 0);
+    LatLngBounds.from(20, 20, 95, 0);
   }
 
   @Test