react-native-maps 0.31.0-beta.6 → 1.0.0-beta.1

package/README.md

@@ -14,11 +14,7 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 
 ## Compatibility
 
-Due to the rapid changes being made in the React Native ecosystem, we are not officially going to
-support this module on anything but the latest version of React Native. With that said, we will do
-our best to stay compatible with older versions as much that is practical, and the peer dependency
-of this requirement is set to `"react-native": "*"` explicitly for this reason. If you are using
-an older version of React Native with this module though, some features may be buggy.
+`react-native-maps` requires `react-native >= 0.64.3`.
 
 ## Component API
 

package/android/build.gradle

@@ -1,9 +1,24 @@
-apply plugin: 'com.android.library'
-
 def safeExtGet(prop, fallback) {
   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+buildscript {
+  // The Android Gradle plugin is only required when opening the android folder stand-alone.
+  // This avoids unnecessary downloads and potential conflicts when the library is included as a
+  // module dependency in an application project.
+  if (project == rootProject) {
+    repositories {
+      google()
+      mavenCentral()
+    }
+    dependencies {
+      classpath("com.android.tools.build:gradle:4.2.2")
+    }
+  }
+}
+
+apply plugin: 'com.android.library'
+
 android {
   compileSdkVersion safeExtGet('compileSdkVersion', 30)
 
@@ -13,6 +28,20 @@ android {
   }
 }
 
+repositories {
+  mavenLocal()
+  mavenCentral()
+  maven {
+    // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+    url "$rootDir/../node_modules/react-native/android"
+  }
+  maven {
+    // Android JSC is installed from npm
+    url "$rootDir/../node_modules/jsc-android/dist"
+  }
+  google()
+}
+
 dependencies {
   def work_version = safeExtGet('targetSdkVersion', 27) < 31 ? "2.5.0" : "2.7.1"
   implementation 'com.facebook.react:react-native:+'

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.airbnb.android.react.maps" >
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 </manifest>

package/android/src/main/java/com/airbnb/android/react/maps/AirMapCalloutManager.java

@@ -1,5 +1,7 @@
 package com.airbnb.android.react.maps;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -8,8 +10,6 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapCalloutManager extends ViewGroupManager<AirMapCallout> {
 
   @Override

package/android/src/main/java/com/airbnb/android/react/maps/AirMapLocalTile.java

@@ -20,11 +20,13 @@ public class AirMapLocalTile extends AirMapFeature {
         private static final int BUFFER_SIZE = 16 * 1024;
         private int tileSize;
         private String pathTemplate;
+        private boolean useAssets;
 
 
-        public AIRMapLocalTileProvider(int tileSizet, String pathTemplate) {
+        public AIRMapLocalTileProvider(int tileSizet, String pathTemplate, boolean useAssets) {
             this.tileSize = tileSizet;
             this.pathTemplate = pathTemplate;
+            this.useAssets = useAssets;
         }
 
         @Override
@@ -44,10 +46,10 @@ public class AirMapLocalTile extends AirMapFeature {
         private byte[] readTileImage(int x, int y, int zoom) {
             InputStream in = null;
             ByteArrayOutputStream buffer = null;
-            File file = new File(getTileFilename(x, y, zoom));
+            String tileFilename = getTileFilename(x, y, zoom);
 
             try {
-                in = new FileInputStream(file);
+                in = useAssets ? getContext().getAssets().open(tileFilename) : new FileInputStream(tileFilename);
                 buffer = new ByteArrayOutputStream();
 
                 int nRead;
@@ -87,6 +89,7 @@ public class AirMapLocalTile extends AirMapFeature {
     private String pathTemplate;
     private float tileSize;
     private float zIndex;
+    private boolean useAssets;
 
     public AirMapLocalTile(Context context) {
         super(context);
@@ -116,6 +119,10 @@ public class AirMapLocalTile extends AirMapFeature {
         }
     }
 
+    public void setUseAssets(boolean useAssets) {
+        this.useAssets = useAssets;
+    }
+
     public TileOverlayOptions getTileOverlayOptions() {
         if (tileOverlayOptions == null) {
             tileOverlayOptions = createTileOverlayOptions();
@@ -126,7 +133,7 @@ public class AirMapLocalTile extends AirMapFeature {
     private TileOverlayOptions createTileOverlayOptions() {
         TileOverlayOptions options = new TileOverlayOptions();
         options.zIndex(zIndex);
-        this.tileProvider = new AirMapLocalTile.AIRMapLocalTileProvider((int)this.tileSize, this.pathTemplate);
+        this.tileProvider = new AirMapLocalTile.AIRMapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
         options.tileProvider(this.tileProvider);
         return options;
     }

package/android/src/main/java/com/airbnb/android/react/maps/AirMapLocalTileManager.java

@@ -53,4 +53,8 @@ public class AirMapLocalTileManager extends ViewGroupManager<AirMapLocalTile> {
         view.setZIndex(zIndex);
     }
 
-}
+    @ReactProp(name = "useAssets", defaultBoolean = false)
+    public void setUseAssets(AirMapLocalTile view, boolean useAssets) {
+        view.setUseAssets(useAssets);
+    }
+}

package/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java

@@ -2,6 +2,8 @@ package com.airbnb.android.react.maps;
 
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -24,8 +26,6 @@ import com.google.android.gms.maps.model.MapStyleOptions;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapManager extends ViewGroupManager<AirMapView> {
 
   private static final String REACT_CLASS = "AIRMap";
@@ -314,17 +314,6 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
         view.animateToCamera(camera, duration);
         break;
 
-      case ANIMATE_TO_NAVIGATION:
-        region = args.getMap(0);
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        LatLng location = new LatLng(lat, lng);
-        bearing = (float)args.getDouble(1);
-        angle = (float)args.getDouble(2);
-        duration = args.getInt(3);
-        view.animateToNavigation(location, bearing, angle, duration);
-        break;
-
       case ANIMATE_TO_REGION:
         region = args.getMap(0);
         duration = args.getInt(1);
@@ -339,26 +328,6 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
         view.animateToRegion(bounds, duration);
         break;
 
-      case ANIMATE_TO_COORDINATE:
-        region = args.getMap(0);
-        duration = args.getInt(1);
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        view.animateToCoordinate(new LatLng(lat, lng), duration);
-        break;
-
-      case ANIMATE_TO_VIEWING_ANGLE:
-        angle = (float)args.getDouble(0);
-        duration = args.getInt(1);
-        view.animateToViewingAngle(angle, duration);
-        break;
-
-      case ANIMATE_TO_BEARING:
-        bearing = (float)args.getDouble(0);
-        duration = args.getInt(1);
-        view.animateToBearing(bearing, duration);
-        break;
-
       case FIT_TO_ELEMENTS:
         view.fitToElements(args.getMap(0), args.getBoolean(1));
         break;
@@ -421,13 +390,9 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
         "setCamera", SET_CAMERA,
         "animateCamera", ANIMATE_CAMERA,
         "animateToRegion", ANIMATE_TO_REGION,
-        "animateToCoordinate", ANIMATE_TO_COORDINATE,
-        "animateToViewingAngle", ANIMATE_TO_VIEWING_ANGLE,
-        "animateToBearing", ANIMATE_TO_BEARING,
         "fitToElements", FIT_TO_ELEMENTS,
         "fitToSuppliedMarkers", FIT_TO_SUPPLIED_MARKERS,
-        "fitToCoordinates", FIT_TO_COORDINATES,
-        "animateToNavigation", ANIMATE_TO_NAVIGATION
+        "fitToCoordinates", FIT_TO_COORDINATES
     );
 
     map.putAll(MapBuilder.of(
@@ -439,7 +404,7 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
   }
 
   public static <K, V> Map<K, V> CreateMap(
-  K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9, K k10, V v10) {
+  K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6) {
     Map map = new HashMap<K, V>();
     map.put(k1, v1);
     map.put(k2, v2);
@@ -447,10 +412,6 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
     map.put(k4, v4);
     map.put(k5, v5);
     map.put(k6, v6);
-    map.put(k7, v7);
-    map.put(k8, v8);
-    map.put(k9, v9);
-    map.put(k10, v10);
     return map;
   }
 

package/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java

@@ -14,6 +14,8 @@ import android.animation.ObjectAnimator;
 import android.util.Property;
 import android.animation.TypeEvaluator;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.drawee.backends.pipeline.Fresco;
@@ -38,8 +40,6 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 
-import javax.annotation.Nullable;
-
 public class AirMapMarker extends AirMapFeature {
 
   private MarkerOptions markerOptions;

package/android/src/main/java/com/airbnb/android/react/maps/AirMapMarkerManager.java

@@ -4,6 +4,8 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
@@ -20,8 +22,6 @@ import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.annotation.Nullable;
-
 public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
 
   private static final int SHOW_INFO_WINDOW = 1;

package/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java

@@ -10,6 +10,7 @@ import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Promise;
@@ -39,8 +40,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import javax.annotation.Nullable;
-
 @ReactModule(name = AirMapModule.NAME)
 public class AirMapModule extends ReactContextBaseJavaModule {
 

package/android/src/main/java/com/airbnb/android/react/maps/AirMapOverlayManager.java

@@ -5,6 +5,8 @@ import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
@@ -14,8 +16,6 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapOverlayManager extends ViewGroupManager<AirMapOverlay> {
   private final DisplayMetrics metrics;
 

package/android/src/main/java/com/airbnb/android/react/maps/AirMapPolygonManager.java

@@ -6,6 +6,8 @@ import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
@@ -15,8 +17,6 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapPolygonManager extends ViewGroupManager<AirMapPolygon> {
   private final DisplayMetrics metrics;
 

package/android/src/main/java/com/airbnb/android/react/maps/AirMapPolylineManager.java

@@ -6,6 +6,8 @@ import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
@@ -19,8 +21,6 @@ import com.google.android.gms.maps.model.SquareCap;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapPolylineManager extends ViewGroupManager<AirMapPolyline> {
   private final DisplayMetrics metrics;
 

package/android/src/main/java/com/airbnb/android/react/maps/AirMapTileProvider.java

@@ -171,10 +171,10 @@ public class AirMapTileProvider implements TileProvider {
 		if (this.tileCachePath != null) {
 			image = readTileImage(x, y, zoom);
 			if (image != null) {
-				Log.d("urlTile: tile cache HIT for ", Integer.toString(zoom) + 
+				Log.d("urlTile", "tile cache HIT for " + Integer.toString(zoom) +
 					"/" + Integer.toString(x) + "/" + Integer.toString(y));
 			} else {
-				Log.d("urlTile: tile cache MISS for ", Integer.toString(zoom) + 
+				Log.d("urlTile", "tile cache MISS for " + Integer.toString(zoom) +
         	"/" + Integer.toString(x) + "/" + Integer.toString(y));
 			}
 			if (image != null && !this.offlineMode) {
@@ -212,10 +212,10 @@ public class AirMapTileProvider implements TileProvider {
 					if (this.tileCachePath != null) {
 						image = readTileImage(x, y, zoom);
 						if (image != null) {
-							Log.d("urlTile: tile cache fetch HIT for ", Integer.toString(zoom) + 
+							Log.d("urlTile","tile cache fetch HIT for " + Integer.toString(zoom) +
 								"/" + Integer.toString(x) + "/" + Integer.toString(y));
 						} else {
-								Log.d("urlTile: tile cache fetch MISS for ", Integer.toString(zoom) + 
+								Log.d("urlTile","tile cache fetch MISS for " + Integer.toString(zoom) +
 									"/" + Integer.toString(x) + "/" + Integer.toString(y));
 						}
 					}
@@ -229,7 +229,7 @@ public class AirMapTileProvider implements TileProvider {
 			Log.d("urlTile", "Normal fetch");
 			image = fetchTile(x, y, zoom);
 			if (image == null) {
-				Log.d("urlTile: tile fetch TIMEOUT / FAIL for ", Integer.toString(zoom) + 
+				Log.d("urlTile", "tile fetch TIMEOUT / FAIL for " + Integer.toString(zoom) +
 					"/" + Integer.toString(x) + "/" + Integer.toString(y));
 			}
 		}

package/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java

@@ -799,43 +799,11 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     }
   }
 
-  public void animateToNavigation(LatLng location, float bearing, float angle, int duration) {
-    if (map == null) return;
-    CameraPosition cameraPosition = new CameraPosition.Builder(map.getCameraPosition())
-        .bearing(bearing)
-        .tilt(angle)
-        .target(location)
-        .build();
-    map.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), duration, null);
-  }
-
   public void animateToRegion(LatLngBounds bounds, int duration) {
     if (map == null) return;
     map.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0), duration, null);
   }
 
-  public void animateToViewingAngle(float angle, int duration) {
-    if (map == null) return;
-
-    CameraPosition cameraPosition = new CameraPosition.Builder(map.getCameraPosition())
-      .tilt(angle)
-      .build();
-    map.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), duration, null);
-  }
-
-  public void animateToBearing(float bearing, int duration) {
-    if (map == null) return;
-    CameraPosition cameraPosition = new CameraPosition.Builder(map.getCameraPosition())
-        .bearing(bearing)
-        .build();
-    map.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), duration, null);
-  }
-
-  public void animateToCoordinate(LatLng coordinate, int duration) {
-    if (map == null) return;
-    map.animateCamera(CameraUpdateFactory.newLatLng(coordinate), duration, null);
-  }
-
   public void fitToElements(ReadableMap edgePadding, boolean animated) {
     if (map == null) return;
 

package/android/src/main/java/com/airbnb/android/react/maps/ImageReader.java

@@ -7,6 +7,8 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.Animatable;
 import android.net.Uri;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.drawee.backends.pipeline.Fresco;
@@ -26,8 +28,6 @@ import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 
-import javax.annotation.Nullable;
-
 public class ImageReader {
 
   private final ImageReadable imp;

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -62,9 +62,10 @@ id regionAsJSON(MKCoordinateRegion region) {
   NSMutableArray<UIView *> *_reactSubviews;
   MKCoordinateRegion _initialRegion;
   MKCoordinateRegion _region;
-  BOOL _initialCameraSetOnLoad;
+  BOOL _initialRegionSet;
+  BOOL _initialCameraSet;
+  BOOL _didPrepareMap;
   BOOL _didCallOnMapReady;
-  BOOL _didMoveToWindow;
   BOOL _zoomTapEnabled;
 }
 
@@ -83,9 +84,10 @@ id regionAsJSON(MKCoordinateRegion region) {
     _cameraProp = nil;
     _initialRegion = MKCoordinateRegionMake(CLLocationCoordinate2DMake(0.0, 0.0), MKCoordinateSpanMake(0.0, 0.0));
     _region = MKCoordinateRegionMake(CLLocationCoordinate2DMake(0.0, 0.0), MKCoordinateSpanMake(0.0, 0.0));
-    _initialCameraSetOnLoad = false;
+    _initialRegionSet = false;
+    _initialCameraSet = false;
+    _didPrepareMap = false;
     _didCallOnMapReady = false;
-    _didMoveToWindow = false;
     _zoomTapEnabled = YES;
 
     // Listen to the myLocation property of GMSMapView.
@@ -245,36 +247,20 @@ id regionAsJSON(MKCoordinateRegion region) {
     ];
 }
 
-- (void)didMoveToWindow {
-  if (_didMoveToWindow) return;
-  _didMoveToWindow = true;
-
-  if (_initialCamera != nil) {
-    self.camera = _initialCamera;
-  }
-  else if (_initialRegion.span.latitudeDelta != 0.0 &&
-      _initialRegion.span.longitudeDelta != 0.0) {
-    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_initialRegion];
-  } else if (_region.span.latitudeDelta != 0.0 &&
-      _region.span.longitudeDelta != 0.0) {
-    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_region];
-  }
-
-  [super didMoveToWindow];
-}
-
 - (void)setInitialRegion:(MKCoordinateRegion)initialRegion {
-  if (_initialCameraSetOnLoad) return;
   _initialRegion = initialRegion;
-  _initialCameraSetOnLoad = _didMoveToWindow;
-  self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:initialRegion];
+  if(!_initialRegionSet && _didPrepareMap){
+    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:initialRegion];
+    _initialRegionSet = true;
+  }
 }
 
 - (void)setInitialCamera:(GMSCameraPosition*)initialCamera {
-    if (_initialCameraSetOnLoad) return;
     _initialCamera = initialCamera;
-    _initialCameraSetOnLoad = _didMoveToWindow;
-    self.camera = initialCamera;
+    if(!_initialCameraSet && _didPrepareMap){
+      self.camera = initialCamera;
+      _initialCameraSet = true;
+    }
 }
 
 - (void)setRegion:(MKCoordinateRegion)region {
@@ -288,14 +274,34 @@ id regionAsJSON(MKCoordinateRegion region) {
     self.camera = camera;
 }
 
+- (void)setOnMapReady:(RCTBubblingEventBlock)onMapReady {
+    _onMapReady = onMapReady;
+    if(!_didCallOnMapReady && _didPrepareMap) {
+      self.onMapReady(@{});
+      _didCallOnMapReady = true;
+    }
+}
 
 - (void)didPrepareMap {
   UIView* mapView = [self valueForKey:@"mapView"]; //GMSVectorMapView
   [self overrideGestureRecognizersForView:mapView];
 
-  if (_didCallOnMapReady) return;
-  _didCallOnMapReady = true;
-  if (self.onMapReady) self.onMapReady(@{});
+  if(!_didPrepareMap && !_initialRegionSet && !_initialCameraSet){
+    if(_initialRegion.span.latitudeDelta != 0.0 && _initialRegion.span.longitudeDelta != 0.0){
+    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_initialRegion];
+    _initialRegionSet = true;
+  } else if(_initialCamera != nil) {
+    self.camera = _initialCamera;
+    _initialCameraSet = true;
+  } else if(_region.span.latitudeDelta != 0.0 && _region.span.longitudeDelta != 0.0) {
+    self.camera = [AIRGoogleMap makeGMSCameraPositionFromMap:self andMKCoordinateRegion:_region];
+  }
+  }
+  if (!_didCallOnMapReady && self.onMapReady) {
+    self.onMapReady(@{});
+    _didCallOnMapReady = true;
+  }
+  _didPrepareMap = true;
 }
 
 - (void)mapViewDidFinishTileRendering {