react-native-google-maps-plus 1.7.0-dev.5 → 1.7.0-dev.7
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.
- package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +336 -494
- package/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt +3 -8
- package/android/src/main/java/com/rngooglemapsplus/MapCircleBuilder.kt +2 -1
- package/android/src/main/java/com/rngooglemapsplus/MapHelper.kt +22 -0
- package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt +4 -2
- package/android/src/main/java/com/rngooglemapsplus/MapPolygonBuilder.kt +2 -1
- package/android/src/main/java/com/rngooglemapsplus/MapPolylineBuilder.kt.kt +2 -1
- package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +10 -21
- package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBoundsExtension.kt +10 -0
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNLatLngBoundsExtension.kt +2 -8
- package/android/src/main/java/com/rngooglemapsplus/extensions/VisibleRegionExtension.kt +13 -0
- package/ios/GoogleMapViewImpl.swift +14 -26
- package/ios/MapCircleBuilder.swift +2 -0
- package/ios/MapHeatmapBuilder.swift +1 -0
- package/ios/MapMarkerBuilder.swift +4 -0
- package/ios/MapPolygonBuilder.swift +2 -0
- package/ios/MapPolylineBuilder.swift +2 -0
- package/ios/MapUrlTileOverlayBuilder.swift +1 -0
- package/ios/extensions/GMSCoordinateBounds+Extension.swift +4 -13
- package/ios/extensions/GMSVisibleRegion+Extension.swift +14 -0
- package/ios/extensions/RNLatLngBounds+Extension.swift +4 -4
- package/lib/module/types.js.map +1 -1
- package/lib/typescript/src/types.d.ts +7 -5
- package/lib/typescript/src/types.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera_bool.hpp +2 -0
- package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp +4 -4
- package/nitrogen/generated/android/c++/JRNLatLngBounds.hpp +8 -8
- package/nitrogen/generated/android/c++/JRNRegion.hpp +23 -13
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLatLngBounds.kt +4 -4
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNRegion.kt +11 -5
- package/nitrogen/generated/ios/swift/RNLatLngBounds.swift +8 -8
- package/nitrogen/generated/ios/swift/RNRegion.swift +33 -11
- package/nitrogen/generated/shared/c++/RNLatLngBounds.hpp +9 -9
- package/nitrogen/generated/shared/c++/RNRegion.hpp +24 -13
- package/package.json +1 -1
- package/src/types.ts +7 -5
- package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBounds.kt +0 -15
- /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSize.kt → RNSizeExtension.kt} +0 -0
- /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSnapshotFormat.kt → RNSnapshotFormatExtension.kt} +0 -0
- /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSnapshotResultType.kt → RNSnapshotResultTypeExtension.kt} +0 -0
|
@@ -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
|
|
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
|
-
|
|
163
|
-
|
|
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
|
}
|
|
@@ -4,6 +4,7 @@ import android.graphics.Color
|
|
|
4
4
|
import com.facebook.react.uimanager.PixelUtil.dpToPx
|
|
5
5
|
import com.google.android.gms.maps.model.Circle
|
|
6
6
|
import com.google.android.gms.maps.model.CircleOptions
|
|
7
|
+
import com.rngooglemapsplus.extensions.onUi
|
|
7
8
|
import com.rngooglemapsplus.extensions.toColor
|
|
8
9
|
import com.rngooglemapsplus.extensions.toLatLng
|
|
9
10
|
|
|
@@ -23,7 +24,7 @@ class MapCircleBuilder {
|
|
|
23
24
|
prev: RNCircle,
|
|
24
25
|
next: RNCircle,
|
|
25
26
|
circle: Circle,
|
|
26
|
-
) {
|
|
27
|
+
) = onUi {
|
|
27
28
|
if (prev.center.latitude != next.center.latitude ||
|
|
28
29
|
prev.center.longitude != next.center.longitude
|
|
29
30
|
) {
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
package com.rngooglemapsplus.extensions
|
|
2
|
+
|
|
3
|
+
import com.facebook.react.bridge.UiThreadUtil
|
|
4
|
+
import kotlinx.coroutines.CompletableDeferred
|
|
5
|
+
import kotlinx.coroutines.runBlocking
|
|
6
|
+
|
|
7
|
+
inline fun onUi(crossinline block: () -> Unit) {
|
|
8
|
+
if (UiThreadUtil.isOnUiThread()) {
|
|
9
|
+
block()
|
|
10
|
+
} else {
|
|
11
|
+
UiThreadUtil.runOnUiThread { block() }
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
inline fun <T> onUiSync(crossinline block: () -> T): T {
|
|
16
|
+
if (UiThreadUtil.isOnUiThread()) return block()
|
|
17
|
+
val result = CompletableDeferred<T>()
|
|
18
|
+
UiThreadUtil.runOnUiThread {
|
|
19
|
+
runCatching(block).onSuccess(result::complete).onFailure(result::completeExceptionally)
|
|
20
|
+
}
|
|
21
|
+
return runBlocking { result.await() }
|
|
22
|
+
}
|
|
@@ -16,6 +16,7 @@ import com.google.android.gms.maps.model.BitmapDescriptorFactory
|
|
|
16
16
|
import com.google.android.gms.maps.model.Marker
|
|
17
17
|
import com.google.android.gms.maps.model.MarkerOptions
|
|
18
18
|
import com.rngooglemapsplus.extensions.markerStyleEquals
|
|
19
|
+
import com.rngooglemapsplus.extensions.onUi
|
|
19
20
|
import com.rngooglemapsplus.extensions.styleHash
|
|
20
21
|
import com.rngooglemapsplus.extensions.toLatLng
|
|
21
22
|
import kotlinx.coroutines.CoroutineScope
|
|
@@ -28,6 +29,7 @@ import kotlinx.coroutines.withContext
|
|
|
28
29
|
import java.net.HttpURLConnection
|
|
29
30
|
import java.net.URL
|
|
30
31
|
import java.net.URLDecoder
|
|
32
|
+
import java.util.concurrent.ConcurrentHashMap
|
|
31
33
|
import kotlin.coroutines.coroutineContext
|
|
32
34
|
|
|
33
35
|
class MapMarkerBuilder(
|
|
@@ -42,7 +44,7 @@ class MapMarkerBuilder(
|
|
|
42
44
|
): Int = 1
|
|
43
45
|
}
|
|
44
46
|
|
|
45
|
-
private val jobsById =
|
|
47
|
+
private val jobsById = ConcurrentHashMap<String, Job>()
|
|
46
48
|
|
|
47
49
|
init {
|
|
48
50
|
// / TODO: refactor with androidsvg 1.5 release
|
|
@@ -162,7 +164,7 @@ class MapMarkerBuilder(
|
|
|
162
164
|
prev: RNMarker,
|
|
163
165
|
next: RNMarker,
|
|
164
166
|
marker: Marker,
|
|
165
|
-
) {
|
|
167
|
+
) = onUi {
|
|
166
168
|
if (prev.coordinate.latitude != next.coordinate.latitude ||
|
|
167
169
|
prev.coordinate.longitude != next.coordinate.longitude
|
|
168
170
|
) {
|
|
@@ -4,6 +4,7 @@ import android.graphics.Color
|
|
|
4
4
|
import com.facebook.react.uimanager.PixelUtil.dpToPx
|
|
5
5
|
import com.google.android.gms.maps.model.Polygon
|
|
6
6
|
import com.google.android.gms.maps.model.PolygonOptions
|
|
7
|
+
import com.rngooglemapsplus.extensions.onUi
|
|
7
8
|
import com.rngooglemapsplus.extensions.toColor
|
|
8
9
|
import com.rngooglemapsplus.extensions.toLatLng
|
|
9
10
|
|
|
@@ -30,7 +31,7 @@ class MapPolygonBuilder {
|
|
|
30
31
|
prev: RNPolygon,
|
|
31
32
|
next: RNPolygon,
|
|
32
33
|
poly: Polygon,
|
|
33
|
-
) {
|
|
34
|
+
) = onUi {
|
|
34
35
|
val coordsChanged =
|
|
35
36
|
prev.coordinates.size != next.coordinates.size ||
|
|
36
37
|
!prev.coordinates.zip(next.coordinates).all { (a, b) ->
|
|
@@ -9,6 +9,7 @@ import com.google.android.gms.maps.model.Polyline
|
|
|
9
9
|
import com.google.android.gms.maps.model.PolylineOptions
|
|
10
10
|
import com.google.android.gms.maps.model.RoundCap
|
|
11
11
|
import com.google.android.gms.maps.model.SquareCap
|
|
12
|
+
import com.rngooglemapsplus.extensions.onUi
|
|
12
13
|
import com.rngooglemapsplus.extensions.toColor
|
|
13
14
|
import com.rngooglemapsplus.extensions.toLatLng
|
|
14
15
|
|
|
@@ -34,7 +35,7 @@ class MapPolylineBuilder {
|
|
|
34
35
|
prev: RNPolyline,
|
|
35
36
|
next: RNPolyline,
|
|
36
37
|
polyline: Polyline,
|
|
37
|
-
) {
|
|
38
|
+
) = onUi {
|
|
38
39
|
val coordsChanged =
|
|
39
40
|
prev.coordinates.size != next.coordinates.size ||
|
|
40
41
|
!prev.coordinates.zip(next.coordinates).all { (a, b) ->
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
package com.rngooglemapsplus
|
|
2
2
|
|
|
3
3
|
import com.facebook.proguard.annotations.DoNotStrip
|
|
4
|
-
import com.facebook.react.bridge.UiThreadUtil
|
|
5
4
|
import com.facebook.react.uimanager.ThemedReactContext
|
|
6
5
|
import com.google.android.gms.maps.GoogleMapOptions
|
|
7
6
|
import com.google.android.gms.maps.model.MapStyleOptions
|
|
@@ -155,7 +154,7 @@ class RNGoogleMapsPlusView(
|
|
|
155
154
|
|
|
156
155
|
!prev.markerEquals(next) ->
|
|
157
156
|
view.updateMarker(id) { marker ->
|
|
158
|
-
|
|
157
|
+
markerBuilder.update(prev, next, marker)
|
|
159
158
|
}
|
|
160
159
|
}
|
|
161
160
|
}
|
|
@@ -179,7 +178,7 @@ class RNGoogleMapsPlusView(
|
|
|
179
178
|
|
|
180
179
|
!prev.polylineEquals(next) ->
|
|
181
180
|
view.updatePolyline(id) { polyline ->
|
|
182
|
-
|
|
181
|
+
polylineBuilder.update(prev, next, polyline)
|
|
183
182
|
}
|
|
184
183
|
}
|
|
185
184
|
}
|
|
@@ -204,7 +203,7 @@ class RNGoogleMapsPlusView(
|
|
|
204
203
|
|
|
205
204
|
!prev.polygonEquals(next) ->
|
|
206
205
|
view.updatePolygon(id) { polygon ->
|
|
207
|
-
|
|
206
|
+
polygonBuilder.update(prev, next, polygon)
|
|
208
207
|
}
|
|
209
208
|
}
|
|
210
209
|
}
|
|
@@ -229,7 +228,7 @@ class RNGoogleMapsPlusView(
|
|
|
229
228
|
|
|
230
229
|
!prev.circleEquals(next) ->
|
|
231
230
|
view.updateCircle(id) { circle ->
|
|
232
|
-
|
|
231
|
+
circleBuilder.update(prev, next, circle)
|
|
233
232
|
}
|
|
234
233
|
}
|
|
235
234
|
}
|
|
@@ -416,14 +415,12 @@ class RNGoogleMapsPlusView(
|
|
|
416
415
|
animated: Boolean?,
|
|
417
416
|
durationMs: Double?,
|
|
418
417
|
) {
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
)
|
|
426
|
-
}
|
|
418
|
+
val current = view.currentCamera
|
|
419
|
+
view.setCamera(
|
|
420
|
+
camera.toCameraPosition(current),
|
|
421
|
+
animated == true,
|
|
422
|
+
durationMs?.toInt() ?: 3000,
|
|
423
|
+
)
|
|
427
424
|
}
|
|
428
425
|
|
|
429
426
|
override fun setCameraToCoordinates(
|
|
@@ -481,11 +478,3 @@ class RNGoogleMapsPlusView(
|
|
|
481
478
|
|
|
482
479
|
override fun isGooglePlayServicesAvailable(): Boolean = playServiceHandler.isPlayServicesAvailable()
|
|
483
480
|
}
|
|
484
|
-
|
|
485
|
-
private inline fun onUi(crossinline block: () -> Unit) {
|
|
486
|
-
if (UiThreadUtil.isOnUiThread()) {
|
|
487
|
-
block()
|
|
488
|
-
} else {
|
|
489
|
-
UiThreadUtil.runOnUiThread { block() }
|
|
490
|
-
}
|
|
491
|
-
}
|
|
@@ -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
|
-
|
|
10
|
-
|
|
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
|
|
713
|
+
let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
|
|
717
714
|
let camera = mapView.camera.toRNCamera()
|
|
718
715
|
|
|
719
|
-
self.onCameraChangeStart?(
|
|
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
|
-
|
|
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?(
|
|
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?(
|
|
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(
|
|
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,6 +1,7 @@
|
|
|
1
1
|
import GoogleMaps
|
|
2
2
|
|
|
3
3
|
final class MapCircleBuilder {
|
|
4
|
+
@MainActor
|
|
4
5
|
func build(_ c: RNCircle) -> GMSCircle {
|
|
5
6
|
let circle = GMSCircle()
|
|
6
7
|
circle.position = c.center.toCLLocationCoordinate2D()
|
|
@@ -14,6 +15,7 @@ final class MapCircleBuilder {
|
|
|
14
15
|
return circle
|
|
15
16
|
}
|
|
16
17
|
|
|
18
|
+
@MainActor
|
|
17
19
|
func update(_ prev: RNCircle, _ next: RNCircle, _ c: GMSCircle) {
|
|
18
20
|
if prev.center.latitude != next.center.latitude
|
|
19
21
|
|| prev.center.longitude != next.center.longitude {
|
|
@@ -10,6 +10,7 @@ final class MapMarkerBuilder {
|
|
|
10
10
|
}()
|
|
11
11
|
private var tasks: [String: Task<Void, Never>] = [:]
|
|
12
12
|
|
|
13
|
+
@MainActor
|
|
13
14
|
func build(_ m: RNMarker, icon: UIImage?) -> GMSMarker {
|
|
14
15
|
let marker = GMSMarker(
|
|
15
16
|
position: m.coordinate.toCLLocationCoordinate2D()
|
|
@@ -160,11 +161,13 @@ final class MapMarkerBuilder {
|
|
|
160
161
|
tasks[id] = task
|
|
161
162
|
}
|
|
162
163
|
|
|
164
|
+
@MainActor
|
|
163
165
|
func cancelIconTask(_ id: String) {
|
|
164
166
|
tasks[id]?.cancel()
|
|
165
167
|
tasks.removeValue(forKey: id)
|
|
166
168
|
}
|
|
167
169
|
|
|
170
|
+
@MainActor
|
|
168
171
|
func cancelAllIconTasks() {
|
|
169
172
|
let ids = Array(tasks.keys)
|
|
170
173
|
for id in ids {
|
|
@@ -174,6 +177,7 @@ final class MapMarkerBuilder {
|
|
|
174
177
|
iconCache.removeAllObjects()
|
|
175
178
|
}
|
|
176
179
|
|
|
180
|
+
@MainActor
|
|
177
181
|
private func renderUIImage(_ m: RNMarker, _ scale: CGFloat) async -> UIImage? {
|
|
178
182
|
guard let iconSvg = m.iconSvg,
|
|
179
183
|
let data = iconSvg.svgString.data(using: .utf8)
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import GoogleMaps
|
|
2
2
|
|
|
3
3
|
final class MapPolygonBuilder {
|
|
4
|
+
@MainActor
|
|
4
5
|
func build(_ p: RNPolygon) -> GMSPolygon {
|
|
5
6
|
let path = GMSMutablePath()
|
|
6
7
|
p.coordinates.forEach {
|
|
@@ -28,6 +29,7 @@ final class MapPolygonBuilder {
|
|
|
28
29
|
return pg
|
|
29
30
|
}
|
|
30
31
|
|
|
32
|
+
@MainActor
|
|
31
33
|
func update(_ prev: RNPolygon, _ next: RNPolygon, _ pg: GMSPolygon) {
|
|
32
34
|
let coordsChanged =
|
|
33
35
|
prev.coordinates.count != next.coordinates.count
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import GoogleMaps
|
|
2
2
|
|
|
3
3
|
final class MapPolylineBuilder {
|
|
4
|
+
@MainActor
|
|
4
5
|
func build(_ p: RNPolyline) -> GMSPolyline {
|
|
5
6
|
let path = GMSMutablePath()
|
|
6
7
|
p.coordinates.forEach {
|
|
@@ -22,6 +23,7 @@ final class MapPolylineBuilder {
|
|
|
22
23
|
return pl
|
|
23
24
|
}
|
|
24
25
|
|
|
26
|
+
@MainActor
|
|
25
27
|
func update(_ prev: RNPolyline, _ next: RNPolyline, _ pl: GMSPolyline) {
|
|
26
28
|
let coordsChanged =
|
|
27
29
|
prev.coordinates.count != next.coordinates.count
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
import GoogleMaps
|
|
2
2
|
|
|
3
3
|
extension GMSCoordinateBounds {
|
|
4
|
-
func
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
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:
|
|
8
|
-
longitude:
|
|
7
|
+
latitude: southwest.latitude,
|
|
8
|
+
longitude: southwest.longitude
|
|
9
9
|
),
|
|
10
10
|
coordinate: CLLocationCoordinate2D(
|
|
11
|
-
latitude:
|
|
12
|
-
longitude:
|
|
11
|
+
latitude: northeast.latitude,
|
|
12
|
+
longitude: northeast.longitude
|
|
13
13
|
)
|
|
14
14
|
)
|
|
15
15
|
}
|
package/lib/module/types.js.map
CHANGED
|
@@ -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;;
|
|
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
|
-
|
|
28
|
-
|
|
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
|
-
|
|
75
|
-
|
|
76
|
-
|
|
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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"}
|
|
@@ -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
|
|
36
|
-
jni::local_ref<JRNLatLng>
|
|
37
|
-
static const auto
|
|
38
|
-
jni::local_ref<JRNLatLng>
|
|
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
|
-
|
|
41
|
-
|
|
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.
|
|
57
|
-
JRNLatLng::fromCpp(value.
|
|
56
|
+
JRNLatLng::fromCpp(value.southwest),
|
|
57
|
+
JRNLatLng::fromCpp(value.northeast)
|
|
58
58
|
);
|
|
59
59
|
}
|
|
60
60
|
};
|