react-native-maps 1.12.0 → 1.13.1

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

@@ -1,16 +1,14 @@
 package com.rnmaps.maps;
 
+import static androidx.core.content.PermissionChecker.checkSelfPermission;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.PermissionChecker;
-import androidx.core.view.GestureDetectorCompat;
-import androidx.core.view.MotionEventCompat;
+import android.location.Location;
+import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -18,8 +16,14 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
-import android.location.Location;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.PermissionChecker;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.core.view.MotionEventCompat;
+
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -28,21 +32,22 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
 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;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.GroundOverlay;
+import com.google.android.gms.maps.model.IndoorBuilding;
+import com.google.android.gms.maps.model.IndoorLevel;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.MapStyleOptions;
@@ -52,8 +57,6 @@ import com.google.android.gms.maps.model.PointOfInterest;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.TileOverlay;
-import com.google.android.gms.maps.model.IndoorBuilding;
-import com.google.android.gms.maps.model.IndoorLevel;
 import com.google.maps.android.collections.CircleManager;
 import com.google.maps.android.collections.GroundOverlayManager;
 import com.google.maps.android.collections.MarkerManager;
@@ -75,8 +78,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-import static androidx.core.content.PermissionChecker.checkSelfPermission;
-
 public class MapView extends com.google.android.gms.maps.MapView implements GoogleMap.InfoWindowAdapter,
     GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener {
   public GoogleMap map;
@@ -104,12 +105,10 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private boolean moveOnMarkerPress = true;
   private boolean cacheEnabled = false;
   private ReadableMap initialRegion;
-  private ReadableMap initialCamera;
   private ReadableMap region;
   private ReadableMap camera;
   private String customMapStyleString;
   private boolean initialRegionSet = false;
-  private boolean initialCameraSet = false;
   private LatLngBounds cameraLastIdleBounds;
   private int cameraMoveReason = 0;
   private MapMarker selectedMarker;
@@ -173,9 +172,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
     this.manager = manager;
     this.context = reactContext;
-
+    MapsInitializer.initialize(context, this.manager.renderer, renderer -> Log.d("AirMapRenderer", renderer.toString()));
     super.onCreate(null);
-    // TODO(lmr): what about onStart????
     super.onResume();
     super.getMapAsync(this);
 
@@ -538,23 +536,10 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
   }
 
-  public void setInitialCamera(ReadableMap initialCamera) {
-    this.initialCamera = initialCamera;
-    // Theoretically onMapReady might be called before setInitialCamera
-    // In that case, trigger moveToCamera manually
-    if (!initialCameraSet && map != null) {
-      moveToCamera(initialCamera);
-      initialCameraSet = true;
-    }
-  }
-
   private void applyBridgedProps() {
     if(initialRegion != null) {
       moveToRegion(initialRegion);
       initialRegionSet = true;
-    } else if(initialCamera != null) {
-      moveToCamera(initialCamera);
-      initialCameraSet = true;
     } else if(region != null) {
       moveToRegion(region);
     } else {
@@ -602,24 +587,28 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       moveToCamera(camera);
     }
   }
+public static CameraPosition cameraPositionFromMap(ReadableMap camera){
+  if (camera == null) return null;
 
-  public void moveToCamera(ReadableMap camera) {
-    if (camera == null) return;
-
-    CameraPosition.Builder builder = new CameraPosition.Builder();
+  CameraPosition.Builder builder = new CameraPosition.Builder();
 
-    ReadableMap center = camera.getMap("center");
-    if (center != null) {
-      double lng = center.getDouble("longitude");
-      double lat = center.getDouble("latitude");
-      builder.target(new LatLng(lat, lng));
-    }
+  ReadableMap center = camera.getMap("center");
+  if (center != null) {
+    double lng = center.getDouble("longitude");
+    double lat = center.getDouble("latitude");
+    builder.target(new LatLng(lat, lng));
+  }
 
-    builder.tilt((float)camera.getDouble("pitch"));
-    builder.bearing((float)camera.getDouble("heading"));
-    builder.zoom((float)camera.getDouble("zoom"));
+  builder.tilt((float)camera.getDouble("pitch"));
+  builder.bearing((float)camera.getDouble("heading"));
+  builder.zoom((float)camera.getDouble("zoom"));
 
-    CameraUpdate update = CameraUpdateFactory.newCameraPosition(builder.build());
+  return builder.build();
+}
+  public void moveToCamera(ReadableMap cameraMap) {
+    CameraPosition camera = cameraPositionFromMap(cameraMap);
+    if (camera == null) return;
+    CameraUpdate update = CameraUpdateFactory.newCameraPosition(camera);
 
     if (super.getHeight() <= 0 || super.getWidth() <= 0) {
       // in this case, our map has not been laid out yet, so we save the camera update in a

package/lib/MapView.d.ts

@@ -101,6 +101,14 @@ export type MapViewProps = ViewProps & {
      * google cloud mapId to enable cloud styling and more
      */
     googleMapId?: string;
+    /**
+     * https://developers.google.com/maps/documentation/android-sdk/renderer
+     * google maps renderer
+     * @default `LATEST`
+     * @platform iOS: Not supported
+     * @platform Android: Supported
+     */
+    googleRenderer?: 'LATEST' | 'LEGACY';
     /**
      * Sets loading background color.
      *
@@ -682,5 +690,4 @@ declare class MapView extends React.Component<MapViewProps, State> {
     render(): React.JSX.Element;
 }
 export declare const AnimatedMapView: RNAnimated.AnimatedComponent<typeof MapView>;
-export declare const enableLatestRenderer: () => any;
 export default MapView;

package/lib/MapView.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableLatestRenderer = exports.AnimatedMapView = exports.MAP_TYPES = void 0;
+exports.AnimatedMapView = exports.MAP_TYPES = void 0;
 const React = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const decorateMapComponent_1 = require("./decorateMapComponent");
@@ -308,6 +308,7 @@ class MapView extends React.Component {
                 onMapReady: this._onMapReady,
                 liteMode: this.props.liteMode,
                 googleMapId: this.props.googleMapId,
+                googleRenderer: this.props.googleRenderer,
                 ref: this.map,
                 customMapStyleString: this.props.customMapStyle
                     ? JSON.stringify(this.props.customMapStyle)
@@ -330,6 +331,7 @@ class MapView extends React.Component {
                 region: null,
                 liteMode: this.props.liteMode,
                 googleMapId: this.props.googleMapId,
+                googleRenderer: this.props.googleRenderer,
                 initialRegion: this.props.initialRegion || null,
                 initialCamera: this.props.initialCamera,
                 ref: this.map,
@@ -361,12 +363,5 @@ else {
 }
 const getNativeMapComponent = (provider) => airMaps[provider || 'default'];
 exports.AnimatedMapView = react_native_1.Animated.createAnimatedComponent(MapView);
-const enableLatestRenderer = () => {
-    if (react_native_1.Platform.OS !== 'android') {
-        return;
-    }
-    return react_native_1.NativeModules.AirMapModule.enableLatestRenderer();
-};
-exports.enableLatestRenderer = enableLatestRenderer;
 MapView.Animated = exports.AnimatedMapView;
 exports.default = MapView;

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import MapView, { AnimatedMapView as Animated, MAP_TYPES, enableLatestRenderer, MapViewProps } from './MapView';
+import MapView, { AnimatedMapView as Animated, MAP_TYPES, MapViewProps } from './MapView';
 import Marker from './MapMarker';
 export { MapMarker } from './MapMarker';
 export type { MapMarkerProps } from './MapMarker';
@@ -28,7 +28,7 @@ export { default as Geojson } from './Geojson';
 export type { GeojsonProps } from './Geojson';
 export { Marker, Overlay };
 export type { MapViewProps };
-export { Animated, MAP_TYPES, enableLatestRenderer };
+export { Animated, MAP_TYPES };
 export * from './ProviderConstants';
 export * from './MapView.types';
 export * from './MapPolygon.types';

package/lib/index.js

@@ -29,11 +29,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OverlayAnimated = exports.MarkerAnimated = exports.enableLatestRenderer = exports.MAP_TYPES = exports.Animated = exports.Overlay = exports.Marker = exports.Geojson = exports.AnimatedRegion = exports.MapCalloutSubview = exports.CalloutSubview = exports.MapCallout = exports.Callout = exports.MapLocalTile = exports.LocalTile = exports.MapWMSTile = exports.WMSTile = exports.MapUrlTile = exports.UrlTile = exports.MapCircle = exports.Circle = exports.MapPolygon = exports.Polygon = exports.MapHeatmap = exports.Heatmap = exports.MapPolyline = exports.Polyline = exports.MapOverlay = exports.MapMarker = void 0;
+exports.OverlayAnimated = exports.MarkerAnimated = exports.MAP_TYPES = exports.Animated = exports.Overlay = exports.Marker = exports.Geojson = exports.AnimatedRegion = exports.MapCalloutSubview = exports.CalloutSubview = exports.MapCallout = exports.Callout = exports.MapLocalTile = exports.LocalTile = exports.MapWMSTile = exports.WMSTile = exports.MapUrlTile = exports.UrlTile = exports.MapCircle = exports.Circle = exports.MapPolygon = exports.Polygon = exports.MapHeatmap = exports.Heatmap = exports.MapPolyline = exports.Polyline = exports.MapOverlay = exports.MapMarker = void 0;
 const MapView_1 = __importStar(require("./MapView"));
 Object.defineProperty(exports, "Animated", { enumerable: true, get: function () { return MapView_1.AnimatedMapView; } });
 Object.defineProperty(exports, "MAP_TYPES", { enumerable: true, get: function () { return MapView_1.MAP_TYPES; } });
-Object.defineProperty(exports, "enableLatestRenderer", { enumerable: true, get: function () { return MapView_1.enableLatestRenderer; } });
 const MapMarker_1 = __importDefault(require("./MapMarker"));
 exports.Marker = MapMarker_1.default;
 var MapMarker_2 = require("./MapMarker");

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.12.0",
+  "version": "1.13.1",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",