Merge release-ios-v3.6.0-android-v5.1.0 to master

platform/android/CHANGELOG.md

@@ -3,11 +3,51 @@
 Mapbox welcomes participation and contributions from everyone.  If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started.
 
 ## 5.1.0 - TBA
+* Fix tracking mode + camera race condition [#9133](https://github.com/mapbox/mapbox-gl-native/pull/9133)
+* Harden orientation changes [#9128](https://github.com/mapbox/mapbox-gl-native/pull/9128)
+
+## 5.1.0-beta.3 - May 26, 2017
+
+* Add binding support for Light [#9013](https://github.com/mapbox/mapbox-gl-native/pull/9013)
 * Update attribution with new Mapbox wordmark [#8774](https://github.com/mapbox/mapbox-gl-native/pull/8774)
+* LatLngBounds bearing default value [#9102](https://github.com/mapbox/mapbox-gl-native/pull/9102)
+* Stop location updates when toggling MyLocationView [#9099](https://github.com/mapbox/mapbox-gl-native/pull/9099)
+* Horizontally rotated in snapshot [#9083](https://github.com/mapbox/mapbox-gl-native/pull/9083)
+* Disable letter spacing for Arabic text [#9071](https://github.com/mapbox/mapbox-gl-native/pull/9071)
+* Correct bearing conversion when animating the map [#9050](https://github.com/mapbox/mapbox-gl-native/pull/9050)
+* Don't leak selected markers when removing [#9047](https://github.com/mapbox/mapbox-gl-native/pull/9047)
+* Bump tools and support lib version [#9046](https://github.com/mapbox/mapbox-gl-native/pull/9046)
+* MarkerView deselect events with OnMarkerViewClickListener [#9047](https://github.com/mapbox/mapbox-gl-native/pull/9047)
+* LOST update to v3.0.0 [#9112](https://github.com/mapbox/mapbox-gl-native/pull/9112)
+* Convert dp to pixels for meters per pixel at latitude [#9048](https://github.com/mapbox/mapbox-gl-native/pull/9048)
+
+## 5.1.0-beta.2 - May 12, 2017
+
+5.1.0-beta.2 builds further on 5.1.0-beta.1 and adds:
+
+* When a layer is added, reload its source's tiles [#8963](https://github.com/mapbox/mapbox-gl-native/pull/8963)
+* Update release script to support CircleCI builds [#8950](https://github.com/mapbox/mapbox-gl-native/pull/8950)
+* URL getter on Sources [#8959](https://github.com/mapbox/mapbox-gl-native/pull/8959)
+* Build SNAPSHOT from release branch CI configuration [#8958](https://github.com/mapbox/mapbox-gl-native/pull/8958)
+* Fix UI test filter in Makefile [#8960](https://github.com/mapbox/mapbox-gl-native/pull/8960)
+* Bump & fixup dependencies [#8921](https://github.com/mapbox/mapbox-gl-native/pull/8921)
+* Ignore already deleted region [#8920](https://github.com/mapbox/mapbox-gl-native/pull/8920)
+* Keep offline observer when timeout occurs [#8919](https://github.com/mapbox/mapbox-gl-native/pull/8919)
+* Show error message when no browser installed [#8920](https://github.com/mapbox/mapbox-gl-native/pull/8920)
+* Reset observers of removed Sources and Layers [#8900](https://github.com/mapbox/mapbox-gl-native/pull/8900)
+* Only build custom layer .so for debug builds [#8885](https://github.com/mapbox/mapbox-gl-native/pull/8885)
+* Update localizations [#8883](https://github.com/mapbox/mapbox-gl-native/pull/8883)
+* Reset observers of removed Sources and Layers [#8862](https://github.com/mapbox/mapbox-gl-native/pull/8862)
+* Remove force style cascade [#8866](https://github.com/mapbox/mapbox-gl-native/pull/8866)
+* Update proguard config [#8944](https://github.com/mapbox/mapbox-gl-native/pull/8944)
+* Update LOST to 2.3.0-SNAPSHOT [#8872](https://github.com/mapbox/mapbox-gl-native/pull/8872)
+* Update logo [#8774](https://github.com/mapbox/mapbox-gl-native/pull/8774)
+* Camera change listener v2.0 [#8644](https://github.com/mapbox/mapbox-gl-native/pull/8644)
+* Allow filesource url transform reset [#8957](https://github.com/mapbox/mapbox-gl-native/pull/8957)
 
 ## 5.1.0-beta.1 - May 2, 2017
 
-5.1.0 builds further on 5.0.2 and adds:
+5.1.0-beta.1 builds further on 5.0.2 and adds:
 
 * Support for FillExtrusionLayer [#8431](https://github.com/mapbox/mapbox-gl-native/pull/8431)
 * Limit Viewport [#8622](https://github.com/mapbox/mapbox-gl-native/pull/8622)

platform/android/MapboxGLAndroidSDK/build.gradle

@@ -95,6 +95,9 @@ android {
                 }
             }
         }
+
+        // proguard config for .aar
+        consumerProguardFiles 'proguard-rules.pro'
     }
 
     // avoid naming conflicts, force usage of prefix
@@ -126,7 +129,6 @@ android {
 
         release {
             // aar proguard configuration
-            consumerProguardFiles 'proguard-rules.pro'
             jniDebuggable false
         }
     }

platform/android/MapboxGLAndroidSDK/gradle-checkstyle.gradle

@@ -15,6 +15,7 @@ task checkstyle(type: Checkstyle) {
     exclude '**/style/layers/Property.java'
     exclude '**/style/layers/PropertyFactory.java'
     exclude '**/style/layers/*Layer.java'
+    exclude '**/style/light/Light.java'
     classpath = files()
     ignoreFailures = false
 }

platform/android/MapboxGLAndroidSDK/proguard-rules.pro

@@ -2,89 +2,8 @@
 # in ../sdk/tools/proguard/proguard-android.txt,
 # contents of this file will be appended into proguard-android.txt
 -keepattributes Signature, *Annotation*, EnclosingMethod
-
-# Square okio, ignoring warnings,
-# see https://github.com/square/okio/issues/60
--dontwarn okhttp3.**
--dontwarn okio.**
-
-# Gesture package
 -keep class almeros.android.multitouch.gesturedetectors.** { *; }
-
-# Package annotations
--keep class com.mapbox.mapboxsdk.annotations.** { *; }
-
-# Package camera
--keep class com.mapbox.mapboxsdk.camera.** { *; }
-
-# Package geometry
--keep class com.mapbox.mapboxsdk.geometry.** { *; }
-
-# Package http
--keep class com.mapbox.mapboxsdk.http.** { *; }
-
-# Package maps
--keep class com.mapbox.mapboxsdk.maps.** { *; }
-
-# Package net
--keep class com.mapbox.mapboxsdk.net.** { *; }
-
-# Package offline
--keep class com.mapbox.mapboxsdk.offline.** { *; }
-
-# Package storage
--keep class com.mapbox.mapboxsdk.storage.** { *; }
-
-# Package style
--keep class com.mapbox.mapboxsdk.style.layers.** { *; }
--keep class com.mapbox.mapboxsdk.style.sources.** { *; }
--keep class com.mapbox.mapboxsdk.style.functions.** { *; }
-
-# Package telemetry
--keep class com.mapbox.mapboxsdk.telemetry.** { *; }
-
-#
-# Mapbox-java Proguard rules
-# We include these rules since libjava is a Jar file not AAR
-#
-
-# Retrofit 2
-# Platform calls Class.forName on types which do not exist on Android to determine platform.
--dontnote retrofit2.Platform
-# Platform used when running on RoboVM on iOS. Will not be used at runtime.
--dontnote retrofit2.Platform$IOS$MainThreadExecutor
-# Platform used when running on Java 8 VMs. Will not be used at runtime.
--dontwarn retrofit2.Platform$Java8
-# Retain generic type information for use by reflection by converters and adapters.
--keepattributes Signature
-# Retain declared checked exceptions for use by a Proxy instance.
--keepattributes Exceptions
-
-# For using GSON @Expose annotation
--keepattributes *Annotation*
-# Gson specific classes
--dontwarn sun.misc.**
-
-# Prevent proguard from stripping interface information from TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
-
-# MAS Data Models
--keep class com.mapbox.services.commons.geojson.** { *; }
--keep class com.mapbox.services.mapmatching.v4.models.** { *; }
--keep class com.mapbox.services.distance.v1.models.** { *; }
--keep class com.mapbox.services.directions.v4.models.** { *; }
--keep class com.mapbox.services.directions.v5.models.** { *; }
--keep class com.mapbox.services.geocoding.v5.models.** { *; }
-
--dontwarn javax.annotation.**
-
--keepclassmembers class rx.internal.util.unsafe.** {
-    long producerIndex;
-    long consumerIndex;
-}
-
--keep class com.google.** { *; }
--dontwarn com.google.**
+-keep class com.mapbox.mapboxsdk.** { *; }
+-keep interface com.mapbox.mapboxsdk.** { *; }
+-keep class com.mapbox.services.android.telemetry.** { *; }
+-keep class com.mapbox.services.commons.** { *;}

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java

@@ -1,5 +1,6 @@
 package com.mapbox.mapboxsdk;
 
+import android.app.Application;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -15,6 +16,14 @@
 import com.mapbox.services.android.telemetry.location.LocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEnginePriority;
 
+/**
+ * The entry point of the Mapbox Android SDK.
+ * <p>
+ * Obtain a reference by calling {@link #getInstance(Context, String)}. Usually this class is configured in
+ * {@link Application#onCreate()} and is responsible for the active access token, application context, and
+ * connectivity state.
+ * </p>
+ */
 public final class Mapbox {
 
   private static Mapbox INSTANCE;
@@ -25,7 +34,7 @@ public final class Mapbox {
   /**
    * Get an instance of Mapbox.
    * <p>
-   * This class manages the active access token, application context and connectivity state.
+   * This class manages the active access token, application context, and connectivity state.
    * </p>
    *
    * @param context     Android context which holds or is an application context
@@ -52,9 +61,9 @@ public static synchronized Mapbox getInstance(@NonNull Context context, @NonNull
   }
 
   /**
-   * Access Token for this application.
+   * Access token for this application.
    *
-   * @return Mapbox Access Token
+   * @return Mapbox access token
    */
   public static String getAccessToken() {
     validateMapbox();
@@ -72,7 +81,7 @@ private static void validateMapbox() throws MapboxConfigurationException {
   }
 
   /**
-   * Runtime validation of Access Token.
+   * Runtime validation of access token.
    *
    * @throws MapboxConfigurationException exception thrown when not using a valid accessToken
    */
@@ -92,22 +101,22 @@ public static Context getApplicationContext() {
   }
 
   /**
-   * Manually sets the connectivity state of the app. This is useful for apps that control their
+   * Manually sets the connectivity state of the app. This is useful for apps which control their
    * own connectivity state and want to bypass any checks to the ConnectivityManager.
    *
    * @param connected flag to determine the connectivity state, true for connected, false for
-   *                  disconnected, null for ConnectivityManager to determine.
+   *                  disconnected, and null for ConnectivityManager to determine.
    */
   public static synchronized void setConnected(Boolean connected) {
     // Connectivity state overridden by app
     INSTANCE.connected = connected;
   }
 
   /**
-   * Determines whether we have an Internet connection available. Please do not rely on this
-   * method in your apps, this method is used internally by the SDK.
+   * Determines whether we have an internet connection available. Please do not rely on this
+   * method in your apps. This method is used internally by the SDK.
    *
-   * @return true if there is an Internet connection, false otherwise
+   * @return true if there is an internet connection, false otherwise
    */
   public static synchronized Boolean isConnected() {
     if (INSTANCE.connected != null) {
@@ -119,4 +128,4 @@ public static synchronized Boolean isConnected() {
     NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
     return (activeNetwork != null && activeNetwork.isConnected());
   }
-}
+}

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java

@@ -1,15 +1,18 @@
 package com.mapbox.mapboxsdk.annotations;
 
 import android.graphics.Bitmap;
+import android.util.DisplayMetrics;
 
-import com.mapbox.mapboxsdk.maps.MapView;
+import java.nio.ByteBuffer;
 
 /**
- * Icon is the visual representation of a {@link Marker} on a {@link MapView}.
+ * Icon is the visual representation of a Marker on a MapView.
  *
  * @see Marker
+ * @see IconFactory
  */
 public class Icon {
+
   private Bitmap mBitmap;
   private String mId;
 
@@ -19,29 +22,67 @@ public class Icon {
   }
 
   /**
-   * {@link String} identifier for this {@link Icon}.
+   * String identifier for this icon.
    *
-   * @return {@link String} identifier for this {@link Icon}.
+   * @return String identifier for this icon.
    */
   public String getId() {
     return mId;
   }
 
   /**
-   * Get the {@link Bitmap} being used for this {@link Icon}.
+   * Get the bitmap being used for this icon.
    *
-   * @return The {@link Bitmap} being used for the {@link Icon}.
+   * @return The bitmap being used for the icon.
    */
   public Bitmap getBitmap() {
+    if (mBitmap.getConfig() != Bitmap.Config.ARGB_8888) {
+      mBitmap = mBitmap.copy(Bitmap.Config.ARGB_8888, false);
+    }
     return mBitmap;
   }
 
   /**
-   * Compares this {@link Icon} object with another {@link Icon} and determines if they match.
+   * Get the icon bitmap scale.
+   * <p>
+   * Requires the bitmap to be set before calling this method.
+   * </p>
+   *
+   * @return the scale of the bitmap
+   */
+  public float getScale() {
+    if (mBitmap == null) {
+      throw new IllegalStateException("Required to set a Icon before calling getScale");
+    }
+    float density = mBitmap.getDensity();
+    if (density == Bitmap.DENSITY_NONE) {
+      density = DisplayMetrics.DENSITY_DEFAULT;
+    }
+    return density / DisplayMetrics.DENSITY_DEFAULT;
+  }
+
+  /**
+   * Get the icon bitmap bytes.
+   * <p>
+   * Requires the bitmap to be set before calling this method.
+   * </p>
    *
-   * @param object Another {@link Icon} to compare with this object.
-   * @return True if the {@link Icon} being passed in matches this {@link Icon} object. Else,
-   * false.
+   * @return the bytes of the bitmap
+   */
+  public byte[] toBytes() {
+    if (mBitmap == null) {
+      throw new IllegalStateException("Required to set a Icon before calling toBytes");
+    }
+    ByteBuffer buffer = ByteBuffer.allocate(mBitmap.getRowBytes() * mBitmap.getHeight());
+    mBitmap.copyPixelsToBuffer(buffer);
+    return buffer.array();
+  }
+
+  /**
+   * Compares this icon object with another icon and determines if they match.
+   *
+   * @param object Another iconi to compare with this object.
+   * @return True if the icon being passed in matches this icon object. Else, false.
    */
   @Override
   public boolean equals(Object object) {
@@ -53,11 +94,7 @@ public boolean equals(Object object) {
     }
 
     Icon icon = (Icon) object;
-
-    if (!mBitmap.equals(icon.mBitmap)) {
-      return false;
-    }
-    return mId.equals(icon.mId);
+    return mBitmap.equals(icon.mBitmap) && mId.equals(icon.mId);
   }
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java

@@ -3,6 +3,7 @@
 import android.support.annotation.FloatRange;
 import android.support.annotation.Nullable;
 
+import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -361,6 +362,9 @@ void setSelected(boolean selected) {
    */
   @Override
   public Icon getIcon() {
+    if (markerViewIcon == null) {
+      setIcon(IconFactory.getInstance(Mapbox.getApplicationContext()).defaultMarkerView());
+    }
     return markerViewIcon;
   }