react-native-maps 2.0.0-beta.1 → 2.0.0-beta.10

package/README.md

@@ -14,7 +14,7 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 
 ## Compatibility
 
-`react-native-maps` requires `react-native >= 0.64.3`.
+`react-native-maps` requires `react-native >= 0.69.0`.
 
 ## Component API
 
@@ -52,9 +52,30 @@ This MapView component is built so that features on the map (such as Markers, Po
 specified as children of the MapView itself. This provides an intuitive and react-like API for
 declaratively controlling features on the map.
 
+### Getting a component reference when using typescript
+
+Most components besides the `MapView` is dynamically exported from `react-native-maps`. This means that typescript isn't able to automatically infer the instance type for the compoenent, which is needed when adding a reference. To fix this, use the `InstanceType` utility type, e.g.:
+
+```tsx
+import React from 'react';
+import MapView, {Marker} from 'react-native-maps';
+
+export default function App() {
+  const markerRef = React.useRef<InstanceType<typeof Marker>>(null);
+  return (
+    <MapView style={{flex: 1}}>
+      <Marker
+        ref={markerRef}
+        coordinate={{latitude: 37.78825, longitude: -122.4324}}
+      />
+    </MapView>
+  );
+}
+```
+
 ### Rendering a Map with an initial region
 
-## MapView
+### MapView
 
 ```jsx
 <MapView
@@ -278,11 +299,7 @@ import MapView, { PROVIDER_GOOGLE } from 'react-native-maps'
 >
 ```
 
-Then add the AirGoogleMaps directory:
-
-https://github.com/react-native-maps/react-native-maps/blob/1e71a21f39e7b88554852951f773c731c94680c9/docs/installation.md#ios
-
-An unofficial step-by-step guide is also available at https://gist.github.com/heron2014/e60fa003e9b117ce80d56bb1d5bfe9e0
+Then update your Podfile and add the Google API key as described in the [installation docs](docs/installation.md#ios).
 
 ### MapView Events
 
@@ -397,7 +414,10 @@ Poi are clickable, you can catch the event to get its information (usually to ge
 The MapView can accept an `AnimatedRegion` value as its `region` prop. This allows you to utilize the Animated API to control the map's center and zoom.
 
 ```jsx
-import MapView, { AnimatedRegion, Animated } from 'react-native-maps';
+import {Animated} from 'react-native'
+import MapView, { AnimatedRegion } from 'react-native-maps';
+
+const AnimatedMapView = Animated.createAnimatedComponent(MapView);
 
 getInitialState() {
   return {
@@ -416,7 +436,7 @@ onRegionChange(region) {
 
 render() {
   return (
-    <Animated
+    <AnimatedMapView
       region={this.state.region}
       onRegionChange={this.onRegionChange}
     />
@@ -429,7 +449,10 @@ render() {
 Markers can also accept an `AnimatedRegion` value as a coordinate.
 
 ```jsx
-import Mapview, { AnimatedRegion, MarkerAnimated } from 'react-native-maps';
+import {Animated} from 'react-native';
+import Mapview, { AnimatedRegion, Marker } from 'react-native-maps';
+
+const AnimatedMarker = Animated.createAnimatedComponent(Marker);
 
 getInitialState() {
   return {
@@ -464,7 +487,7 @@ componentWillReceiveProps(nextProps) {
 render() {
   return (
     <MapView initialRegion={...}>
-      <MarkerAnimated
+      <AnimatedMarker
         ref={marker => { this.marker = marker }}
         coordinate={this.state.coordinate}
       />

package/android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
       mavenCentral()
     }
     dependencies {
-      classpath("com.android.tools.build:gradle:4.2.2")
+      classpath("com.android.tools.build:gradle:7.1.1")
     }
   }
 }
@@ -29,24 +29,55 @@ 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"
+    url("$rootDir/../node_modules/react-native/android")
   }
   maven {
     // Android JSC is installed from npm
-    url "$rootDir/../node_modules/jsc-android/dist"
+    url("$rootDir/../node_modules/jsc-android/dist")
+  }
+  mavenCentral {
+    // We don't want to fetch react-native from Maven Central as there are
+    // older versions over there.
+    content {
+      excludeGroup "com.facebook.react"
+    }
   }
   google()
+  maven { url 'https://www.jitpack.io' }
 }
 
 dependencies {
   implementation 'com.facebook.react:react-native:+'
-  implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.1.0')}"
-  implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.0.2')}"
-  implementation "com.google.android.gms:play-services-location:20.0.0"
-  implementation 'com.google.maps.android:android-maps-utils:3.4.0'
-  implementation "androidx.work:work-runtime:2.7.1"
+  implementation('com.google.android.gms:play-services-base') {
+    version {
+      strictly '[18.0.1, 19.0.0['
+      prefer '18.2.0'
+    }
+  }
+  implementation('com.google.android.gms:play-services-maps') {
+    version {
+      strictly '[18.0.0, 19.0.0['
+      prefer '18.1.0'
+    }
+  }
+  implementation('com.google.android.gms:play-services-location') {
+    version {
+      strictly '[21.0.1, 22.0.0['
+      prefer '21.0.1'
+    }
+  }
+  implementation('com.google.maps.android:android-maps-utils') {
+    version {
+      strictly '[3.0.0, 4.0.0['
+      prefer '3.4.0'
+    }
+  }
+  implementation('androidx.work:work-runtime') {
+    version {
+      strictly '[2.7.1, 3.0.0['
+      prefer '2.7.1'
+    }
+  }
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/java/com/rnmaps/maps/MapCalloutManager.java

@@ -14,7 +14,7 @@ public class MapCalloutManager extends ViewGroupManager<MapCallout> {
 
   @Override
   public String getName() {
-    return "AIRMapCallout";
+    return "RNMMapCallout";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapCircleManager.java

@@ -25,7 +25,7 @@ public class MapCircleManager extends ViewGroupManager<MapCircle> {
 
   @Override
   public String getName() {
-    return "AIRMapCircle";
+    return "RNMMapCircle";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapGradientPolyline.java

@@ -86,7 +86,7 @@ public class MapGradientPolyline extends MapFeature {
   private TileOverlayOptions createTileOverlayOptions() {
     TileOverlayOptions options = new TileOverlayOptions();
     options.zIndex(zIndex);
-    AirMapGradientPolylineProvider tileProvider = new AirMapGradientPolylineProvider(context, points, colors, width);
+    MapGradientPolylineProvider tileProvider = new MapGradientPolylineProvider(context, points, colors, width);
     options.tileProvider(tileProvider);
     return options;
   }
@@ -110,7 +110,7 @@ public class MapGradientPolyline extends MapFeature {
     return Color.rgb(rTotal, gTotal, bTotal);
   }
 
-  public class AirMapGradientPolylineProvider implements TileProvider {
+  public class MapGradientPolylineProvider implements TileProvider {
 
     public static final int BASE_TILE_SIZE = 256;
 
@@ -126,7 +126,7 @@ public class MapGradientPolyline extends MapFeature {
     protected Point[] projectedPts;
     protected Point[] projectedPtMids;
 
-    public AirMapGradientPolylineProvider(Context context, List<LatLng> points, int[] colors,
+    public MapGradientPolylineProvider(Context context, List<LatLng> points, int[] colors,
         float width) {
       super();
 
@@ -239,7 +239,7 @@ public class MapGradientPolyline extends MapFeature {
         float interp2 = ((float)i - 1) / points.size();
         float interp1to2 = (interp1 + interp2) / 2;
 
-        Log.d("AirMapGradientPolyline", String.valueOf(interp1to2));
+        Log.d("MapGradientPolyline", String.valueOf(interp1to2));
 
         // Circle for the corner (removes the weird empty corners that occur otherwise)
         colorPaint.setStyle(Paint.Style.FILL);

package/android/src/main/java/com/rnmaps/maps/MapGradientPolylineManager.java

@@ -28,7 +28,7 @@ public class MapGradientPolylineManager extends ViewGroupManager<MapGradientPoly
 
   @Override
   public String getName() {
-    return "AIRMapGradientPolyline";
+    return "RNMMapGradientPolyline";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapHeatmapManager.java

@@ -15,7 +15,7 @@ public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
 
     @Override
     public String getName() {
-        return "AIRMapHeatmap";
+        return "RNMMapHeatmap";
     }
 
     @Override

package/android/src/main/java/com/rnmaps/maps/MapLiteManager.java

@@ -5,7 +5,7 @@ import com.google.android.gms.maps.GoogleMapOptions;
 
 public class MapLiteManager extends MapManager {
 
-  private static final String REACT_CLASS = "AIRMapLite";
+  private static final String REACT_CLASS = "RNMMapLite";
 
   @Override
   public String getName() {

package/android/src/main/java/com/rnmaps/maps/MapLocalTile.java

@@ -15,14 +15,14 @@ import java.io.InputStream;
 
 public class MapLocalTile extends MapFeature {
 
-    class AIRMapLocalTileProvider implements TileProvider {
+    class MapLocalTileProvider implements TileProvider {
         private static final int BUFFER_SIZE = 16 * 1024;
         private int tileSize;
         private String pathTemplate;
         private final boolean useAssets;
 
 
-        public AIRMapLocalTileProvider(int tileSizet, String pathTemplate, boolean useAssets) {
+        public MapLocalTileProvider(int tileSizet, String pathTemplate, boolean useAssets) {
             this.tileSize = tileSizet;
             this.pathTemplate = pathTemplate;
             this.useAssets = useAssets;
@@ -80,7 +80,7 @@ public class MapLocalTile extends MapFeature {
 
     private TileOverlayOptions tileOverlayOptions;
     private TileOverlay tileOverlay;
-    private MapLocalTile.AIRMapLocalTileProvider tileProvider;
+    private MapLocalTile.MapLocalTileProvider tileProvider;
 
     private String pathTemplate;
     private float tileSize;
@@ -129,7 +129,7 @@ public class MapLocalTile extends MapFeature {
     private TileOverlayOptions createTileOverlayOptions() {
         TileOverlayOptions options = new TileOverlayOptions();
         options.zIndex(zIndex);
-        this.tileProvider = new MapLocalTile.AIRMapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
+        this.tileProvider = new MapLocalTile.MapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
         options.tileProvider(this.tileProvider);
         return options;
     }

package/android/src/main/java/com/rnmaps/maps/MapLocalTileManager.java

@@ -24,7 +24,7 @@ public class MapLocalTileManager extends ViewGroupManager<MapLocalTile> {
 
     @Override
     public String getName() {
-        return "AIRMapLocalTile";
+        return "RNMMapLocalTile";
     }
 
     @Override

package/android/src/main/java/com/rnmaps/maps/MapManager.java

@@ -20,14 +20,12 @@ import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.google.android.gms.location.Priority;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.LatLngBounds;
 
 import java.util.Map;
 
 public class MapManager extends ViewGroupManager<MapView> {
 
-  private static final String REACT_CLASS = "AIRMap";
+  private static final String REACT_CLASS = "RNMMap";
 
   private final Map<String, Integer> MAP_TYPES = MapBuilder.of(
       "standard", GoogleMap.MAP_TYPE_NORMAL,
@@ -276,14 +274,13 @@ public class MapManager extends ViewGroupManager<MapView> {
     }
   }
 
+  @ReactProp(name = "boundary")
+  public void setBoundary(MapView view, ReadableMap boundary) {
+    view.setBoundary(boundary);
+  }
+
   @Override
   public void receiveCommand(@NonNull MapView view, String commandId, @Nullable ReadableArray args) {
-    int duration;
-    double lat;
-    double lng;
-    double lngDelta;
-    double latDelta;
-    ReadableMap region;
     ReadableMap camera;
 
     switch (commandId) {
@@ -295,60 +292,6 @@ public class MapManager extends ViewGroupManager<MapView> {
         view.animateToCamera(camera, 0);
         break;
 
-      case "animateCamera":
-        if(args == null) {
-          break;
-        }
-        camera = args.getMap(0);
-        duration = args.getInt(1);
-        view.animateToCamera(camera, duration);
-        break;
-
-      case "animateToRegion":
-        if(args == null) {
-          break;
-        }
-        region = args.getMap(0);
-        duration = args.getInt(1);
-        lng = region.getDouble("longitude");
-        lat = region.getDouble("latitude");
-        lngDelta = region.getDouble("longitudeDelta");
-        latDelta = region.getDouble("latitudeDelta");
-        LatLngBounds bounds = new LatLngBounds(
-            new LatLng(lat - latDelta / 2, lng - lngDelta / 2), // southwest
-            new LatLng(lat + latDelta / 2, lng + lngDelta / 2)  // northeast
-        );
-        view.animateToRegion(bounds, duration);
-        break;
-
-      case "fitToElements":
-        if(args == null) {
-          break;
-        }
-        view.fitToElements(args.getMap(0), args.getBoolean(1));
-        break;
-
-      case "fitToSuppliedMarkers":
-        if(args == null) {
-          break;
-        }
-        view.fitToSuppliedMarkers(args.getArray(0), args.getMap(1), args.getBoolean(2));
-        break;
-
-      case "fitToCoordinates":
-        if(args == null) {
-          break;
-        }
-        view.fitToCoordinates(args.getArray(0), args.getMap(1), args.getBoolean(2));
-        break;
-
-      case "setMapBoundaries":
-        if(args == null) {
-          break;
-        }
-        view.setMapBoundaries(args.getMap(0), args.getMap(1));
-        break;
-
       case "setIndoorActiveLevelIndex":
         if(args == null) {
           break;

package/android/src/main/java/com/rnmaps/maps/MapMarker.java

@@ -74,7 +74,7 @@ public class MapMarker extends MapFeature {
   private float calloutAnchorY;
   private boolean calloutAnchorIsSet;
 
-  private boolean tracksViewChanges = true;
+  private boolean tracksViewChanges = false;
   private boolean tracksViewChangesActive = false;
 
   private boolean hasCustomMarkerView = false;
@@ -332,7 +332,7 @@ public class MapMarker extends MapFeature {
       }
       if (uri != null) {
         // listening for marker bitmap descriptor update, as well as check whether to load the image.
-        MapMarkerManager.AirMapMarkerSharedIcon sharedIcon = this.markerManager.getSharedIcon(uri);
+        MapMarkerManager.MapMarkerSharedIcon sharedIcon = this.markerManager.getSharedIcon(uri);
         sharedIcon.addMarker(this);
         shouldLoadImage = sharedIcon.shouldLoadImage();
       }

package/android/src/main/java/com/rnmaps/maps/MapMarkerManager.java

@@ -25,20 +25,20 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class MapMarkerManager extends ViewGroupManager<MapMarker> {
 
-  public static class AirMapMarkerSharedIcon {
+  public static class MapMarkerSharedIcon {
     private BitmapDescriptor iconBitmapDescriptor;
     private Bitmap bitmap;
     private final Map<MapMarker, Boolean> markers;
     private boolean loadImageStarted;
 
-    public AirMapMarkerSharedIcon(){
+    public MapMarkerSharedIcon(){
       this.markers = new WeakHashMap<>();
       this.loadImageStarted = false;
     }
 
     /**
      * check whether the load image process started.
-     * caller AirMapMarker will only need to load it when this returns true.
+     * caller MapMarker will only need to load it when this returns true.
      *
      * @return true if it is not started, false otherwise.
      */
@@ -109,7 +109,7 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
     }
   }
 
-  private final Map<String, AirMapMarkerSharedIcon> sharedIcons = new ConcurrentHashMap<>();
+  private final Map<String, MapMarkerSharedIcon> sharedIcons = new ConcurrentHashMap<>();
 
   /**
    * get the shared icon object, if not existed, create a new one and store it.
@@ -117,12 +117,12 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
    * @param uri
    * @return the icon object for the given uri.
    */
-  public AirMapMarkerSharedIcon getSharedIcon(String uri) {
-    AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
+  public MapMarkerSharedIcon getSharedIcon(String uri) {
+    MapMarkerSharedIcon icon = this.sharedIcons.get(uri);
     if (icon == null) {
       synchronized (this) {
         if((icon = this.sharedIcons.get(uri)) == null) {
-          icon = new AirMapMarkerSharedIcon();
+          icon = new MapMarkerSharedIcon();
           this.sharedIcons.put(uri, icon);
         }
       }
@@ -136,7 +136,7 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
    * @param uri
    */
   public void removeSharedIconIfEmpty(String uri) {
-    AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
+    MapMarkerSharedIcon icon = this.sharedIcons.get(uri);
     if (icon == null) {return;}
     if (!icon.hasMarker()) {
       synchronized (this) {
@@ -152,7 +152,7 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
 
   @Override
   public String getName() {
-    return "AIRMapMarker";
+    return "RNMMapMarker";
   }
 
   @Override
@@ -180,20 +180,6 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
     view.setSnippet(description);
   }
 
-  // NOTE(lmr):
-  // android uses normalized coordinate systems for this, and is provided through the
-  // `anchor` property  and `calloutAnchor` instead.  Perhaps some work could be done
-  // to normalize iOS and android to use just one of the systems.
-//    @ReactProp(name = "centerOffset")
-//    public void setCenterOffset(AirMapMarker view, ReadableMap map) {
-//
-//    }
-//
-//    @ReactProp(name = "calloutOffset")
-//    public void setCalloutOffset(AirMapMarker view, ReadableMap map) {
-//
-//    }
-
   @ReactProp(name = "anchor")
   public void setAnchor(MapMarker view, ReadableMap map) {
     // should default to (0.5, 1) (bottom middle)
@@ -214,9 +200,6 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
   public void setImage(MapMarker view, @Nullable String source) {
     view.setImage(source);
   }
-//    public void setImage(AirMapMarker view, ReadableMap image) {
-//        view.setImage(image);
-//    }
 
   @ReactProp(name = "icon")
   public void setIcon(MapMarker view, @Nullable String source) {
@@ -261,7 +244,7 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
     view.setOpacity(opacity);
   }
 
-  @ReactProp(name = "tracksViewChanges", defaultBoolean = true)
+  @ReactProp(name = "tracksViewChanges", defaultBoolean = false)
   public void setTracksViewChanges(MapMarker view, boolean tracksViewChanges) {
     view.setTracksViewChanges(tracksViewChanges);
   }

package/android/src/main/java/com/rnmaps/maps/MapOverlayManager.java

@@ -27,7 +27,7 @@ public class MapOverlayManager extends ViewGroupManager<MapOverlay> {
 
   @Override
   public String getName() {
-    return "AIRMapOverlay";
+    return "RNMMapOverlay";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapPolygonManager.java

@@ -29,7 +29,7 @@ public class MapPolygonManager extends ViewGroupManager<MapPolygon> {
 
   @Override
   public String getName() {
-    return "AIRMapPolygon";
+    return "RNMMapPolygon";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapPolylineManager.java

@@ -33,7 +33,7 @@ public class MapPolylineManager extends ViewGroupManager<MapPolyline> {
 
   @Override
   public String getName() {
-    return "AIRMapPolyline";
+    return "RNMMapPolyline";
   }
 
   @Override

package/android/src/main/java/com/rnmaps/maps/MapTileProvider.java

@@ -43,10 +43,10 @@ import java.net.URLConnection;
 
 public class MapTileProvider implements TileProvider {
 
-	class AIRMapUrlTileProvider extends UrlTileProvider {
+	class MapUrlTileProvider extends UrlTileProvider {
     private String urlTemplate;
 
-    public AIRMapUrlTileProvider(int width, int height, String urlTemplate) {
+    public MapUrlTileProvider(int width, int height, String urlTemplate) {
       super(width, height);
       this.urlTemplate = urlTemplate;
     }
@@ -104,7 +104,7 @@ public class MapTileProvider implements TileProvider {
 	public MapTileProvider(int tileSizet, boolean doubleTileSize, String urlTemplate,
                            int maximumZ, int maximumNativeZ, int minimumZ, boolean flipY, String tileCachePath,
                            int tileCacheMaxAge, boolean offlineMode, Context context, boolean customMode) {
-		this.tileProvider = new AIRMapUrlTileProvider(tileSizet, tileSizet, urlTemplate);
+		this.tileProvider = new MapUrlTileProvider(tileSizet, tileSizet, urlTemplate);
 
 		this.tileSize = tileSizet;
     this.doubleTileSize = doubleTileSize;
@@ -213,7 +213,9 @@ public class MapTileProvider implements TileProvider {
 			} catch (Exception e) {
 			  e.printStackTrace();
 			}
-		} else if (image == null && !this.offlineMode) {
+		}
+
+		if (image == null && !this.offlineMode) {
 			Log.d("urlTile", "Normal fetch");
 			image = fetchTile(x, y, zoom);
 			if (image == null) {
@@ -448,7 +450,7 @@ public class MapTileProvider implements TileProvider {
 
 	public void setTileSize(int tileSize) {
 		if (this.tileSize != tileSize) {
-			this.tileProvider = new AIRMapUrlTileProvider(tileSize, tileSize, urlTemplate);
+			this.tileProvider = new MapUrlTileProvider(tileSize, tileSize, urlTemplate);
 		}
 		this.tileSize = tileSize;
 	}

package/android/src/main/java/com/rnmaps/maps/MapUrlTileManager.java

@@ -21,7 +21,7 @@ public class MapUrlTileManager extends ViewGroupManager<MapUrlTile> {
 
   @Override
   public String getName() {
-    return "AIRMapUrlTile";
+    return "RNMMapUrlTile";
   }
 
   @Override