react-native-google-maps-plus 1.7.0-dev.13 → 1.7.0-dev.15

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 (34) hide show
  1. package/android/build.gradle +1 -1
  2. package/android/gradle.properties +2 -1
  3. package/android/src/main/java/com/rngooglemapsplus/MapCircleBuilder.kt +2 -3
  4. package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt +24 -33
  5. package/android/src/main/java/com/rngooglemapsplus/MapPolygonBuilder.kt +6 -23
  6. package/android/src/main/java/com/rngooglemapsplus/MapPolylineBuilder.kt.kt +12 -39
  7. package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +1 -1
  8. package/android/src/main/java/com/rngooglemapsplus/extensions/RNLineCapTypeExtension.kt +14 -0
  9. package/android/src/main/java/com/rngooglemapsplus/extensions/RNLineJoinTypeExtension.kt +12 -0
  10. package/android/src/main/java/com/rngooglemapsplus/extensions/RNMapCircleExtension.kt +7 -1
  11. package/android/src/main/java/com/rngooglemapsplus/extensions/RNMarkerExtension.kt +54 -17
  12. package/android/src/main/java/com/rngooglemapsplus/extensions/RNPolygonExtension.kt +31 -1
  13. package/android/src/main/java/com/rngooglemapsplus/extensions/RNPolylineExtension.kt +6 -1
  14. package/ios/MapCircleBuilder.swift +2 -3
  15. package/ios/MapMarkerBuilder.swift +52 -49
  16. package/ios/MapPolygonBuilder.swift +6 -41
  17. package/ios/MapPolylineBuilder.swift +2 -10
  18. package/ios/RNGoogleMapsPlusView.swift +1 -1
  19. package/ios/extensions/RNCircle+Extension.swift +14 -5
  20. package/ios/extensions/RNLatLng+Extension.swift +11 -0
  21. package/ios/extensions/RNLineCapType+Extension.swift +10 -0
  22. package/ios/extensions/RNLineJoinType+Extension.swift +11 -0
  23. package/ios/extensions/RNMarker+Extension.swift +43 -12
  24. package/ios/extensions/RNPolygon+Extension.swift.swift +50 -21
  25. package/ios/extensions/RNPolyline+Extension.swift.swift +15 -26
  26. package/lib/module/types.js.map +1 -1
  27. package/lib/typescript/src/types.d.ts +0 -1
  28. package/lib/typescript/src/types.d.ts.map +1 -1
  29. package/nitrogen/generated/android/c++/JRNMarker.hpp +1 -5
  30. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMarker.kt +2 -5
  31. package/nitrogen/generated/ios/swift/RNMarker.swift +1 -31
  32. package/nitrogen/generated/shared/c++/RNMarker.hpp +1 -5
  33. package/package.json +1 -1
  34. package/src/types.ts +0 -1
@@ -32,9 +32,6 @@ data class RNMarker(
32
32
  val anchor: RNPosition?,
33
33
  @DoNotStrip
34
34
  @Keep
35
- val showInfoWindow: Boolean?,
36
- @DoNotStrip
37
- @Keep
38
35
  val title: String?,
39
36
  @DoNotStrip
40
37
  @Keep
@@ -69,8 +66,8 @@ data class RNMarker(
69
66
  @Keep
70
67
  @Suppress("unused")
71
68
  @JvmStatic
72
- private fun fromCpp(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, showInfoWindow: Boolean?, title: String?, snippet: String?, opacity: Double?, flat: Boolean?, draggable: Boolean?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?): RNMarker {
73
- return RNMarker(id, zIndex, coordinate, anchor, showInfoWindow, title, snippet, opacity, flat, draggable, rotation, infoWindowAnchor, iconSvg, infoWindowIconSvg)
69
+ private fun fromCpp(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, title: String?, snippet: String?, opacity: Double?, flat: Boolean?, draggable: Boolean?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?): RNMarker {
70
+ return RNMarker(id, zIndex, coordinate, anchor, title, snippet, opacity, flat, draggable, rotation, infoWindowAnchor, iconSvg, infoWindowIconSvg)
74
71
  }
75
72
  }
76
73
  }
@@ -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?, infoWindowIconSvg: RNMarkerSvg?) {
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))
@@ -150,30 +144,6 @@ public extension RNMarker {
150
144
  }
151
145
  }
152
146
 
153
- var showInfoWindow: Bool? {
154
- @inline(__always)
155
- get {
156
- return { () -> Bool? in
157
- if bridge.has_value_std__optional_bool_(self.__showInfoWindow) {
158
- let __unwrapped = bridge.get_std__optional_bool_(self.__showInfoWindow)
159
- return __unwrapped
160
- } else {
161
- return nil
162
- }
163
- }()
164
- }
165
- @inline(__always)
166
- set {
167
- self.__showInfoWindow = { () -> bridge.std__optional_bool_ in
168
- if let __unwrappedValue = newValue {
169
- return bridge.create_std__optional_bool_(__unwrappedValue)
170
- } else {
171
- return .init()
172
- }
173
- }()
174
- }
175
- }
176
-
177
147
  var title: String? {
178
148
  @inline(__always)
179
149
  get {
@@ -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;
@@ -60,7 +59,7 @@ namespace margelo::nitro::rngooglemapsplus {
60
59
 
61
60
  public:
62
61
  RNMarker() = default;
63
- explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, std::optional<bool> showInfoWindow, 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), showInfoWindow(showInfoWindow), title(title), snippet(snippet), opacity(opacity), flat(flat), draggable(draggable), rotation(rotation), infoWindowAnchor(infoWindowAnchor), iconSvg(iconSvg), infoWindowIconSvg(infoWindowIconSvg) {}
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) {}
64
63
  };
65
64
 
66
65
  } // namespace margelo::nitro::rngooglemapsplus
@@ -77,7 +76,6 @@ namespace margelo::nitro {
77
76
  JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "zIndex")),
78
77
  JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::fromJSI(runtime, obj.getProperty(runtime, "coordinate")),
79
78
  JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::fromJSI(runtime, obj.getProperty(runtime, "anchor")),
80
- JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "showInfoWindow")),
81
79
  JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "title")),
82
80
  JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "snippet")),
83
81
  JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "opacity")),
@@ -95,7 +93,6 @@ namespace margelo::nitro {
95
93
  obj.setProperty(runtime, "zIndex", JSIConverter<std::optional<double>>::toJSI(runtime, arg.zIndex));
96
94
  obj.setProperty(runtime, "coordinate", JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::toJSI(runtime, arg.coordinate));
97
95
  obj.setProperty(runtime, "anchor", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::toJSI(runtime, arg.anchor));
98
- obj.setProperty(runtime, "showInfoWindow", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.showInfoWindow));
99
96
  obj.setProperty(runtime, "title", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.title));
100
97
  obj.setProperty(runtime, "snippet", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.snippet));
101
98
  obj.setProperty(runtime, "opacity", JSIConverter<std::optional<double>>::toJSI(runtime, arg.opacity));
@@ -119,7 +116,6 @@ namespace margelo::nitro {
119
116
  if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "zIndex"))) return false;
120
117
  if (!JSIConverter<margelo::nitro::rngooglemapsplus::RNLatLng>::canConvert(runtime, obj.getProperty(runtime, "coordinate"))) return false;
121
118
  if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::canConvert(runtime, obj.getProperty(runtime, "anchor"))) return false;
122
- if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "showInfoWindow"))) return false;
123
119
  if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "title"))) return false;
124
120
  if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "snippet"))) return false;
125
121
  if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "opacity"))) return false;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-google-maps-plus",
3
- "version": "1.7.0-dev.13",
3
+ "version": "1.7.0-dev.15",
4
4
  "description": "React Native wrapper for Android & iOS Google Maps SDK",
5
5
  "main": "./lib/module/index.js",
6
6
  "module": "./lib/module/index.js",
package/src/types.ts CHANGED
@@ -163,7 +163,6 @@ export type RNMarker = {
163
163
  zIndex?: number;
164
164
  coordinate: RNLatLng;
165
165
  anchor?: RNPosition;
166
- showInfoWindow?: boolean;
167
166
  title?: string;
168
167
  snippet?: string;
169
168
  opacity?: number;