tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* [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
This commit is contained in:
Tobrun
2016-09-20 03:03:49 +02:00
committed by John Firebaugh
parent 37cb2bd756
commit 72e3d6906d
8 changed files with 239 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
View File

@@ -49,6 +49,13 @@ public class Marker extends Annotation {
title = baseMarkerViewOptions.title;
}
Marker(LatLng position, Icon icon, String title, String snippet) {
this.position = position;
this.icon = icon;
this.title = title;
this.snippet = snippet;
}
public LatLng getPosition() {
return position;
}

10
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
View File

@@ -22,14 +22,10 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
*/
public final class MarkerOptions extends BaseMarkerOptions<Marker, MarkerOptions> implements Parcelable {
private Marker marker;
public MarkerOptions() {
marker = new Marker();
}
protected MarkerOptions(Parcel in) {
marker = new Marker();
position((LatLng) in.readParcelable(LatLng.class.getClassLoader()));
snippet(in.readString());
title(in.readString());
@@ -75,11 +71,7 @@ public final class MarkerOptions extends BaseMarkerOptions<Marker, MarkerOptions
throw new InvalidMarkerPositionException();
}
marker.setPosition(position);
marker.setSnippet(snippet);
marker.setTitle(title);
marker.setIcon(icon);
return marker;
return new Marker(position, icon, title, snippet);
}
public LatLng getPosition() {

10
platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
View File

@@ -383,6 +383,16 @@
android:name="@string/category"
android:value="@string/category_navigation" />
</activity>
<activity
android:name=".activity.annotation.AddRemoveMarkerActivity"
android:description="@string/description_add_remove_markers"
android:label="@string/activity_add_remove_markers">
<meta-data
android:name="@string/category"
android:value="@string/category_annotation" />
</activity>
<!-- For Unit tests -->
<activity android:name=".activity.style.RuntimeStyleTestActivity" />
<activity android:name=".activity.style.RuntimeStyleTimingTestActivity" />

171
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddRemoveMarkerActivity.java Normal file
View File

@@ -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);
}
}

19
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_remove_marker.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/primary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
<com.mapbox.mapboxsdk.maps.MapView
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
View File

@@ -19,6 +19,7 @@
<string name="activity_press_for_marker">Press Map For Marker</string>
<string name="activity_view_marker">View Marker API</string>
<string name="activity_view_marker_scale">Scaling in the View Marker API</string>
<string name="activity_add_remove_markers">Add/Remove marker</string>
<!-- InfoWindow-->
<string name="activity_info_window">Standard InfoWindow</string>
@@ -112,6 +113,7 @@
<string name="description_query_rendered_features_box_highlight">Hightligh buildings in box</string>
<string name="description_car_driving">MyLocationView follow map update example</string>
<string name="description_video_view">Android video view on top of the map view</string>
<string name="description_add_remove_markers">Based on zoom level</string>
<string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string>
<string name="menuitem_title_deselect_markers_on_tap">Deselect Markers On Tap</string>

10
platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
View File

@@ -590,10 +590,10 @@ public class MapboxMapTest {
MarkerOptions markerOptions2 = new MarkerOptions().position(new LatLng()).title("b");
markerList.add(markerOptions1);
markerList.add(markerOptions2);
mMapboxMap.addMarkers(markerList);
List<Marker> markers = mMapboxMap.addMarkers(markerList);
assertEquals("Markers size should be 2", 2, mMapboxMap.getMarkers().size());
assertTrue(mMapboxMap.getMarkers().contains(markerOptions1.getMarker()));
assertTrue(mMapboxMap.getMarkers().contains(markerOptions2.getMarker()));
assertTrue(mMapboxMap.getMarkers().contains(markers.get(0)));
assertTrue(mMapboxMap.getMarkers().contains(markers.get(1)));
}
@Test
@@ -608,9 +608,9 @@ public class MapboxMapTest {
List<BaseMarkerOptions> markerList = new ArrayList<>();
MarkerOptions markerOptions = new MarkerOptions().title("a").position(new LatLng());
markerList.add(markerOptions);
mMapboxMap.addMarkers(markerList);
List<Marker> markers = mMapboxMap.addMarkers(markerList);
assertEquals("Markers size should be 1", 1, mMapboxMap.getMarkers().size());
assertTrue(mMapboxMap.getMarkers().contains(markerOptions.getMarker()));
assertTrue(mMapboxMap.getMarkers().contains(markers.get(0)));
}
@Test

28
src/mbgl/annotation/annotation_manager.cpp
View File

@@ -40,7 +40,9 @@ AnnotationManager::~AnnotationManager() = default;
AnnotationID AnnotationManager::addAnnotation(const Annotation& annotation, const uint8_t maxZoom) {
AnnotationID id = nextID++;
updateAnnotation(id, annotation, maxZoom);
Annotation::visit(annotation, [&] (const auto& annotation_) {
this->add(id, annotation_, maxZoom);
});
return id;
}
@@ -57,6 +59,8 @@ void AnnotationManager::removeAnnotation(const AnnotationID& id) {
} else if (shapeAnnotations.find(id) != shapeAnnotations.end()) {
obsoleteShapeAnnotationLayers.insert(shapeAnnotations.at(id)->layerID);
shapeAnnotations.erase(id);
} else {
assert(false); // Should never happen
}
}
@@ -85,13 +89,14 @@ void AnnotationManager::add(const AnnotationID& id, const StyleSourcedAnnotation
}
Update AnnotationManager::update(const AnnotationID& id, const SymbolAnnotation& annotation, const uint8_t maxZoom) {
Update result = Update::Nothing;
auto it = symbolAnnotations.find(id);
if (it == symbolAnnotations.end()) {
removeAndAdd(id, annotation, maxZoom);
return Update::AnnotationData | Update::AnnotationStyle;
assert(false); // Attempt to update a non-existent symbol annotation
return result;
}
Update result = Update::Nothing;
const SymbolAnnotation& existing = it->second->annotation;
if (existing.geometry != annotation.geometry) {
@@ -110,16 +115,31 @@ Update AnnotationManager::update(const AnnotationID& id, const SymbolAnnotation&
}
Update AnnotationManager::update(const AnnotationID& id, const LineAnnotation& annotation, const uint8_t maxZoom) {
auto it = shapeAnnotations.find(id);
if (it == shapeAnnotations.end()) {
assert(false); // Attempt to update a non-existent shape annotation
return Update::Nothing;
}
removeAndAdd(id, annotation, maxZoom);
return Update::AnnotationData | Update::AnnotationStyle;
}
Update AnnotationManager::update(const AnnotationID& id, const FillAnnotation& annotation, const uint8_t maxZoom) {
auto it = shapeAnnotations.find(id);
if (it == shapeAnnotations.end()) {
assert(false); // Attempt to update a non-existent shape annotation
return Update::Nothing;
}
removeAndAdd(id, annotation, maxZoom);
return Update::AnnotationData | Update::AnnotationStyle;
}
Update AnnotationManager::update(const AnnotationID& id, const StyleSourcedAnnotation& annotation, const uint8_t maxZoom) {
auto it = shapeAnnotations.find(id);
if (it == shapeAnnotations.end()) {
assert(false); // Attempt to update a non-existent shape annotation
return Update::Nothing;
}
removeAndAdd(id, annotation, maxZoom);
return Update::AnnotationData | Update::AnnotationStyle;
}