status-im/react-native-mapbox-gl
1
0
Fork 0
mirror of https://github.com/status-im/react-native-mapbox-gl.git synced 2026-08-27 11:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #254 from mapbox/update-3.1.0

Browse Source 
Update to android 3.1.0
This commit is contained in:
Bobby Sudekum
2016-01-20 16:30:27 -08:00
parent 84d179c392 15b6118b27
commit 9db966481a
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/build.gradle
+1 -1
View File
@@ -31,7 +31,7 @@ repositories {
dependencies {
compile 'com.facebook.react:react-native:0.17.+'
compile('com.mapbox.mapboxsdk:mapbox-android-sdk:2.3.0@aar') {
compile('com.mapbox.mapboxsdk:mapbox-android-sdk:3.1.0@aar') {
transitive = true
}
}
android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
+20 -23
View File
@@ -6,7 +6,6 @@ import android.util.Log;
import android.os.StrictMode;
import android.location.Location;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReadableArray;
@@ -15,23 +14,19 @@ import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.ReactProp;
import com.facebook.react.modules.core.DeviceEventManagerModule;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.constants.Style;
import com.facebook.react.bridge.LifecycleEventListener;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
import android.graphics.RectF;
import com.mapbox.mapboxsdk.geometry.CoordinateBounds;
import com.facebook.react.uimanager.SimpleViewManager;
import com.facebook.react.uimanager.ThemedReactContext;
import com.facebook.react.uimanager.events.RCTEventEmitter;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.annotations.PolygonOptions;
import com.mapbox.mapboxsdk.annotations.PolylineOptions;
import com.mapbox.mapboxsdk.constants.MyLocationTracking;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLngZoom;
import com.mapbox.mapboxsdk.views.MapView;
import com.mapbox.mapboxsdk.annotations.Sprite;
import com.mapbox.mapboxsdk.annotations.SpriteFactory;
import android.support.v4.content.ContextCompat;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.annotations.Icon;
import com.mapbox.mapboxsdk.annotations.IconFactory;
import android.graphics.drawable.Drawable;
import android.graphics.BitmapFactory;
import android.graphics.Bitmap;
@@ -39,13 +34,9 @@ import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import android.graphics.drawable.BitmapDrawable;
import javax.annotation.Nullable;
public class ReactNativeMapboxGLManager extends SimpleViewManager<MapView> {
public static final String REACT_CLASS = "RCTMapbox";
@@ -147,8 +138,8 @@ public class ReactNativeMapboxGLManager extends SimpleViewManager<MapView> {
String annotationURL = annotationImage.getString("url");
try {
Drawable image = drawableFromUrl(mapView, annotationURL);
SpriteFactory iconFactory = view.getSpriteFactory();
Sprite icon = iconFactory.fromDrawable(image);
IconFactory iconFactory = view.getIconFactory();
Icon icon = iconFactory.fromDrawable(image);
marker.icon(icon);
} catch (Exception e) {
e.printStackTrace();
@@ -300,7 +291,10 @@ public class ReactNativeMapboxGLManager extends SimpleViewManager<MapView> {
if (center != null) {
double latitude = center.getDouble("latitude");
double longitude = center.getDouble("longitude");
view.setCenterCoordinate(new LatLng(latitude, longitude));
CameraPosition cameraPosition = new CameraPosition.Builder()
.target(new LatLng(latitude, longitude))
.build();
view.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
}else{
Log.w(REACT_CLASS, "No CenterCoordinate provided");
}
@@ -366,8 +360,12 @@ public class ReactNativeMapboxGLManager extends SimpleViewManager<MapView> {
if (center != null) {
double latitude = center.getDouble("latitude");
double longitude = center.getDouble("longitude");
double zoom = center.getDouble("zoom");
view.setCenterCoordinate(new LatLngZoom(latitude, longitude, zoom), true);
float zoom = (float)center.getDouble("zoom");
CameraPosition cameraPosition = new CameraPosition.Builder()
.target(new LatLng(latitude, longitude))
.zoom(zoom)
.build();
view.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
}else{
Log.w(REACT_CLASS, "No CenterCoordinate provided");
}
@@ -391,11 +389,10 @@ public class ReactNativeMapboxGLManager extends SimpleViewManager<MapView> {
public WritableMap getCenterCoordinateZoomLevel(MapView view) {
WritableMap callbackDict = Arguments.createMap();
LatLng center = view.getCenterCoordinate();
double zoom = view.getZoomLevel();
callbackDict.putDouble("latitude", center.getLatitude());
callbackDict.putDouble("longitude", center.getLongitude());
callbackDict.putDouble("zoomLevel", zoom);
CameraPosition center = view.getCameraPosition();
callbackDict.putDouble("latitude", center.target.getLatitude());
callbackDict.putDouble("longitude", center.target.getLongitude());
callbackDict.putDouble("zoomLevel", center.zoom);
return callbackDict;
}