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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +11 -22
  2. package/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt +3 -8
  3. package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBoundsExtension.kt +10 -0
  4. package/android/src/main/java/com/rngooglemapsplus/extensions/RNLatLngBoundsExtension.kt +2 -8
  5. package/android/src/main/java/com/rngooglemapsplus/extensions/VisibleRegionExtension.kt +13 -0
  6. package/ios/GoogleMapViewImpl.swift +14 -26
  7. package/ios/extensions/GMSCoordinateBounds+Extension.swift +4 -13
  8. package/ios/extensions/GMSVisibleRegion+Extension.swift +14 -0
  9. package/ios/extensions/RNLatLngBounds+Extension.swift +4 -4
  10. package/lib/module/types.js.map +1 -1
  11. package/lib/typescript/src/types.d.ts +7 -5
  12. package/lib/typescript/src/types.d.ts.map +1 -1
  13. package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera_bool.hpp +2 -0
  14. package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp +4 -4
  15. package/nitrogen/generated/android/c++/JRNLatLngBounds.hpp +8 -8
  16. package/nitrogen/generated/android/c++/JRNRegion.hpp +23 -13
  17. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLatLngBounds.kt +4 -4
  18. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNRegion.kt +11 -5
  19. package/nitrogen/generated/ios/swift/RNLatLngBounds.swift +8 -8
  20. package/nitrogen/generated/ios/swift/RNRegion.swift +33 -11
  21. package/nitrogen/generated/shared/c++/RNLatLngBounds.hpp +9 -9
  22. package/nitrogen/generated/shared/c++/RNRegion.hpp +24 -13
  23. package/package.json +1 -1
  24. package/src/types.ts +7 -5
  25. package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBounds.kt +0 -15
  26. /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSize.kt → RNSizeExtension.kt} +0 -0
  27. /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSnapshotFormat.kt → RNSnapshotFormatExtension.kt} +0 -0
  28. /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSnapshotResultType.kt → RNSnapshotResultTypeExtension.kt} +0 -0
@@ -96,7 +96,6 @@ class GoogleMapsViewImpl(
96
96
  private val urlTileOverlaysById = mutableMapOf<String, TileOverlay>()
97
97
 
98
98
  private var cameraMoveReason = -1
99
- private var lastSubmittedCameraPosition: CameraPosition? = null
100
99
 
101
100
  init {
102
101
  reactContext.addLifecycleEventListener(this)
@@ -155,48 +154,38 @@ class GoogleMapsViewImpl(
155
154
  }
156
155
 
157
156
  override fun onCameraMoveStarted(reason: Int) {
158
- lastSubmittedCameraPosition = null
159
157
  cameraMoveReason = reason
160
- val bounds = googleMap?.projection?.visibleRegion?.latLngBounds ?: return
158
+ val visibleRegion = googleMap?.projection?.visibleRegion ?: return
161
159
  val cameraPosition = googleMap?.cameraPosition ?: return
162
160
 
163
- val isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason
164
-
165
161
  onCameraChangeStart?.invoke(
166
- bounds.toRnRegion(),
162
+ visibleRegion.toRnRegion(),
167
163
  cameraPosition.toRnCamera(),
168
- isGesture,
164
+ GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason,
169
165
  )
170
166
  }
171
167
 
172
168
  override fun onCameraMove() {
173
- val bounds = googleMap?.projection?.visibleRegion?.latLngBounds ?: return
169
+ val visibleRegion = googleMap?.projection?.visibleRegion ?: return
174
170
  val cameraPosition = googleMap?.cameraPosition ?: return
175
-
176
- if (cameraPosition == lastSubmittedCameraPosition) {
177
- return
178
- }
179
- lastSubmittedCameraPosition = cameraPosition
180
-
181
- val isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
171
+ val gesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
182
172
 
183
173
  onCameraChange?.invoke(
184
- bounds.toRnRegion(),
174
+ visibleRegion.toRnRegion(),
185
175
  cameraPosition.toRnCamera(),
186
- isGesture,
176
+ gesture,
187
177
  )
188
178
  }
189
179
 
190
180
  override fun onCameraIdle() {
191
- val bounds = googleMap?.projection?.visibleRegion?.latLngBounds ?: return
181
+ val visibleRegion = googleMap?.projection?.visibleRegion ?: return
192
182
  val cameraPosition = googleMap?.cameraPosition ?: return
193
-
194
- val isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
183
+ val gesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
195
184
 
196
185
  onCameraChangeComplete?.invoke(
197
- bounds.toRnRegion(),
186
+ visibleRegion.toRnRegion(),
198
187
  cameraPosition.toRnCamera(),
199
- isGesture,
188
+ gesture,
200
189
  )
201
190
  }
202
191
 
@@ -38,7 +38,6 @@ class LocationHandler(
38
38
  private var priority: Int = PRIORITY_DEFAULT
39
39
  private var interval: Long = INTERVAL_DEFAULT
40
40
  private var minUpdateInterval: Long = MIN_UPDATE_INTERVAL
41
- private var lastSubmittedLocation: Location? = null
42
41
  private var isActive = false
43
42
 
44
43
  var onUpdate: ((Location) -> Unit)? = null
@@ -145,9 +144,8 @@ class LocationHandler(
145
144
  fusedLocationClientProviderClient.lastLocation
146
145
  .addOnSuccessListener(
147
146
  OnSuccessListener { location ->
148
- if (location != null && location != lastSubmittedLocation) {
147
+ if (location != null) {
149
148
  onUpdate?.invoke(location)
150
- lastSubmittedLocation = location
151
149
  }
152
150
  },
153
151
  ).addOnFailureListener { e ->
@@ -159,11 +157,8 @@ class LocationHandler(
159
157
  override fun onLocationResult(locationResult: LocationResult) {
160
158
  val location = locationResult.lastLocation
161
159
  if (location != null) {
162
- if (location != lastSubmittedLocation) {
163
- lastSubmittedLocation = location
164
- listener?.onLocationChanged(location)
165
- onUpdate?.invoke(location)
166
- }
160
+ listener?.onLocationChanged(location)
161
+ onUpdate?.invoke(location)
167
162
  } else {
168
163
  onError?.invoke(RNLocationErrorCode.POSITION_UNAVAILABLE)
169
164
  }
@@ -0,0 +1,10 @@
1
+ package com.rngooglemapsplus.extensions
2
+
3
+ import com.google.android.gms.maps.model.LatLngBounds
4
+ import com.rngooglemapsplus.RNLatLngBounds
5
+
6
+ fun LatLngBounds.toRnLatLngBounds(): RNLatLngBounds =
7
+ RNLatLngBounds(
8
+ northeast = northeast.toRnLatLng(),
9
+ southwest = southwest.toRnLatLng(),
10
+ )
@@ -6,12 +6,6 @@ import com.rngooglemapsplus.RNLatLngBounds
6
6
 
7
7
  fun RNLatLngBounds.toLatLngBounds(): LatLngBounds =
8
8
  LatLngBounds(
9
- LatLng(
10
- southWest.latitude,
11
- southWest.longitude,
12
- ),
13
- LatLng(
14
- northEast.latitude,
15
- northEast.longitude,
16
- ),
9
+ southwest.toLatLng(),
10
+ northeast.toLatLng(),
17
11
  )
@@ -0,0 +1,13 @@
1
+ package com.rngooglemapsplus.extensions
2
+
3
+ import com.google.android.gms.maps.model.VisibleRegion
4
+ import com.rngooglemapsplus.RNRegion
5
+
6
+ fun VisibleRegion.toRnRegion(): RNRegion =
7
+ RNRegion(
8
+ nearLeft = nearLeft.toRnLatLng(),
9
+ nearRight = nearRight.toRnLatLng(),
10
+ farLeft = farLeft.toRnLatLng(),
11
+ farRight = farRight.toRnLatLng(),
12
+ latLngBounds = latLngBounds.toRnLatLngBounds(),
13
+ )
@@ -30,7 +30,6 @@ GMSIndoorDisplayDelegate {
30
30
  private var urlTileOverlays: [String: GMSURLTileLayer] = [:]
31
31
 
32
32
  private var cameraMoveReasonIsGesture: Bool = false
33
- private var lastSubmittedCameraPosition: GMSCameraPosition?
34
33
 
35
34
  init(
36
35
  frame: CGRect = .zero,
@@ -710,47 +709,31 @@ GMSIndoorDisplayDelegate {
710
709
  func mapView(_ mapView: GMSMapView, willMove gesture: Bool) {
711
710
  onMain {
712
711
  self.cameraMoveReasonIsGesture = gesture
713
- let visibleRegion = mapView.projection.visibleRegion()
714
- let bounds = GMSCoordinateBounds(region: visibleRegion)
715
712
 
716
- let region = bounds.toRNRegion()
713
+ let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
717
714
  let camera = mapView.camera.toRNCamera()
718
715
 
719
- self.onCameraChangeStart?(region, camera, gesture)
716
+ self.onCameraChangeStart?(visibleRegion, camera, gesture)
720
717
  }
721
718
  }
722
719
 
723
720
  func mapView(_ mapView: GMSMapView, didChange position: GMSCameraPosition) {
724
721
  onMain {
725
- if let last = self.lastSubmittedCameraPosition,
726
- last.target.latitude == position.target.latitude,
727
- last.target.longitude == position.target.longitude,
728
- last.zoom == position.zoom,
729
- last.bearing == position.bearing,
730
- last.viewingAngle == position.viewingAngle {
731
- return
732
- }
733
-
734
- self.lastSubmittedCameraPosition = position
735
- let visibleRegion = mapView.projection.visibleRegion()
736
- let bounds = GMSCoordinateBounds(region: visibleRegion)
737
-
738
- let region = bounds.toRNRegion()
722
+ let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
739
723
  let camera = mapView.camera.toRNCamera()
724
+ let gesture = self.cameraMoveReasonIsGesture
740
725
 
741
- self.onCameraChange?(region, camera, self.cameraMoveReasonIsGesture)
726
+ self.onCameraChange?(visibleRegion, camera, gesture)
742
727
  }
743
728
  }
744
729
 
745
730
  func mapView(_ mapView: GMSMapView, idleAt position: GMSCameraPosition) {
746
731
  onMain {
747
- let visibleRegion = mapView.projection.visibleRegion()
748
- let bounds = GMSCoordinateBounds(region: visibleRegion)
749
-
750
- let region = bounds.toRNRegion()
732
+ let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
751
733
  let camera = mapView.camera.toRNCamera()
734
+ let gesture = self.cameraMoveReasonIsGesture
752
735
 
753
- self.onCameraChangeComplete?(region, camera, self.cameraMoveReasonIsGesture)
736
+ self.onCameraChangeComplete?(visibleRegion, camera, gesture)
754
737
  }
755
738
  }
756
739
 
@@ -776,7 +759,12 @@ GMSIndoorDisplayDelegate {
776
759
  }
777
760
  }
778
761
 
779
- func mapView(_ mapView: GMSMapView, didTapPOIWithPlaceID placeID: String, name: String, location: CLLocationCoordinate2D) {
762
+ func mapView(
763
+ _ mapView: GMSMapView,
764
+ didTapPOIWithPlaceID placeID: String,
765
+ name: String,
766
+ location: CLLocationCoordinate2D
767
+ ) {
780
768
  onMain {
781
769
  self.onPoiPress?(placeID, name, location.toRNLatLng())
782
770
  }
@@ -1,19 +1,10 @@
1
1
  import GoogleMaps
2
2
 
3
3
  extension GMSCoordinateBounds {
4
- func toRNRegion() -> RNRegion {
5
- let center = CLLocationCoordinate2D(
6
- latitude: (northEast.latitude + southWest.latitude) / 2.0,
7
- longitude: (northEast.longitude + southWest.longitude) / 2.0
8
- )
9
-
10
- let latDelta = northEast.latitude - southWest.latitude
11
- let lngDelta = northEast.longitude - southWest.longitude
12
-
13
- return RNRegion(
14
- center: center.toRNLatLng(),
15
- latitudeDelta: latDelta,
16
- longitudeDelta: lngDelta
4
+ func toRNLatLngBounds() -> RNLatLngBounds {
5
+ return RNLatLngBounds(
6
+ southwest: southWest.toRNLatLng(),
7
+ northeast: northEast.toRNLatLng()
17
8
  )
18
9
  }
19
10
  }
@@ -0,0 +1,14 @@
1
+ import GoogleMaps
2
+
3
+ extension GMSVisibleRegion {
4
+ func toRNRegion() -> RNRegion {
5
+ let bounds = GMSCoordinateBounds(region: self)
6
+ return RNRegion(
7
+ nearLeft: nearLeft.toRNLatLng(),
8
+ nearRight: nearRight.toRNLatLng(),
9
+ farLeft: farLeft.toRNLatLng(),
10
+ farRight: farRight.toRNLatLng(),
11
+ latLngBounds: bounds.toRNLatLngBounds()
12
+ )
13
+ }
14
+ }
@@ -4,12 +4,12 @@ extension RNLatLngBounds {
4
4
  func toCoordinateBounds() -> GMSCoordinateBounds {
5
5
  return GMSCoordinateBounds(
6
6
  coordinate: CLLocationCoordinate2D(
7
- latitude: southWest.latitude,
8
- longitude: southWest.longitude
7
+ latitude: southwest.latitude,
8
+ longitude: southwest.longitude
9
9
  ),
10
10
  coordinate: CLLocationCoordinate2D(
11
- latitude: northEast.latitude,
12
- longitude: northEast.longitude
11
+ latitude: northeast.latitude,
12
+ longitude: northeast.longitude
13
13
  )
14
14
  )
15
15
  }
@@ -1 +1 @@
1
- {"version":3,"names":["RNAndroidLocationPriority","RNIOSLocationAccuracy","RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AAgEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AAsKA,WAAYA,yBAAyB,0BAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAA,OAAzBA,yBAAyB;AAAA;AAYrC,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAYjC,WAAYC,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAoCjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}
1
+ {"version":3,"names":["RNAndroidLocationPriority","RNIOSLocationAccuracy","RNAndroidLocationPermissionResult","RNIOSPermissionResult","RNLocationErrorCode","RNMapErrorCode"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;AAgEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;;AAwKA,WAAYA,yBAAyB,0BAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAzBA,yBAAyB,CAAzBA,yBAAyB;EAAA,OAAzBA,yBAAyB;AAAA;AAYrC,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAYjC,WAAYC,iCAAiC,0BAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAjCA,iCAAiC,CAAjCA,iCAAiC;EAAA,OAAjCA,iCAAiC;AAAA;AAM7C,WAAYC,qBAAqB,0BAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAArBA,qBAAqB,CAArBA,qBAAqB;EAAA,OAArBA,qBAAqB;AAAA;AAoCjC,WAAYC,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAnBA,mBAAmB,CAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAS/B,WAAYC,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA","ignoreList":[]}
@@ -24,8 +24,8 @@ export type RNLatLng = {
24
24
  longitude: number;
25
25
  };
26
26
  export type RNLatLngBounds = {
27
- northEast: RNLatLng;
28
- southWest: RNLatLng;
27
+ southwest: RNLatLng;
28
+ northeast: RNLatLng;
29
29
  };
30
30
  export type RNSnapshotOptions = {
31
31
  size?: RNSize;
@@ -71,9 +71,11 @@ export type RNCamera = {
71
71
  tilt?: number;
72
72
  };
73
73
  export type RNRegion = {
74
- center: RNLatLng;
75
- latitudeDelta: number;
76
- longitudeDelta: number;
74
+ nearLeft: RNLatLng;
75
+ nearRight: RNLatLng;
76
+ farLeft: RNLatLng;
77
+ farRight: RNLatLng;
78
+ latLngBounds: RNLatLngBounds;
77
79
  };
78
80
  export type RNPosition = {
79
81
  x: number;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}
@@ -16,6 +16,8 @@
16
16
  #include "JRNRegion.hpp"
17
17
  #include "RNLatLng.hpp"
18
18
  #include "JRNLatLng.hpp"
19
+ #include "RNLatLngBounds.hpp"
20
+ #include "JRNLatLngBounds.hpp"
19
21
  #include "JRNCamera.hpp"
20
22
  #include <optional>
21
23
 
@@ -77,14 +77,14 @@ namespace margelo::nitro::rngooglemapsplus { struct RNIndoorBuilding; }
77
77
  namespace margelo::nitro::rngooglemapsplus { struct RNIndoorLevel; }
78
78
  // Forward declaration of `RNRegion` to properly resolve imports.
79
79
  namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
80
+ // Forward declaration of `RNLatLngBounds` to properly resolve imports.
81
+ namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
80
82
  // Forward declaration of `RNLocationPermissionResult` to properly resolve imports.
81
83
  namespace margelo::nitro::rngooglemapsplus { struct RNLocationPermissionResult; }
82
84
  // Forward declaration of `RNAndroidLocationPermissionResult` to properly resolve imports.
83
85
  namespace margelo::nitro::rngooglemapsplus { enum class RNAndroidLocationPermissionResult; }
84
86
  // Forward declaration of `RNIOSPermissionResult` to properly resolve imports.
85
87
  namespace margelo::nitro::rngooglemapsplus { enum class RNIOSPermissionResult; }
86
- // Forward declaration of `RNLatLngBounds` to properly resolve imports.
87
- namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
88
88
  // Forward declaration of `RNSnapshotOptions` to properly resolve imports.
89
89
  namespace margelo::nitro::rngooglemapsplus { struct RNSnapshotOptions; }
90
90
  // Forward declaration of `RNSize` to properly resolve imports.
@@ -179,6 +179,8 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
179
179
  #include "RNRegion.hpp"
180
180
  #include "JFunc_void_RNRegion_RNCamera_bool.hpp"
181
181
  #include "JRNRegion.hpp"
182
+ #include "RNLatLngBounds.hpp"
183
+ #include "JRNLatLngBounds.hpp"
182
184
  #include <NitroModules/Promise.hpp>
183
185
  #include <NitroModules/JPromise.hpp>
184
186
  #include "RNLocationPermissionResult.hpp"
@@ -187,8 +189,6 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
187
189
  #include "JRNAndroidLocationPermissionResult.hpp"
188
190
  #include "RNIOSPermissionResult.hpp"
189
191
  #include "JRNIOSPermissionResult.hpp"
190
- #include "RNLatLngBounds.hpp"
191
- #include "JRNLatLngBounds.hpp"
192
192
  #include "RNSnapshotOptions.hpp"
193
193
  #include "JRNSnapshotOptions.hpp"
194
194
  #include "RNSize.hpp"
@@ -32,13 +32,13 @@ namespace margelo::nitro::rngooglemapsplus {
32
32
  [[nodiscard]]
33
33
  RNLatLngBounds toCpp() const {
34
34
  static const auto clazz = javaClassStatic();
35
- static const auto fieldNorthEast = clazz->getField<JRNLatLng>("northEast");
36
- jni::local_ref<JRNLatLng> northEast = this->getFieldValue(fieldNorthEast);
37
- static const auto fieldSouthWest = clazz->getField<JRNLatLng>("southWest");
38
- jni::local_ref<JRNLatLng> southWest = this->getFieldValue(fieldSouthWest);
35
+ static const auto fieldSouthwest = clazz->getField<JRNLatLng>("southwest");
36
+ jni::local_ref<JRNLatLng> southwest = this->getFieldValue(fieldSouthwest);
37
+ static const auto fieldNortheast = clazz->getField<JRNLatLng>("northeast");
38
+ jni::local_ref<JRNLatLng> northeast = this->getFieldValue(fieldNortheast);
39
39
  return RNLatLngBounds(
40
- northEast->toCpp(),
41
- southWest->toCpp()
40
+ southwest->toCpp(),
41
+ northeast->toCpp()
42
42
  );
43
43
  }
44
44
 
@@ -53,8 +53,8 @@ namespace margelo::nitro::rngooglemapsplus {
53
53
  static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
54
54
  return create(
55
55
  clazz,
56
- JRNLatLng::fromCpp(value.northEast),
57
- JRNLatLng::fromCpp(value.southWest)
56
+ JRNLatLng::fromCpp(value.southwest),
57
+ JRNLatLng::fromCpp(value.northeast)
58
58
  );
59
59
  }
60
60
  };
@@ -11,7 +11,9 @@
11
11
  #include "RNRegion.hpp"
12
12
 
13
13
  #include "JRNLatLng.hpp"
14
+ #include "JRNLatLngBounds.hpp"
14
15
  #include "RNLatLng.hpp"
16
+ #include "RNLatLngBounds.hpp"
15
17
 
16
18
  namespace margelo::nitro::rngooglemapsplus {
17
19
 
@@ -32,16 +34,22 @@ namespace margelo::nitro::rngooglemapsplus {
32
34
  [[nodiscard]]
33
35
  RNRegion toCpp() const {
34
36
  static const auto clazz = javaClassStatic();
35
- static const auto fieldCenter = clazz->getField<JRNLatLng>("center");
36
- jni::local_ref<JRNLatLng> center = this->getFieldValue(fieldCenter);
37
- static const auto fieldLatitudeDelta = clazz->getField<double>("latitudeDelta");
38
- double latitudeDelta = this->getFieldValue(fieldLatitudeDelta);
39
- static const auto fieldLongitudeDelta = clazz->getField<double>("longitudeDelta");
40
- double longitudeDelta = this->getFieldValue(fieldLongitudeDelta);
37
+ static const auto fieldNearLeft = clazz->getField<JRNLatLng>("nearLeft");
38
+ jni::local_ref<JRNLatLng> nearLeft = this->getFieldValue(fieldNearLeft);
39
+ static const auto fieldNearRight = clazz->getField<JRNLatLng>("nearRight");
40
+ jni::local_ref<JRNLatLng> nearRight = this->getFieldValue(fieldNearRight);
41
+ static const auto fieldFarLeft = clazz->getField<JRNLatLng>("farLeft");
42
+ jni::local_ref<JRNLatLng> farLeft = this->getFieldValue(fieldFarLeft);
43
+ static const auto fieldFarRight = clazz->getField<JRNLatLng>("farRight");
44
+ jni::local_ref<JRNLatLng> farRight = this->getFieldValue(fieldFarRight);
45
+ static const auto fieldLatLngBounds = clazz->getField<JRNLatLngBounds>("latLngBounds");
46
+ jni::local_ref<JRNLatLngBounds> latLngBounds = this->getFieldValue(fieldLatLngBounds);
41
47
  return RNRegion(
42
- center->toCpp(),
43
- latitudeDelta,
44
- longitudeDelta
48
+ nearLeft->toCpp(),
49
+ nearRight->toCpp(),
50
+ farLeft->toCpp(),
51
+ farRight->toCpp(),
52
+ latLngBounds->toCpp()
45
53
  );
46
54
  }
47
55
 
@@ -51,14 +59,16 @@ namespace margelo::nitro::rngooglemapsplus {
51
59
  */
52
60
  [[maybe_unused]]
53
61
  static jni::local_ref<JRNRegion::javaobject> fromCpp(const RNRegion& value) {
54
- using JSignature = JRNRegion(jni::alias_ref<JRNLatLng>, double, double);
62
+ using JSignature = JRNRegion(jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLngBounds>);
55
63
  static const auto clazz = javaClassStatic();
56
64
  static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
57
65
  return create(
58
66
  clazz,
59
- JRNLatLng::fromCpp(value.center),
60
- value.latitudeDelta,
61
- value.longitudeDelta
67
+ JRNLatLng::fromCpp(value.nearLeft),
68
+ JRNLatLng::fromCpp(value.nearRight),
69
+ JRNLatLng::fromCpp(value.farLeft),
70
+ JRNLatLng::fromCpp(value.farRight),
71
+ JRNLatLngBounds::fromCpp(value.latLngBounds)
62
72
  );
63
73
  }
64
74
  };
@@ -20,10 +20,10 @@ import com.margelo.nitro.core.*
20
20
  data class RNLatLngBounds(
21
21
  @DoNotStrip
22
22
  @Keep
23
- val northEast: RNLatLng,
23
+ val southwest: RNLatLng,
24
24
  @DoNotStrip
25
25
  @Keep
26
- val southWest: RNLatLng
26
+ val northeast: RNLatLng
27
27
  ) {
28
28
  private companion object {
29
29
  /**
@@ -33,8 +33,8 @@ data class RNLatLngBounds(
33
33
  @Keep
34
34
  @Suppress("unused")
35
35
  @JvmStatic
36
- private fun fromCpp(northEast: RNLatLng, southWest: RNLatLng): RNLatLngBounds {
37
- return RNLatLngBounds(northEast, southWest)
36
+ private fun fromCpp(southwest: RNLatLng, northeast: RNLatLng): RNLatLngBounds {
37
+ return RNLatLngBounds(southwest, northeast)
38
38
  }
39
39
  }
40
40
  }
@@ -20,13 +20,19 @@ import com.margelo.nitro.core.*
20
20
  data class RNRegion(
21
21
  @DoNotStrip
22
22
  @Keep
23
- val center: RNLatLng,
23
+ val nearLeft: RNLatLng,
24
24
  @DoNotStrip
25
25
  @Keep
26
- val latitudeDelta: Double,
26
+ val nearRight: RNLatLng,
27
27
  @DoNotStrip
28
28
  @Keep
29
- val longitudeDelta: Double
29
+ val farLeft: RNLatLng,
30
+ @DoNotStrip
31
+ @Keep
32
+ val farRight: RNLatLng,
33
+ @DoNotStrip
34
+ @Keep
35
+ val latLngBounds: RNLatLngBounds
30
36
  ) {
31
37
  private companion object {
32
38
  /**
@@ -36,8 +42,8 @@ data class RNRegion(
36
42
  @Keep
37
43
  @Suppress("unused")
38
44
  @JvmStatic
39
- private fun fromCpp(center: RNLatLng, latitudeDelta: Double, longitudeDelta: Double): RNRegion {
40
- return RNRegion(center, latitudeDelta, longitudeDelta)
45
+ private fun fromCpp(nearLeft: RNLatLng, nearRight: RNLatLng, farLeft: RNLatLng, farRight: RNLatLng, latLngBounds: RNLatLngBounds): RNRegion {
46
+ return RNRegion(nearLeft, nearRight, farLeft, farRight, latLngBounds)
41
47
  }
42
48
  }
43
49
  }
@@ -18,29 +18,29 @@ public extension RNLatLngBounds {
18
18
  /**
19
19
  * Create a new instance of `RNLatLngBounds`.
20
20
  */
21
- init(northEast: RNLatLng, southWest: RNLatLng) {
22
- self.init(northEast, southWest)
21
+ init(southwest: RNLatLng, northeast: RNLatLng) {
22
+ self.init(southwest, northeast)
23
23
  }
24
24
 
25
- var northEast: RNLatLng {
25
+ var southwest: RNLatLng {
26
26
  @inline(__always)
27
27
  get {
28
- return self.__northEast
28
+ return self.__southwest
29
29
  }
30
30
  @inline(__always)
31
31
  set {
32
- self.__northEast = newValue
32
+ self.__southwest = newValue
33
33
  }
34
34
  }
35
35
 
36
- var southWest: RNLatLng {
36
+ var northeast: RNLatLng {
37
37
  @inline(__always)
38
38
  get {
39
- return self.__southWest
39
+ return self.__northeast
40
40
  }
41
41
  @inline(__always)
42
42
  set {
43
- self.__southWest = newValue
43
+ self.__northeast = newValue
44
44
  }
45
45
  }
46
46
  }
@@ -18,40 +18,62 @@ public extension RNRegion {
18
18
  /**
19
19
  * Create a new instance of `RNRegion`.
20
20
  */
21
- init(center: RNLatLng, latitudeDelta: Double, longitudeDelta: Double) {
22
- self.init(center, latitudeDelta, longitudeDelta)
21
+ init(nearLeft: RNLatLng, nearRight: RNLatLng, farLeft: RNLatLng, farRight: RNLatLng, latLngBounds: RNLatLngBounds) {
22
+ self.init(nearLeft, nearRight, farLeft, farRight, latLngBounds)
23
23
  }
24
24
 
25
- var center: RNLatLng {
25
+ var nearLeft: RNLatLng {
26
26
  @inline(__always)
27
27
  get {
28
- return self.__center
28
+ return self.__nearLeft
29
29
  }
30
30
  @inline(__always)
31
31
  set {
32
- self.__center = newValue
32
+ self.__nearLeft = newValue
33
33
  }
34
34
  }
35
35
 
36
- var latitudeDelta: Double {
36
+ var nearRight: RNLatLng {
37
37
  @inline(__always)
38
38
  get {
39
- return self.__latitudeDelta
39
+ return self.__nearRight
40
40
  }
41
41
  @inline(__always)
42
42
  set {
43
- self.__latitudeDelta = newValue
43
+ self.__nearRight = newValue
44
44
  }
45
45
  }
46
46
 
47
- var longitudeDelta: Double {
47
+ var farLeft: RNLatLng {
48
48
  @inline(__always)
49
49
  get {
50
- return self.__longitudeDelta
50
+ return self.__farLeft
51
51
  }
52
52
  @inline(__always)
53
53
  set {
54
- self.__longitudeDelta = newValue
54
+ self.__farLeft = newValue
55
+ }
56
+ }
57
+
58
+ var farRight: RNLatLng {
59
+ @inline(__always)
60
+ get {
61
+ return self.__farRight
62
+ }
63
+ @inline(__always)
64
+ set {
65
+ self.__farRight = newValue
66
+ }
67
+ }
68
+
69
+ var latLngBounds: RNLatLngBounds {
70
+ @inline(__always)
71
+ get {
72
+ return self.__latLngBounds
73
+ }
74
+ @inline(__always)
75
+ set {
76
+ self.__latLngBounds = newValue
55
77
  }
56
78
  }
57
79
  }
@@ -35,12 +35,12 @@ namespace margelo::nitro::rngooglemapsplus {
35
35
  */
36
36
  struct RNLatLngBounds {
37
37
  public:
38
- RNLatLng northEast SWIFT_PRIVATE;
39
- RNLatLng southWest SWIFT_PRIVATE;
38
+ RNLatLng southwest SWIFT_PRIVATE;
39
+ RNLatLng northeast SWIFT_PRIVATE;
40
40
 
41
41
  public:
42
42
  RNLatLngBounds() = default;
43
- explicit RNLatLngBounds(RNLatLng northEast, RNLatLng southWest): northEast(northEast), southWest(southWest) {}
43
+ explicit RNLatLngBounds(RNLatLng southwest, RNLatLng northeast): southwest(southwest), northeast(northeast) {}
44
44
  };
45
45
 
46
46
  } // namespace margelo::nitro::rngooglemapsplus
@@ -53,14 +53,14 @@ namespace margelo::nitro {
53
53
  static inline margelo::nitro::rngooglemapsplus::RNLatLngBounds fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
54
54
  jsi::Object obj = arg.asObject(runtime);
55
55
  return margelo::nitro::rngooglemapsplus::RNLatLngBounds(
56
- JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "northEast")),
57
- JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "southWest"))
56
+ JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "southwest")),
57
+ JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "northeast"))
58
58
  );
59
59
  }
60
60
  static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNLatLngBounds& arg) {
61
61
  jsi::Object obj(runtime);
62
- obj.setProperty(runtime, "northEast", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.northEast));
63
- obj.setProperty(runtime, "southWest", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.southWest));
62
+ obj.setProperty(runtime, "southwest", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.southwest));
63
+ obj.setProperty(runtime, "northeast", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.northeast));
64
64
  return obj;
65
65
  }
66
66
  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -71,8 +71,8 @@ namespace margelo::nitro {
71
71
  if (!nitro::isPlainObject(runtime, obj)) {
72
72
  return false;
73
73
  }
74
- if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "northEast"))) return false;
75
- if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "southWest"))) return false;
74
+ if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "southwest"))) return false;
75
+ if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "northeast"))) return false;
76
76
  return true;
77
77
  }
78
78
  };
@@ -25,8 +25,11 @@
25
25
 
26
26
  // Forward declaration of `RNLatLng` to properly resolve imports.
27
27
  namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
28
+ // Forward declaration of `RNLatLngBounds` to properly resolve imports.
29
+ namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
28
30
 
29
31
  #include "RNLatLng.hpp"
32
+ #include "RNLatLngBounds.hpp"
30
33
 
31
34
  namespace margelo::nitro::rngooglemapsplus {
32
35
 
@@ -35,13 +38,15 @@ namespace margelo::nitro::rngooglemapsplus {
35
38
  */
36
39
  struct RNRegion {
37
40
  public:
38
- RNLatLng center SWIFT_PRIVATE;
39
- double latitudeDelta SWIFT_PRIVATE;
40
- double longitudeDelta SWIFT_PRIVATE;
41
+ RNLatLng nearLeft SWIFT_PRIVATE;
42
+ RNLatLng nearRight SWIFT_PRIVATE;
43
+ RNLatLng farLeft SWIFT_PRIVATE;
44
+ RNLatLng farRight SWIFT_PRIVATE;
45
+ RNLatLngBounds latLngBounds SWIFT_PRIVATE;
41
46
 
42
47
  public:
43
48
  RNRegion() = default;
44
- explicit RNRegion(RNLatLng center, double latitudeDelta, double longitudeDelta): center(center), latitudeDelta(latitudeDelta), longitudeDelta(longitudeDelta) {}
49
+ explicit RNRegion(RNLatLng nearLeft, RNLatLng nearRight, RNLatLng farLeft, RNLatLng farRight, RNLatLngBounds latLngBounds): nearLeft(nearLeft), nearRight(nearRight), farLeft(farLeft), farRight(farRight), latLngBounds(latLngBounds) {}
45
50
  };
46
51
 
47
52
  } // namespace margelo::nitro::rngooglemapsplus
@@ -54,16 +59,20 @@ namespace margelo::nitro {
54
59
  static inline margelo::nitro::rngooglemapsplus::RNRegion fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
55
60
  jsi::Object obj = arg.asObject(runtime);
56
61
  return margelo::nitro::rngooglemapsplus::RNRegion(
57
- JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "center")),
58
- JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "latitudeDelta")),
59
- JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "longitudeDelta"))
62
+ JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "nearLeft")),
63
+ JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "nearRight")),
64
+ JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "farLeft")),
65
+ JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "farRight")),
66
+ JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLngBounds>::fromJSI(runtime, obj.getProperty(runtime, "latLngBounds"))
60
67
  );
61
68
  }
62
69
  static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNRegion& arg) {
63
70
  jsi::Object obj(runtime);
64
- obj.setProperty(runtime, "center", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.center));
65
- obj.setProperty(runtime, "latitudeDelta", JSIConverter<double>::toJSI(runtime, arg.latitudeDelta));
66
- obj.setProperty(runtime, "longitudeDelta", JSIConverter<double>::toJSI(runtime, arg.longitudeDelta));
71
+ obj.setProperty(runtime, "nearLeft", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.nearLeft));
72
+ obj.setProperty(runtime, "nearRight", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.nearRight));
73
+ obj.setProperty(runtime, "farLeft", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.farLeft));
74
+ obj.setProperty(runtime, "farRight", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.farRight));
75
+ obj.setProperty(runtime, "latLngBounds", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLngBounds>::toJSI(runtime, arg.latLngBounds));
67
76
  return obj;
68
77
  }
69
78
  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -74,9 +83,11 @@ namespace margelo::nitro {
74
83
  if (!nitro::isPlainObject(runtime, obj)) {
75
84
  return false;
76
85
  }
77
- if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "center"))) return false;
78
- if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "latitudeDelta"))) return false;
79
- if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "longitudeDelta"))) return false;
86
+ if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "nearLeft"))) return false;
87
+ if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "nearRight"))) return false;
88
+ if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "farLeft"))) return false;
89
+ if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "farRight"))) return false;
90
+ if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLngBounds>::canConvert(runtime, obj.getProperty(runtime, "latLngBounds"))) return false;
80
91
  return true;
81
92
  }
82
93
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-google-maps-plus",
3
- "version": "1.7.0-dev.5",
3
+ "version": "1.7.0-dev.6",
4
4
  "description": "React Native wrapper for Android & iOS Google Maps SDK",
5
5
  "main": "./lib/module/index.js",
6
6
  "module": "./lib/module/index.js",
package/src/types.ts CHANGED
@@ -29,8 +29,8 @@ export type RNLatLng = {
29
29
  };
30
30
 
31
31
  export type RNLatLngBounds = {
32
- northEast: RNLatLng;
33
- southWest: RNLatLng;
32
+ southwest: RNLatLng;
33
+ northeast: RNLatLng;
34
34
  };
35
35
 
36
36
  export type RNSnapshotOptions = {
@@ -135,9 +135,11 @@ export type RNCamera = {
135
135
  };
136
136
 
137
137
  export type RNRegion = {
138
- center: RNLatLng;
139
- latitudeDelta: number;
140
- longitudeDelta: number;
138
+ nearLeft: RNLatLng;
139
+ nearRight: RNLatLng;
140
+ farLeft: RNLatLng;
141
+ farRight: RNLatLng;
142
+ latLngBounds: RNLatLngBounds;
141
143
  };
142
144
 
143
145
  export type RNPosition = {
@@ -1,15 +0,0 @@
1
- package com.rngooglemapsplus.extensions
2
-
3
- import com.google.android.gms.maps.model.LatLngBounds
4
- import com.rngooglemapsplus.RNRegion
5
-
6
- fun LatLngBounds.toRnRegion(): RNRegion {
7
- val latDelta = northeast.latitude - southwest.latitude
8
- val lngDelta = northeast.longitude - southwest.longitude
9
-
10
- return RNRegion(
11
- center = center.toRnLatLng(),
12
- latitudeDelta = latDelta,
13
- longitudeDelta = lngDelta,
14
- )
15
- }