react-native-maps 1.21.0-alpha.140 → 1.21.0-alpha.141

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

@@ -11,7 +11,6 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
@@ -28,7 +27,7 @@ public class RNMapsOverlayManagerDelegate<T extends View, U extends BaseViewMana
         mViewManager.setBearing(view, value == null ? 0f : ((Double) value).floatValue());
         break;
       case "bounds":
-        mViewManager.setBounds(view, (ReadableArray) value);
+        mViewManager.setBounds(view, (ReadableMap) value);
         break;
       case "image":
         mViewManager.setImage(view, (ReadableMap) value);

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

@@ -11,12 +11,11 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 
 public interface RNMapsOverlayManagerInterface<T extends View> {
   void setBearing(T view, float value);
-  void setBounds(T view, @Nullable ReadableArray value);
+  void setBounds(T view, @Nullable ReadableMap value);
   void setImage(T view, @Nullable ReadableMap value);
   void setOpacity(T view, float value);
   void setTappable(T view, boolean value);

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

@@ -4,7 +4,6 @@ package com.rnmaps.fabric;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -12,6 +11,8 @@ import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsOverlayManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsOverlayManagerInterface;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
 import com.rnmaps.maps.MapOverlay;
 
 import java.util.HashMap;
@@ -70,8 +71,13 @@ public class OverlayManager extends ViewGroupManager<MapOverlay> implements RNMa
     }
 
     @Override
-    public void setBounds(MapOverlay view, @Nullable ReadableArray value) {
-            view.setBounds(value);
+    public void setBounds(MapOverlay view, @Nullable ReadableMap value) {
+        LatLng sw = new LatLng(value.getMap("southWest").getDouble("latitude"),
+                value.getMap("southWest").getDouble("longitude"));
+        LatLng ne = new LatLng(value.getMap("northEast").getDouble("latitude"),
+                value.getMap("northEast").getDouble("longitude"));
+        LatLngBounds bounds =  new LatLngBounds(sw, ne);
+        view.setBounds(bounds);
     }
 
     @Override

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

@@ -68,29 +68,9 @@ public class MapOverlay extends MapFeature {
     }
 
 
-    // seems like apple users north west, south east
-    // google uses north east, south west
-    private static LatLngBounds fixBoundsIfNecessary(ReadableArray bounds) {
-        double lat1 = bounds.getArray(0).getDouble(0);
-        double lon1 = bounds.getArray(0).getDouble(1);
-        double lat2 = bounds.getArray(1).getDouble(0);
-        double lon2 = bounds.getArray(1).getDouble(1);
-
-// Ensure lat1/lon1 is the SW corner and lat2/lon2 is the NE corner
-        double southLat = Math.min(lat1, lat2);
-        double northLat = Math.max(lat1, lat2);
-        double westLon = Math.min(lon1, lon2);
-        double eastLon = Math.max(lon1, lon2);
-
-// Create corrected LatLngs
-        LatLng sw = new LatLng(southLat, westLon);
-        LatLng ne = new LatLng(northLat, eastLon);
-        return new LatLngBounds(sw, ne);
-    }
-
-    public void setBounds(ReadableArray bounds) {
 
-        this.bounds = fixBoundsIfNecessary(bounds);
+    public void setBounds(LatLngBounds bounds) {
+        this.bounds = bounds;
         if (this.groundOverlay != null) {
             this.groundOverlay.setPositionFromBounds(this.bounds);
         }

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

@@ -12,6 +12,8 @@ import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
 
 import java.util.Map;
 
@@ -37,7 +39,27 @@ public class MapOverlayManager extends ViewGroupManager<MapOverlay> {
 
   @ReactProp(name = "bounds")
   public void setBounds(MapOverlay view, ReadableArray bounds) {
-    view.setBounds(bounds);
+    view.setBounds(fixBoundsIfNecessary(bounds));
+  }
+
+  // seems like apple users north west, south east
+  // google uses north east, south west
+  private static LatLngBounds fixBoundsIfNecessary(ReadableArray bounds) {
+    double lat1 = bounds.getArray(0).getDouble(0);
+    double lon1 = bounds.getArray(0).getDouble(1);
+    double lat2 = bounds.getArray(1).getDouble(0);
+    double lon2 = bounds.getArray(1).getDouble(1);
+
+// Ensure lat1/lon1 is the SW corner and lat2/lon2 is the NE corner
+    double southLat = Math.min(lat1, lat2);
+    double northLat = Math.max(lat1, lat2);
+    double westLon = Math.min(lon1, lon2);
+    double eastLon = Math.max(lon1, lon2);
+
+// Create corrected LatLngs
+    LatLng sw = new LatLng(southLat, westLon);
+    LatLng ne = new LatLng(northLat, eastLon);
+    return new LatLngBounds(sw, ne);
   }
 
   @ReactProp(name = "bearing")

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

@@ -1094,12 +1094,12 @@ class RNMapsMarkerProps final : public ViewProps {
   bool useLegacyPinView{false};
 };
 
-struct RNMapsOverlayBoundsStruct {
+struct RNMapsOverlayBoundsNorthEastStruct {
   double latitude{0.0};
   double longitude{0.0};
 };
 
-static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsNorthEastStruct &result) {
   auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto tmp_latitude = map.find("latitude");
@@ -1112,19 +1112,53 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   }
 }
 
-static inline std::string toString(const RNMapsOverlayBoundsStruct &value) {
-  return "[Object RNMapsOverlayBoundsStruct]";
+static inline std::string toString(const RNMapsOverlayBoundsNorthEastStruct &value) {
+  return "[Object RNMapsOverlayBoundsNorthEastStruct]";
 }
 
-static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<RNMapsOverlayBoundsStruct> &result) {
-  auto items = (std::vector<RawValue>)value;
-  for (const auto &item : items) {
-    RNMapsOverlayBoundsStruct newItem;
-    fromRawValue(context, item, newItem);
-    result.emplace_back(newItem);
+struct RNMapsOverlayBoundsSouthWestStruct {
+  double latitude{0.0};
+  double longitude{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsSouthWestStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_latitude = map.find("latitude");
+  if (tmp_latitude != map.end()) {
+    fromRawValue(context, tmp_latitude->second, result.latitude);
+  }
+  auto tmp_longitude = map.find("longitude");
+  if (tmp_longitude != map.end()) {
+    fromRawValue(context, tmp_longitude->second, result.longitude);
+  }
+}
+
+static inline std::string toString(const RNMapsOverlayBoundsSouthWestStruct &value) {
+  return "[Object RNMapsOverlayBoundsSouthWestStruct]";
+}
+
+struct RNMapsOverlayBoundsStruct {
+  RNMapsOverlayBoundsNorthEastStruct northEast{};
+  RNMapsOverlayBoundsSouthWestStruct southWest{};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsOverlayBoundsStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_northEast = map.find("northEast");
+  if (tmp_northEast != map.end()) {
+    fromRawValue(context, tmp_northEast->second, result.northEast);
+  }
+  auto tmp_southWest = map.find("southWest");
+  if (tmp_southWest != map.end()) {
+    fromRawValue(context, tmp_southWest->second, result.southWest);
   }
 }
 
+static inline std::string toString(const RNMapsOverlayBoundsStruct &value) {
+  return "[Object RNMapsOverlayBoundsStruct]";
+}
 class RNMapsOverlayProps final : public ViewProps {
  public:
   RNMapsOverlayProps() = default;
@@ -1133,7 +1167,7 @@ class RNMapsOverlayProps final : public ViewProps {
 #pragma mark - Props
 
   Float bearing{0.0};
-  std::vector<RNMapsOverlayBoundsStruct> bounds{};
+  RNMapsOverlayBoundsStruct bounds{};
   ImageSource image{};
   Float opacity{1.0};
   bool tappable{false};

package/ios/AirMaps/AIRMapOverlay.m

@@ -50,8 +50,8 @@
 - (void)setBoundsRect:(NSArray *)boundsRect {
     _boundsRect = boundsRect;
 
-    _southWest = CLLocationCoordinate2DMake([boundsRect[0][0] doubleValue], [boundsRect[0][1] doubleValue]);
-    _northEast = CLLocationCoordinate2DMake([boundsRect[1][0] doubleValue], [boundsRect[1][1] doubleValue]);
+    _northEast = CLLocationCoordinate2DMake([boundsRect[0][0] doubleValue], [boundsRect[0][1] doubleValue]);
+    _southWest = CLLocationCoordinate2DMake([boundsRect[1][0] doubleValue], [boundsRect[1][1] doubleValue]);
 
     MKMapPoint southWest = MKMapPointForCoordinate(_southWest);
     MKMapPoint northEast = MKMapPointForCoordinate(_northEast);

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.21.0-alpha.140",
+  "version": "1.21.0-alpha.141",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/src/MapOverlay.tsx

@@ -77,6 +77,13 @@ export type MapOverlayProps = ViewProps & {
 
 type NativeProps = Modify<MapOverlayProps, {image?: string}>;
 
+function normalizeBounds(bounds: [number, number][]): any {
+  return {
+    northEast: {latitude: bounds[0][0], longitude: bounds[0][1]},
+    southWest: {latitude: bounds[1][0], longitude: bounds[1][1]},
+  };
+}
+
 export class MapOverlay extends React.Component<MapOverlayProps> {
   // declaration only, as they are set through decorateMap
   /// @ts-ignore
@@ -90,7 +97,7 @@ export class MapOverlay extends React.Component<MapOverlayProps> {
   private fabricOverlay?: Boolean = undefined;
 
   render() {
-    const {opacity = 1.0} = this.props;
+    const {opacity = 1.0, bounds} = this.props;
 
     if (this.fabricOverlay === undefined) {
       this.fabricOverlay = Platform.OS === 'android';
@@ -98,12 +105,27 @@ export class MapOverlay extends React.Component<MapOverlayProps> {
 
     const AIRMapOverlay = this.getNativeComponent();
     let image: any = this.props.image;
-    if (this.props.image && this.fabricOverlay) {
-      image = fixImageProp(this.props.image);
+
+    let boundsParam: any = bounds;
+    if (this.fabricOverlay) {
+      if (this.props.image) {
+        image = fixImageProp(this.props.image);
+      }
+      if (bounds) {
+        boundsParam = normalizeBounds(bounds);
+      }
+    } else {
+      if (this.props.image) {
+        image = fixImageProp(this.props.image);
+        if (image.uri) {
+          image = image.uri;
+        }
+      }
     }
     return (
       <AIRMapOverlay
-        {...this.props}
+        // @ts-ignore
+        bounds={boundsParam}
         opacity={opacity}
         // @ts-ignore
         image={image}

package/src/specs/NativeComponentOverlay.ts

@@ -46,7 +46,16 @@ export interface OverlayFabricNativeProps extends ViewProps {
    * @platform iOS: Supported
    * @platform Android: Supported
    */
-  bounds: ReadonlyArray<LatLng>;
+  bounds: Readonly<{
+    northEast: {
+      latitude: Double; // Non-nullable Double for latitude
+      longitude: Double; // Non-nullable Double for longitude
+    };
+    southWest: {
+      latitude: Double; // Non-nullable Double for latitude
+      longitude: Double; // Non-nullable Double for longitude
+    };
+  }>;
 
   /**
    * A custom image to be used as the overlay.