1 files changed, 85 insertions, 26 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
index 80b25bf0de..7b979f5563 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
@@ -79,12 +79,12 @@ public class MapboxMapOptions implements Parcelable {
   private int[] myLocationBackgroundPadding;
   private int myLocationAccuracyTintColor;
   private int myLocationAccuracyAlpha;
+  private float myLocationAccuracyThreshold;
+  private boolean prefetchesTiles = true;
+  private boolean zMediaOverlay = false;
 
   private String apiBaseUrl;
 
-  @Deprecated
-  private boolean textureMode;
-
   private String style;
 
   /**
@@ -148,10 +148,13 @@ public class MapboxMapOptions implements Parcelable {
     myLocationBackgroundPadding = in.createIntArray();
     myLocationAccuracyAlpha = in.readInt();
     myLocationAccuracyTintColor = in.readInt();
+    myLocationAccuracyThreshold = in.readFloat();
 
     style = in.readString();
     apiBaseUrl = in.readString();
-    textureMode = in.readByte() != 0;
+
+    prefetchesTiles = in.readByte() != 0;
+    zMediaOverlay = in.readByte() != 0;
   }
 
   static Bitmap getBitmapFromDrawable(Drawable drawable) {
@@ -291,8 +294,12 @@ public class MapboxMapOptions implements Parcelable {
       mapboxMapOptions.myLocationAccuracyTint(
         typedArray.getColor(R.styleable.mapbox_MapView_mapbox_myLocationAccuracyTintColor,
           ColorUtils.getPrimaryColor(context)));
-      mapboxMapOptions.textureMode(
-        typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_renderTextureMode, false));
+      mapboxMapOptions.myLocationAccuracyThreshold(
+        typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_myLocationAccuracyThreshold, 0));
+      mapboxMapOptions.setPrefetchesTiles(
+        typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_enableTilePrefetch, true));
+      mapboxMapOptions.renderSurfaceOnTop(
+        typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_enableZMediaOverlay, false));
     } finally {
       typedArray.recycle();
     }
@@ -681,22 +688,59 @@ public class MapboxMapOptions implements Parcelable {
   }
 
   /**
-   * Enable TextureView as rendered surface.
-   * <p>
-   * Since the 4.2.0 release we replaced our TextureView with an SurfaceView implemenation.
-   * Enabling this option will use the deprecated TextureView instead.
-   * </p>
+   * Set accuracy circle threshold. Circle won't be displayed if accuracy is below set value.
+   *
+   * @param myLocationAccuracyThreshold Value of accuracy (in meters), below which circle won't be displayed
+   * @return This
+   */
+  public MapboxMapOptions myLocationAccuracyThreshold(float myLocationAccuracyThreshold) {
+    this.myLocationAccuracyThreshold = myLocationAccuracyThreshold;
+    return this;
+  }
+
+  /**
+   * Enable tile pre-fetching. Loads tiles at a lower zoom-level to pre-render
+   * a low resolution preview while more detailed tiles are loaded.
+   * Enabled by default
+   *
+   * @param enable true to enable
    *
-   * @param textureMode True to enable texture mode
    * @return This
-   * @deprecated As of the 4.2.0 release, using TextureView is deprecated.
    */
-  public MapboxMapOptions textureMode(boolean textureMode) {
-    this.textureMode = textureMode;
+  public MapboxMapOptions setPrefetchesTiles(boolean enable) {
+    this.prefetchesTiles = enable;
     return this;
   }
 
   /**
+   * Check whether tile pre-fetching is enabled.
+   *
+   * @return true if enabled
+   */
+  public boolean getPrefetchesTiles() {
+    return prefetchesTiles;
+  }
+
+
+  /**
+   * Set the flag to render the map surface on top of another surface.
+   *
+   * @param renderOnTop true if this map is shown on top of another one, false if bottom.
+   */
+  public void renderSurfaceOnTop(boolean renderOnTop) {
+    this.zMediaOverlay = renderOnTop;
+  }
+
+  /**
+   * Get the flag to render the map surface on top of another surface.
+   *
+   * @return true if this map is
+   */
+  public boolean getRenderSurfaceOnTop() {
+    return zMediaOverlay;
+  }
+
+  /**
    * Get the current configured API endpoint base URL.
    *
    * @return Base URL to be used API endpoint.
@@ -988,22 +1032,21 @@ public class MapboxMapOptions implements Parcelable {
   }
 
   /**
-   * Get the current configured debug state for a map view.
+   * Returns current accuracy threshold value (in meters).
    *
-   * @return True indicates debug is enabled.
+   * @return Value of accuracy threshold (in meters), below which circle won't be displayed
    */
-  public boolean getDebugActive() {
-    return debugActive;
+  public float getMyLocationAccuracyThreshold() {
+    return myLocationAccuracyThreshold;
   }
 
   /**
-   * Returns true if TextureView is being used a render view.
+   * Get the current configured debug state for a map view.
    *
-   * @return True if TextureView is used.
-   * @deprecated As of the 4.2.0 release, using TextureView is deprecated.
+   * @return True indicates debug is enabled.
    */
-  public boolean getTextureMode() {
-    return textureMode;
+  public boolean getDebugActive() {
+    return debugActive;
   }
 
   public static final Parcelable.Creator<MapboxMapOptions> CREATOR = new Parcelable.Creator<MapboxMapOptions>() {
@@ -1065,10 +1108,13 @@ public class MapboxMapOptions implements Parcelable {
     dest.writeIntArray(myLocationBackgroundPadding);
     dest.writeInt(myLocationAccuracyAlpha);
     dest.writeInt(myLocationAccuracyTintColor);
+    dest.writeFloat(myLocationAccuracyThreshold);
 
     dest.writeString(style);
     dest.writeString(apiBaseUrl);
-    dest.writeByte((byte) (textureMode ? 1 : 0));
+
+    dest.writeByte((byte) (prefetchesTiles ? 1 : 0));
+    dest.writeByte((byte) (zMediaOverlay ? 1 : 0));
   }
 
   @Override
@@ -1153,6 +1199,9 @@ public class MapboxMapOptions implements Parcelable {
     if (myLocationAccuracyAlpha != options.myLocationAccuracyAlpha) {
       return false;
     }
+    if (myLocationAccuracyThreshold != options.myLocationAccuracyThreshold) {
+      return false;
+    }
     if (cameraPosition != null ? !cameraPosition.equals(options.cameraPosition) : options.cameraPosition != null) {
       return false;
     }
@@ -1189,6 +1238,13 @@ public class MapboxMapOptions implements Parcelable {
     if (apiBaseUrl != null ? !apiBaseUrl.equals(options.apiBaseUrl) : options.apiBaseUrl != null) {
       return false;
     }
+    if (prefetchesTiles != options.prefetchesTiles) {
+      return false;
+    }
+    if (zMediaOverlay != options.zMediaOverlay) {
+      return false;
+    }
+
     return false;
   }
 
@@ -1230,9 +1286,12 @@ public class MapboxMapOptions implements Parcelable {
     result = 31 * result + Arrays.hashCode(myLocationBackgroundPadding);
     result = 31 * result + myLocationAccuracyTintColor;
     result = 31 * result + myLocationAccuracyAlpha;
+    result = 31 * result + (myLocationAccuracyThreshold != +0.0f
+      ? Float.floatToIntBits(myLocationAccuracyThreshold) : 0);
     result = 31 * result + (apiBaseUrl != null ? apiBaseUrl.hashCode() : 0);
-    result = 31 * result + (textureMode ? 1 : 0);
     result = 31 * result + (style != null ? style.hashCode() : 0);
+    result = 31 * result + (prefetchesTiles ? 1 : 0);
+    result = 31 * result + (zMediaOverlay ? 1 : 0);
     return result;
   }
 }