[android] #5084 - remove addMarkerViews, renamed addMarkerView to addMarker

3 files changed, 5 insertions, 60 deletions

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 09a6d592ef..77cfff184b 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
@@ -691,7 +691,7 @@ public class MapboxMap {
      */
     @UiThread
     @NonNull
-    public MarkerView addMarkerView(@NonNull BaseMarkerViewOptions markerOptions) {
+    public MarkerView addMarker(@NonNull BaseMarkerViewOptions markerOptions) {
         MarkerView marker = prepareViewMarker(markerOptions);
         long id = mMapView.addMarker(marker);
         marker.setMapboxMap(this);
@@ -751,58 +751,6 @@ public class MapboxMap {
 
     /**
      * <p>
-     * Adds multiple markers to this map.
-     * </p>
-     * The marker's icon is rendered on the map at the location {@code Marker.position}.
-     * If {@code Marker.title} is defined, the map shows an info box with the marker's title and snippet.
-     *
-     * @param markerOptionsList A list of marker options objects that defines how to render the markers.
-     * @return A list of the {@code Marker}s that were added to the map.
-     */
-    @UiThread
-    @NonNull
-    public List<Marker> addMarkerViews(@NonNull List<? extends BaseMarkerViewOptions> markerOptionsList) {
-        int count = markerOptionsList.size();
-        List<Marker> markers = new ArrayList<>(count);
-        if (count > 0) {
-            BaseMarkerViewOptions markerOptions;
-            Marker marker;
-            for (int i = 0; i < count; i++) {
-                markerOptions = markerOptionsList.get(i);
-                marker = markerOptions.getMarker();
-                Icon icon = IconFactory.recreate("markerViewSettings", mViewMarkerBitmap);
-                marker.setIcon(icon);
-                markers.add(marker);
-            }
-
-            if (markers.size() > 0) {
-                long[] ids = mMapView.addMarkers(markers);
-
-                // if unittests or markers are correctly added to map
-                if (ids == null || ids.length == markers.size()) {
-                    long id = 0;
-                    Marker m;
-                    for (int i = 0; i < markers.size(); i++) {
-                        m = markers.get(i);
-                        m.setMapboxMap(this);
-                        if (ids != null) {
-                            id = ids[i];
-                        } else {
-                            //unit test
-                            id++;
-                        }
-                        m.setId(id);
-                        mAnnotations.put(id, m);
-                    }
-                }
-            }
-        }
-        mMarkerViewManager.invalidateViewMarkersInBounds();
-        return markers;
-    }
-
-    /**
-     * <p>
      * Updates a marker on this map. Does nothing if the marker is already added.
      * </p>
      *
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
index 5f054f80f6..7a2241a84c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
@@ -147,7 +147,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     }
 
     private void showNativeMarkers(int amount) {
-        List<MarkerViewOptions> markerOptionsList = new ArrayList<>();
         DecimalFormat formatter = new DecimalFormat("#.#####");
         Random random = new Random();
         int randomIndex;
@@ -155,14 +154,12 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
         for (int i = 0; i < amount; i++) {
             randomIndex = random.nextInt(mLocations.size());
             LatLng latLng = mLocations.get(randomIndex);
-            markerOptionsList.add(new MarkerViewOptions()
+            mMapboxMap.addMarker(new MarkerViewOptions()
                     .position(latLng)
                     .title(String.valueOf(i))
                     .snippet(formatter.format(latLng.getLatitude()) + ", " + formatter.format(latLng.getLongitude())));
         }
-
-        mMapboxMap.addMarkerViews(markerOptionsList);
-    }
+     }
 
     private void showGlMarkers(int amount) {
         List<MarkerOptions> markerOptionsList = new ArrayList<>();
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerAdapterActivity.java
index 52e9cc9d1b..2fd21a04ab 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerAdapterActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerAdapterActivity.java
@@ -69,7 +69,7 @@ public class ViewMarkerAdapterActivity extends AppCompatActivity {
 
                 // add text markers
                 for (int i = 0; i < LAT_LNGS.length; i++) {
-                    mMapboxMap.addMarkerView(new MarkerViewOptions()
+                    mMapboxMap.addMarker(new MarkerViewOptions()
                             .position(LAT_LNGS[i])
                             .title(String.valueOf(i))
                             .infoWindowOffset(new Point(0, 86))
@@ -89,7 +89,7 @@ public class ViewMarkerAdapterActivity extends AppCompatActivity {
                 options.infoWindowOffset(new Point(0, 64));
                 options.flat(true);
 
-                mapboxMap.addMarkerView(options);
+                mapboxMap.addMarker(options);
 
                 // default GL marker
                 mMapboxMap.addMarker(new CountryMarkerOptions()