react-native-google-maps-plus 1.7.0-dev.5 → 1.7.0-dev.7

package/nitrogen/generated/android/c++/JRNRegion.hpp

@@ -11,7 +11,9 @@
 #include "RNRegion.hpp"
 
 #include "JRNLatLng.hpp"
+#include "JRNLatLngBounds.hpp"
 #include "RNLatLng.hpp"
+#include "RNLatLngBounds.hpp"
 
 namespace margelo::nitro::rngooglemapsplus {
 
@@ -32,16 +34,22 @@ namespace margelo::nitro::rngooglemapsplus {
     [[nodiscard]]
     RNRegion toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldCenter = clazz->getField<JRNLatLng>("center");
-      jni::local_ref<JRNLatLng> center = this->getFieldValue(fieldCenter);
-      static const auto fieldLatitudeDelta = clazz->getField<double>("latitudeDelta");
-      double latitudeDelta = this->getFieldValue(fieldLatitudeDelta);
-      static const auto fieldLongitudeDelta = clazz->getField<double>("longitudeDelta");
-      double longitudeDelta = this->getFieldValue(fieldLongitudeDelta);
+      static const auto fieldNearLeft = clazz->getField<JRNLatLng>("nearLeft");
+      jni::local_ref<JRNLatLng> nearLeft = this->getFieldValue(fieldNearLeft);
+      static const auto fieldNearRight = clazz->getField<JRNLatLng>("nearRight");
+      jni::local_ref<JRNLatLng> nearRight = this->getFieldValue(fieldNearRight);
+      static const auto fieldFarLeft = clazz->getField<JRNLatLng>("farLeft");
+      jni::local_ref<JRNLatLng> farLeft = this->getFieldValue(fieldFarLeft);
+      static const auto fieldFarRight = clazz->getField<JRNLatLng>("farRight");
+      jni::local_ref<JRNLatLng> farRight = this->getFieldValue(fieldFarRight);
+      static const auto fieldLatLngBounds = clazz->getField<JRNLatLngBounds>("latLngBounds");
+      jni::local_ref<JRNLatLngBounds> latLngBounds = this->getFieldValue(fieldLatLngBounds);
       return RNRegion(
-        center->toCpp(),
-        latitudeDelta,
-        longitudeDelta
+        nearLeft->toCpp(),
+        nearRight->toCpp(),
+        farLeft->toCpp(),
+        farRight->toCpp(),
+        latLngBounds->toCpp()
       );
     }
 
@@ -51,14 +59,16 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNRegion::javaobject> fromCpp(const RNRegion& value) {
-      using JSignature = JRNRegion(jni::alias_ref<JRNLatLng>, double, double);
+      using JSignature = JRNRegion(jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLngBounds>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
-        JRNLatLng::fromCpp(value.center),
-        value.latitudeDelta,
-        value.longitudeDelta
+        JRNLatLng::fromCpp(value.nearLeft),
+        JRNLatLng::fromCpp(value.nearRight),
+        JRNLatLng::fromCpp(value.farLeft),
+        JRNLatLng::fromCpp(value.farRight),
+        JRNLatLngBounds::fromCpp(value.latLngBounds)
       );
     }
   };

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLatLngBounds.kt

@@ -20,10 +20,10 @@ import com.margelo.nitro.core.*
 data class RNLatLngBounds(
   @DoNotStrip
   @Keep
-  val northEast: RNLatLng,
+  val southwest: RNLatLng,
   @DoNotStrip
   @Keep
-  val southWest: RNLatLng
+  val northeast: RNLatLng
 ) {
   private companion object {
     /**
@@ -33,8 +33,8 @@ data class RNLatLngBounds(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(northEast: RNLatLng, southWest: RNLatLng): RNLatLngBounds {
-      return RNLatLngBounds(northEast, southWest)
+    private fun fromCpp(southwest: RNLatLng, northeast: RNLatLng): RNLatLngBounds {
+      return RNLatLngBounds(southwest, northeast)
     }
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNRegion.kt

@@ -20,13 +20,19 @@ import com.margelo.nitro.core.*
 data class RNRegion(
   @DoNotStrip
   @Keep
-  val center: RNLatLng,
+  val nearLeft: RNLatLng,
   @DoNotStrip
   @Keep
-  val latitudeDelta: Double,
+  val nearRight: RNLatLng,
   @DoNotStrip
   @Keep
-  val longitudeDelta: Double
+  val farLeft: RNLatLng,
+  @DoNotStrip
+  @Keep
+  val farRight: RNLatLng,
+  @DoNotStrip
+  @Keep
+  val latLngBounds: RNLatLngBounds
 ) {
   private companion object {
     /**
@@ -36,8 +42,8 @@ data class RNRegion(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(center: RNLatLng, latitudeDelta: Double, longitudeDelta: Double): RNRegion {
-      return RNRegion(center, latitudeDelta, longitudeDelta)
+    private fun fromCpp(nearLeft: RNLatLng, nearRight: RNLatLng, farLeft: RNLatLng, farRight: RNLatLng, latLngBounds: RNLatLngBounds): RNRegion {
+      return RNRegion(nearLeft, nearRight, farLeft, farRight, latLngBounds)
     }
   }
 }

package/nitrogen/generated/ios/swift/RNLatLngBounds.swift

@@ -18,29 +18,29 @@ public extension RNLatLngBounds {
   /**
    * Create a new instance of `RNLatLngBounds`.
    */
-  init(northEast: RNLatLng, southWest: RNLatLng) {
-    self.init(northEast, southWest)
+  init(southwest: RNLatLng, northeast: RNLatLng) {
+    self.init(southwest, northeast)
   }
 
-  var northEast: RNLatLng {
+  var southwest: RNLatLng {
     @inline(__always)
     get {
-      return self.__northEast
+      return self.__southwest
     }
     @inline(__always)
     set {
-      self.__northEast = newValue
+      self.__southwest = newValue
     }
   }
   
-  var southWest: RNLatLng {
+  var northeast: RNLatLng {
     @inline(__always)
     get {
-      return self.__southWest
+      return self.__northeast
     }
     @inline(__always)
     set {
-      self.__southWest = newValue
+      self.__northeast = newValue
     }
   }
 }

package/nitrogen/generated/ios/swift/RNRegion.swift

@@ -18,40 +18,62 @@ public extension RNRegion {
   /**
    * Create a new instance of `RNRegion`.
    */
-  init(center: RNLatLng, latitudeDelta: Double, longitudeDelta: Double) {
-    self.init(center, latitudeDelta, longitudeDelta)
+  init(nearLeft: RNLatLng, nearRight: RNLatLng, farLeft: RNLatLng, farRight: RNLatLng, latLngBounds: RNLatLngBounds) {
+    self.init(nearLeft, nearRight, farLeft, farRight, latLngBounds)
   }
 
-  var center: RNLatLng {
+  var nearLeft: RNLatLng {
     @inline(__always)
     get {
-      return self.__center
+      return self.__nearLeft
     }
     @inline(__always)
     set {
-      self.__center = newValue
+      self.__nearLeft = newValue
     }
   }
   
-  var latitudeDelta: Double {
+  var nearRight: RNLatLng {
     @inline(__always)
     get {
-      return self.__latitudeDelta
+      return self.__nearRight
     }
     @inline(__always)
     set {
-      self.__latitudeDelta = newValue
+      self.__nearRight = newValue
     }
   }
   
-  var longitudeDelta: Double {
+  var farLeft: RNLatLng {
     @inline(__always)
     get {
-      return self.__longitudeDelta
+      return self.__farLeft
     }
     @inline(__always)
     set {
-      self.__longitudeDelta = newValue
+      self.__farLeft = newValue
+    }
+  }
+  
+  var farRight: RNLatLng {
+    @inline(__always)
+    get {
+      return self.__farRight
+    }
+    @inline(__always)
+    set {
+      self.__farRight = newValue
+    }
+  }
+  
+  var latLngBounds: RNLatLngBounds {
+    @inline(__always)
+    get {
+      return self.__latLngBounds
+    }
+    @inline(__always)
+    set {
+      self.__latLngBounds = newValue
     }
   }
 }

package/nitrogen/generated/shared/c++/RNLatLngBounds.hpp

@@ -35,12 +35,12 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct RNLatLngBounds {
   public:
-    RNLatLng northEast     SWIFT_PRIVATE;
-    RNLatLng southWest     SWIFT_PRIVATE;
+    RNLatLng southwest     SWIFT_PRIVATE;
+    RNLatLng northeast     SWIFT_PRIVATE;
 
   public:
     RNLatLngBounds() = default;
-    explicit RNLatLngBounds(RNLatLng northEast, RNLatLng southWest): northEast(northEast), southWest(southWest) {}
+    explicit RNLatLngBounds(RNLatLng southwest, RNLatLng northeast): southwest(southwest), northeast(northeast) {}
   };
 
 } // namespace margelo::nitro::rngooglemapsplus
@@ -53,14 +53,14 @@ namespace margelo::nitro {
     static inline margelo::nitro::rngooglemapsplus::RNLatLngBounds fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rngooglemapsplus::RNLatLngBounds(
-        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "northEast")),
-        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "southWest"))
+        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "southwest")),
+        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "northeast"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNLatLngBounds& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "northEast", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.northEast));
-      obj.setProperty(runtime, "southWest", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.southWest));
+      obj.setProperty(runtime, "southwest", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.southwest));
+      obj.setProperty(runtime, "northeast", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.northeast));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -71,8 +71,8 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "northEast"))) return false;
-      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "southWest"))) return false;
+      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "southwest"))) return false;
+      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "northeast"))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/RNRegion.hpp

@@ -25,8 +25,11 @@
 
 // Forward declaration of `RNLatLng` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
+// Forward declaration of `RNLatLngBounds` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 
 #include "RNLatLng.hpp"
+#include "RNLatLngBounds.hpp"
 
 namespace margelo::nitro::rngooglemapsplus {
 
@@ -35,13 +38,15 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct RNRegion {
   public:
-    RNLatLng center     SWIFT_PRIVATE;
-    double latitudeDelta     SWIFT_PRIVATE;
-    double longitudeDelta     SWIFT_PRIVATE;
+    RNLatLng nearLeft     SWIFT_PRIVATE;
+    RNLatLng nearRight     SWIFT_PRIVATE;
+    RNLatLng farLeft     SWIFT_PRIVATE;
+    RNLatLng farRight     SWIFT_PRIVATE;
+    RNLatLngBounds latLngBounds     SWIFT_PRIVATE;
 
   public:
     RNRegion() = default;
-    explicit RNRegion(RNLatLng center, double latitudeDelta, double longitudeDelta): center(center), latitudeDelta(latitudeDelta), longitudeDelta(longitudeDelta) {}
+    explicit RNRegion(RNLatLng nearLeft, RNLatLng nearRight, RNLatLng farLeft, RNLatLng farRight, RNLatLngBounds latLngBounds): nearLeft(nearLeft), nearRight(nearRight), farLeft(farLeft), farRight(farRight), latLngBounds(latLngBounds) {}
   };
 
 } // namespace margelo::nitro::rngooglemapsplus
@@ -54,16 +59,20 @@ namespace margelo::nitro {
     static inline margelo::nitro::rngooglemapsplus::RNRegion fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::rngooglemapsplus::RNRegion(
-        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "center")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "latitudeDelta")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "longitudeDelta"))
+        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "nearLeft")),
+        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "nearRight")),
+        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "farLeft")),
+        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "farRight")),
+        JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLngBounds>::fromJSI(runtime, obj.getProperty(runtime, "latLngBounds"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNRegion& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "center", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.center));
-      obj.setProperty(runtime, "latitudeDelta", JSIConverter<double>::toJSI(runtime, arg.latitudeDelta));
-      obj.setProperty(runtime, "longitudeDelta", JSIConverter<double>::toJSI(runtime, arg.longitudeDelta));
+      obj.setProperty(runtime, "nearLeft", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.nearLeft));
+      obj.setProperty(runtime, "nearRight", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.nearRight));
+      obj.setProperty(runtime, "farLeft", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.farLeft));
+      obj.setProperty(runtime, "farRight", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.farRight));
+      obj.setProperty(runtime, "latLngBounds", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLngBounds>::toJSI(runtime, arg.latLngBounds));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -74,9 +83,11 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "center"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "latitudeDelta"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "longitudeDelta"))) return false;
+      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "nearLeft"))) return false;
+      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "nearRight"))) return false;
+      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "farLeft"))) return false;
+      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "farRight"))) return false;
+      if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLngBounds>::canConvert(runtime, obj.getProperty(runtime, "latLngBounds"))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.5",
+  "version": "1.7.0-dev.7",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",

package/src/types.ts

@@ -29,8 +29,8 @@ export type RNLatLng = {
 };
 
 export type RNLatLngBounds = {
-  northEast: RNLatLng;
-  southWest: RNLatLng;
+  southwest: RNLatLng;
+  northeast: RNLatLng;
 };
 
 export type RNSnapshotOptions = {
@@ -135,9 +135,11 @@ export type RNCamera = {
 };
 
 export type RNRegion = {
-  center: RNLatLng;
-  latitudeDelta: number;
-  longitudeDelta: number;
+  nearLeft: RNLatLng;
+  nearRight: RNLatLng;
+  farLeft: RNLatLng;
+  farRight: RNLatLng;
+  latLngBounds: RNLatLngBounds;
 };
 
 export type RNPosition = {

package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBounds.kt

@@ -1,15 +0,0 @@
-package com.rngooglemapsplus.extensions
-
-import com.google.android.gms.maps.model.LatLngBounds
-import com.rngooglemapsplus.RNRegion
-
-fun LatLngBounds.toRnRegion(): RNRegion {
-  val latDelta = northeast.latitude - southwest.latitude
-  val lngDelta = northeast.longitude - southwest.longitude
-
-  return RNRegion(
-    center = center.toRnLatLng(),
-    latitudeDelta = latDelta,
-    longitudeDelta = lngDelta,
-  )
-}