Merge master into release-ios-v3.5.0-android-v5.0.0

13 files changed, 119 insertions, 37 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
index f954073974..296d93d0ca 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
@@ -43,7 +43,7 @@ public final class Mapbox {
     return INSTANCE;
   }
 
-  private Mapbox(@NonNull Context context, @NonNull String accessToken) {
+  Mapbox(@NonNull Context context, @NonNull String accessToken) {
     this.context = context;
     this.accessToken = accessToken;
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
index 17a1866379..315e12d280 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
@@ -636,6 +636,7 @@ public class MarkerViewManager implements MapView.OnMapChangedListener {
         viewHolder = (ViewHolder) convertView.getTag();
       }
       viewHolder.imageView.setImageBitmap(marker.getIcon().getBitmap());
+      viewHolder.imageView.setContentDescription(marker.getTitle());
       return convertView;
     }
 
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 16b7bf1800..8fa2d0b152 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
@@ -118,6 +118,9 @@ public class MapView extends FrameLayout {
     ImageView attrView = (ImageView) view.findViewById(R.id.attributionView);
     initalizeDrawingSurface(context, options);
 
+    // add accessibility support
+    setContentDescription(context.getString(R.string.mapbox_mapActionDescription));
+
     // create native Map object
     nativeMapView = new NativeMapView(this);
 
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 e3e33ec067..46c5e269c0 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
@@ -37,6 +37,7 @@ import com.mapbox.mapboxsdk.constants.MyLocationTracking;
 import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
+import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.services.commons.geojson.Feature;
@@ -1674,7 +1675,23 @@ public final class MapboxMap {
   @NonNull
   public List<Feature> queryRenderedFeatures(@NonNull PointF coordinates, @Nullable String...
     layerIds) {
-    return nativeMapView.queryRenderedFeatures(coordinates, layerIds);
+    return nativeMapView.queryRenderedFeatures(coordinates, layerIds, null);
+  }
+
+  /**
+   * Queries the map for rendered features
+   *
+   * @param coordinates the point to query
+   * @param filter      filters the returned features
+   * @param layerIds    optionally - only query these layers
+   * @return the list of feature
+   */
+  @UiThread
+  @NonNull
+  public List<Feature> queryRenderedFeatures(@NonNull PointF coordinates,
+                                             @Nullable Filter.Statement filter,
+                                             @Nullable String... layerIds) {
+    return nativeMapView.queryRenderedFeatures(coordinates, layerIds, filter);
   }
 
   /**
@@ -1686,9 +1703,25 @@ public final class MapboxMap {
    */
   @UiThread
   @NonNull
-  public List<Feature> queryRenderedFeatures(@NonNull RectF coordinates, @Nullable String...
-    layerIds) {
-    return nativeMapView.queryRenderedFeatures(coordinates, layerIds);
+  public List<Feature> queryRenderedFeatures(@NonNull RectF coordinates,
+                                             @Nullable String... layerIds) {
+    return nativeMapView.queryRenderedFeatures(coordinates, layerIds, null);
+  }
+
+  /**
+   * Queries the map for rendered features
+   *
+   * @param coordinates the box to query
+   * @param filter      filters the returned features
+   * @param layerIds    optionally - only query these layers
+   * @return the list of feature
+   */
+  @UiThread
+  @NonNull
+  public List<Feature> queryRenderedFeatures(@NonNull RectF coordinates,
+                                             @Nullable Filter.Statement filter,
+                                             @Nullable String... layerIds) {
+    return nativeMapView.queryRenderedFeatures(coordinates, layerIds, filter);
   }
 
   //
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 e02a0f3d36..7c68a48c4d 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
@@ -22,6 +22,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.ProjectedMeters;
 import com.mapbox.mapboxsdk.storage.FileSource;
 import com.mapbox.mapboxsdk.style.layers.CannotAddLayerException;
+import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.sources.CannotAddSourceException;
 import com.mapbox.mapboxsdk.style.sources.Source;
@@ -881,27 +882,31 @@ final class NativeMapView {
   // Feature querying
 
   @NonNull
-  public List<Feature> queryRenderedFeatures(PointF coordinates, String... layerIds) {
+  public List<Feature> queryRenderedFeatures(@NonNull PointF coordinates,
+                                             @Nullable String[] layerIds,
+                                             @Nullable Filter.Statement filter) {
     if (isDestroyedOn("queryRenderedFeatures")) {
       return new ArrayList<>();
     }
     Feature[] features = nativeQueryRenderedFeaturesForPoint(coordinates.x / pixelRatio,
-      coordinates.y / pixelRatio, layerIds);
+      coordinates.y / pixelRatio, layerIds, filter != null ? filter.toArray() : null);
     return features != null ? Arrays.asList(features) : new ArrayList<Feature>();
   }
 
   @NonNull
-  public List<Feature> queryRenderedFeatures(RectF coordinates, String... layerIds) {
+  public List<Feature> queryRenderedFeatures(@NonNull RectF coordinates,
+                                             @Nullable String[] layerIds,
+                                             @Nullable Filter.Statement filter) {
     if (isDestroyedOn("queryRenderedFeatures")) {
       return new ArrayList<>();
     }
     Feature[] features = nativeQueryRenderedFeaturesForBox(
-
       coordinates.left / pixelRatio,
       coordinates.top / pixelRatio,
       coordinates.right / pixelRatio,
       coordinates.bottom / pixelRatio,
-      layerIds);
+      layerIds,
+      filter != null ? filter.toArray() : null);
     return features != null ? Arrays.asList(features) : new ArrayList<Feature>();
   }
 
@@ -1139,12 +1144,14 @@ final class NativeMapView {
 
   private native void nativeTakeSnapshot();
 
-  private native Feature[] nativeQueryRenderedFeaturesForPoint(float x, float y, String[]
-    layerIds);
+  private native Feature[] nativeQueryRenderedFeaturesForPoint(float x, float y,
+                                                               String[] layerIds,
+                                                               Object[] filter);
 
   private native Feature[] nativeQueryRenderedFeaturesForBox(float left, float top,
                                                              float right, float bottom,
-                                                             String[] layerIds);
+                                                             String[] layerIds,
+                                                             Object[] filter);
 
   int getWidth() {
     if (isDestroyedOn("")) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
index 6d8adc1e2a..5c9cf93ebc 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
@@ -56,7 +56,6 @@ public final class CompassView extends AppCompatImageView implements Runnable, F
 
   private void initialize(Context context) {
     setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.mapbox_compass_icon));
-    setContentDescription(getResources().getString(R.string.mapbox_compassContentDescription));
     setEnabled(false);
 
     // Layout params
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/CompositeFunction.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/CompositeFunction.java
index 1db14afc5f..8ded7ecd34 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/CompositeFunction.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/CompositeFunction.java
@@ -8,6 +8,7 @@ import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
 import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
+import com.mapbox.mapboxsdk.style.layers.PropertyValue;
 
 import java.util.Map;
 
@@ -27,7 +28,7 @@ import java.util.Map;
 public class CompositeFunction<Z extends Number, I, O> extends Function<Stop.CompositeValue<Z, I>, O> {
 
   private final String property;
-  private O defaultValue;
+  private PropertyValue<O> defaultValue;
 
   CompositeFunction(@NonNull String property,
                     @NonNull CategoricalStops<Stop.CompositeValue<Z, I>, O> stops) {
@@ -51,7 +52,7 @@ public class CompositeFunction<Z extends Number, I, O> extends Function<Stop.Com
   private CompositeFunction(@Nullable O defaultValue, @NonNull String property,
                             @NonNull Stops<Stop.CompositeValue<Z, I>, O> stops) {
     super(stops);
-    this.defaultValue = defaultValue;
+    this.defaultValue = new PropertyValue<>(property, defaultValue);
     this.property = property;
   }
 
@@ -61,7 +62,7 @@ public class CompositeFunction<Z extends Number, I, O> extends Function<Stop.Com
    * @param defaultValue the default value to use when no other applies
    * @return this (for chaining)
    */
-  public CompositeFunction<Z, I, O> withDefaultValue(O defaultValue) {
+  public CompositeFunction<Z, I, O> withDefaultValue(PropertyValue<O> defaultValue) {
     this.defaultValue = defaultValue;
     return this;
   }
@@ -70,7 +71,7 @@ public class CompositeFunction<Z extends Number, I, O> extends Function<Stop.Com
    * @return the defaultValue
    */
   @Nullable
-  public O getDefaultValue() {
+  public PropertyValue<O> getDefaultValue() {
     return defaultValue;
   }
 
@@ -91,7 +92,7 @@ public class CompositeFunction<Z extends Number, I, O> extends Function<Stop.Com
     Map<String, Object> valueObject = super.toValueObject();
     valueObject.put(PROPERTY_KEY, property);
     if (defaultValue != null) {
-      valueObject.put(DEFAULT_VALUE_KEY, defaultValue);
+      valueObject.put(DEFAULT_VALUE_KEY, defaultValue.value);
     }
     return valueObject;
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/SourceFunction.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/SourceFunction.java
index f0eed760a4..33f436ae71 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/SourceFunction.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/SourceFunction.java
@@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
+import com.mapbox.mapboxsdk.style.layers.PropertyValue;
 
 import java.util.Map;
 
@@ -25,7 +26,7 @@ import java.util.Map;
 public class SourceFunction<I, O> extends Function<I, O> {
 
   private final String property;
-  private O defaultValue;
+  private PropertyValue<O> defaultValue;
 
   SourceFunction(@NonNull String property, @NonNull Stops<I, O> stops) {
     this(null, property, stops);
@@ -37,7 +38,7 @@ public class SourceFunction<I, O> extends Function<I, O> {
   private SourceFunction(@Nullable O defaultValue, @NonNull String property, @NonNull Stops<I, O> stops) {
     super(stops);
     this.property = property;
-    this.defaultValue = defaultValue;
+    this.defaultValue = defaultValue != null ? new PropertyValue<>(property, defaultValue) : null;
   }
 
 
@@ -56,7 +57,7 @@ public class SourceFunction<I, O> extends Function<I, O> {
    * @param defaultValue the default value to use when no other applies
    * @return this (for chaining)
    */
-  public SourceFunction<I, O> withDefaultValue(O defaultValue) {
+  public SourceFunction<I, O> withDefaultValue(PropertyValue<O> defaultValue) {
     this.defaultValue = defaultValue;
     return this;
   }
@@ -65,7 +66,7 @@ public class SourceFunction<I, O> extends Function<I, O> {
    * @return the defaultValue
    */
   @Nullable
-  public O getDefaultValue() {
+  public PropertyValue<O> getDefaultValue() {
     return defaultValue;
   }
 
@@ -77,7 +78,7 @@ public class SourceFunction<I, O> extends Function<I, O> {
     Map<String, Object> valueObject = super.toValueObject();
     valueObject.put(PROPERTY_KEY, property);
     if (defaultValue != null) {
-      valueObject.put(DEFAULT_VALUE_KEY, defaultValue);
+      valueObject.put(DEFAULT_VALUE_KEY, defaultValue.value);
     }
     return valueObject;
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
index 5286e6916d..68727c8a4f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
@@ -1,9 +1,12 @@
 package com.mapbox.mapboxsdk.style.layers;
 
+import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import com.mapbox.mapboxsdk.exceptions.ConversionException;
 import com.mapbox.mapboxsdk.style.functions.Function;
+import com.mapbox.mapboxsdk.utils.ColorUtils;
 
 import timber.log.Timber;
 
@@ -15,7 +18,14 @@ public class PropertyValue<T> {
   public final String name;
   public final T value;
 
-  /* package */ PropertyValue(@NonNull String name, T value) {
+  /**
+   * Not part of the public API.
+   *
+   * @param name  the property name
+   * @param value the property value
+   * @see PropertyFactory for construction of {@link PropertyValue}s
+   */
+  public PropertyValue(@NonNull String name, T value) {
     this.name = name;
     this.value = value;
   }
@@ -54,6 +64,22 @@ public class PropertyValue<T> {
     }
   }
 
+  @ColorInt
+  @Nullable
+  public Integer getColorInt() {
+    if (!isValue() || !(value instanceof String)) {
+      Timber.e("%s is not a String value and can not be converted to a color it", name);
+      return null;
+    }
+
+    try {
+      return ColorUtils.rgbaToColor((String) value);
+    } catch (ConversionException ex) {
+      Timber.e("%s could not be converted to a Color int: %s", name, ex.getMessage());
+      return null;
+    }
+  }
+
   @Override
   public String toString() {
     return String.format("%s: %s", name, value);
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
index e786aaca4c..641020906a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
@@ -74,6 +74,12 @@
     <!-- Deprecated to use TextureView-->
     <public name="mapbox_renderTextureMode" type="attr" />
 
+    <!-- Exposed content descriptions -->
+    <public name="mapbox_compassContentDescription" type="string" />
+    <public name="mapbox_attributionsIconContentDescription" type="string" />
+    <public name="mapbox_myLocationViewContentDescription" type="string" />
+    <public name="mapbox_logoContentDescription" type="string" />
+
     <!-- Exposed styles -->
     <public name="mapbox_style_mapbox_streets" type="string" />
     <public name="mapbox_style_emerald" type="string" />
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml
index 9810e8900b..e6a2677785 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml
@@ -5,30 +5,34 @@
         android:id="@+id/surfaceView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone" />
+        android:contentDescription="@null"
+        android:visibility="gone"/>
 
     <FrameLayout
         android:id="@+id/markerViewContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/transparent" />
+        android:background="@android:color/transparent"
+        android:contentDescription="@null"/>
 
     <com.mapbox.mapboxsdk.maps.widgets.MyLocationView
         android:id="@+id/userLocationView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:contentDescription="@string/mapbox_myLocationViewContentDescription"/>
 
     <com.mapbox.mapboxsdk.maps.widgets.CompassView
         android:id="@+id/compassView"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/mapbox_compassContentDescription"/>
 
     <ImageView
         android:id="@+id/logoView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:contentDescription="@string/mapbox_iconContentDescription"
-        android:src="@drawable/mapbox_logo_icon" />
+        android:contentDescription="@null"
+        android:src="@drawable/mapbox_logo_icon"/>
 
     <ImageView
         android:id="@+id/attributionView"
@@ -39,6 +43,6 @@
         android:clickable="true"
         android:contentDescription="@string/mapbox_attributionsIconContentDescription"
         android:padding="7dp"
-        android:src="@drawable/mapbox_info_bg_selector" />
+        android:src="@drawable/mapbox_info_bg_selector"/>
 
 </merge>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml
index d87f443586..d015bc5785 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml
@@ -17,8 +17,8 @@
         android:layout_alignParentLeft="true"
         android:layout_marginBottom="@dimen/mapbox_eight_dp"
         android:layout_marginLeft="@dimen/mapbox_eight_dp"
-        android:contentDescription="@string/mapbox_iconContentDescription"
-        android:src="@drawable/mapbox_logo_icon" />
+        android:contentDescription="@null"
+        android:src="@drawable/mapbox_logo_icon"/>
 
     <ImageView
         android:layout_width="wrap_content"
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
index 5905878350..0d8e9bdc49 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="mapbox_compassContentDescription">Map compass. Click to reset the map rotation to North.</string>
-    <string name="mapbox_attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string>
+    <string name="mapbox_compassContentDescription">Map compass. Activate to reset the map rotation to North.</string>
+    <string name="mapbox_attributionsIconContentDescription">Attribution icon. Activate to show attribution dialog.</string>
+    <string name="mapbox_myLocationViewContentDescription">Location View. This shows your location on the map.</string>
+    <string name="mapbox_mapActionDescription">Showing a Map created with Mapbox. Scroll by dragging two fingers. Zoom by pinching two fingers.</string>
     <string name="mapbox_attributionsDialogTitle">Mapbox Android SDK</string>
     <string name="mapbox_attributionTelemetryTitle">Make Mapbox Maps Better</string>
     <string name="mapbox_attributionTelemetryMessage">You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.</string>
     <string name="mapbox_attributionTelemetryPositive">Agree</string>
     <string name="mapbox_attributionTelemetryNegative">Disagree</string>
     <string name="mapbox_attributionTelemetryNeutral">More info</string>
-    <string name="mapbox_iconContentDescription">The Mapbox logo.</string>
     <string name="mapbox_infoWindowTitle">Title</string>
     <string name="mapbox_infoWindowDescription">Description</string>
     <string name="mapbox_infoWindowAddress">Address</string>