react-native-google-maps-plus 1.10.0-dev.7 → 1.10.1-dev.1
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 +17 -14
- package/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt +3 -2
- package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBoundsExtension.kt +0 -31
- package/ios/GoogleMapViewImpl.swift +320 -260
- package/ios/LocationHandler.swift +2 -4
- package/ios/MapCircleBuilder.swift +28 -28
- package/ios/MapHeatmapBuilder.swift +0 -1
- package/ios/MapHelper.swift +9 -14
- package/ios/MapMarkerBuilder.swift +65 -71
- package/ios/MapPolygonBuilder.swift +32 -32
- package/ios/MapPolylineBuilder.swift +24 -24
- package/ios/MapUrlTileOverlayBuilder.swift +0 -1
- package/ios/RNGoogleMapsPlusView.swift +9 -63
- package/package.json +1 -1
|
@@ -30,12 +30,10 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
30
30
|
)
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
@MainActor
|
|
34
33
|
func dispose() {
|
|
35
34
|
impl.deinitInternal()
|
|
36
35
|
}
|
|
37
36
|
|
|
38
|
-
@MainActor
|
|
39
37
|
var initialProps: RNInitialProps? {
|
|
40
38
|
didSet {
|
|
41
39
|
let options = GMSMapViewOptions()
|
|
@@ -52,32 +50,26 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
52
50
|
}
|
|
53
51
|
}
|
|
54
52
|
|
|
55
|
-
@MainActor
|
|
56
53
|
var uiSettings: RNMapUiSettings? {
|
|
57
54
|
didSet { impl.uiSettings = uiSettings }
|
|
58
55
|
}
|
|
59
56
|
|
|
60
|
-
@MainActor
|
|
61
57
|
var myLocationEnabled: Bool? {
|
|
62
58
|
didSet { impl.myLocationEnabled = myLocationEnabled }
|
|
63
59
|
}
|
|
64
60
|
|
|
65
|
-
@MainActor
|
|
66
61
|
var buildingEnabled: Bool? {
|
|
67
62
|
didSet { impl.buildingEnabled = buildingEnabled }
|
|
68
63
|
}
|
|
69
64
|
|
|
70
|
-
@MainActor
|
|
71
65
|
var trafficEnabled: Bool? {
|
|
72
66
|
didSet { impl.trafficEnabled = trafficEnabled }
|
|
73
67
|
}
|
|
74
68
|
|
|
75
|
-
@MainActor
|
|
76
69
|
var indoorEnabled: Bool? {
|
|
77
70
|
didSet { impl.indoorEnabled = indoorEnabled }
|
|
78
71
|
}
|
|
79
72
|
|
|
80
|
-
@MainActor
|
|
81
73
|
var customMapStyle: String? {
|
|
82
74
|
didSet {
|
|
83
75
|
if let value = customMapStyle {
|
|
@@ -86,31 +78,26 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
86
78
|
}
|
|
87
79
|
}
|
|
88
80
|
|
|
89
|
-
@MainActor
|
|
90
81
|
var userInterfaceStyle: RNUserInterfaceStyle? {
|
|
91
82
|
didSet {
|
|
92
83
|
impl.userInterfaceStyle = userInterfaceStyle?.toUIUserInterfaceStyle
|
|
93
84
|
}
|
|
94
85
|
}
|
|
95
86
|
|
|
96
|
-
@MainActor
|
|
97
87
|
var mapZoomConfig: RNMapZoomConfig? {
|
|
98
88
|
didSet { impl.mapZoomConfig = mapZoomConfig }
|
|
99
89
|
}
|
|
100
90
|
|
|
101
|
-
@MainActor
|
|
102
91
|
var mapPadding: RNMapPadding? {
|
|
103
92
|
didSet { impl.mapPadding = mapPadding }
|
|
104
93
|
}
|
|
105
94
|
|
|
106
|
-
@MainActor
|
|
107
95
|
var mapType: RNMapType? {
|
|
108
96
|
didSet {
|
|
109
97
|
impl.mapType = mapType?.toGMSMapViewType
|
|
110
98
|
}
|
|
111
99
|
}
|
|
112
100
|
|
|
113
|
-
@MainActor
|
|
114
101
|
var markers: [RNMarker]? {
|
|
115
102
|
didSet {
|
|
116
103
|
let prevById = Dictionary(
|
|
@@ -148,7 +135,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
148
135
|
}
|
|
149
136
|
}
|
|
150
137
|
|
|
151
|
-
@MainActor
|
|
152
138
|
var polylines: [RNPolyline]? {
|
|
153
139
|
didSet {
|
|
154
140
|
let prevById = Dictionary(
|
|
@@ -181,7 +167,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
181
167
|
}
|
|
182
168
|
}
|
|
183
169
|
|
|
184
|
-
@MainActor
|
|
185
170
|
var polygons: [RNPolygon]? {
|
|
186
171
|
didSet {
|
|
187
172
|
let prevById = Dictionary(
|
|
@@ -211,7 +196,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
211
196
|
}
|
|
212
197
|
}
|
|
213
198
|
|
|
214
|
-
@MainActor
|
|
215
199
|
var circles: [RNCircle]? {
|
|
216
200
|
didSet {
|
|
217
201
|
let prevById = Dictionary(
|
|
@@ -241,7 +225,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
241
225
|
}
|
|
242
226
|
}
|
|
243
227
|
|
|
244
|
-
@MainActor
|
|
245
228
|
var heatmaps: [RNHeatmap]? {
|
|
246
229
|
didSet {
|
|
247
230
|
let prevById = Dictionary(
|
|
@@ -262,7 +245,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
262
245
|
}
|
|
263
246
|
}
|
|
264
247
|
|
|
265
|
-
@MainActor
|
|
266
248
|
var kmlLayers: [RNKMLayer]? {
|
|
267
249
|
didSet {
|
|
268
250
|
let prevById = Dictionary(
|
|
@@ -283,7 +265,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
283
265
|
}
|
|
284
266
|
}
|
|
285
267
|
|
|
286
|
-
@MainActor
|
|
287
268
|
var urlTileOverlays: [RNUrlTileOverlay]? {
|
|
288
269
|
didSet {
|
|
289
270
|
let prevById = Dictionary(
|
|
@@ -307,135 +288,107 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
307
288
|
}
|
|
308
289
|
}
|
|
309
290
|
|
|
310
|
-
@MainActor
|
|
311
291
|
var locationConfig: RNLocationConfig? {
|
|
312
292
|
didSet {
|
|
313
293
|
impl.locationConfig = locationConfig
|
|
314
294
|
}
|
|
315
295
|
}
|
|
316
296
|
|
|
317
|
-
@MainActor
|
|
318
297
|
var onMapError: ((RNMapErrorCode) -> Void)? {
|
|
319
298
|
didSet { impl.onMapError = onMapError }
|
|
320
299
|
}
|
|
321
|
-
@MainActor
|
|
322
300
|
var onMapReady: ((Bool) -> Void)? {
|
|
323
301
|
didSet { impl.onMapReady = onMapReady }
|
|
324
302
|
}
|
|
325
|
-
@MainActor
|
|
326
303
|
var onMapLoaded: ((RNRegion, RNCamera) -> Void)? {
|
|
327
304
|
didSet { impl.onMapLoaded = onMapLoaded }
|
|
328
305
|
}
|
|
329
|
-
@MainActor
|
|
330
306
|
var onLocationUpdate: ((RNLocation) -> Void)? {
|
|
331
307
|
didSet { impl.onLocationUpdate = onLocationUpdate }
|
|
332
308
|
}
|
|
333
|
-
@MainActor
|
|
334
309
|
var onLocationError: ((_ error: RNLocationErrorCode) -> Void)? {
|
|
335
310
|
didSet { impl.onLocationError = onLocationError }
|
|
336
311
|
}
|
|
337
|
-
@MainActor
|
|
338
312
|
var onMapPress: ((RNLatLng) -> Void)? {
|
|
339
313
|
didSet { impl.onMapPress = onMapPress }
|
|
340
314
|
}
|
|
341
|
-
@MainActor
|
|
342
315
|
var onMapLongPress: ((RNLatLng) -> Void)? {
|
|
343
316
|
didSet { impl.onMapLongPress = onMapLongPress }
|
|
344
317
|
}
|
|
345
|
-
@MainActor
|
|
346
318
|
var onPoiPress: ((String, String, RNLatLng) -> Void)? {
|
|
347
319
|
didSet { impl.onPoiPress = onPoiPress }
|
|
348
320
|
}
|
|
349
|
-
@MainActor
|
|
350
321
|
var onMarkerPress: ((String) -> Void)? {
|
|
351
322
|
didSet { impl.onMarkerPress = onMarkerPress }
|
|
352
323
|
}
|
|
353
|
-
@MainActor
|
|
354
324
|
var onPolylinePress: ((String) -> Void)? {
|
|
355
325
|
didSet { impl.onPolylinePress = onPolylinePress }
|
|
356
326
|
}
|
|
357
|
-
@MainActor
|
|
358
327
|
var onPolygonPress: ((String) -> Void)? {
|
|
359
328
|
didSet { impl.onPolygonPress = onPolygonPress }
|
|
360
329
|
}
|
|
361
|
-
@MainActor
|
|
362
330
|
var onCirclePress: ((String) -> Void)? {
|
|
363
331
|
didSet { impl.onCirclePress = onCirclePress }
|
|
364
332
|
}
|
|
365
|
-
@MainActor
|
|
366
333
|
var onMarkerDragStart: ((String, RNLatLng) -> Void)? {
|
|
367
334
|
didSet { impl.onMarkerDragStart = onMarkerDragStart }
|
|
368
335
|
}
|
|
369
|
-
@MainActor
|
|
370
336
|
var onMarkerDrag: ((String, RNLatLng) -> Void)? {
|
|
371
337
|
didSet { impl.onMarkerDrag = onMarkerDrag }
|
|
372
338
|
}
|
|
373
|
-
@MainActor
|
|
374
339
|
var onMarkerDragEnd: ((String, RNLatLng) -> Void)? {
|
|
375
340
|
didSet { impl.onMarkerDragEnd = onMarkerDragEnd }
|
|
376
341
|
}
|
|
377
|
-
@MainActor
|
|
378
342
|
var onIndoorBuildingFocused: ((RNIndoorBuilding) -> Void)? {
|
|
379
343
|
didSet { impl.onIndoorBuildingFocused = onIndoorBuildingFocused }
|
|
380
344
|
}
|
|
381
|
-
@MainActor
|
|
382
345
|
var onIndoorLevelActivated: ((RNIndoorLevel) -> Void)? {
|
|
383
346
|
didSet { impl.onIndoorLevelActivated = onIndoorLevelActivated }
|
|
384
347
|
}
|
|
385
|
-
@MainActor
|
|
386
348
|
var onInfoWindowPress: ((String) -> Void)? {
|
|
387
349
|
didSet { impl.onInfoWindowPress = onInfoWindowPress }
|
|
388
350
|
}
|
|
389
|
-
@MainActor
|
|
390
351
|
var onInfoWindowClose: ((String) -> Void)? {
|
|
391
352
|
didSet { impl.onInfoWindowClose = onInfoWindowClose }
|
|
392
353
|
}
|
|
393
|
-
@MainActor
|
|
394
354
|
var onInfoWindowLongPress: ((String) -> Void)? {
|
|
395
355
|
didSet { impl.onInfoWindowLongPress = onInfoWindowLongPress }
|
|
396
356
|
}
|
|
397
|
-
@MainActor
|
|
398
357
|
var onMyLocationPress: ((RNLocation) -> Void)? {
|
|
399
358
|
didSet { impl.onMyLocationPress = onMyLocationPress }
|
|
400
359
|
}
|
|
401
|
-
@MainActor
|
|
402
360
|
var onMyLocationButtonPress: ((Bool) -> Void)? {
|
|
403
361
|
didSet { impl.onMyLocationButtonPress = onMyLocationButtonPress }
|
|
404
362
|
}
|
|
405
|
-
@MainActor
|
|
406
363
|
var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)? {
|
|
407
364
|
didSet { impl.onCameraChangeStart = onCameraChangeStart }
|
|
408
365
|
}
|
|
409
|
-
@MainActor
|
|
410
366
|
var onCameraChange: ((RNRegion, RNCamera, Bool) -> Void)? {
|
|
411
367
|
didSet { impl.onCameraChange = onCameraChange }
|
|
412
368
|
}
|
|
413
|
-
@MainActor
|
|
414
369
|
var onCameraChangeComplete: ((RNRegion, RNCamera, Bool) -> Void)? {
|
|
415
370
|
didSet { impl.onCameraChangeComplete = onCameraChangeComplete }
|
|
416
371
|
}
|
|
417
372
|
|
|
418
|
-
@MainActor
|
|
419
373
|
func showMarkerInfoWindow(id: String) {
|
|
420
374
|
impl.showMarkerInfoWindow(id: id)
|
|
421
375
|
}
|
|
422
376
|
|
|
423
|
-
@MainActor
|
|
424
377
|
func hideMarkerInfoWindow(id: String) {
|
|
425
378
|
impl.hideMarkerInfoWindow(id: id)
|
|
426
379
|
}
|
|
427
380
|
|
|
428
|
-
@MainActor
|
|
429
381
|
func setCamera(camera: RNCameraUpdate, animated: Bool?, durationMs: Double?) {
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
382
|
+
onMain {
|
|
383
|
+
let cam = camera.toGMSCameraPosition(current: self.impl.currentCamera)
|
|
384
|
+
self.impl.setCamera(
|
|
385
|
+
camera: cam,
|
|
386
|
+
animated: animated ?? true,
|
|
387
|
+
durationMs: durationMs ?? 3000
|
|
388
|
+
)
|
|
389
|
+
}
|
|
436
390
|
}
|
|
437
391
|
|
|
438
|
-
@MainActor
|
|
439
392
|
func setCameraToCoordinates(
|
|
440
393
|
coordinates: [RNLatLng],
|
|
441
394
|
padding: RNMapPadding?,
|
|
@@ -450,12 +403,10 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
450
403
|
)
|
|
451
404
|
}
|
|
452
405
|
|
|
453
|
-
@MainActor
|
|
454
406
|
func setCameraBounds(bounds: RNLatLngBounds?) {
|
|
455
407
|
impl.setCameraBounds(bounds?.toCoordinateBounds())
|
|
456
408
|
}
|
|
457
409
|
|
|
458
|
-
@MainActor
|
|
459
410
|
func animateToBounds(
|
|
460
411
|
bounds: RNLatLngBounds,
|
|
461
412
|
padding: Double?,
|
|
@@ -470,7 +421,6 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
470
421
|
)
|
|
471
422
|
}
|
|
472
423
|
|
|
473
|
-
@MainActor
|
|
474
424
|
func snapshot(
|
|
475
425
|
options: RNSnapshotOptions,
|
|
476
426
|
) -> NitroModules.Promise<String?> {
|
|
@@ -484,25 +434,21 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
484
434
|
|
|
485
435
|
}
|
|
486
436
|
|
|
487
|
-
@MainActor
|
|
488
437
|
func showLocationDialog() {
|
|
489
438
|
locationHandler.showLocationDialog()
|
|
490
439
|
}
|
|
491
440
|
|
|
492
|
-
@MainActor
|
|
493
441
|
func openLocationSettings() {
|
|
494
442
|
locationHandler.openLocationSettings()
|
|
495
443
|
}
|
|
496
444
|
|
|
497
|
-
@MainActor
|
|
498
445
|
func requestLocationPermission()
|
|
499
446
|
-> NitroModules.Promise<RNLocationPermissionResult> {
|
|
500
447
|
return permissionHandler.requestLocationPermission()
|
|
501
448
|
}
|
|
502
449
|
|
|
503
|
-
@MainActor
|
|
504
450
|
func isGooglePlayServicesAvailable() -> Bool {
|
|
505
451
|
/// not supported
|
|
506
|
-
return
|
|
452
|
+
return false
|
|
507
453
|
}
|
|
508
454
|
}
|
package/package.json
CHANGED