react-native-google-maps-plus 1.7.0-dev.9 → 1.8.0-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/build.gradle +1 -1
- package/android/gradle.properties +2 -1
- package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +124 -128
- package/android/src/main/java/com/rngooglemapsplus/MapCircleBuilder.kt +2 -3
- package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt +83 -53
- package/android/src/main/java/com/rngooglemapsplus/MapPolygonBuilder.kt +6 -23
- package/android/src/main/java/com/rngooglemapsplus/MapPolylineBuilder.kt.kt +12 -39
- package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +34 -16
- package/android/src/main/java/com/rngooglemapsplus/extensions/BitmapExtension.kt +35 -0
- package/android/src/main/java/com/rngooglemapsplus/extensions/CameraPositionExtension.kt +3 -2
- package/android/src/main/java/com/rngooglemapsplus/extensions/LatLngBoundsExtension.kt +31 -0
- package/android/src/main/java/com/rngooglemapsplus/extensions/MapObjectTagExtensions.kt +84 -0
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNLineCapTypeExtension.kt +14 -0
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNLineJoinTypeExtension.kt +12 -0
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNMapCircleExtension.kt +7 -1
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNMarkerExtension.kt +54 -17
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNPolygonExtension.kt +31 -1
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNPolylineExtension.kt +6 -1
- package/ios/GoogleMapViewImpl.swift +89 -69
- package/ios/LocationHandler.swift +3 -1
- package/ios/MapCircleBuilder.swift +2 -3
- package/ios/MapHelper.swift +3 -5
- package/ios/MapMarkerBuilder.swift +147 -91
- package/ios/MapPolygonBuilder.swift +6 -41
- package/ios/MapPolylineBuilder.swift +2 -10
- package/ios/RNGoogleMapsPlusView.swift +49 -33
- package/ios/extensions/GMSCameraPosition+Extension.swift +2 -2
- package/ios/extensions/MapObjectTag+Extension.swift +93 -0
- package/ios/extensions/RNCircle+Extension.swift +14 -5
- package/ios/extensions/RNLatLng+Extension.swift +11 -0
- package/ios/extensions/RNLineCapType+Extension.swift +10 -0
- package/ios/extensions/RNLineJoinType+Extension.swift +11 -0
- package/ios/extensions/RNMarker+Extension.swift +43 -12
- package/ios/extensions/RNPolygon+Extension.swift.swift +50 -21
- package/ios/extensions/RNPolyline+Extension.swift.swift +15 -26
- package/ios/extensions/SVGKImage+Extension.swift +22 -0
- package/ios/extensions/UIImage+Extension.swift +45 -0
- package/lib/module/types.js.map +1 -1
- package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts +17 -15
- package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types.d.ts +8 -1
- package/lib/typescript/src/types.d.ts.map +1 -1
- package/nitrogen/generated/android/RNGoogleMapsPlusOnLoad.cpp +8 -8
- package/nitrogen/generated/android/c++/{JFunc_void_RNRegion_RNCamera.hpp → JFunc_void_RNRegion_RNCameraChange.hpp} +21 -22
- package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCameraChange_bool.hpp +82 -0
- package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +75 -0
- package/nitrogen/generated/android/c++/JFunc_void_std__string_RNLatLng.hpp +77 -0
- package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp +142 -130
- package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.hpp +30 -28
- package/nitrogen/generated/android/c++/JRNCameraChange.hpp +70 -0
- package/nitrogen/generated/android/c++/JRNInitialProps.hpp +7 -3
- package/nitrogen/generated/android/c++/JRNMarker.hpp +7 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_RNRegion_RNCamera.kt → Func_void_RNRegion_RNCameraChange.kt} +9 -9
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_RNRegion_RNCamera_bool.kt → Func_void_RNRegion_RNCameraChange_bool.kt} +9 -9
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_std__optional_std__string_.kt → Func_void_std__string.kt} +12 -12
- 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
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt +50 -42
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNCameraChange.kt +46 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNInitialProps.kt +6 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMarker.kt +6 -6
- package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Bridge.cpp +24 -16
- package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Bridge.hpp +97 -72
- package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Umbrella.hpp +3 -0
- package/nitrogen/generated/ios/c++/HybridRNGoogleMapsPlusViewSpecSwift.hpp +43 -28
- package/nitrogen/generated/ios/swift/{Func_void_RNRegion_RNCamera.swift → Func_void_RNRegion_RNCameraChange.swift} +10 -10
- package/nitrogen/generated/ios/swift/{Func_void_RNRegion_RNCamera_bool.swift → Func_void_RNRegion_RNCameraChange_bool.swift} +10 -10
- package/nitrogen/generated/ios/swift/Func_void_std__optional_std__string_.swift +6 -6
- package/nitrogen/generated/ios/swift/Func_void_std__string.swift +47 -0
- package/nitrogen/generated/ios/swift/Func_void_std__string_RNLatLng.swift +47 -0
- package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec.swift +16 -14
- package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec_cxx.swift +186 -224
- package/nitrogen/generated/ios/swift/RNCameraChange.swift +68 -0
- package/nitrogen/generated/ios/swift/RNInitialProps.swift +31 -1
- package/nitrogen/generated/ios/swift/RNMarker.swift +24 -31
- package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.cpp +2 -0
- package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.hpp +36 -31
- package/nitrogen/generated/shared/c++/RNCameraChange.hpp +88 -0
- package/nitrogen/generated/shared/c++/RNInitialProps.hpp +6 -2
- package/nitrogen/generated/shared/c++/RNMarker.hpp +6 -6
- package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.cpp +28 -28
- package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.hpp +15 -15
- package/package.json +1 -1
- package/src/RNGoogleMapsPlusView.nitro.ts +19 -14
- package/src/types.ts +9 -1
- package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera_bool.hpp +0 -83
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__string_.hpp +0 -76
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__string__RNLatLng.hpp +0 -78
- package/nitrogen/generated/ios/swift/Func_void_std__optional_std__string__RNLatLng.swift +0 -54
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// RNCameraChange.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 `RNCameraChange`, backed by a C++ struct.
|
|
12
|
+
*/
|
|
13
|
+
public typealias RNCameraChange = margelo.nitro.rngooglemapsplus.RNCameraChange
|
|
14
|
+
|
|
15
|
+
public extension RNCameraChange {
|
|
16
|
+
private typealias bridge = margelo.nitro.rngooglemapsplus.bridge.swift
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Create a new instance of `RNCameraChange`.
|
|
20
|
+
*/
|
|
21
|
+
init(center: RNLatLng, zoom: Double, bearing: Double, tilt: Double) {
|
|
22
|
+
self.init(center, zoom, bearing, tilt)
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
var center: RNLatLng {
|
|
26
|
+
@inline(__always)
|
|
27
|
+
get {
|
|
28
|
+
return self.__center
|
|
29
|
+
}
|
|
30
|
+
@inline(__always)
|
|
31
|
+
set {
|
|
32
|
+
self.__center = newValue
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
var zoom: Double {
|
|
37
|
+
@inline(__always)
|
|
38
|
+
get {
|
|
39
|
+
return self.__zoom
|
|
40
|
+
}
|
|
41
|
+
@inline(__always)
|
|
42
|
+
set {
|
|
43
|
+
self.__zoom = newValue
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
var bearing: Double {
|
|
48
|
+
@inline(__always)
|
|
49
|
+
get {
|
|
50
|
+
return self.__bearing
|
|
51
|
+
}
|
|
52
|
+
@inline(__always)
|
|
53
|
+
set {
|
|
54
|
+
self.__bearing = newValue
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
var tilt: Double {
|
|
59
|
+
@inline(__always)
|
|
60
|
+
get {
|
|
61
|
+
return self.__tilt
|
|
62
|
+
}
|
|
63
|
+
@inline(__always)
|
|
64
|
+
set {
|
|
65
|
+
self.__tilt = newValue
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
@@ -18,7 +18,7 @@ public extension RNInitialProps {
|
|
|
18
18
|
/**
|
|
19
19
|
* Create a new instance of `RNInitialProps`.
|
|
20
20
|
*/
|
|
21
|
-
init(mapId: String?, liteMode: Bool?, camera: RNCamera?) {
|
|
21
|
+
init(mapId: String?, liteMode: Bool?, camera: RNCamera?, backgroundColor: String?) {
|
|
22
22
|
self.init({ () -> bridge.std__optional_std__string_ in
|
|
23
23
|
if let __unwrappedValue = mapId {
|
|
24
24
|
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
@@ -37,6 +37,12 @@ public extension RNInitialProps {
|
|
|
37
37
|
} else {
|
|
38
38
|
return .init()
|
|
39
39
|
}
|
|
40
|
+
}(), { () -> bridge.std__optional_std__string_ in
|
|
41
|
+
if let __unwrappedValue = backgroundColor {
|
|
42
|
+
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
43
|
+
} else {
|
|
44
|
+
return .init()
|
|
45
|
+
}
|
|
40
46
|
}())
|
|
41
47
|
}
|
|
42
48
|
|
|
@@ -104,4 +110,28 @@ public extension RNInitialProps {
|
|
|
104
110
|
}()
|
|
105
111
|
}
|
|
106
112
|
}
|
|
113
|
+
|
|
114
|
+
var backgroundColor: String? {
|
|
115
|
+
@inline(__always)
|
|
116
|
+
get {
|
|
117
|
+
return { () -> String? in
|
|
118
|
+
if bridge.has_value_std__optional_std__string_(self.__backgroundColor) {
|
|
119
|
+
let __unwrapped = bridge.get_std__optional_std__string_(self.__backgroundColor)
|
|
120
|
+
return String(__unwrapped)
|
|
121
|
+
} else {
|
|
122
|
+
return nil
|
|
123
|
+
}
|
|
124
|
+
}()
|
|
125
|
+
}
|
|
126
|
+
@inline(__always)
|
|
127
|
+
set {
|
|
128
|
+
self.__backgroundColor = { () -> bridge.std__optional_std__string_ in
|
|
129
|
+
if let __unwrappedValue = newValue {
|
|
130
|
+
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
131
|
+
} else {
|
|
132
|
+
return .init()
|
|
133
|
+
}
|
|
134
|
+
}()
|
|
135
|
+
}
|
|
136
|
+
}
|
|
107
137
|
}
|
|
@@ -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?,
|
|
21
|
+
init(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, 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)
|
|
@@ -31,12 +31,6 @@ public extension RNMarker {
|
|
|
31
31
|
} else {
|
|
32
32
|
return .init()
|
|
33
33
|
}
|
|
34
|
-
}(), { () -> bridge.std__optional_bool_ in
|
|
35
|
-
if let __unwrappedValue = showInfoWindow {
|
|
36
|
-
return bridge.create_std__optional_bool_(__unwrappedValue)
|
|
37
|
-
} else {
|
|
38
|
-
return .init()
|
|
39
|
-
}
|
|
40
34
|
}(), { () -> bridge.std__optional_std__string_ in
|
|
41
35
|
if let __unwrappedValue = title {
|
|
42
36
|
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
@@ -85,6 +79,12 @@ public extension RNMarker {
|
|
|
85
79
|
} else {
|
|
86
80
|
return .init()
|
|
87
81
|
}
|
|
82
|
+
}(), { () -> bridge.std__optional_RNMarkerSvg_ in
|
|
83
|
+
if let __unwrappedValue = infoWindowIconSvg {
|
|
84
|
+
return bridge.create_std__optional_RNMarkerSvg_(__unwrappedValue)
|
|
85
|
+
} else {
|
|
86
|
+
return .init()
|
|
87
|
+
}
|
|
88
88
|
}())
|
|
89
89
|
}
|
|
90
90
|
|
|
@@ -144,30 +144,6 @@ public extension RNMarker {
|
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
|
|
147
|
-
var showInfoWindow: Bool? {
|
|
148
|
-
@inline(__always)
|
|
149
|
-
get {
|
|
150
|
-
return { () -> Bool? in
|
|
151
|
-
if bridge.has_value_std__optional_bool_(self.__showInfoWindow) {
|
|
152
|
-
let __unwrapped = bridge.get_std__optional_bool_(self.__showInfoWindow)
|
|
153
|
-
return __unwrapped
|
|
154
|
-
} else {
|
|
155
|
-
return nil
|
|
156
|
-
}
|
|
157
|
-
}()
|
|
158
|
-
}
|
|
159
|
-
@inline(__always)
|
|
160
|
-
set {
|
|
161
|
-
self.__showInfoWindow = { () -> bridge.std__optional_bool_ in
|
|
162
|
-
if let __unwrappedValue = newValue {
|
|
163
|
-
return bridge.create_std__optional_bool_(__unwrappedValue)
|
|
164
|
-
} else {
|
|
165
|
-
return .init()
|
|
166
|
-
}
|
|
167
|
-
}()
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
|
|
171
147
|
var title: String? {
|
|
172
148
|
@inline(__always)
|
|
173
149
|
get {
|
|
@@ -331,4 +307,21 @@ public extension RNMarker {
|
|
|
331
307
|
}()
|
|
332
308
|
}
|
|
333
309
|
}
|
|
310
|
+
|
|
311
|
+
var infoWindowIconSvg: RNMarkerSvg? {
|
|
312
|
+
@inline(__always)
|
|
313
|
+
get {
|
|
314
|
+
return self.__infoWindowIconSvg.value
|
|
315
|
+
}
|
|
316
|
+
@inline(__always)
|
|
317
|
+
set {
|
|
318
|
+
self.__infoWindowIconSvg = { () -> bridge.std__optional_RNMarkerSvg_ in
|
|
319
|
+
if let __unwrappedValue = newValue {
|
|
320
|
+
return bridge.create_std__optional_RNMarkerSvg_(__unwrappedValue)
|
|
321
|
+
} else {
|
|
322
|
+
return .init()
|
|
323
|
+
}
|
|
324
|
+
}()
|
|
325
|
+
}
|
|
326
|
+
}
|
|
334
327
|
}
|
|
@@ -102,6 +102,8 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
102
102
|
prototype.registerHybridSetter("onCameraChange", &HybridRNGoogleMapsPlusViewSpec::setOnCameraChange);
|
|
103
103
|
prototype.registerHybridGetter("onCameraChangeComplete", &HybridRNGoogleMapsPlusViewSpec::getOnCameraChangeComplete);
|
|
104
104
|
prototype.registerHybridSetter("onCameraChangeComplete", &HybridRNGoogleMapsPlusViewSpec::setOnCameraChangeComplete);
|
|
105
|
+
prototype.registerHybridMethod("showMarkerInfoWindow", &HybridRNGoogleMapsPlusViewSpec::showMarkerInfoWindow);
|
|
106
|
+
prototype.registerHybridMethod("hideMarkerInfoWindow", &HybridRNGoogleMapsPlusViewSpec::hideMarkerInfoWindow);
|
|
105
107
|
prototype.registerHybridMethod("setCamera", &HybridRNGoogleMapsPlusViewSpec::setCamera);
|
|
106
108
|
prototype.registerHybridMethod("setCameraToCoordinates", &HybridRNGoogleMapsPlusViewSpec::setCameraToCoordinates);
|
|
107
109
|
prototype.registerHybridMethod("setCameraBounds", &HybridRNGoogleMapsPlusViewSpec::setCameraBounds);
|
|
@@ -45,8 +45,8 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLocationConfig; }
|
|
|
45
45
|
namespace margelo::nitro::rngooglemapsplus { enum class RNMapErrorCode; }
|
|
46
46
|
// Forward declaration of `RNRegion` to properly resolve imports.
|
|
47
47
|
namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
|
|
48
|
-
// Forward declaration of `
|
|
49
|
-
namespace margelo::nitro::rngooglemapsplus { struct
|
|
48
|
+
// Forward declaration of `RNCameraChange` to properly resolve imports.
|
|
49
|
+
namespace margelo::nitro::rngooglemapsplus { struct RNCameraChange; }
|
|
50
50
|
// Forward declaration of `RNLocation` to properly resolve imports.
|
|
51
51
|
namespace margelo::nitro::rngooglemapsplus { struct RNLocation; }
|
|
52
52
|
// Forward declaration of `RNLocationErrorCode` to properly resolve imports.
|
|
@@ -57,6 +57,8 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
|
|
|
57
57
|
namespace margelo::nitro::rngooglemapsplus { struct RNIndoorBuilding; }
|
|
58
58
|
// Forward declaration of `RNIndoorLevel` to properly resolve imports.
|
|
59
59
|
namespace margelo::nitro::rngooglemapsplus { struct RNIndoorLevel; }
|
|
60
|
+
// Forward declaration of `RNCamera` to properly resolve imports.
|
|
61
|
+
namespace margelo::nitro::rngooglemapsplus { struct RNCamera; }
|
|
60
62
|
// Forward declaration of `RNLatLngBounds` to properly resolve imports.
|
|
61
63
|
namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
|
|
62
64
|
// Forward declaration of `RNSnapshotOptions` to properly resolve imports.
|
|
@@ -84,12 +86,13 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLocationPermissionResult;
|
|
|
84
86
|
#include "RNMapErrorCode.hpp"
|
|
85
87
|
#include <functional>
|
|
86
88
|
#include "RNRegion.hpp"
|
|
87
|
-
#include "
|
|
89
|
+
#include "RNCameraChange.hpp"
|
|
88
90
|
#include "RNLocation.hpp"
|
|
89
91
|
#include "RNLocationErrorCode.hpp"
|
|
90
92
|
#include "RNLatLng.hpp"
|
|
91
93
|
#include "RNIndoorBuilding.hpp"
|
|
92
94
|
#include "RNIndoorLevel.hpp"
|
|
95
|
+
#include "RNCamera.hpp"
|
|
93
96
|
#include "RNLatLngBounds.hpp"
|
|
94
97
|
#include <NitroModules/Promise.hpp>
|
|
95
98
|
#include "RNSnapshotOptions.hpp"
|
|
@@ -164,8 +167,8 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
164
167
|
virtual void setOnMapError(const std::optional<std::function<void(RNMapErrorCode /* error */)>>& onMapError) = 0;
|
|
165
168
|
virtual std::optional<std::function<void(bool /* ready */)>> getOnMapReady() = 0;
|
|
166
169
|
virtual void setOnMapReady(const std::optional<std::function<void(bool /* ready */)>>& onMapReady) = 0;
|
|
167
|
-
virtual std::optional<std::function<void(const RNRegion& /* region */, const
|
|
168
|
-
virtual void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
170
|
+
virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)>> getOnMapLoaded() = 0;
|
|
171
|
+
virtual void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)>>& onMapLoaded) = 0;
|
|
169
172
|
virtual std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() = 0;
|
|
170
173
|
virtual void setOnLocationUpdate(const std::optional<std::function<void(const RNLocation& /* location */)>>& onLocationUpdate) = 0;
|
|
171
174
|
virtual std::optional<std::function<void(RNLocationErrorCode /* error */)>> getOnLocationError() = 0;
|
|
@@ -176,43 +179,45 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
176
179
|
virtual void setOnMapLongPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapLongPress) = 0;
|
|
177
180
|
virtual std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>> getOnPoiPress() = 0;
|
|
178
181
|
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::
|
|
180
|
-
virtual void setOnMarkerPress(const std::optional<std::function<void(const std::
|
|
181
|
-
virtual std::optional<std::function<void(const std::
|
|
182
|
-
virtual void setOnPolylinePress(const std::optional<std::function<void(const std::
|
|
183
|
-
virtual std::optional<std::function<void(const std::
|
|
184
|
-
virtual void setOnPolygonPress(const std::optional<std::function<void(const std::
|
|
185
|
-
virtual std::optional<std::function<void(const std::
|
|
186
|
-
virtual void setOnCirclePress(const std::optional<std::function<void(const std::
|
|
187
|
-
virtual std::optional<std::function<void(const std::
|
|
188
|
-
virtual void setOnMarkerDragStart(const std::optional<std::function<void(const std::
|
|
189
|
-
virtual std::optional<std::function<void(const std::
|
|
190
|
-
virtual void setOnMarkerDrag(const std::optional<std::function<void(const std::
|
|
191
|
-
virtual std::optional<std::function<void(const std::
|
|
192
|
-
virtual void setOnMarkerDragEnd(const std::optional<std::function<void(const std::
|
|
182
|
+
virtual std::optional<std::function<void(const std::string& /* id */)>> getOnMarkerPress() = 0;
|
|
183
|
+
virtual void setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) = 0;
|
|
184
|
+
virtual std::optional<std::function<void(const std::string& /* id */)>> getOnPolylinePress() = 0;
|
|
185
|
+
virtual void setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) = 0;
|
|
186
|
+
virtual std::optional<std::function<void(const std::string& /* id */)>> getOnPolygonPress() = 0;
|
|
187
|
+
virtual void setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) = 0;
|
|
188
|
+
virtual std::optional<std::function<void(const std::string& /* id */)>> getOnCirclePress() = 0;
|
|
189
|
+
virtual void setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) = 0;
|
|
190
|
+
virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() = 0;
|
|
191
|
+
virtual void setOnMarkerDragStart(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) = 0;
|
|
192
|
+
virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() = 0;
|
|
193
|
+
virtual void setOnMarkerDrag(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) = 0;
|
|
194
|
+
virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() = 0;
|
|
195
|
+
virtual void setOnMarkerDragEnd(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) = 0;
|
|
193
196
|
virtual std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> getOnIndoorBuildingFocused() = 0;
|
|
194
197
|
virtual void setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>& onIndoorBuildingFocused) = 0;
|
|
195
198
|
virtual std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> getOnIndoorLevelActivated() = 0;
|
|
196
199
|
virtual void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) = 0;
|
|
197
|
-
virtual std::optional<std::function<void(const std::
|
|
198
|
-
virtual void setOnInfoWindowPress(const std::optional<std::function<void(const std::
|
|
199
|
-
virtual std::optional<std::function<void(const std::
|
|
200
|
-
virtual void setOnInfoWindowClose(const std::optional<std::function<void(const std::
|
|
201
|
-
virtual std::optional<std::function<void(const std::
|
|
202
|
-
virtual void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::
|
|
200
|
+
virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowPress() = 0;
|
|
201
|
+
virtual void setOnInfoWindowPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowPress) = 0;
|
|
202
|
+
virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowClose() = 0;
|
|
203
|
+
virtual void setOnInfoWindowClose(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowClose) = 0;
|
|
204
|
+
virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowLongPress() = 0;
|
|
205
|
+
virtual void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowLongPress) = 0;
|
|
203
206
|
virtual std::optional<std::function<void(const RNLocation& /* location */)>> getOnMyLocationPress() = 0;
|
|
204
207
|
virtual void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) = 0;
|
|
205
208
|
virtual std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() = 0;
|
|
206
209
|
virtual void setOnMyLocationButtonPress(const std::optional<std::function<void(bool /* pressed */)>>& onMyLocationButtonPress) = 0;
|
|
207
|
-
virtual std::optional<std::function<void(const RNRegion& /* region */, const
|
|
208
|
-
virtual void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
209
|
-
virtual std::optional<std::function<void(const RNRegion& /* region */, const
|
|
210
|
-
virtual void setOnCameraChange(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
211
|
-
virtual std::optional<std::function<void(const RNRegion& /* region */, const
|
|
212
|
-
virtual void setOnCameraChangeComplete(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
210
|
+
virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() = 0;
|
|
211
|
+
virtual void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) = 0;
|
|
212
|
+
virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChange() = 0;
|
|
213
|
+
virtual void setOnCameraChange(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChange) = 0;
|
|
214
|
+
virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChangeComplete() = 0;
|
|
215
|
+
virtual void setOnCameraChangeComplete(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChangeComplete) = 0;
|
|
213
216
|
|
|
214
217
|
public:
|
|
215
218
|
// Methods
|
|
219
|
+
virtual void showMarkerInfoWindow(const std::string& id) = 0;
|
|
220
|
+
virtual void hideMarkerInfoWindow(const std::string& id) = 0;
|
|
216
221
|
virtual void setCamera(const RNCamera& camera, std::optional<bool> animated, std::optional<double> durationMs) = 0;
|
|
217
222
|
virtual void setCameraToCoordinates(const std::vector<RNLatLng>& coordinates, const std::optional<RNMapPadding>& padding, std::optional<bool> animated, std::optional<double> durationMs) = 0;
|
|
218
223
|
virtual void setCameraBounds(const std::optional<RNLatLngBounds>& bounds) = 0;
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// RNCameraChange.hpp
|
|
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
|
+
#pragma once
|
|
9
|
+
|
|
10
|
+
#if __has_include(<NitroModules/JSIConverter.hpp>)
|
|
11
|
+
#include <NitroModules/JSIConverter.hpp>
|
|
12
|
+
#else
|
|
13
|
+
#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
|
|
14
|
+
#endif
|
|
15
|
+
#if __has_include(<NitroModules/NitroDefines.hpp>)
|
|
16
|
+
#include <NitroModules/NitroDefines.hpp>
|
|
17
|
+
#else
|
|
18
|
+
#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
|
|
19
|
+
#endif
|
|
20
|
+
#if __has_include(<NitroModules/JSIHelpers.hpp>)
|
|
21
|
+
#include <NitroModules/JSIHelpers.hpp>
|
|
22
|
+
#else
|
|
23
|
+
#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
|
|
24
|
+
#endif
|
|
25
|
+
|
|
26
|
+
// Forward declaration of `RNLatLng` to properly resolve imports.
|
|
27
|
+
namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
|
|
28
|
+
|
|
29
|
+
#include "RNLatLng.hpp"
|
|
30
|
+
|
|
31
|
+
namespace margelo::nitro::rngooglemapsplus {
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* A struct which can be represented as a JavaScript object (RNCameraChange).
|
|
35
|
+
*/
|
|
36
|
+
struct RNCameraChange {
|
|
37
|
+
public:
|
|
38
|
+
RNLatLng center SWIFT_PRIVATE;
|
|
39
|
+
double zoom SWIFT_PRIVATE;
|
|
40
|
+
double bearing SWIFT_PRIVATE;
|
|
41
|
+
double tilt SWIFT_PRIVATE;
|
|
42
|
+
|
|
43
|
+
public:
|
|
44
|
+
RNCameraChange() = default;
|
|
45
|
+
explicit RNCameraChange(RNLatLng center, double zoom, double bearing, double tilt): center(center), zoom(zoom), bearing(bearing), tilt(tilt) {}
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
} // namespace margelo::nitro::rngooglemapsplus
|
|
49
|
+
|
|
50
|
+
namespace margelo::nitro {
|
|
51
|
+
|
|
52
|
+
// C++ RNCameraChange <> JS RNCameraChange (object)
|
|
53
|
+
template <>
|
|
54
|
+
struct JSIConverter<margelo::nitro::rngooglemapsplus::RNCameraChange> final {
|
|
55
|
+
static inline margelo::nitro::rngooglemapsplus::RNCameraChange fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
|
|
56
|
+
jsi::Object obj = arg.asObject(runtime);
|
|
57
|
+
return margelo::nitro::rngooglemapsplus::RNCameraChange(
|
|
58
|
+
JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "center")),
|
|
59
|
+
JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "zoom")),
|
|
60
|
+
JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "bearing")),
|
|
61
|
+
JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "tilt"))
|
|
62
|
+
);
|
|
63
|
+
}
|
|
64
|
+
static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNCameraChange& arg) {
|
|
65
|
+
jsi::Object obj(runtime);
|
|
66
|
+
obj.setProperty(runtime, "center", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.center));
|
|
67
|
+
obj.setProperty(runtime, "zoom", JSIConverter<double>::toJSI(runtime, arg.zoom));
|
|
68
|
+
obj.setProperty(runtime, "bearing", JSIConverter<double>::toJSI(runtime, arg.bearing));
|
|
69
|
+
obj.setProperty(runtime, "tilt", JSIConverter<double>::toJSI(runtime, arg.tilt));
|
|
70
|
+
return obj;
|
|
71
|
+
}
|
|
72
|
+
static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
|
|
73
|
+
if (!value.isObject()) {
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
jsi::Object obj = value.getObject(runtime);
|
|
77
|
+
if (!nitro::isPlainObject(runtime, obj)) {
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "center"))) return false;
|
|
81
|
+
if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "zoom"))) return false;
|
|
82
|
+
if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "bearing"))) return false;
|
|
83
|
+
if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "tilt"))) return false;
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
|
|
88
|
+
} // namespace margelo::nitro
|
|
@@ -40,10 +40,11 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
40
40
|
std::optional<std::string> mapId SWIFT_PRIVATE;
|
|
41
41
|
std::optional<bool> liteMode SWIFT_PRIVATE;
|
|
42
42
|
std::optional<RNCamera> camera SWIFT_PRIVATE;
|
|
43
|
+
std::optional<std::string> backgroundColor SWIFT_PRIVATE;
|
|
43
44
|
|
|
44
45
|
public:
|
|
45
46
|
RNInitialProps() = default;
|
|
46
|
-
explicit RNInitialProps(std::optional<std::string> mapId, std::optional<bool> liteMode, std::optional<RNCamera> camera): mapId(mapId), liteMode(liteMode), camera(camera) {}
|
|
47
|
+
explicit RNInitialProps(std::optional<std::string> mapId, std::optional<bool> liteMode, std::optional<RNCamera> camera, std::optional<std::string> backgroundColor): mapId(mapId), liteMode(liteMode), camera(camera), backgroundColor(backgroundColor) {}
|
|
47
48
|
};
|
|
48
49
|
|
|
49
50
|
} // namespace margelo::nitro::rngooglemapsplus
|
|
@@ -58,7 +59,8 @@ namespace margelo::nitro {
|
|
|
58
59
|
return margelo::nitro::rngooglemapsplus::RNInitialProps(
|
|
59
60
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "mapId")),
|
|
60
61
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "liteMode")),
|
|
61
|
-
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNCamera>>::fromJSI(runtime, obj.getProperty(runtime, "camera"))
|
|
62
|
+
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNCamera>>::fromJSI(runtime, obj.getProperty(runtime, "camera")),
|
|
63
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "backgroundColor"))
|
|
62
64
|
);
|
|
63
65
|
}
|
|
64
66
|
static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNInitialProps& arg) {
|
|
@@ -66,6 +68,7 @@ namespace margelo::nitro {
|
|
|
66
68
|
obj.setProperty(runtime, "mapId", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.mapId));
|
|
67
69
|
obj.setProperty(runtime, "liteMode", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.liteMode));
|
|
68
70
|
obj.setProperty(runtime, "camera", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNCamera>>::toJSI(runtime, arg.camera));
|
|
71
|
+
obj.setProperty(runtime, "backgroundColor", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.backgroundColor));
|
|
69
72
|
return obj;
|
|
70
73
|
}
|
|
71
74
|
static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
|
|
@@ -79,6 +82,7 @@ namespace margelo::nitro {
|
|
|
79
82
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "mapId"))) return false;
|
|
80
83
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "liteMode"))) return false;
|
|
81
84
|
if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNCamera>>::canConvert(runtime, obj.getProperty(runtime, "camera"))) return false;
|
|
85
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "backgroundColor"))) return false;
|
|
82
86
|
return true;
|
|
83
87
|
}
|
|
84
88
|
};
|
|
@@ -47,7 +47,6 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
47
47
|
std::optional<double> zIndex SWIFT_PRIVATE;
|
|
48
48
|
RNLatLng coordinate SWIFT_PRIVATE;
|
|
49
49
|
std::optional<RNPosition> anchor SWIFT_PRIVATE;
|
|
50
|
-
std::optional<bool> showInfoWindow SWIFT_PRIVATE;
|
|
51
50
|
std::optional<std::string> title SWIFT_PRIVATE;
|
|
52
51
|
std::optional<std::string> snippet SWIFT_PRIVATE;
|
|
53
52
|
std::optional<double> opacity SWIFT_PRIVATE;
|
|
@@ -56,10 +55,11 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
56
55
|
std::optional<double> rotation SWIFT_PRIVATE;
|
|
57
56
|
std::optional<RNPosition> infoWindowAnchor SWIFT_PRIVATE;
|
|
58
57
|
std::optional<RNMarkerSvg> iconSvg SWIFT_PRIVATE;
|
|
58
|
+
std::optional<RNMarkerSvg> infoWindowIconSvg SWIFT_PRIVATE;
|
|
59
59
|
|
|
60
60
|
public:
|
|
61
61
|
RNMarker() = default;
|
|
62
|
-
explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, std::optional<
|
|
62
|
+
explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, std::optional<std::string> title, std::optional<std::string> snippet, std::optional<double> opacity, std::optional<bool> flat, std::optional<bool> draggable, std::optional<double> rotation, std::optional<RNPosition> infoWindowAnchor, std::optional<RNMarkerSvg> iconSvg, std::optional<RNMarkerSvg> infoWindowIconSvg): id(id), zIndex(zIndex), coordinate(coordinate), anchor(anchor), title(title), snippet(snippet), opacity(opacity), flat(flat), draggable(draggable), rotation(rotation), infoWindowAnchor(infoWindowAnchor), iconSvg(iconSvg), infoWindowIconSvg(infoWindowIconSvg) {}
|
|
63
63
|
};
|
|
64
64
|
|
|
65
65
|
} // namespace margelo::nitro::rngooglemapsplus
|
|
@@ -76,7 +76,6 @@ namespace margelo::nitro {
|
|
|
76
76
|
JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "zIndex")),
|
|
77
77
|
JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "coordinate")),
|
|
78
78
|
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::fromJSI(runtime, obj.getProperty(runtime, "anchor")),
|
|
79
|
-
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "showInfoWindow")),
|
|
80
79
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "title")),
|
|
81
80
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "snippet")),
|
|
82
81
|
JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "opacity")),
|
|
@@ -84,7 +83,8 @@ namespace margelo::nitro {
|
|
|
84
83
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "draggable")),
|
|
85
84
|
JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "rotation")),
|
|
86
85
|
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::fromJSI(runtime, obj.getProperty(runtime, "infoWindowAnchor")),
|
|
87
|
-
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::fromJSI(runtime, obj.getProperty(runtime, "iconSvg"))
|
|
86
|
+
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::fromJSI(runtime, obj.getProperty(runtime, "iconSvg")),
|
|
87
|
+
JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::fromJSI(runtime, obj.getProperty(runtime, "infoWindowIconSvg"))
|
|
88
88
|
);
|
|
89
89
|
}
|
|
90
90
|
static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNMarker& arg) {
|
|
@@ -93,7 +93,6 @@ namespace margelo::nitro {
|
|
|
93
93
|
obj.setProperty(runtime, "zIndex", JSIConverter<std::optional<double>>::toJSI(runtime, arg.zIndex));
|
|
94
94
|
obj.setProperty(runtime, "coordinate", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.coordinate));
|
|
95
95
|
obj.setProperty(runtime, "anchor", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::toJSI(runtime, arg.anchor));
|
|
96
|
-
obj.setProperty(runtime, "showInfoWindow", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.showInfoWindow));
|
|
97
96
|
obj.setProperty(runtime, "title", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.title));
|
|
98
97
|
obj.setProperty(runtime, "snippet", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.snippet));
|
|
99
98
|
obj.setProperty(runtime, "opacity", JSIConverter<std::optional<double>>::toJSI(runtime, arg.opacity));
|
|
@@ -102,6 +101,7 @@ namespace margelo::nitro {
|
|
|
102
101
|
obj.setProperty(runtime, "rotation", JSIConverter<std::optional<double>>::toJSI(runtime, arg.rotation));
|
|
103
102
|
obj.setProperty(runtime, "infoWindowAnchor", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::toJSI(runtime, arg.infoWindowAnchor));
|
|
104
103
|
obj.setProperty(runtime, "iconSvg", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::toJSI(runtime, arg.iconSvg));
|
|
104
|
+
obj.setProperty(runtime, "infoWindowIconSvg", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::toJSI(runtime, arg.infoWindowIconSvg));
|
|
105
105
|
return obj;
|
|
106
106
|
}
|
|
107
107
|
static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
|
|
@@ -116,7 +116,6 @@ namespace margelo::nitro {
|
|
|
116
116
|
if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "zIndex"))) return false;
|
|
117
117
|
if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "coordinate"))) return false;
|
|
118
118
|
if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::canConvert(runtime, obj.getProperty(runtime, "anchor"))) return false;
|
|
119
|
-
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "showInfoWindow"))) return false;
|
|
120
119
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "title"))) return false;
|
|
121
120
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "snippet"))) return false;
|
|
122
121
|
if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "opacity"))) return false;
|
|
@@ -125,6 +124,7 @@ namespace margelo::nitro {
|
|
|
125
124
|
if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "rotation"))) return false;
|
|
126
125
|
if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::canConvert(runtime, obj.getProperty(runtime, "infoWindowAnchor"))) return false;
|
|
127
126
|
if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::canConvert(runtime, obj.getProperty(runtime, "iconSvg"))) return false;
|
|
127
|
+
if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::canConvert(runtime, obj.getProperty(runtime, "infoWindowIconSvg"))) return false;
|
|
128
128
|
return true;
|
|
129
129
|
}
|
|
130
130
|
};
|