[android] - do not update marker while creating (#6314)

* [android] - do not update marker while creating, add activity to prevent regression

* [core] - add asserts to incorrect usage of update and remove annotations api

* [android] - fix marker tests

1 files changed, 171 insertions, 0 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java
new file mode 100644
index 0000000000..811a87c0ad
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java
@@ -0,0 +1,171 @@
+package com.mapbox.mapboxsdk.testapp.activity.annotation;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.MenuItem;
+
+import com.mapbox.mapboxsdk.annotations.Icon;
+import com.mapbox.mapboxsdk.annotations.IconFactory;
+import com.mapbox.mapboxsdk.annotations.Marker;
+import com.mapbox.mapboxsdk.annotations.MarkerOptions;
+import com.mapbox.mapboxsdk.camera.CameraPosition;
+import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
+import com.mapbox.mapboxsdk.constants.MapboxConstants;
+import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.maps.MapView;
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
+import com.mapbox.mapboxsdk.testapp.R;
+
+public class AddRemoveMarkerActivity extends AppCompatActivity {
+
+    public static final double THRESHOLD = 5.0;
+
+    private MapView mapView;
+    private MapboxMap mapboxMap;
+    private double lastZoom;
+    private boolean isShowingHighThresholdMarker;
+    private boolean isShowingLowThresholdMarker;
+
+    private MarkerOptions lowThresholdMarker;
+    private MarkerOptions highThresholdMarker;
+    private Marker activeMarker;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_remove_marker);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
+
+        final Icon icon1 = IconFactory.getInstance(this).fromResource(R.drawable.ic_arsenal);
+        final Icon icon2 = IconFactory.getInstance(this).fromResource(R.drawable.ic_chelsea);
+
+        lowThresholdMarker = new MarkerOptions()
+                .icon(icon1)
+                .position(new LatLng(-0.1, 0));
+
+        highThresholdMarker = new MarkerOptions()
+                .icon(icon2)
+                .position(new LatLng(0.1, 0));
+
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(new OnMapReadyCallback() {
+            @Override
+            public void onMapReady(MapboxMap mapboxMap) {
+                AddRemoveMarkerActivity.this.mapboxMap = mapboxMap;
+                updateZoom(mapboxMap.getCameraPosition().zoom);
+                mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(4.9f));
+                mapboxMap.setOnCameraChangeListener(new MapboxMap.OnCameraChangeListener() {
+                    @Override
+                    public void onCameraChange(CameraPosition position) {
+                        updateZoom(position.zoom);
+                    }
+                });
+            }
+        });
+    }
+
+    private void updateZoom(double zoom) {
+        if (lastZoom == zoom) {
+            return;
+        }
+
+        lastZoom = zoom;
+        if (zoom > THRESHOLD) {
+            showHighThresholdMarker();
+        } else {
+            showLowThresholdMarker();
+        }
+    }
+
+    private void showLowThresholdMarker() {
+        if (isShowingLowThresholdMarker) {
+            return;
+        }
+
+        isShowingLowThresholdMarker = true;
+        isShowingHighThresholdMarker = false;
+
+        if (activeMarker != null) {
+            Log.d(MapboxConstants.TAG, "Remove marker with " + activeMarker.getId());
+            mapboxMap.removeMarker(activeMarker);
+        } else {
+            Log.e(MapboxConstants.TAG, "active marker is null");
+        }
+
+        activeMarker = mapboxMap.addMarker(lowThresholdMarker);
+        Log.d(MapboxConstants.TAG, "showLowThresholdMarker() " + activeMarker.getId());
+    }
+
+    private void showHighThresholdMarker() {
+        if (isShowingHighThresholdMarker) {
+            return;
+        }
+
+        isShowingLowThresholdMarker = false;
+        isShowingHighThresholdMarker = true;
+
+        if (activeMarker != null) {
+            Log.d(MapboxConstants.TAG, "Remove marker with " + activeMarker.getId());
+            mapboxMap.removeMarker(activeMarker);
+        } else {
+            Log.e(MapboxConstants.TAG, "active marker is null");
+        }
+
+        activeMarker = mapboxMap.addMarker(highThresholdMarker);
+        Log.d(MapboxConstants.TAG, "showHighThresholdMarker() " + activeMarker.getId());
+    }
+
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mapView.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        mapView.onPause();
+        super.onPause();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapView.onLowMemory();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mapView.onDestroy();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
\ No newline at end of file