react-native-maps 1.21.0-alpha.54 → 1.21.0-alpha.56

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -3,13 +3,18 @@ package com.rnmaps.fabric;
 
 import static com.rnmaps.maps.MapManager.MY_LOCATION_PRIORITY;
 
+import android.util.Log;
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
+import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
@@ -17,20 +22,25 @@ import com.facebook.react.viewmanagers.RNMapsMapViewManagerInterface;
 import com.facebook.react.viewmanagers.RNMapsMapViewManagerDelegate;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
+import com.google.android.gms.maps.MapsInitializer;
+import com.google.android.gms.maps.model.CameraPosition;
 import com.rnmaps.maps.MapView;
+import com.rnmaps.maps.SizeReportingShadowNode;
 
 import java.util.Map;
 
 @ReactModule(name = MapViewManager.REACT_CLASS)
 public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsMapViewManagerInterface<MapView> {
 
+    private static boolean rendererInitialized = false;
+    private final RNMapsMapViewManagerDelegate<MapView, MapViewManager> delegate =
+            new RNMapsMapViewManagerDelegate<>(this);
+
 
     public MapViewManager(ReactApplicationContext context) {
         super(context);
     }
-    private GoogleMapOptions options;
-    private final RNMapsMapViewManagerDelegate<MapView, MapViewManager> delegate =
-            new RNMapsMapViewManagerDelegate<>(this);
+
 
     @Override
     public ViewManagerDelegate<MapView> getDelegate() {
@@ -44,7 +54,88 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public MapView createViewInstance(ThemedReactContext context) {
-        return new MapView(context, options);
+        return new MapView(context, new GoogleMapOptions());
+    }
+
+    @Override
+    protected void setupViewRecycling() {
+        // override parent to block recycling / allow reliable GoogleMapsOptions passing
+    }
+
+    @Override
+    protected MapView createViewInstance(int reactTag, @NonNull ThemedReactContext reactContext, @Nullable ReactStylesDiffMap initialProps, @Nullable StateWrapper stateWrapper) {
+        MapView view = null;
+        GoogleMapOptions options = new GoogleMapOptions();
+        if (initialProps != null) {
+            setGoogleRenderer(null, initialProps.getString("googleRenderer"));
+            if (initialProps.hasKey("liteMode")) {
+                options.liteMode(initialProps.getBoolean("liteMode", false));
+            }
+            if (initialProps.hasKey("googleMapId")) {
+                String googleMapId = initialProps.getString("googleMapId");
+                options.mapId(googleMapId);
+            }
+            if (initialProps.getMap("initialCamera") != null) {
+                ReadableMap initialCamera = initialProps.getMap("initialCamera");
+                CameraPosition camera = MapView.cameraPositionFromMap(initialCamera);
+                if (camera != null) {
+                    options.camera(camera);
+                }
+            }
+            if (initialProps.hasKey("mapType")) {
+                if (initialProps.getString("mapType") != null) {
+                    options.mapType(mapTypeFromStrValue(initialProps.getString("mapType")));
+                }
+            }
+            if (initialProps.hasKey("minZoom")) {
+                if (initialProps.getInt("minZoom", 0) != 0) {
+                    options.minZoomPreference(initialProps.getInt("minZoom", 0));
+                }
+            }
+            if (initialProps.hasKey("maxZoom")) {
+                if (initialProps.getInt("maxZoom", 0) != 0) {
+                    options.maxZoomPreference(initialProps.getInt("maxZoom", 0));
+                }
+            }
+            if (initialProps.hasKey("pitchEnabled")) {
+                options.tiltGesturesEnabled(initialProps.getBoolean("pitchEnabled", true));
+            }
+            if (initialProps.hasKey("rotateEnabled")) {
+                options.rotateGesturesEnabled(initialProps.getBoolean("rotateEnabled", true));
+            }
+            if (initialProps.hasKey("scrollDuringRotateOrZoomEnabled")) {
+                options.scrollGesturesEnabledDuringRotateOrZoom(initialProps.getBoolean("scrollDuringRotateOrZoomEnabled", true));
+            }
+            if (initialProps.hasKey("scrollEnabled")) {
+                options.scrollGesturesEnabled(initialProps.getBoolean("scrollEnabled", true));
+            }
+            if (initialProps.hasKey("showsCompass")) {
+                options.compassEnabled(initialProps.getBoolean("showsCompass", true));
+            }
+            if (initialProps.hasKey("toolbarEnabled")) {
+                options.mapToolbarEnabled(initialProps.getBoolean("toolbarEnabled", true));
+            }
+            if (initialProps.hasKey("zoomControlEnabled")) {
+                options.zoomControlsEnabled(initialProps.getBoolean("zoomControlEnabled", true));
+            }
+            if (initialProps.hasKey("zoomEnabled")) {
+                options.zoomGesturesEnabled(initialProps.getBoolean("zoomEnabled", true));
+            }
+        }
+
+        view = new MapView(reactContext, options);
+        view.setId(reactTag);
+        this.addEventEmitters(reactContext, view);
+        if (initialProps != null) {
+            this.updateProperties(view, initialProps);
+        }
+        if (stateWrapper != null) {
+            Object extraData = this.updateState(view, initialProps, stateWrapper);
+            if (extraData != null) {
+                this.updateExtraData(view, extraData);
+            }
+        }
+        return view;
     }
 
 
@@ -56,6 +147,14 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
         return MapView.getExportedCustomBubblingEventTypeConstants();
     }
 
+
+    @Override
+    public LayoutShadowNode createShadowNodeInstance() {
+        // A custom shadow node is needed in order to pass back the width/height of the map to the
+        // view manager so that it can start applying camera moves with bounds.
+        return new SizeReportingShadowNode();
+    }
+
     @Nullable
     @Override
     public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
@@ -89,9 +188,13 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setInitialCamera(MapView view, @Nullable ReadableMap value) {
-        view.setInitialCamera(value);
+        CameraPosition camera = MapView.cameraPositionFromMap(value);
+        if (camera != null) {
+            view.setInitialCameraSet(true);
+        }
     }
 
+
     @Override
     public void setInitialRegion(MapView view, @Nullable ReadableMap value) {
         view.setInitialRegion(value);
@@ -114,11 +217,20 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setGoogleMapId(MapView view, @Nullable String value) {
+        // do nothing (initialProp)
 
     }
 
     @Override
     public void setGoogleRenderer(MapView view, @Nullable String value) {
+        if (!rendererInitialized) {
+            MapsInitializer.Renderer renderer = MapsInitializer.Renderer.LATEST;
+            if ("LEGACY".equals(value)) {
+                renderer = MapsInitializer.Renderer.LEGACY;
+            }
+            MapsInitializer.initialize(getReactApplicationContext(), renderer, r -> Log.d("AirMapRenderer", "Init with renderer: " + r));
+            rendererInitialized = true;
+        }
 
     }
 
@@ -174,18 +286,26 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setMapType(MapView view, @Nullable String value) {
+        view.setMapType(mapTypeFromStrValue(value));
+    }
+
+    private static int mapTypeFromStrValue(String value) {
+        int mapType;
         //hybrid | none | satellite | standard | terrain
         if ("hybrid".equals(value)) {
-            view.setMapType(GoogleMap.MAP_TYPE_HYBRID);
+            mapType = GoogleMap.MAP_TYPE_HYBRID;
         } else if ("none".equals(value)) {
-            view.setMapType(GoogleMap.MAP_TYPE_NONE);
+            mapType = GoogleMap.MAP_TYPE_NONE;
         } else if ("satellite".equals(value)) {
-            view.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
+            mapType = GoogleMap.MAP_TYPE_SATELLITE;
         } else if ("standard".equals(value)) {
-            view.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+            mapType = GoogleMap.MAP_TYPE_NORMAL;
         } else if ("terrain".equals(value)) {
-            view.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
+            mapType = GoogleMap.MAP_TYPE_TERRAIN;
+        } else {
+            mapType = GoogleMap.MAP_TYPE_NORMAL;
         }
+        return mapType;
     }
 
     @Override
@@ -210,7 +330,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setMoveOnMarkerPress(MapView view, boolean value) {
-            view.setMoveOnMarkerPress(value);
+        view.setMoveOnMarkerPress(value);
     }
 
     @Override
@@ -220,7 +340,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setPaddingAdjustmentBehavior(MapView view, @Nullable String value) {
-
+        // not supported
     }
 
     @Override
@@ -250,7 +370,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setShowsBuildings(MapView view, boolean value) {
-
+        view.setShowBuildings(value);
     }
 
     @Override
@@ -295,7 +415,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setUserInterfaceStyle(MapView view, @Nullable String value) {
-        // not supported
+        // todo update google maps SDK and add support for MapColorScheme
     }
 
     @Override
@@ -372,4 +492,10 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
     public void fitToCoordinates(MapView view, String coordinatesJSON, String edgePaddingJSON, boolean animated) {
 
     }
+
+    @Override
+    public void onDropViewInstance(MapView view) {
+        super.onDropViewInstance(view);
+        view.onDestroy();
+    }
 }

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

@@ -43,7 +43,6 @@ import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
-import com.google.android.gms.maps.MapsInitializer;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.Projection;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
@@ -185,7 +184,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
                  GoogleMapOptions googleMapOptions) {
     super(context, googleMapOptions);
     // todo add support for legacy renderer
-    MapsInitializer.initialize(context, MapsInitializer.Renderer.LATEST, renderer -> Log.d("AirMapRenderer", renderer.toString()));
     this.context = context;
     super.onCreate(null);
     super.onResume();
@@ -634,6 +632,10 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     onDestroy();
   }
 
+  public void setInitialCameraSet(boolean initialCameraSet){
+    this.initialCameraSet = initialCameraSet;
+  }
+
   public void setInitialRegion(ReadableMap initialRegion) {
     this.initialRegion = initialRegion;
     // Theoretically onMapReady might be called before setInitialRegion
@@ -669,18 +671,23 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
     this.setPoiClickEnabled(poiClickEnabled);
   }
-
+public static LatLngBounds latLngBoundsFromRegion(ReadableMap region){
+  if (region == null) return null;
+
+  double lng = region.getDouble("longitude");
+  double lat = region.getDouble("latitude");
+  double lngDelta = region.getDouble("longitudeDelta");
+  double latDelta = region.getDouble("latitudeDelta");
+  return  new LatLngBounds(
+          new LatLng(lat - latDelta / 2, lng - lngDelta / 2), // southwest
+          new LatLng(lat + latDelta / 2, lng + lngDelta / 2)  // northeast
+  );
+}
   private void moveToRegion(ReadableMap region) {
-    if (region == null) return;
-
+    LatLngBounds bounds = latLngBoundsFromRegion(region);
+    if (bounds == null) return;
     double lng = region.getDouble("longitude");
     double lat = region.getDouble("latitude");
-    double lngDelta = region.getDouble("longitudeDelta");
-    double 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
-    );
     if (super.getHeight() <= 0 || super.getWidth() <= 0) {
       // in this case, our map has not been laid out yet, so we save the bounds in a local
       // variable, and make a guess of zoomLevel 10. Not to worry, though: as soon as layout
@@ -770,18 +777,24 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
   }
 
   public void setShowsMyLocationButton(boolean showMyLocationButton) {
-    if (hasPermissions() || !showMyLocationButton) {
-      map.getUiSettings().setMyLocationButtonEnabled(showMyLocationButton);
+    if (map != null) {
+      if (hasPermissions() || !showMyLocationButton) {
+        map.getUiSettings().setMyLocationButtonEnabled(showMyLocationButton);
+      }
     }
   }
 
   public void setToolbarEnabled(boolean toolbarEnabled) {
-    if (hasPermissions() || !toolbarEnabled) {
-      map.getUiSettings().setMapToolbarEnabled(toolbarEnabled);
+    if (map != null) {
+      if (hasPermissions() || !toolbarEnabled) {
+        map.getUiSettings().setMapToolbarEnabled(toolbarEnabled);
+      }
     }
   }
   public void setMapType(int mapType){
-    map.setMapType(mapType);
+    if (map != null) {
+      map.setMapType(mapType);
+    }
   }
 
   public void setCacheEnabled(boolean cacheEnabled) {
@@ -791,7 +804,9 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
 
   public void setPoiClickEnabled(boolean poiClickEnabled) {
     this.poiClickEnabled = poiClickEnabled;
-    map.setOnPoiClickListener(poiClickEnabled ? this : null);
+    if (map != null) {
+      map.setOnPoiClickListener(poiClickEnabled ? this : null);
+    }
   }
 
   public void setLoadingEnabled(boolean loadingEnabled) {

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.54",
+  "version": "1.21.0-alpha.56",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",