@rnmapbox/maps 10.1.3 → 10.1.4
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/README.md +1 -1
- package/android/build.gradle +1 -1
- package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewManager.kt +5 -2
- package/android/src/main/java/com/rnmapbox/rnmbx/utils/GeoJSONUtils.kt +5 -0
- package/ios/RNMBX/RNMBXMarkerView.swift +11 -24
- package/ios/RNMBX/RNMBXMarkerViewManager.m +1 -1
- package/ios/RNMBX/RNMBXModule.swift +1 -3
- package/lib/commonjs/components/MarkerView.js +3 -3
- package/lib/commonjs/components/MarkerView.js.map +1 -1
- package/lib/commonjs/specs/RNMBXMarkerViewNativeComponent.js.map +1 -1
- package/lib/module/components/MarkerView.js +4 -4
- package/lib/module/components/MarkerView.js.map +1 -1
- package/lib/module/specs/RNMBXMarkerViewNativeComponent.js.map +1 -1
- package/lib/typescript/src/components/MarkerView.d.ts.map +1 -1
- package/lib/typescript/src/specs/RNMBXMarkerViewNativeComponent.d.ts +2 -1
- package/lib/typescript/src/specs/RNMBXMarkerViewNativeComponent.d.ts.map +1 -1
- package/package.json +1 -1
- package/rnmapbox-maps.podspec +1 -1
- package/src/components/MarkerView.tsx +8 -5
- package/src/specs/RNMBXMarkerViewNativeComponent.ts +4 -2
package/README.md
CHANGED
|
@@ -79,7 +79,7 @@ _See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using
|
|
|
79
79
|
|
|
80
80
|
## Installation
|
|
81
81
|
|
|
82
|
-
Check our [Installation
|
|
82
|
+
Check our [Installation instructions](https://rnmapbox.github.io/docs/install)
|
|
83
83
|
|
|
84
84
|
### Getting Started
|
|
85
85
|
For more information, check out our [Getting Started](/docs/GettingStarted.md) section
|
package/android/build.gradle
CHANGED
package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewManager.kt
CHANGED
|
@@ -16,6 +16,8 @@ import com.mapbox.maps.ScreenCoordinate
|
|
|
16
16
|
import com.mapbox.maps.viewannotation.ViewAnnotationManager
|
|
17
17
|
import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
|
|
18
18
|
import com.rnmapbox.rnmbx.v11compat.annotation.*
|
|
19
|
+
import com.rnmapbox.rnmbx.utils.LatLng
|
|
20
|
+
import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toGNPointGeometry
|
|
19
21
|
|
|
20
22
|
class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
|
|
21
23
|
AbstractEventEmitter<RNMBXMarkerView>(reactApplicationContext),
|
|
@@ -35,8 +37,9 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
|
|
|
35
37
|
}
|
|
36
38
|
|
|
37
39
|
@ReactProp(name = "coordinate")
|
|
38
|
-
override fun setCoordinate(markerView: RNMBXMarkerView,
|
|
39
|
-
|
|
40
|
+
override fun setCoordinate(markerView: RNMBXMarkerView, value: Dynamic) {
|
|
41
|
+
val array = value.asArray()
|
|
42
|
+
markerView.setCoordinate(toGNPointGeometry(LatLng(array.getDouble(1), array.getDouble(0))))
|
|
40
43
|
}
|
|
41
44
|
|
|
42
45
|
@ReactProp(name = "anchor")
|
|
@@ -109,6 +109,11 @@ object GeoJSONUtils {
|
|
|
109
109
|
return map
|
|
110
110
|
}
|
|
111
111
|
|
|
112
|
+
@JvmStatic
|
|
113
|
+
fun toGNPointGeometry(latLng: LatLng): Point? {
|
|
114
|
+
return Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude())
|
|
115
|
+
}
|
|
116
|
+
|
|
112
117
|
fun toPointGeometry(latLng: LatLng): WritableMap {
|
|
113
118
|
val geometry: WritableMap = WritableNativeMap()
|
|
114
119
|
geometry.putString("type", "Point")
|
|
@@ -42,7 +42,7 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
|
|
|
42
42
|
|
|
43
43
|
var didAddToMap = false
|
|
44
44
|
|
|
45
|
-
@objc public var coordinate:
|
|
45
|
+
@objc public var coordinate: Array<NSNumber>? {
|
|
46
46
|
didSet {
|
|
47
47
|
update()
|
|
48
48
|
}
|
|
@@ -79,32 +79,19 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
var point: Point? {
|
|
82
|
-
guard let
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
guard let _lat = coordinate?[1] else {
|
|
83
|
+
Logger.log(level: .error, message: "[getPoint] No latitude were set")
|
|
84
|
+
return nil
|
|
85
85
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
return nil
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
guard let _feature = try? JSONDecoder().decode(Feature.self, from: _data) else {
|
|
93
|
-
Logger.log(level: .error, message: "[getPoint] Cannot parse serialized coordinate")
|
|
94
|
-
return nil
|
|
86
|
+
guard let _lon = coordinate?[0] else {
|
|
87
|
+
Logger.log(level: .error, message: "[getPoint] No Longitude were set")
|
|
88
|
+
return nil
|
|
95
89
|
}
|
|
90
|
+
|
|
91
|
+
let coord = CLLocationCoordinate2D(
|
|
92
|
+
latitude: Double(_lat) as CLLocationDegrees, longitude: Double(_lon) as CLLocationDegrees);
|
|
96
93
|
|
|
97
|
-
|
|
98
|
-
Logger.log(level: .error, message: "[getPoint] Invalid geometry")
|
|
99
|
-
return nil
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
guard case .point(let _point) = _geometry else {
|
|
103
|
-
Logger.log(level: .error, message: "[getPoint] Invalid point")
|
|
104
|
-
return nil
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
return _point
|
|
94
|
+
return Point(coord)
|
|
108
95
|
}
|
|
109
96
|
|
|
110
97
|
// MARK: - RNMBXMapComponent methods
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
@interface RCT_EXTERN_REMAP_MODULE(RNMBXMarkerView, RNMBXMarkerViewManager, RCTViewManager)
|
|
6
6
|
|
|
7
|
-
RCT_EXPORT_VIEW_PROPERTY(coordinate,
|
|
7
|
+
RCT_EXPORT_VIEW_PROPERTY(coordinate, NSArray)
|
|
8
8
|
RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary)
|
|
9
9
|
RCT_EXPORT_VIEW_PROPERTY(allowOverlap, BOOL)
|
|
10
10
|
RCT_EXPORT_VIEW_PROPERTY(allowOverlapWithPuck, BOOL)
|
|
@@ -103,9 +103,7 @@ class RNMBXModule : NSObject {
|
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
@objc func setTelemetryEnabled(_ telemetryEnabled: Bool) {
|
|
106
|
-
|
|
107
|
-
UserDefaults.mme_configuration().mme_isCollectionEnabled = telemetryEnabled
|
|
108
|
-
#endif
|
|
106
|
+
UserDefaults.standard.set(telemetryEnabled, forKey: "MGLMapboxMetricsEnabled")
|
|
109
107
|
}
|
|
110
108
|
|
|
111
109
|
@objc func setWellKnownTileServer(_ tileServer: String) {
|
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
var _reactNative = require("react-native");
|
|
9
|
+
var _RNMBXMarkerViewContentNativeComponent = _interopRequireDefault(require("../specs/RNMBXMarkerViewContentNativeComponent"));
|
|
10
|
+
var _RNMBXMarkerViewNativeComponent = _interopRequireDefault(require("../specs/RNMBXMarkerViewNativeComponent"));
|
|
9
11
|
var _utils = require("../utils");
|
|
10
12
|
var _geoUtils = require("../utils/geoUtils");
|
|
11
|
-
var _RNMBXMarkerViewNativeComponent = _interopRequireDefault(require("../specs/RNMBXMarkerViewNativeComponent"));
|
|
12
|
-
var _RNMBXMarkerViewContentNativeComponent = _interopRequireDefault(require("../specs/RNMBXMarkerViewContentNativeComponent"));
|
|
13
13
|
var _PointAnnotation = _interopRequireDefault(require("./PointAnnotation"));
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
15
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
@@ -71,7 +71,7 @@ class MarkerView extends _react.default.PureComponent {
|
|
|
71
71
|
flex: 0,
|
|
72
72
|
alignSelf: 'flex-start'
|
|
73
73
|
}, this.props.style],
|
|
74
|
-
coordinate: this.
|
|
74
|
+
coordinate: [Number(this.props.coordinate[0]), Number(this.props.coordinate[1])],
|
|
75
75
|
anchor: anchor,
|
|
76
76
|
allowOverlap: this.props.allowOverlap,
|
|
77
77
|
allowOverlapWithPuck: this.props.allowOverlapWithPuck,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_RNMBXMarkerViewContentNativeComponent","_RNMBXMarkerViewNativeComponent","_utils","_geoUtils","_PointAnnotation","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","Mapbox","NativeModules","RNMBXModule","MarkerView","React","PureComponent","defaultProps","anchor","x","y","allowOverlap","allowOverlapWithPuck","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","toJSONString","makePoint","render","props","console","warn","Platform","OS","MapboxV10","createElement","id","RNMBXMarkerView","style","flex","alignSelf","Number","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children","NativeMarkerViewComponent","_default","exports"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","obj","__esModule","default","_default","exports","codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","obj","__esModule","default","_default","exports","codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":";;;;;;AAEA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAAAC,OAAA,CAAAF,OAAA,GAmB9E,IAAAG,+BAAsB,EACnC,iBACF,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import {
|
|
3
|
+
import { NativeModules, Platform } from 'react-native';
|
|
4
|
+
import RNMBXMakerViewContentCoponent from '../specs/RNMBXMarkerViewContentNativeComponent';
|
|
5
|
+
import NativeMarkerViewComponent from '../specs/RNMBXMarkerViewNativeComponent';
|
|
4
6
|
import { toJSONString } from '../utils';
|
|
5
7
|
import { makePoint } from '../utils/geoUtils';
|
|
6
|
-
import NativeMarkerViewComponent from '../specs/RNMBXMarkerViewNativeComponent';
|
|
7
|
-
import RNMBXMakerViewContentCoponent from '../specs/RNMBXMarkerViewContentNativeComponent';
|
|
8
8
|
import PointAnnotation from './PointAnnotation';
|
|
9
9
|
const Mapbox = NativeModules.RNMBXModule;
|
|
10
10
|
/**
|
|
@@ -64,7 +64,7 @@ class MarkerView extends React.PureComponent {
|
|
|
64
64
|
flex: 0,
|
|
65
65
|
alignSelf: 'flex-start'
|
|
66
66
|
}, this.props.style],
|
|
67
|
-
coordinate: this.
|
|
67
|
+
coordinate: [Number(this.props.coordinate[0]), Number(this.props.coordinate[1])],
|
|
68
68
|
anchor: anchor,
|
|
69
69
|
allowOverlap: this.props.allowOverlap,
|
|
70
70
|
allowOverlapWithPuck: this.props.allowOverlapWithPuck,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","
|
|
1
|
+
{"version":3,"names":["React","NativeModules","Platform","RNMBXMakerViewContentCoponent","NativeMarkerViewComponent","toJSONString","makePoint","PointAnnotation","Mapbox","RNMBXModule","MarkerView","PureComponent","defaultProps","anchor","x","y","allowOverlap","allowOverlapWithPuck","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","render","props","console","warn","OS","MapboxV10","createElement","_extends","id","RNMBXMarkerView","style","flex","alignSelf","Number","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":";AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,aAAa,EAAEC,QAAQ,QAAwB,cAAc;AAEtE,OAAOC,6BAA6B,MAAM,gDAAgD;AAC1F,OAAOC,yBAAyB,MAAM,yCAAyC;AAE/E,SAASC,YAAY,QAAQ,UAAU;AACvC,SAASC,SAAS,QAAQ,mBAAmB;AAE7C,OAAOC,eAAe,MAAM,mBAAmB;AAE/C,MAAMC,MAAM,GAAGP,aAAa,CAACQ,WAAW;AAuCxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,UAAU,SAASV,KAAK,CAACW,aAAa,CAAQ;EAClD,OAAOC,YAAY,GAAmB;IACpCC,MAAM,EAAE;MAAEC,CAAC,EAAE,GAAG;MAAEC,CAAC,EAAE;IAAI,CAAC;IAC1BC,YAAY,EAAE,KAAK;IACnBC,oBAAoB,EAAE,KAAK;IAC3BC,UAAU,EAAE;EACd,CAAC;EAED,OAAOC,MAAM,GAAG,CAAC;EAGjBC,qBAAqBA,CAAA,EAAW;IAC9B,IAAI,IAAI,CAACC,sBAAsB,KAAKC,SAAS,EAAE;MAC7CZ,UAAU,CAACS,MAAM,GAAGT,UAAU,CAACS,MAAM,GAAG,CAAC;MACzC,IAAI,CAACE,sBAAsB,GAAI,MAAKX,UAAU,CAACS,MAAO,EAAC;IACzD;IACA,OAAO,IAAI,CAACE,sBAAsB;EACpC;EAEAE,cAAcA,CAACC,UAAoB,EAAsB;IACvD,IAAI,CAACA,UAAU,EAAE;MACf,OAAOF,SAAS;IAClB;IACA,OAAOjB,YAAY,CAACC,SAAS,CAACkB,UAAU,CAAC,CAAC;EAC5C;EAEAC,MAAMA,CAAA,EAAG;IACP,IACE,IAAI,CAACC,KAAK,CAACb,MAAM,CAACC,CAAC,GAAG,CAAC,IACvB,IAAI,CAACY,KAAK,CAACb,MAAM,CAACE,CAAC,GAAG,CAAC,IACvB,IAAI,CAACW,KAAK,CAACb,MAAM,CAACC,CAAC,GAAG,CAAC,IACvB,IAAI,CAACY,KAAK,CAACb,MAAM,CAACE,CAAC,GAAG,CAAC,EACvB;MACAY,OAAO,CAACC,IAAI,CACT,mCAAkC,IAAI,CAACF,KAAK,CAACb,MAAM,CAACC,CAAE,KAAI,IAAI,CAACY,KAAK,CAACb,MAAM,CAACE,CAAE,oDACjF,CAAC;IACH;IAEA,IAAIb,QAAQ,CAAC2B,EAAE,KAAK,KAAK,IAAI,CAACrB,MAAM,CAACsB,SAAS,EAAE;MAC9C,oBACE9B,KAAA,CAAA+B,aAAA,CAACxB,eAAe,EAAAyB,QAAA;QAACC,EAAE,EAAE,IAAI,CAACb,qBAAqB,CAAC;MAAE,GAAK,IAAI,CAACM,KAAK,CAAG,CAAC;IAEzE;IAEA,MAAM;MAAEb,MAAM,GAAG;QAAEC,CAAC,EAAE,GAAG;QAAEC,CAAC,EAAE;MAAI;IAAE,CAAC,GAAG,IAAI,CAACW,KAAK;IAElD,oBACE1B,KAAA,CAAA+B,aAAA,CAACG,eAAe;MACdC,KAAK,EAAE,CACL;QACEC,IAAI,EAAE,CAAC;QACPC,SAAS,EAAE;MACb,CAAC,EACD,IAAI,CAACX,KAAK,CAACS,KAAK,CAChB;MACFX,UAAU,EAAE,CACVc,MAAM,CAAC,IAAI,CAACZ,KAAK,CAACF,UAAU,CAAC,CAAC,CAAC,CAAC,EAChCc,MAAM,CAAC,IAAI,CAACZ,KAAK,CAACF,UAAU,CAAC,CAAC,CAAC,CAAC,CAChC;MACFX,MAAM,EAAEA,MAAO;MACfG,YAAY,EAAE,IAAI,CAACU,KAAK,CAACV,YAAa;MACtCC,oBAAoB,EAAE,IAAI,CAACS,KAAK,CAACT,oBAAqB;MACtDC,UAAU,EAAE,IAAI,CAACQ,KAAK,CAACR,UAAW;MAClCqB,UAAU,EAAGC,CAAC,IAAK;QACjBA,CAAC,CAACC,eAAe,CAAC,CAAC;MACrB;IAAE,gBAEFzC,KAAA,CAAA+B,aAAA,CAAC5B,6BAA6B;MAC5BgC,KAAK,EAAE;QAAEC,IAAI,EAAE,CAAC;QAAEC,SAAS,EAAE;MAAa,CAAE;MAC5CK,yBAAyB,EAAGC,MAAM,IAAK;QACrC,OAAO,IAAI;MACb,CAAE;MACFJ,UAAU,EAAGC,CAAC,IAAK;QACjBA,CAAC,CAACC,eAAe,CAAC,CAAC;MACrB;IAAE,GAED,IAAI,CAACf,KAAK,CAACkB,QACiB,CAChB,CAAC;EAEtB;AACF;AAEA,MAAMV,eAAe,GAAG9B,yBAAyB;AAEjD,eAAeM,UAAU"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":"
|
|
1
|
+
{"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":"AAEA,OAAOA,sBAAsB,MAAM,yDAAyD;AAmB5F,eAAeA,sBAAsB,CACnC,iBACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkerView.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkerView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIvE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAQlD,aAAK,KAAK,GAAG,SAAS,GAAG;IACvB;;OAEG;IACH,UAAU,EAAE,QAAQ,CAAC;IAErB;;;OAGG;IACH,MAAM,EAAE;QACN,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IAEF;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IACjD,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAKjC;IAEF,MAAM,CAAC,MAAM,SAAK;IAClB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qBAAqB,IAAI,MAAM;IAQ/B,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS;IAOxD,MAAM;
|
|
1
|
+
{"version":3,"file":"MarkerView.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkerView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIvE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAQlD,aAAK,KAAK,GAAG,SAAS,GAAG;IACvB;;OAEG;IACH,UAAU,EAAE,QAAQ,CAAC;IAErB;;;OAGG;IACH,MAAM,EAAE;QACN,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IAEF;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IACjD,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAKjC;IAEF,MAAM,CAAC,MAAM,SAAK;IAClB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qBAAqB,IAAI,MAAM;IAQ/B,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS;IAOxD,MAAM;CAuDP;AAID,eAAe,UAAU,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { HostComponent, ViewProps } from 'react-native';
|
|
2
2
|
import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
|
|
3
|
+
import { Position } from '../types/Position';
|
|
3
4
|
import { UnsafeMixed } from './codegenUtils';
|
|
4
5
|
declare type Point = {
|
|
5
6
|
x: Int32;
|
|
6
7
|
y: Int32;
|
|
7
8
|
};
|
|
8
9
|
export interface NativeProps extends ViewProps {
|
|
9
|
-
coordinate?: UnsafeMixed<
|
|
10
|
+
coordinate?: UnsafeMixed<Position>;
|
|
10
11
|
anchor: UnsafeMixed<Point>;
|
|
11
12
|
allowOverlap: UnsafeMixed<boolean>;
|
|
12
13
|
allowOverlapWithPuck: UnsafeMixed<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RNMBXMarkerViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/specs/RNMBXMarkerViewNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"RNMBXMarkerViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/specs/RNMBXMarkerViewNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,aAAK,KAAK,GAAG;IACX,CAAC,EAAE,KAAK,CAAC;IACT,CAAC,EAAE,KAAK,CAAC;CACV,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,UAAU,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,oBAAoB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CAClC;;AAED,wBAEgC"}
|
package/package.json
CHANGED
package/rnmapbox-maps.podspec
CHANGED
|
@@ -20,7 +20,7 @@ require 'json'
|
|
|
20
20
|
package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
|
|
21
21
|
|
|
22
22
|
## Warning: these lines are scanned by autogenerate.js
|
|
23
|
-
rnMapboxMapsDefaultMapboxVersion = '~> 10.16.
|
|
23
|
+
rnMapboxMapsDefaultMapboxVersion = '~> 10.16.3'
|
|
24
24
|
|
|
25
25
|
rnMapboxMapsDefaultImpl = 'mapbox'
|
|
26
26
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { NativeModules, Platform, type ViewProps } from 'react-native';
|
|
3
3
|
|
|
4
|
+
import RNMBXMakerViewContentCoponent from '../specs/RNMBXMarkerViewContentNativeComponent';
|
|
5
|
+
import NativeMarkerViewComponent from '../specs/RNMBXMarkerViewNativeComponent';
|
|
6
|
+
import { type Position } from '../types/Position';
|
|
4
7
|
import { toJSONString } from '../utils';
|
|
5
8
|
import { makePoint } from '../utils/geoUtils';
|
|
6
|
-
import { type Position } from '../types/Position';
|
|
7
|
-
import NativeMarkerViewComponent from '../specs/RNMBXMarkerViewNativeComponent';
|
|
8
|
-
import RNMBXMakerViewContentCoponent from '../specs/RNMBXMarkerViewContentNativeComponent';
|
|
9
9
|
|
|
10
10
|
import PointAnnotation from './PointAnnotation';
|
|
11
11
|
|
|
@@ -116,7 +116,10 @@ class MarkerView extends React.PureComponent<Props> {
|
|
|
116
116
|
},
|
|
117
117
|
this.props.style,
|
|
118
118
|
]}
|
|
119
|
-
coordinate={
|
|
119
|
+
coordinate={[
|
|
120
|
+
Number(this.props.coordinate[0]),
|
|
121
|
+
Number(this.props.coordinate[1]),
|
|
122
|
+
]}
|
|
120
123
|
anchor={anchor}
|
|
121
124
|
allowOverlap={this.props.allowOverlap}
|
|
122
125
|
allowOverlapWithPuck={this.props.allowOverlapWithPuck}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { HostComponent, ViewProps } from 'react-native';
|
|
2
|
-
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
|
|
3
2
|
import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
|
|
3
|
+
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
|
|
4
|
+
|
|
5
|
+
import { Position } from '../types/Position';
|
|
4
6
|
|
|
5
7
|
import { UnsafeMixed } from './codegenUtils';
|
|
6
8
|
|
|
@@ -10,7 +12,7 @@ type Point = {
|
|
|
10
12
|
};
|
|
11
13
|
|
|
12
14
|
export interface NativeProps extends ViewProps {
|
|
13
|
-
coordinate?: UnsafeMixed<
|
|
15
|
+
coordinate?: UnsafeMixed<Position>;
|
|
14
16
|
anchor: UnsafeMixed<Point>;
|
|
15
17
|
allowOverlap: UnsafeMixed<boolean>;
|
|
16
18
|
allowOverlapWithPuck: UnsafeMixed<boolean>;
|