react-native-google-maps-plus 1.7.0-dev.1 → 1.7.0-dev.11

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 (95) hide show
  1. package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +457 -451
  2. package/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt +3 -8
  3. package/android/src/main/java/com/rngooglemapsplus/MapCircleBuilder.kt +2 -1
  4. package/android/src/main/java/com/rngooglemapsplus/MapHeatmapBuilder.kt +1 -1
  5. package/android/src/main/java/com/rngooglemapsplus/MapHelper.kt +22 -0
  6. package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt +103 -2
  7. package/android/src/main/java/com/rngooglemapsplus/MapPolygonBuilder.kt +2 -1
  8. package/android/src/main/java/com/rngooglemapsplus/MapPolylineBuilder.kt.kt +2 -1
  9. package/android/src/main/java/com/rngooglemapsplus/MapUrlTileOverlayBuilder.kt +40 -0
  10. package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +84 -34
  11. package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBoundsExtension.kt +10 -0
  12. package/android/src/main/java/com/rngooglemapsplus/extensions/MapObjectTagExtensions.kt +84 -0
  13. package/android/src/main/java/com/rngooglemapsplus/extensions/RNLatLngBoundsExtension.kt +2 -8
  14. package/android/src/main/java/com/rngooglemapsplus/extensions/RNMapTypeExtension.kt +13 -0
  15. package/android/src/main/java/com/rngooglemapsplus/extensions/VisibleRegionExtension.kt +13 -0
  16. package/ios/GoogleMapViewImpl.swift +164 -48
  17. package/ios/MapCircleBuilder.swift +2 -0
  18. package/ios/MapHeatmapBuilder.swift +2 -1
  19. package/ios/MapMarkerBuilder.swift +54 -1
  20. package/ios/MapPolygonBuilder.swift +2 -0
  21. package/ios/MapPolylineBuilder.swift +2 -0
  22. package/ios/MapUrlTileOverlayBuilder.swift +24 -0
  23. package/ios/RNGoogleMapsPlusView.swift +68 -11
  24. package/ios/extensions/GMSCoordinateBounds+Extension.swift +4 -13
  25. package/ios/extensions/GMSVisibleRegion+Extension.swift +14 -0
  26. package/ios/extensions/MapObjectTag+Extension.swift +93 -0
  27. package/ios/extensions/RNLatLngBounds+Extension.swift +4 -4
  28. package/ios/extensions/RNMapType+Extension.swift +18 -0
  29. package/lib/module/types.js.map +1 -1
  30. package/lib/nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json +7 -0
  31. package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts +18 -9
  32. package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts.map +1 -1
  33. package/lib/typescript/src/types.d.ts +18 -5
  34. package/lib/typescript/src/types.d.ts.map +1 -1
  35. package/nitrogen/generated/android/RNGoogleMapsPlusOnLoad.cpp +8 -4
  36. package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera.hpp +83 -0
  37. package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera_bool.hpp +2 -0
  38. package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +75 -0
  39. package/nitrogen/generated/android/c++/JFunc_void_std__string_RNLatLng.hpp +77 -0
  40. package/nitrogen/generated/android/c++/JFunc_void_std__string_std__string_RNLatLng.hpp +77 -0
  41. package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp +237 -83
  42. package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.hpp +32 -16
  43. package/nitrogen/generated/android/c++/JRNLatLngBounds.hpp +8 -8
  44. package/nitrogen/generated/android/c++/JRNMapUiSettings.hpp +11 -3
  45. package/nitrogen/generated/android/c++/JRNMarker.hpp +7 -3
  46. package/nitrogen/generated/android/c++/JRNRegion.hpp +23 -13
  47. package/nitrogen/generated/android/c++/JRNUrlTileOverlay.hpp +78 -0
  48. package/nitrogen/generated/android/c++/views/JHybridRNGoogleMapsPlusViewStateUpdater.cpp +28 -0
  49. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_RNRegion_RNCamera.kt +81 -0
  50. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_std__optional_std__string_.kt → Func_void_std__string.kt} +12 -12
  51. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_std__optional_std__string__RNLatLng.kt → Func_void_std__string_RNLatLng.kt} +12 -12
  52. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/Func_void_std__string_std__string_RNLatLng.kt +81 -0
  53. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt +122 -24
  54. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNLatLngBounds.kt +4 -4
  55. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMapUiSettings.kt +9 -3
  56. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMarker.kt +6 -3
  57. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNRegion.kt +11 -5
  58. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNUrlTileOverlay.kt +52 -0
  59. package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Bridge.cpp +32 -8
  60. package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Bridge.hpp +168 -43
  61. package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Umbrella.hpp +3 -0
  62. package/nitrogen/generated/ios/c++/HybridRNGoogleMapsPlusViewSpecSwift.hpp +86 -22
  63. package/nitrogen/generated/ios/c++/views/HybridRNGoogleMapsPlusViewComponent.mm +35 -0
  64. package/nitrogen/generated/ios/swift/Func_void_RNRegion_RNCamera.swift +47 -0
  65. package/nitrogen/generated/ios/swift/Func_void_std__optional_std__string_.swift +6 -6
  66. package/nitrogen/generated/ios/swift/Func_void_std__string.swift +47 -0
  67. package/nitrogen/generated/ios/swift/Func_void_std__string_RNLatLng.swift +47 -0
  68. package/nitrogen/generated/ios/swift/Func_void_std__string_std__string_RNLatLng.swift +47 -0
  69. package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec.swift +17 -8
  70. package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec_cxx.swift +340 -138
  71. package/nitrogen/generated/ios/swift/RNLatLngBounds.swift +8 -8
  72. package/nitrogen/generated/ios/swift/RNMapUiSettings.swift +61 -1
  73. package/nitrogen/generated/ios/swift/RNMarker.swift +24 -1
  74. package/nitrogen/generated/ios/swift/RNRegion.swift +33 -11
  75. package/nitrogen/generated/ios/swift/RNUrlTileOverlay.swift +133 -0
  76. package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.cpp +16 -0
  77. package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.hpp +41 -22
  78. package/nitrogen/generated/shared/c++/RNLatLngBounds.hpp +9 -9
  79. package/nitrogen/generated/shared/c++/RNMapUiSettings.hpp +10 -2
  80. package/nitrogen/generated/shared/c++/RNMarker.hpp +6 -2
  81. package/nitrogen/generated/shared/c++/RNRegion.hpp +24 -13
  82. package/nitrogen/generated/shared/c++/RNUrlTileOverlay.hpp +96 -0
  83. package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.cpp +100 -16
  84. package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.hpp +18 -10
  85. package/nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json +7 -0
  86. package/package.json +4 -2
  87. package/src/RNGoogleMapsPlusView.nitro.ts +20 -8
  88. package/src/types.ts +19 -5
  89. package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBounds.kt +0 -15
  90. package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__string_.hpp +0 -76
  91. package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__string__RNLatLng.hpp +0 -78
  92. package/nitrogen/generated/ios/swift/Func_void_std__optional_std__string__RNLatLng.swift +0 -54
  93. /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSize.kt → RNSizeExtension.kt} +0 -0
  94. /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSnapshotFormat.kt → RNSnapshotFormatExtension.kt} +0 -0
  95. /package/android/src/main/java/com/rngooglemapsplus/extensions/{RNSnapshotResultType.kt → RNSnapshotResultTypeExtension.kt} +0 -0
@@ -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,7 +18,7 @@ public extension RNMapUiSettings {
18
18
  /**
19
19
  * Create a new instance of `RNMapUiSettings`.
20
20
  */
21
- init(allGesturesEnabled: Bool?, compassEnabled: Bool?, indoorLevelPickerEnabled: Bool?, mapToolbarEnabled: Bool?, myLocationButtonEnabled: Bool?, rotateEnabled: Bool?, scrollEnabled: Bool?, scrollDuringRotateOrZoomEnabled: Bool?, tiltEnabled: Bool?, zoomControlsEnabled: Bool?, zoomGesturesEnabled: Bool?) {
21
+ init(allGesturesEnabled: Bool?, compassEnabled: Bool?, indoorLevelPickerEnabled: Bool?, mapToolbarEnabled: Bool?, myLocationButtonEnabled: Bool?, rotateEnabled: Bool?, scrollEnabled: Bool?, scrollDuringRotateOrZoomEnabled: Bool?, tiltEnabled: Bool?, zoomControlsEnabled: Bool?, zoomGesturesEnabled: Bool?, consumeOnMarkerPress: Bool?, consumeOnMyLocationButtonPress: Bool?) {
22
22
  self.init({ () -> bridge.std__optional_bool_ in
23
23
  if let __unwrappedValue = allGesturesEnabled {
24
24
  return bridge.create_std__optional_bool_(__unwrappedValue)
@@ -85,6 +85,18 @@ public extension RNMapUiSettings {
85
85
  } else {
86
86
  return .init()
87
87
  }
88
+ }(), { () -> bridge.std__optional_bool_ in
89
+ if let __unwrappedValue = consumeOnMarkerPress {
90
+ return bridge.create_std__optional_bool_(__unwrappedValue)
91
+ } else {
92
+ return .init()
93
+ }
94
+ }(), { () -> bridge.std__optional_bool_ in
95
+ if let __unwrappedValue = consumeOnMyLocationButtonPress {
96
+ return bridge.create_std__optional_bool_(__unwrappedValue)
97
+ } else {
98
+ return .init()
99
+ }
88
100
  }())
89
101
  }
90
102
 
@@ -351,4 +363,52 @@ public extension RNMapUiSettings {
351
363
  }()
352
364
  }
353
365
  }
366
+
367
+ var consumeOnMarkerPress: Bool? {
368
+ @inline(__always)
369
+ get {
370
+ return { () -> Bool? in
371
+ if bridge.has_value_std__optional_bool_(self.__consumeOnMarkerPress) {
372
+ let __unwrapped = bridge.get_std__optional_bool_(self.__consumeOnMarkerPress)
373
+ return __unwrapped
374
+ } else {
375
+ return nil
376
+ }
377
+ }()
378
+ }
379
+ @inline(__always)
380
+ set {
381
+ self.__consumeOnMarkerPress = { () -> bridge.std__optional_bool_ in
382
+ if let __unwrappedValue = newValue {
383
+ return bridge.create_std__optional_bool_(__unwrappedValue)
384
+ } else {
385
+ return .init()
386
+ }
387
+ }()
388
+ }
389
+ }
390
+
391
+ var consumeOnMyLocationButtonPress: Bool? {
392
+ @inline(__always)
393
+ get {
394
+ return { () -> Bool? in
395
+ if bridge.has_value_std__optional_bool_(self.__consumeOnMyLocationButtonPress) {
396
+ let __unwrapped = bridge.get_std__optional_bool_(self.__consumeOnMyLocationButtonPress)
397
+ return __unwrapped
398
+ } else {
399
+ return nil
400
+ }
401
+ }()
402
+ }
403
+ @inline(__always)
404
+ set {
405
+ self.__consumeOnMyLocationButtonPress = { () -> bridge.std__optional_bool_ in
406
+ if let __unwrappedValue = newValue {
407
+ return bridge.create_std__optional_bool_(__unwrappedValue)
408
+ } else {
409
+ return .init()
410
+ }
411
+ }()
412
+ }
413
+ }
354
414
  }
@@ -18,7 +18,7 @@ public extension RNMarker {
18
18
  /**
19
19
  * Create a new instance of `RNMarker`.
20
20
  */
21
- init(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, showInfoWindow: Bool?, title: String?, snippet: String?, opacity: Double?, flat: Bool?, draggable: Bool?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?) {
21
+ init(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, showInfoWindow: Bool?, title: String?, snippet: String?, opacity: Double?, flat: Bool?, draggable: Bool?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?) {
22
22
  self.init(std.string(id), { () -> bridge.std__optional_double_ in
23
23
  if let __unwrappedValue = zIndex {
24
24
  return bridge.create_std__optional_double_(__unwrappedValue)
@@ -85,6 +85,12 @@ public extension RNMarker {
85
85
  } else {
86
86
  return .init()
87
87
  }
88
+ }(), { () -> bridge.std__optional_RNMarkerSvg_ in
89
+ if let __unwrappedValue = infoWindowIconSvg {
90
+ return bridge.create_std__optional_RNMarkerSvg_(__unwrappedValue)
91
+ } else {
92
+ return .init()
93
+ }
88
94
  }())
89
95
  }
90
96
 
@@ -331,4 +337,21 @@ public extension RNMarker {
331
337
  }()
332
338
  }
333
339
  }
340
+
341
+ var infoWindowIconSvg: RNMarkerSvg? {
342
+ @inline(__always)
343
+ get {
344
+ return self.__infoWindowIconSvg.value
345
+ }
346
+ @inline(__always)
347
+ set {
348
+ self.__infoWindowIconSvg = { () -> bridge.std__optional_RNMarkerSvg_ in
349
+ if let __unwrappedValue = newValue {
350
+ return bridge.create_std__optional_RNMarkerSvg_(__unwrappedValue)
351
+ } else {
352
+ return .init()
353
+ }
354
+ }()
355
+ }
356
+ }
334
357
  }
@@ -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
  }
@@ -0,0 +1,133 @@
1
+ ///
2
+ /// RNUrlTileOverlay.swift
3
+ /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
4
+ /// https://github.com/mrousavy/nitro
5
+ /// Copyright © 2025 Marc Rousavy @ Margelo
6
+ ///
7
+
8
+ import NitroModules
9
+
10
+ /**
11
+ * Represents an instance of `RNUrlTileOverlay`, backed by a C++ struct.
12
+ */
13
+ public typealias RNUrlTileOverlay = margelo.nitro.rngooglemapsplus.RNUrlTileOverlay
14
+
15
+ public extension RNUrlTileOverlay {
16
+ private typealias bridge = margelo.nitro.rngooglemapsplus.bridge.swift
17
+
18
+ /**
19
+ * Create a new instance of `RNUrlTileOverlay`.
20
+ */
21
+ init(id: String, zIndex: Double?, url: String, tileSize: Double, opacity: Double?, fadeIn: Bool?) {
22
+ self.init(std.string(id), { () -> bridge.std__optional_double_ in
23
+ if let __unwrappedValue = zIndex {
24
+ return bridge.create_std__optional_double_(__unwrappedValue)
25
+ } else {
26
+ return .init()
27
+ }
28
+ }(), std.string(url), tileSize, { () -> bridge.std__optional_double_ in
29
+ if let __unwrappedValue = opacity {
30
+ return bridge.create_std__optional_double_(__unwrappedValue)
31
+ } else {
32
+ return .init()
33
+ }
34
+ }(), { () -> bridge.std__optional_bool_ in
35
+ if let __unwrappedValue = fadeIn {
36
+ return bridge.create_std__optional_bool_(__unwrappedValue)
37
+ } else {
38
+ return .init()
39
+ }
40
+ }())
41
+ }
42
+
43
+ var id: String {
44
+ @inline(__always)
45
+ get {
46
+ return String(self.__id)
47
+ }
48
+ @inline(__always)
49
+ set {
50
+ self.__id = std.string(newValue)
51
+ }
52
+ }
53
+
54
+ var zIndex: Double? {
55
+ @inline(__always)
56
+ get {
57
+ return self.__zIndex.value
58
+ }
59
+ @inline(__always)
60
+ set {
61
+ self.__zIndex = { () -> bridge.std__optional_double_ in
62
+ if let __unwrappedValue = newValue {
63
+ return bridge.create_std__optional_double_(__unwrappedValue)
64
+ } else {
65
+ return .init()
66
+ }
67
+ }()
68
+ }
69
+ }
70
+
71
+ var url: String {
72
+ @inline(__always)
73
+ get {
74
+ return String(self.__url)
75
+ }
76
+ @inline(__always)
77
+ set {
78
+ self.__url = std.string(newValue)
79
+ }
80
+ }
81
+
82
+ var tileSize: Double {
83
+ @inline(__always)
84
+ get {
85
+ return self.__tileSize
86
+ }
87
+ @inline(__always)
88
+ set {
89
+ self.__tileSize = newValue
90
+ }
91
+ }
92
+
93
+ var opacity: Double? {
94
+ @inline(__always)
95
+ get {
96
+ return self.__opacity.value
97
+ }
98
+ @inline(__always)
99
+ set {
100
+ self.__opacity = { () -> bridge.std__optional_double_ in
101
+ if let __unwrappedValue = newValue {
102
+ return bridge.create_std__optional_double_(__unwrappedValue)
103
+ } else {
104
+ return .init()
105
+ }
106
+ }()
107
+ }
108
+ }
109
+
110
+ var fadeIn: Bool? {
111
+ @inline(__always)
112
+ get {
113
+ return { () -> Bool? in
114
+ if bridge.has_value_std__optional_bool_(self.__fadeIn) {
115
+ let __unwrapped = bridge.get_std__optional_bool_(self.__fadeIn)
116
+ return __unwrapped
117
+ } else {
118
+ return nil
119
+ }
120
+ }()
121
+ }
122
+ @inline(__always)
123
+ set {
124
+ self.__fadeIn = { () -> bridge.std__optional_bool_ in
125
+ if let __unwrappedValue = newValue {
126
+ return bridge.create_std__optional_bool_(__unwrappedValue)
127
+ } else {
128
+ return .init()
129
+ }
130
+ }()
131
+ }
132
+ }
133
+ }
@@ -48,6 +48,8 @@ namespace margelo::nitro::rngooglemapsplus {
48
48
  prototype.registerHybridSetter("heatmaps", &HybridRNGoogleMapsPlusViewSpec::setHeatmaps);
49
49
  prototype.registerHybridGetter("kmlLayers", &HybridRNGoogleMapsPlusViewSpec::getKmlLayers);
50
50
  prototype.registerHybridSetter("kmlLayers", &HybridRNGoogleMapsPlusViewSpec::setKmlLayers);
51
+ prototype.registerHybridGetter("urlTileOverlays", &HybridRNGoogleMapsPlusViewSpec::getUrlTileOverlays);
52
+ prototype.registerHybridSetter("urlTileOverlays", &HybridRNGoogleMapsPlusViewSpec::setUrlTileOverlays);
51
53
  prototype.registerHybridGetter("locationConfig", &HybridRNGoogleMapsPlusViewSpec::getLocationConfig);
52
54
  prototype.registerHybridSetter("locationConfig", &HybridRNGoogleMapsPlusViewSpec::setLocationConfig);
53
55
  prototype.registerHybridGetter("onMapError", &HybridRNGoogleMapsPlusViewSpec::getOnMapError);
@@ -64,6 +66,8 @@ namespace margelo::nitro::rngooglemapsplus {
64
66
  prototype.registerHybridSetter("onMapPress", &HybridRNGoogleMapsPlusViewSpec::setOnMapPress);
65
67
  prototype.registerHybridGetter("onMapLongPress", &HybridRNGoogleMapsPlusViewSpec::getOnMapLongPress);
66
68
  prototype.registerHybridSetter("onMapLongPress", &HybridRNGoogleMapsPlusViewSpec::setOnMapLongPress);
69
+ prototype.registerHybridGetter("onPoiPress", &HybridRNGoogleMapsPlusViewSpec::getOnPoiPress);
70
+ prototype.registerHybridSetter("onPoiPress", &HybridRNGoogleMapsPlusViewSpec::setOnPoiPress);
67
71
  prototype.registerHybridGetter("onMarkerPress", &HybridRNGoogleMapsPlusViewSpec::getOnMarkerPress);
68
72
  prototype.registerHybridSetter("onMarkerPress", &HybridRNGoogleMapsPlusViewSpec::setOnMarkerPress);
69
73
  prototype.registerHybridGetter("onPolylinePress", &HybridRNGoogleMapsPlusViewSpec::getOnPolylinePress);
@@ -82,12 +86,24 @@ namespace margelo::nitro::rngooglemapsplus {
82
86
  prototype.registerHybridSetter("onIndoorBuildingFocused", &HybridRNGoogleMapsPlusViewSpec::setOnIndoorBuildingFocused);
83
87
  prototype.registerHybridGetter("onIndoorLevelActivated", &HybridRNGoogleMapsPlusViewSpec::getOnIndoorLevelActivated);
84
88
  prototype.registerHybridSetter("onIndoorLevelActivated", &HybridRNGoogleMapsPlusViewSpec::setOnIndoorLevelActivated);
89
+ prototype.registerHybridGetter("onInfoWindowPress", &HybridRNGoogleMapsPlusViewSpec::getOnInfoWindowPress);
90
+ prototype.registerHybridSetter("onInfoWindowPress", &HybridRNGoogleMapsPlusViewSpec::setOnInfoWindowPress);
91
+ prototype.registerHybridGetter("onInfoWindowClose", &HybridRNGoogleMapsPlusViewSpec::getOnInfoWindowClose);
92
+ prototype.registerHybridSetter("onInfoWindowClose", &HybridRNGoogleMapsPlusViewSpec::setOnInfoWindowClose);
93
+ prototype.registerHybridGetter("onInfoWindowLongPress", &HybridRNGoogleMapsPlusViewSpec::getOnInfoWindowLongPress);
94
+ prototype.registerHybridSetter("onInfoWindowLongPress", &HybridRNGoogleMapsPlusViewSpec::setOnInfoWindowLongPress);
95
+ prototype.registerHybridGetter("onMyLocationPress", &HybridRNGoogleMapsPlusViewSpec::getOnMyLocationPress);
96
+ prototype.registerHybridSetter("onMyLocationPress", &HybridRNGoogleMapsPlusViewSpec::setOnMyLocationPress);
97
+ prototype.registerHybridGetter("onMyLocationButtonPress", &HybridRNGoogleMapsPlusViewSpec::getOnMyLocationButtonPress);
98
+ prototype.registerHybridSetter("onMyLocationButtonPress", &HybridRNGoogleMapsPlusViewSpec::setOnMyLocationButtonPress);
85
99
  prototype.registerHybridGetter("onCameraChangeStart", &HybridRNGoogleMapsPlusViewSpec::getOnCameraChangeStart);
86
100
  prototype.registerHybridSetter("onCameraChangeStart", &HybridRNGoogleMapsPlusViewSpec::setOnCameraChangeStart);
87
101
  prototype.registerHybridGetter("onCameraChange", &HybridRNGoogleMapsPlusViewSpec::getOnCameraChange);
88
102
  prototype.registerHybridSetter("onCameraChange", &HybridRNGoogleMapsPlusViewSpec::setOnCameraChange);
89
103
  prototype.registerHybridGetter("onCameraChangeComplete", &HybridRNGoogleMapsPlusViewSpec::getOnCameraChangeComplete);
90
104
  prototype.registerHybridSetter("onCameraChangeComplete", &HybridRNGoogleMapsPlusViewSpec::setOnCameraChangeComplete);
105
+ prototype.registerHybridMethod("showMarkerInfoWindow", &HybridRNGoogleMapsPlusViewSpec::showMarkerInfoWindow);
106
+ prototype.registerHybridMethod("hideMarkerInfoWindow", &HybridRNGoogleMapsPlusViewSpec::hideMarkerInfoWindow);
91
107
  prototype.registerHybridMethod("setCamera", &HybridRNGoogleMapsPlusViewSpec::setCamera);
92
108
  prototype.registerHybridMethod("setCameraToCoordinates", &HybridRNGoogleMapsPlusViewSpec::setCameraToCoordinates);
93
109
  prototype.registerHybridMethod("setCameraBounds", &HybridRNGoogleMapsPlusViewSpec::setCameraBounds);
@@ -37,10 +37,16 @@ namespace margelo::nitro::rngooglemapsplus { struct RNCircle; }
37
37
  namespace margelo::nitro::rngooglemapsplus { struct RNHeatmap; }
38
38
  // Forward declaration of `RNKMLayer` to properly resolve imports.
39
39
  namespace margelo::nitro::rngooglemapsplus { struct RNKMLayer; }
40
+ // Forward declaration of `RNUrlTileOverlay` to properly resolve imports.
41
+ namespace margelo::nitro::rngooglemapsplus { struct RNUrlTileOverlay; }
40
42
  // Forward declaration of `RNLocationConfig` to properly resolve imports.
41
43
  namespace margelo::nitro::rngooglemapsplus { struct RNLocationConfig; }
42
44
  // Forward declaration of `RNMapErrorCode` to properly resolve imports.
43
45
  namespace margelo::nitro::rngooglemapsplus { enum class RNMapErrorCode; }
46
+ // Forward declaration of `RNRegion` to properly resolve imports.
47
+ namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
48
+ // Forward declaration of `RNCamera` to properly resolve imports.
49
+ namespace margelo::nitro::rngooglemapsplus { struct RNCamera; }
44
50
  // Forward declaration of `RNLocation` to properly resolve imports.
45
51
  namespace margelo::nitro::rngooglemapsplus { struct RNLocation; }
46
52
  // Forward declaration of `RNLocationErrorCode` to properly resolve imports.
@@ -51,10 +57,6 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
51
57
  namespace margelo::nitro::rngooglemapsplus { struct RNIndoorBuilding; }
52
58
  // Forward declaration of `RNIndoorLevel` to properly resolve imports.
53
59
  namespace margelo::nitro::rngooglemapsplus { struct RNIndoorLevel; }
54
- // Forward declaration of `RNRegion` to properly resolve imports.
55
- namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
56
- // Forward declaration of `RNCamera` to properly resolve imports.
57
- namespace margelo::nitro::rngooglemapsplus { struct RNCamera; }
58
60
  // Forward declaration of `RNLatLngBounds` to properly resolve imports.
59
61
  namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
60
62
  // Forward declaration of `RNSnapshotOptions` to properly resolve imports.
@@ -77,16 +79,17 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLocationPermissionResult;
77
79
  #include "RNCircle.hpp"
78
80
  #include "RNHeatmap.hpp"
79
81
  #include "RNKMLayer.hpp"
82
+ #include "RNUrlTileOverlay.hpp"
80
83
  #include "RNLocationConfig.hpp"
81
84
  #include "RNMapErrorCode.hpp"
82
85
  #include <functional>
86
+ #include "RNRegion.hpp"
87
+ #include "RNCamera.hpp"
83
88
  #include "RNLocation.hpp"
84
89
  #include "RNLocationErrorCode.hpp"
85
90
  #include "RNLatLng.hpp"
86
91
  #include "RNIndoorBuilding.hpp"
87
92
  #include "RNIndoorLevel.hpp"
88
- #include "RNRegion.hpp"
89
- #include "RNCamera.hpp"
90
93
  #include "RNLatLngBounds.hpp"
91
94
  #include <NitroModules/Promise.hpp>
92
95
  #include "RNSnapshotOptions.hpp"
@@ -153,14 +156,16 @@ namespace margelo::nitro::rngooglemapsplus {
153
156
  virtual void setHeatmaps(const std::optional<std::vector<RNHeatmap>>& heatmaps) = 0;
154
157
  virtual std::optional<std::vector<RNKMLayer>> getKmlLayers() = 0;
155
158
  virtual void setKmlLayers(const std::optional<std::vector<RNKMLayer>>& kmlLayers) = 0;
159
+ virtual std::optional<std::vector<RNUrlTileOverlay>> getUrlTileOverlays() = 0;
160
+ virtual void setUrlTileOverlays(const std::optional<std::vector<RNUrlTileOverlay>>& urlTileOverlays) = 0;
156
161
  virtual std::optional<RNLocationConfig> getLocationConfig() = 0;
157
162
  virtual void setLocationConfig(const std::optional<RNLocationConfig>& locationConfig) = 0;
158
163
  virtual std::optional<std::function<void(RNMapErrorCode /* error */)>> getOnMapError() = 0;
159
164
  virtual void setOnMapError(const std::optional<std::function<void(RNMapErrorCode /* error */)>>& onMapError) = 0;
160
165
  virtual std::optional<std::function<void(bool /* ready */)>> getOnMapReady() = 0;
161
166
  virtual void setOnMapReady(const std::optional<std::function<void(bool /* ready */)>>& onMapReady) = 0;
162
- virtual std::optional<std::function<void(bool /* loaded */)>> getOnMapLoaded() = 0;
163
- virtual void setOnMapLoaded(const std::optional<std::function<void(bool /* loaded */)>>& onMapLoaded) = 0;
167
+ virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>> getOnMapLoaded() = 0;
168
+ virtual void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& onMapLoaded) = 0;
164
169
  virtual std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() = 0;
165
170
  virtual void setOnLocationUpdate(const std::optional<std::function<void(const RNLocation& /* location */)>>& onLocationUpdate) = 0;
166
171
  virtual std::optional<std::function<void(RNLocationErrorCode /* error */)>> getOnLocationError() = 0;
@@ -169,24 +174,36 @@ namespace margelo::nitro::rngooglemapsplus {
169
174
  virtual void setOnMapPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapPress) = 0;
170
175
  virtual std::optional<std::function<void(const RNLatLng& /* coordinate */)>> getOnMapLongPress() = 0;
171
176
  virtual void setOnMapLongPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapLongPress) = 0;
172
- virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnMarkerPress() = 0;
173
- virtual void setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) = 0;
174
- virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolylinePress() = 0;
175
- virtual void setOnPolylinePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolylinePress) = 0;
176
- virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolygonPress() = 0;
177
- virtual void setOnPolygonPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolygonPress) = 0;
178
- virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnCirclePress() = 0;
179
- virtual void setOnCirclePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onCirclePress) = 0;
180
- virtual std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() = 0;
181
- virtual void setOnMarkerDragStart(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) = 0;
182
- virtual std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() = 0;
183
- virtual void setOnMarkerDrag(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) = 0;
184
- virtual std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() = 0;
185
- virtual void setOnMarkerDragEnd(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) = 0;
177
+ virtual std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>> getOnPoiPress() = 0;
178
+ virtual void setOnPoiPress(const std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>>& onPoiPress) = 0;
179
+ virtual std::optional<std::function<void(const std::string& /* id */)>> getOnMarkerPress() = 0;
180
+ virtual void setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) = 0;
181
+ virtual std::optional<std::function<void(const std::string& /* id */)>> getOnPolylinePress() = 0;
182
+ virtual void setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) = 0;
183
+ virtual std::optional<std::function<void(const std::string& /* id */)>> getOnPolygonPress() = 0;
184
+ virtual void setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) = 0;
185
+ virtual std::optional<std::function<void(const std::string& /* id */)>> getOnCirclePress() = 0;
186
+ virtual void setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) = 0;
187
+ virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() = 0;
188
+ virtual void setOnMarkerDragStart(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) = 0;
189
+ virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() = 0;
190
+ virtual void setOnMarkerDrag(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) = 0;
191
+ virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() = 0;
192
+ virtual void setOnMarkerDragEnd(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) = 0;
186
193
  virtual std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> getOnIndoorBuildingFocused() = 0;
187
194
  virtual void setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>& onIndoorBuildingFocused) = 0;
188
195
  virtual std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> getOnIndoorLevelActivated() = 0;
189
196
  virtual void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) = 0;
197
+ virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowPress() = 0;
198
+ virtual void setOnInfoWindowPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowPress) = 0;
199
+ virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowClose() = 0;
200
+ virtual void setOnInfoWindowClose(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowClose) = 0;
201
+ virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowLongPress() = 0;
202
+ virtual void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowLongPress) = 0;
203
+ virtual std::optional<std::function<void(const RNLocation& /* location */)>> getOnMyLocationPress() = 0;
204
+ virtual void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) = 0;
205
+ virtual std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() = 0;
206
+ virtual void setOnMyLocationButtonPress(const std::optional<std::function<void(bool /* pressed */)>>& onMyLocationButtonPress) = 0;
190
207
  virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() = 0;
191
208
  virtual void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) = 0;
192
209
  virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChange() = 0;
@@ -196,6 +213,8 @@ namespace margelo::nitro::rngooglemapsplus {
196
213
 
197
214
  public:
198
215
  // Methods
216
+ virtual void showMarkerInfoWindow(const std::string& id) = 0;
217
+ virtual void hideMarkerInfoWindow(const std::string& id) = 0;
199
218
  virtual void setCamera(const RNCamera& camera, std::optional<bool> animated, std::optional<double> durationMs) = 0;
200
219
  virtual void setCameraToCoordinates(const std::vector<RNLatLng>& coordinates, const std::optional<RNMapPadding>& padding, std::optional<bool> animated, std::optional<double> durationMs) = 0;
201
220
  virtual void setCameraBounds(const std::optional<RNLatLngBounds>& bounds) = 0;
@@ -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
  };
@@ -45,10 +45,12 @@ namespace margelo::nitro::rngooglemapsplus {
45
45
  std::optional<bool> tiltEnabled SWIFT_PRIVATE;
46
46
  std::optional<bool> zoomControlsEnabled SWIFT_PRIVATE;
47
47
  std::optional<bool> zoomGesturesEnabled SWIFT_PRIVATE;
48
+ std::optional<bool> consumeOnMarkerPress SWIFT_PRIVATE;
49
+ std::optional<bool> consumeOnMyLocationButtonPress SWIFT_PRIVATE;
48
50
 
49
51
  public:
50
52
  RNMapUiSettings() = default;
51
- explicit RNMapUiSettings(std::optional<bool> allGesturesEnabled, std::optional<bool> compassEnabled, std::optional<bool> indoorLevelPickerEnabled, std::optional<bool> mapToolbarEnabled, std::optional<bool> myLocationButtonEnabled, std::optional<bool> rotateEnabled, std::optional<bool> scrollEnabled, std::optional<bool> scrollDuringRotateOrZoomEnabled, std::optional<bool> tiltEnabled, std::optional<bool> zoomControlsEnabled, std::optional<bool> zoomGesturesEnabled): allGesturesEnabled(allGesturesEnabled), compassEnabled(compassEnabled), indoorLevelPickerEnabled(indoorLevelPickerEnabled), mapToolbarEnabled(mapToolbarEnabled), myLocationButtonEnabled(myLocationButtonEnabled), rotateEnabled(rotateEnabled), scrollEnabled(scrollEnabled), scrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled), tiltEnabled(tiltEnabled), zoomControlsEnabled(zoomControlsEnabled), zoomGesturesEnabled(zoomGesturesEnabled) {}
53
+ explicit RNMapUiSettings(std::optional<bool> allGesturesEnabled, std::optional<bool> compassEnabled, std::optional<bool> indoorLevelPickerEnabled, std::optional<bool> mapToolbarEnabled, std::optional<bool> myLocationButtonEnabled, std::optional<bool> rotateEnabled, std::optional<bool> scrollEnabled, std::optional<bool> scrollDuringRotateOrZoomEnabled, std::optional<bool> tiltEnabled, std::optional<bool> zoomControlsEnabled, std::optional<bool> zoomGesturesEnabled, std::optional<bool> consumeOnMarkerPress, std::optional<bool> consumeOnMyLocationButtonPress): allGesturesEnabled(allGesturesEnabled), compassEnabled(compassEnabled), indoorLevelPickerEnabled(indoorLevelPickerEnabled), mapToolbarEnabled(mapToolbarEnabled), myLocationButtonEnabled(myLocationButtonEnabled), rotateEnabled(rotateEnabled), scrollEnabled(scrollEnabled), scrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled), tiltEnabled(tiltEnabled), zoomControlsEnabled(zoomControlsEnabled), zoomGesturesEnabled(zoomGesturesEnabled), consumeOnMarkerPress(consumeOnMarkerPress), consumeOnMyLocationButtonPress(consumeOnMyLocationButtonPress) {}
52
54
  };
53
55
 
54
56
  } // namespace margelo::nitro::rngooglemapsplus
@@ -71,7 +73,9 @@ namespace margelo::nitro {
71
73
  JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "scrollDuringRotateOrZoomEnabled")),
72
74
  JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "tiltEnabled")),
73
75
  JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomControlsEnabled")),
74
- JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomGesturesEnabled"))
76
+ JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomGesturesEnabled")),
77
+ JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "consumeOnMarkerPress")),
78
+ JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "consumeOnMyLocationButtonPress"))
75
79
  );
76
80
  }
77
81
  static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNMapUiSettings& arg) {
@@ -87,6 +91,8 @@ namespace margelo::nitro {
87
91
  obj.setProperty(runtime, "tiltEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.tiltEnabled));
88
92
  obj.setProperty(runtime, "zoomControlsEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.zoomControlsEnabled));
89
93
  obj.setProperty(runtime, "zoomGesturesEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.zoomGesturesEnabled));
94
+ obj.setProperty(runtime, "consumeOnMarkerPress", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.consumeOnMarkerPress));
95
+ obj.setProperty(runtime, "consumeOnMyLocationButtonPress", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.consumeOnMyLocationButtonPress));
90
96
  return obj;
91
97
  }
92
98
  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -108,6 +114,8 @@ namespace margelo::nitro {
108
114
  if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "tiltEnabled"))) return false;
109
115
  if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "zoomControlsEnabled"))) return false;
110
116
  if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "zoomGesturesEnabled"))) return false;
117
+ if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "consumeOnMarkerPress"))) return false;
118
+ if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "consumeOnMyLocationButtonPress"))) return false;
111
119
  return true;
112
120
  }
113
121
  };