Merge branch 'master' of github.com:mapbox/mapbox-gl-native

This commit is contained in:
Brad Leege
2015-10-01 15:44:48 -05:00
4 changed files with 110 additions and 13 deletions

View File

@@ -1057,6 +1057,19 @@ public class MapView extends FrameLayout implements LocationListener, CompassVie
return marker;
}
public List<Marker> addMarkers(List<Marker> markers){
long[] ids = mNativeMapView.addMarkers(markers);
Marker m;
int count = markers.size();
for (int i = 0; i < count; i++) {
m = markers.get(i);
m.setId(ids[i]);
m.setMapView(this);
mAnnotations.add(m);
}
return markers;
}
public Polyline addPolyline(PolylineOptions polylineOptions) {
Polyline polyline = polylineOptions.getPolyline();
long id = mNativeMapView.addPolyline(polyline);

View File

@@ -333,6 +333,10 @@ class NativeMapView {
return nativeAddMarker(mNativeMapViewPtr, marker);
}
public long[] addMarkers(List<Marker> markers) {
return nativeAddMarkers(mNativeMapViewPtr, markers);
}
public long addPolyline(Polyline polyline) {
return nativeAddPolyline(mNativeMapViewPtr, polyline);
}
@@ -561,6 +565,8 @@ class NativeMapView {
private native long nativeAddMarker(long nativeMapViewPtr, Marker marker);
private native long[] nativeAddMarkers(long nativeMapViewPtr, List<Marker> markers);
private native long nativeAddPolyline(long nativeMapViewPtr, Polyline polyline);
private native long nativeAddPolygon(long mNativeMapViewPtr, Polygon polygon);