[android] - remove style config from mapboxMapOptions and attributes

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java

@@ -92,8 +92,6 @@ public final class MapboxMap {
     // Map configuration
     setDebugActive(options.getDebugActive());
     setApiBaseUrl(options);
-    setStyleUrl(options);
-    setStyleJson(options);
     setPrefetchesTiles(options);
   }
 
@@ -851,25 +849,6 @@ public final class MapboxMap {
     });
   }
 
-  /**
-   * Loads a new map style from MapboxMapOptions if available.
-   *
-   * @param options the object containing the style url
-   */
-  private void setStyleUrl(@NonNull MapboxMapOptions options) {
-    String style = options.getStyleUrl();
-    if (!TextUtils.isEmpty(style)) {
-      setStyle(new Style.Builder().fromUrl(style));
-    }
-  }
-
-  private void setStyleJson(@NonNull MapboxMapOptions options) {
-    String styleJson = options.getStyleJson();
-    if (!TextUtils.isEmpty(styleJson)) {
-      setStyle(new Style.Builder().fromJson(styleJson));
-    }
-  }
-
   //
   // Annotations
   //
@@ -1839,7 +1818,7 @@ public final class MapboxMap {
   /**
    * Returns the {@link LocationComponent} that can be used to display user's location on the map.
    * <p>
-   * Use {@link LocationComponent#activateLocationComponent(Context)} or any overload to activate the component,
+   * Use {@link LocationComponent#activateLocationComponent(Context, Style)} or any overload to activate the component,
    * then, enable it with {@link LocationComponent#setLocationComponentEnabled(boolean)}.
    * <p>
    * You can customize the location icon and more with {@link com.mapbox.mapboxsdk.location.LocationComponentOptions}.

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java

@@ -77,9 +77,6 @@ public class MapboxMapOptions implements Parcelable {
   @ColorInt
   private int foregroundLoadColor;
 
-  private String styleUrl;
-  private String styleJson;
-
   private float pixelRatio;
 
   private boolean crossSourceCollisions = true;
@@ -122,8 +119,6 @@ public class MapboxMapOptions implements Parcelable {
     zoomGesturesEnabled = in.readByte() != 0;
     doubleTapGesturesEnabled = in.readByte() != 0;
 
-    styleUrl = in.readString();
-    styleJson = in.readString();
     apiBaseUrl = in.readString();
     textureMode = in.readByte() != 0;
     translucentTextureSurface = in.readByte() != 0;
@@ -149,8 +144,6 @@ public class MapboxMapOptions implements Parcelable {
     TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.mapbox_MapView, 0, 0);
     try {
       mapboxMapOptions.camera(new CameraPosition.Builder(typedArray).build());
-      mapboxMapOptions.styleUrl(typedArray.getString(R.styleable.mapbox_MapView_mapbox_styleUrl));
-      mapboxMapOptions.styleJson(typedArray.getString(R.styleable.mapbox_MapView_mapbox_styleJson));
       mapboxMapOptions.apiBaseUrl(typedArray.getString(R.styleable.mapbox_MapView_mapbox_apiBaseUrl));
 
       mapboxMapOptions.zoomGesturesEnabled(
@@ -266,30 +259,6 @@ public class MapboxMapOptions implements Parcelable {
     return this;
   }
 
-  /**
-   * Specifies the styleUrl url associated with a map view.
-   *
-   * @param styleUrl Url to be used to load a styleUrl
-   * @return This
-   */
-  @NonNull
-  public MapboxMapOptions styleUrl(String styleUrl) {
-    this.styleUrl = styleUrl;
-    return this;
-  }
-
-  /**
-   * Specifies the styleJson associated with a map view.
-   *
-   * @param styleJson json to used as style
-   * @return This
-   */
-  @NonNull
-  public MapboxMapOptions styleJson(String styleJson) {
-    this.styleJson = styleJson;
-    return this;
-  }
-
   /**
    * Specifies the used debug type for a map view.
    *
@@ -776,24 +745,6 @@ public class MapboxMapOptions implements Parcelable {
     return logoMargins;
   }
 
-  /**
-   * Get the current configured styleUrl url for a map view.
-   *
-   * @return Style url to be used.
-   */
-  public String getStyleUrl() {
-    return styleUrl;
-  }
-
-  /**
-   * Get the current configured styleJson for a map view.
-   *
-   * @return Style json to be used.
-   */
-  public String getStyleJson() {
-    return styleJson;
-  }
-
   /**
    * Get the current configured rotate gesture state for a map view.
    *
@@ -972,8 +923,6 @@ public class MapboxMapOptions implements Parcelable {
     dest.writeByte((byte) (zoomGesturesEnabled ? 1 : 0));
     dest.writeByte((byte) (doubleTapGesturesEnabled ? 1 : 0));
 
-    dest.writeString(styleUrl);
-    dest.writeString(styleJson);
     dest.writeString(apiBaseUrl);
     dest.writeByte((byte) (textureMode ? 1 : 0));
     dest.writeByte((byte) (translucentTextureSurface ? 1 : 0));
@@ -1061,13 +1010,6 @@ public class MapboxMapOptions implements Parcelable {
     if (!Arrays.equals(attributionMargins, options.attributionMargins)) {
       return false;
     }
-    if (styleUrl != null ? !styleUrl.equals(options.styleUrl) : options.styleUrl != null) {
-      return false;
-    }
-
-    if (styleJson != null ? !styleJson.equals(options.styleJson) : options.styleJson != null) {
-      return false;
-    }
 
     if (apiBaseUrl != null ? !apiBaseUrl.equals(options.apiBaseUrl) : options.apiBaseUrl != null) {
       return false;
@@ -1122,8 +1064,6 @@ public class MapboxMapOptions implements Parcelable {
     result = 31 * result + (apiBaseUrl != null ? apiBaseUrl.hashCode() : 0);
     result = 31 * result + (textureMode ? 1 : 0);
     result = 31 * result + (translucentTextureSurface ? 1 : 0);
-    result = 31 * result + (styleUrl != null ? styleUrl.hashCode() : 0);
-    result = 31 * result + (styleJson != null ? styleJson.hashCode() : 0);
     result = 31 * result + (prefetchesTiles ? 1 : 0);
     result = 31 * result + (zMediaOverlay ? 1 : 0);
     result = 31 * result + (localIdeographFontFamily != null ? localIdeographFontFamily.hashCode() : 0);