react-native-maps 1.24.9 → 1.24.11

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsCircleManagerDelegate.java

@@ -37,7 +37,7 @@ public class RNMapsCircleManagerDelegate<T extends View, U extends BaseViewManag
         mViewManager.setStrokeColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "strokeWidth":
-        mViewManager.setStrokeWidth(view, value == null ? 0f : ((Double) value).floatValue());
+        mViewManager.setStrokeWidth(view, value == null ? 1f : ((Double) value).floatValue());
         break;
       case "tappable":
         mViewManager.setTappable(view, value == null ? false : (boolean) value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsGooglePolygonManagerDelegate.java

@@ -33,6 +33,9 @@ public class RNMapsGooglePolygonManagerDelegate<T extends View, U extends BaseVi
       case "strokeColor":
         mViewManager.setStrokeColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
+      case "strokeWidth":
+        mViewManager.setStrokeWidth(view, value == null ? 1f : ((Double) value).floatValue());
+        break;
       case "geodesic":
         mViewManager.setGeodesic(view, value == null ? false : (boolean) value);
         break;

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsGooglePolygonManagerInterface.java

@@ -17,6 +17,7 @@ public interface RNMapsGooglePolygonManagerInterface<T extends View> {
   void setCoordinates(T view, @Nullable ReadableArray value);
   void setFillColor(T view, @Nullable Integer value);
   void setStrokeColor(T view, @Nullable Integer value);
+  void setStrokeWidth(T view, float value);
   void setGeodesic(T view, boolean value);
   void setHoles(T view, @Nullable ReadableArray value);
   void setTappable(T view, boolean value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsMarkerManagerDelegate.java

@@ -40,6 +40,9 @@ public class RNMapsMarkerManagerDelegate<T extends View, U extends BaseViewManag
       case "displayPriority":
         mViewManager.setDisplayPriority(view, (String) value);
         break;
+      case "centerOffset":
+        mViewManager.setCenterOffset(view, (ReadableMap) value);
+        break;
       case "coordinate":
         mViewManager.setCoordinate(view, (ReadableMap) value);
         break;

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsMarkerManagerInterface.java

@@ -19,6 +19,7 @@ public interface RNMapsMarkerManagerInterface<T extends View> {
   void setImage(T view, @Nullable ReadableMap value);
   void setCalloutOffset(T view, @Nullable ReadableMap value);
   void setDisplayPriority(T view, @Nullable String value);
+  void setCenterOffset(T view, @Nullable ReadableMap value);
   void setCoordinate(T view, @Nullable ReadableMap value);
   void setDescription(T view, @Nullable String value);
   void setDraggable(T view, boolean value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsPolylineManagerDelegate.java

@@ -46,7 +46,7 @@ public class RNMapsPolylineManagerDelegate<T extends View, U extends BaseViewMan
         mViewManager.setStrokeColors(view, (ReadableArray) value);
         break;
       case "strokeWidth":
-        mViewManager.setStrokeWidth(view, value == null ? 0f : ((Double) value).floatValue());
+        mViewManager.setStrokeWidth(view, value == null ? 1f : ((Double) value).floatValue());
         break;
       case "tappable":
         mViewManager.setTappable(view, value == null ? false : (boolean) value);

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

@@ -158,6 +158,10 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     }
 
+    @Override
+    public void setCenterOffset(MapMarker view, @Nullable ReadableMap value) {
+    }
+
     @Override
     public void setCoordinate(MapMarker view, @Nullable ReadableMap value) {
         view.setCoordinate(value);

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

@@ -2,7 +2,7 @@ package com.rnmaps.fabric;
 
 
 import androidx.annotation.Nullable;
-
+import android.util.DisplayMetrics;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.module.annotations.ReactModule;
@@ -72,6 +72,13 @@ public class PolygonManager extends ViewGroupManager<MapPolygon> implements RNMa
         view.setStrokeColor(value);
     }
 
+    @Override
+    public void setStrokeWidth(MapPolygon view, float value) {
+        DisplayMetrics metrics = view.getContext().getResources().getDisplayMetrics();
+        float widthInScreenPx = metrics.density * value; // done for parity with iOS
+        view.setStrokeWidth(widthInScreenPx);
+    }
+
     @Override
     public void setGeodesic(MapPolygon view, boolean value) {
         view.setGeodesic(value);
@@ -86,4 +93,4 @@ public class PolygonManager extends ViewGroupManager<MapPolygon> implements RNMa
     public void setTappable(MapPolygon view, boolean value) {
             view.setTappable(value);
     }
-}
+}

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

@@ -128,8 +128,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private String customMapStyleString;
     private boolean initialRegionSet = false;
     private boolean initialCameraSet = false;
-    private LatLngBounds cameraLastIdleBounds;
-    private int cameraMoveReason = 0;
+    private int cameraMoveReason = -1;
     private MapMarker selectedMarker;
 
     private LifecycleOwner currentLifecycleOwner;
@@ -601,24 +600,18 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         });
 
         map.setOnCameraMoveListener(() -> {
-            LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
-            cameraLastIdleBounds = null;
             boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
+            LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
             WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, isGesture);
             dispatchEvent(payload, OnRegionChangeEvent::new);
         });
 
         map.setOnCameraIdleListener(() -> {
+            boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
+            cameraMoveReason = -1;
             LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
-            if ((cameraMoveReason != 0) &&
-                    ((cameraLastIdleBounds == null) ||
-                            LatLngBoundsUtils.BoundsAreDifferent(bounds, cameraLastIdleBounds))) {
-
-                cameraLastIdleBounds = bounds;
-                boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
-                WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, isGesture);
-                dispatchEvent(payload, OnRegionChangeCompleteEvent::new);
-            }
+            WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, isGesture);
+            dispatchEvent(payload, OnRegionChangeCompleteEvent::new);
         });
 
         map.setOnMapLoadedCallback(() -> {

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.cpp

@@ -32,7 +32,7 @@ RNMapsCircleProps::RNMapsCircleProps(
     fillColor(convertRawProp(context, rawProps, "fillColor", sourceProps.fillColor, {})),
     radius(convertRawProp(context, rawProps, "radius", sourceProps.radius, {0.0})),
     strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
-    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {0.0})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
       {}
 RNMapsGoogleMapViewProps::RNMapsGoogleMapViewProps(
@@ -83,6 +83,7 @@ RNMapsGooglePolygonProps::RNMapsGooglePolygonProps(
     coordinates(convertRawProp(context, rawProps, "coordinates", sourceProps.coordinates, {})),
     fillColor(convertRawProp(context, rawProps, "fillColor", sourceProps.fillColor, {})),
     strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     geodesic(convertRawProp(context, rawProps, "geodesic", sourceProps.geodesic, {false})),
     holes(convertRawProp(context, rawProps, "holes", sourceProps.holes, {})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
@@ -153,6 +154,7 @@ RNMapsMarkerProps::RNMapsMarkerProps(
     image(convertRawProp(context, rawProps, "image", sourceProps.image, {})),
     calloutOffset(convertRawProp(context, rawProps, "calloutOffset", sourceProps.calloutOffset, {})),
     displayPriority(convertRawProp(context, rawProps, "displayPriority", sourceProps.displayPriority, {RNMapsMarkerDisplayPriority::Required})),
+    centerOffset(convertRawProp(context, rawProps, "centerOffset", sourceProps.centerOffset, {})),
     coordinate(convertRawProp(context, rawProps, "coordinate", sourceProps.coordinate, {})),
     description(convertRawProp(context, rawProps, "description", sourceProps.description, {})),
     draggable(convertRawProp(context, rawProps, "draggable", sourceProps.draggable, {false})),
@@ -189,7 +191,7 @@ RNMapsPolylineProps::RNMapsPolylineProps(
     lineJoin(convertRawProp(context, rawProps, "lineJoin", sourceProps.lineJoin, {RNMapsPolylineLineJoin::Miter})),
     strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
     strokeColors(convertRawProp(context, rawProps, "strokeColors", sourceProps.strokeColors, {})),
-    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {0.0})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
       {}
 RNMapsUrlTileProps::RNMapsUrlTileProps(

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.h

@@ -61,7 +61,7 @@ class RNMapsCircleProps final : public ViewProps {
   SharedColor fillColor{};
   double radius{0.0};
   SharedColor strokeColor{};
-  Float strokeWidth{0.0};
+  Float strokeWidth{1.0};
   bool tappable{false};
 };
 
@@ -478,6 +478,7 @@ class RNMapsGooglePolygonProps final : public ViewProps {
   std::vector<RNMapsGooglePolygonCoordinatesStruct> coordinates{};
   SharedColor fillColor{};
   SharedColor strokeColor{};
+  Float strokeWidth{1.0};
   bool geodesic{false};
   std::vector<std::vector<RNMapsGooglePolygonHolesStruct>> holes{};
   bool tappable{false};
@@ -1048,6 +1049,28 @@ static inline std::string toString(const RNMapsMarkerCalloutOffsetStruct &value)
   return "[Object RNMapsMarkerCalloutOffsetStruct]";
 }
 
+struct RNMapsMarkerCenterOffsetStruct {
+  double x{0.0};
+  double y{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsMarkerCenterOffsetStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_x = map.find("x");
+  if (tmp_x != map.end()) {
+    fromRawValue(context, tmp_x->second, result.x);
+  }
+  auto tmp_y = map.find("y");
+  if (tmp_y != map.end()) {
+    fromRawValue(context, tmp_y->second, result.y);
+  }
+}
+
+static inline std::string toString(const RNMapsMarkerCenterOffsetStruct &value) {
+  return "[Object RNMapsMarkerCenterOffsetStruct]";
+}
+
 struct RNMapsMarkerCoordinateStruct {
   double latitude{0.0};
   double longitude{0.0};
@@ -1081,6 +1104,7 @@ class RNMapsMarkerProps final : public ViewProps {
   ImageSource image{};
   RNMapsMarkerCalloutOffsetStruct calloutOffset{};
   RNMapsMarkerDisplayPriority displayPriority{RNMapsMarkerDisplayPriority::Required};
+  RNMapsMarkerCenterOffsetStruct centerOffset{};
   RNMapsMarkerCoordinateStruct coordinate{};
   std::string description{};
   bool draggable{false};
@@ -1253,7 +1277,7 @@ class RNMapsPolylineProps final : public ViewProps {
   RNMapsPolylineLineJoin lineJoin{RNMapsPolylineLineJoin::Miter};
   SharedColor strokeColor{};
   std::vector<SharedColor> strokeColors{};
-  Float strokeWidth{0.0};
+  Float strokeWidth{1.0};
   bool tappable{false};
 };
 

package/package.json

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