@rnmapbox/maps 10.1.0-rc.1 → 10.1.0-rc.3

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 (35) hide show
  1. package/README.md +1 -1
  2. package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt +11 -3
  3. package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContent.kt +16 -8
  4. package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewManager.kt +5 -0
  5. package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXModule.kt +18 -1
  6. package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt +11 -0
  7. package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt +5 -0
  8. package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerDelegate.java +3 -0
  9. package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerInterface.java +1 -0
  10. package/ios/RNMBX/RNMBXMarkerView.swift +10 -1
  11. package/ios/RNMBX/RNMBXMarkerViewComponentView.mm +4 -0
  12. package/ios/RNMBX/RNMBXMarkerViewManager.m +1 -0
  13. package/ios/RNMBX/RNMBXModule.m +1 -1
  14. package/ios/RNMBX/RNMBXModule.swift +24 -0
  15. package/lib/commonjs/RNMBXModule.js +3 -1
  16. package/lib/commonjs/RNMBXModule.js.map +1 -1
  17. package/lib/commonjs/components/MarkerView.js +2 -0
  18. package/lib/commonjs/components/MarkerView.js.map +1 -1
  19. package/lib/commonjs/specs/RNMBXMarkerViewNativeComponent.js.map +1 -1
  20. package/lib/module/RNMBXModule.js +1 -0
  21. package/lib/module/RNMBXModule.js.map +1 -1
  22. package/lib/module/components/MarkerView.js +2 -0
  23. package/lib/module/components/MarkerView.js.map +1 -1
  24. package/lib/module/specs/RNMBXMarkerViewNativeComponent.js.map +1 -1
  25. package/lib/typescript/src/RNMBXModule.d.ts +1 -1
  26. package/lib/typescript/src/RNMBXModule.d.ts.map +1 -1
  27. package/lib/typescript/src/components/MarkerView.d.ts +5 -0
  28. package/lib/typescript/src/components/MarkerView.d.ts.map +1 -1
  29. package/lib/typescript/src/specs/RNMBXMarkerViewNativeComponent.d.ts +1 -0
  30. package/lib/typescript/src/specs/RNMBXMarkerViewNativeComponent.d.ts.map +1 -1
  31. package/package.json +1 -1
  32. package/setup-jest.js +1 -0
  33. package/src/RNMBXModule.ts +2 -0
  34. package/src/components/MarkerView.tsx +8 -0
  35. package/src/specs/RNMBXMarkerViewNativeComponent.ts +1 -0
package/README.md CHANGED
@@ -220,7 +220,7 @@ const styles = StyleSheet.create({
220
220
 
221
221
  ### Misc
222
222
 
223
- - [Mapbox](/docs/MapboxGL.md)
223
+ - [Mapbox](/docs/Mapbox.md)
224
224
  - [CustomHttpHeaders](/docs/CustomHttpHeaders.md)
225
225
  - [Logger](/docs/Logger.md)
226
226
 
@@ -31,6 +31,7 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
31
31
  private var mCoordinate: Point? = null
32
32
  private var mAnchor: Vec2 = Vec2(0.5, 0.5)
33
33
  private var mAllowOverlap = false
34
+ private var mAllowOverlapWithPuck = false
34
35
  private var mIsSelected = false
35
36
 
36
37
  fun setCoordinate(point: Point?) {
@@ -48,6 +49,11 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
48
49
  update()
49
50
  }
50
51
 
52
+ fun setAllowOverlapWithPuck(allowOverlapWithPuck: Boolean) {
53
+ mAllowOverlapWithPuck = allowOverlapWithPuck
54
+ update()
55
+ }
56
+
51
57
  fun setIsSelected(isSelected: Boolean) {
52
58
  mIsSelected = isSelected
53
59
  update()
@@ -116,13 +122,14 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
116
122
 
117
123
  val options = getOptions()
118
124
 
119
-
125
+ val content = view as? RNMBXMarkerViewContent;
126
+ content?.inAdd = true;
127
+ didAddToMap = true
120
128
  val annotation = mMapView?.viewAnnotationManager?.addViewAnnotation(
121
129
  view,
122
130
  options
123
131
  )
124
- didAddToMap = true
125
-
132
+ content?.inAdd = false;
126
133
  }
127
134
 
128
135
  fun update() {
@@ -176,6 +183,7 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
176
183
  width(width.toDouble())
177
184
  height(height.toDouble())
178
185
  allowOverlap(mAllowOverlap)
186
+ allowOverlapWithPuck(mAllowOverlapWithPuck)
179
187
  offsets(offset.dx, offset.dy)
180
188
  selected(mIsSelected)
181
189
 
@@ -1,21 +1,29 @@
1
1
  package com.rnmapbox.rnmbx.components.annotation
2
2
 
3
3
  import android.content.Context
4
+ import android.view.View.MeasureSpec
4
5
  import com.facebook.react.uimanager.MeasureSpecAssertions
5
6
  import com.facebook.react.views.view.ReactViewGroup
6
7
 
7
8
  class RNMBXMarkerViewContent(context: Context): ReactViewGroup(context) {
9
+
10
+ var inAdd: Boolean = false
8
11
  // see https://github.com/rnmapbox/maps/pull/3235
9
12
  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
10
- try {
13
+ if (inAdd) {
14
+ val w = if (widthMeasureSpec == 0) {
15
+ MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY)
16
+ } else {
17
+ widthMeasureSpec
18
+ };
19
+ val h = if (heightMeasureSpec == 0) {
20
+ MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY)
21
+ } else {
22
+ heightMeasureSpec
23
+ }
24
+ super.onMeasure(w, h)
25
+ } else {
11
26
  super.onMeasure(widthMeasureSpec, heightMeasureSpec)
12
- } catch(e: IllegalStateException) {
13
- val w = MeasureSpec.getSize(widthMeasureSpec)
14
- val h = MeasureSpec.getSize(heightMeasureSpec)
15
- setMeasuredDimension(
16
- if (w == 0) measuredWidth else w,
17
- if (h == 0) measuredHeight else h
18
- )
19
27
  }
20
28
  }
21
29
 
@@ -49,6 +49,11 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
49
49
  markerView.setAllowOverlap(allowOverlap.asBoolean())
50
50
  }
51
51
 
52
+ @ReactProp(name = "allowOverlapWithPuck")
53
+ override fun setAllowOverlapWithPuck(markerView: RNMBXMarkerView, allowOverlapWithPuck: Dynamic) {
54
+ markerView.setAllowOverlapWithPuck(allowOverlapWithPuck.asBoolean())
55
+ }
56
+
52
57
  @ReactProp(name = "isSelected")
53
58
  override fun setIsSelected(markerView: RNMBXMarkerView, isSelected: Dynamic) {
54
59
  markerView.setIsSelected(isSelected.asBoolean())
@@ -14,12 +14,15 @@ import com.facebook.react.bridge.ReactMethod
14
14
  import com.facebook.react.common.MapBuilder
15
15
  import com.mapbox.common.*
16
16
  import com.mapbox.maps.MapView
17
+ import com.mapbox.maps.MapboxMap
17
18
  import com.mapbox.maps.Style
18
19
  import com.mapbox.maps.plugin.attribution.attribution
19
20
  import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
21
+ import com.rnmapbox.rnmbx.utils.Logger
20
22
  import java.util.HashMap
21
23
 
22
24
  import com.rnmapbox.rnmbx.v11compat.resourceoption.*
25
+ import com.rnmapbox.rnmbx.v11compat.mapboxmap.*
23
26
 
24
27
  @ReactModule(name = RNMBXModule.REACT_CLASS)
25
28
  class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactContextBaseJavaModule(
@@ -128,6 +131,19 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
128
131
  }
129
132
  }
130
133
 
134
+ @ReactMethod
135
+ fun clearData(promise: Promise) {
136
+ mReactContext.runOnUiQueueThread {
137
+ MapboxMap.clearData(mReactContext) {
138
+ if (it.isValue) {
139
+ promise.resolve(it.value)
140
+ } else {
141
+ promise.reject("error", "RNMBXModule.clearError ${it.error}")
142
+ }
143
+ }
144
+ }
145
+ }
146
+
131
147
  @ReactMethod
132
148
  fun setAccessToken(accessToken: String?, promise: Promise) {
133
149
  mReactContext.runOnUiQueueThread(Runnable {
@@ -138,7 +154,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
138
154
 
139
155
  @ReactMethod
140
156
  fun setWellKnownTileServer(tileServer: String?) {
141
- // NO-OP
157
+ Logger.e(LOG_TAG, "setWellKnownTileServer is deprecated and will be removed")
142
158
  }
143
159
 
144
160
  @ReactMethod
@@ -153,6 +169,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
153
169
 
154
170
  companion object {
155
171
  const val REACT_CLASS = "RNMBXModule"
172
+ const val LOG_TAG = "RNMBXModule"
156
173
  private val customHeaderInterceptorAdded = false
157
174
  @JvmStatic
158
175
  fun getAccessToken(reactContext: ReactApplicationContext?): String {
@@ -1,7 +1,14 @@
1
1
  package com.rnmapbox.rnmbx.v11compat.mapboxmap;
2
2
 
3
3
  import android.animation.Animator
4
+ import android.app.Activity
5
+ import android.content.Context
6
+ import android.content.ContextWrapper
7
+ import androidx.activity.result.contract.ActivityResultContracts
8
+ import com.mapbox.bindgen.Expected
9
+ import com.mapbox.bindgen.None
4
10
  import com.mapbox.maps.CameraOptions
11
+ import com.mapbox.maps.MapView
5
12
  import com.mapbox.maps.MapboxMap
6
13
  import com.mapbox.maps.plugin.animation.MapAnimationOptions
7
14
  import com.mapbox.maps.plugin.animation.easeTo
@@ -29,3 +36,7 @@ fun MapboxMap.easeToV11(
29
36
 
30
37
  )
31
38
  }
39
+
40
+ fun MapboxMap.Companion.clearData(context: Context, callback: (result: Expected<String, None>) -> Unit) {
41
+ MapView(context).getMapboxMap().clearData(callback)
42
+ }
@@ -1,6 +1,7 @@
1
1
  package com.rnmapbox.rnmbx.v11compat.mapboxmap
2
2
 
3
3
  import android.animation.Animator
4
+ import android.content.Context
4
5
  import com.mapbox.maps.AsyncOperationResultCallback
5
6
  import com.mapbox.maps.CameraOptions
6
7
  import com.mapbox.maps.MapboxMap
@@ -34,4 +35,8 @@ fun MapboxMap.easeToV11(
34
35
 
35
36
  fun MapboxMap.clearData(callback: AsyncOperationResultCallback) {
36
37
  return MapboxMap.clearData(callback)
38
+ }
39
+
40
+ fun MapboxMap.Companion.clearData(context: Context, callback: AsyncOperationResultCallback) {
41
+ this.clearData(callback)
37
42
  }
@@ -31,6 +31,9 @@ public class RNMBXMarkerViewManagerDelegate<T extends View, U extends BaseViewMa
31
31
  case "allowOverlap":
32
32
  mViewManager.setAllowOverlap(view, new DynamicFromObject(value));
33
33
  break;
34
+ case "allowOverlapWithPuck":
35
+ mViewManager.setAllowOverlapWithPuck(view, new DynamicFromObject(value));
36
+ break;
34
37
  case "isSelected":
35
38
  mViewManager.setIsSelected(view, new DynamicFromObject(value));
36
39
  break;
@@ -16,5 +16,6 @@ public interface RNMBXMarkerViewManagerInterface<T extends View> {
16
16
  void setCoordinate(T view, Dynamic value);
17
17
  void setAnchor(T view, Dynamic value);
18
18
  void setAllowOverlap(T view, Dynamic value);
19
+ void setAllowOverlapWithPuck(T view, Dynamic value);
19
20
  void setIsSelected(T view, Dynamic value);
20
21
  }
@@ -60,6 +60,12 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
60
60
  }
61
61
  }
62
62
 
63
+ @objc public var allowOverlapWithPuck: Bool = false {
64
+ didSet {
65
+ update()
66
+ }
67
+ }
68
+
63
69
  @objc public var isSelected: Bool = false {
64
70
  didSet {
65
71
  update()
@@ -227,7 +233,7 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
227
233
  let size = self.bounds.size
228
234
  let offset = calcOffset(size: size)
229
235
 
230
- let options = ViewAnnotationOptions(
236
+ var options = ViewAnnotationOptions(
231
237
  geometry: geometry,
232
238
  width: size.width,
233
239
  height: size.height,
@@ -236,6 +242,9 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
236
242
  offsetY: offset.dy,
237
243
  selected: isSelected
238
244
  )
245
+ #if RNMBX_11
246
+ options.allowOverlapWithPuck = allowOverlapWithPuck
247
+ #endif
239
248
  return options
240
249
  }
241
250
 
@@ -84,6 +84,10 @@ using namespace facebook::react;
84
84
  if (allowOverlap != nil) {
85
85
  _view.allowOverlap = allowOverlap;
86
86
  }
87
+ id allowOverlapWithPuck = RNMBXConvertFollyDynamicToId(newProps.allowOverlapWithPuck);
88
+ if (allowOverlapWithPuck != nil) {
89
+ _view.allowOverlapWithPuck = allowOverlapWithPuck;
90
+ }
87
91
  id isSelected = RNMBXConvertFollyDynamicToId(newProps.isSelected);
88
92
  if (isSelected != nil) {
89
93
  _view.isSelected = isSelected;
@@ -7,6 +7,7 @@
7
7
  RCT_EXPORT_VIEW_PROPERTY(coordinate, NSString)
8
8
  RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary)
9
9
  RCT_EXPORT_VIEW_PROPERTY(allowOverlap, BOOL)
10
+ RCT_EXPORT_VIEW_PROPERTY(allowOverlapWithPuck, BOOL)
10
11
  RCT_EXPORT_VIEW_PROPERTY(isSelected, BOOL)
11
12
 
12
13
  @end
@@ -9,6 +9,6 @@ RCT_EXTERN_METHOD(removeCustomHeader:(NSString *)headerName)
9
9
 
10
10
  RCT_EXTERN_METHOD(setTelemetryEnabled:(BOOL)telemetryEnabled)
11
11
  RCT_EXTERN_METHOD(setWellKnownTileServer:(NSString *)tileServer)
12
-
12
+ RCT_EXTERN_METHOD(clearData:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
13
13
 
14
14
  @end
@@ -113,4 +113,28 @@ class RNMBXModule : NSObject {
113
113
  Logger.error("setWellKnownTileServer: \(tileServer) should be mapbox")
114
114
  }
115
115
  }
116
+
117
+ @objc func clearData(_ resolver: @escaping RCTPromiseResolveBlock,
118
+ rejecter: @escaping RCTPromiseRejectBlock) {
119
+
120
+ DispatchQueue.main.async {
121
+ #if RNMBX_11
122
+ MapboxMap.clearData { error in
123
+ if let error = error {
124
+ rejecter("error", error.localizedDescription, error)
125
+ } else {
126
+ resolver(nil)
127
+ }
128
+ }
129
+ #else
130
+ MapboxMap.clearData(for: ResourceOptions(accessToken: RNMBXModule.accessToken ?? "")) { error in
131
+ if let error = error {
132
+ rejecter("error", error.localizedDescription, error)
133
+ } else {
134
+ resolver(nil)
135
+ }
136
+ }
137
+ #endif
138
+ }
139
+ }
116
140
  }
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.setWellKnownTileServer = exports.setTelemetryEnabled = exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.addCustomHeader = exports.TileServers = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.LineJoin = void 0;
6
+ exports.setWellKnownTileServer = exports.setTelemetryEnabled = exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.clearData = exports.addCustomHeader = exports.TileServers = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.LineJoin = void 0;
7
7
  var _reactNative = require("react-native");
8
8
  const RNMBXModule = {
9
9
  ..._reactNative.NativeModules.RNMBXModule
@@ -18,6 +18,7 @@ const {
18
18
  addCustomHeader,
19
19
  setAccessToken,
20
20
  setWellKnownTileServer,
21
+ clearData,
21
22
  getAccessToken,
22
23
  setTelemetryEnabled,
23
24
  setConnected
@@ -25,6 +26,7 @@ const {
25
26
  exports.setConnected = setConnected;
26
27
  exports.setTelemetryEnabled = setTelemetryEnabled;
27
28
  exports.getAccessToken = getAccessToken;
29
+ exports.clearData = clearData;
28
30
  exports.setWellKnownTileServer = setWellKnownTileServer;
29
31
  exports.setAccessToken = setAccessToken;
30
32
  exports.addCustomHeader = addCustomHeader;
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","RNMBXModule","NativeModules","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","getAccessToken","setTelemetryEnabled","setConnected","exports"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAsCA,MAAMC,WAAwB,GAAG;EAAE,GAAGC,0BAAa,CAACD;AAAY,CAAC;AAE1D,MAAM;EACXE,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGb,WAAW;AAACc,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,mBAAA,GAAAA,mBAAA;AAAAE,OAAA,CAAAH,cAAA,GAAAA,cAAA;AAAAG,OAAA,CAAAJ,sBAAA,GAAAA,sBAAA;AAAAI,OAAA,CAAAL,cAAA,GAAAA,cAAA;AAAAK,OAAA,CAAAN,eAAA,GAAAA,eAAA;AAAAM,OAAA,CAAAP,kBAAA,GAAAA,kBAAA;AAAAO,OAAA,CAAAR,WAAA,GAAAA,WAAA;AAAAQ,OAAA,CAAAT,WAAA,GAAAA,WAAA;AAAAS,OAAA,CAAAV,QAAA,GAAAA,QAAA;AAAAU,OAAA,CAAAX,wBAAA,GAAAA,wBAAA;AAAAW,OAAA,CAAAZ,QAAA,GAAAA,QAAA"}
1
+ {"version":3,"names":["_reactNative","require","RNMBXModule","NativeModules","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","clearData","getAccessToken","setTelemetryEnabled","setConnected","exports"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAuCA,MAAMC,WAAwB,GAAG;EAAE,GAAGC,0BAAa,CAACD;AAAY,CAAC;AAE1D,MAAM;EACXE,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,SAAS;EACTC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGd,WAAW;AAACe,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,mBAAA,GAAAA,mBAAA;AAAAE,OAAA,CAAAH,cAAA,GAAAA,cAAA;AAAAG,OAAA,CAAAJ,SAAA,GAAAA,SAAA;AAAAI,OAAA,CAAAL,sBAAA,GAAAA,sBAAA;AAAAK,OAAA,CAAAN,cAAA,GAAAA,cAAA;AAAAM,OAAA,CAAAP,eAAA,GAAAA,eAAA;AAAAO,OAAA,CAAAR,kBAAA,GAAAA,kBAAA;AAAAQ,OAAA,CAAAT,WAAA,GAAAA,WAAA;AAAAS,OAAA,CAAAV,WAAA,GAAAA,WAAA;AAAAU,OAAA,CAAAX,QAAA,GAAAA,QAAA;AAAAW,OAAA,CAAAZ,wBAAA,GAAAA,wBAAA;AAAAY,OAAA,CAAAb,QAAA,GAAAA,QAAA"}
@@ -34,6 +34,7 @@ class MarkerView extends _react.default.PureComponent {
34
34
  y: 0.5
35
35
  },
36
36
  allowOverlap: false,
37
+ allowOverlapWithPuck: false,
37
38
  isSelected: false
38
39
  };
39
40
  static lastId = 0;
@@ -73,6 +74,7 @@ class MarkerView extends _react.default.PureComponent {
73
74
  coordinate: this._getCoordinate(this.props.coordinate),
74
75
  anchor: anchor,
75
76
  allowOverlap: this.props.allowOverlap,
77
+ allowOverlapWithPuck: this.props.allowOverlapWithPuck,
76
78
  isSelected: this.props.isSelected,
77
79
  onTouchEnd: e => {
78
80
  e.stopPropagation();
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_geoUtils","_RNMBXMarkerViewNativeComponent","_RNMBXMarkerViewContentNativeComponent","_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","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","toJSONString","makePoint","render","props","console","warn","Platform","OS","MapboxV10","createElement","id","RNMBXMarkerView","style","flex","alignSelf","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children","NativeMarkerViewComponent","_default","exports"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}
1
+ {"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_geoUtils","_RNMBXMarkerViewNativeComponent","_RNMBXMarkerViewContentNativeComponent","_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","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":";;;;;;AACA,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,GAiB9E,IAAAG,+BAAsB,EACnC,iBACF,CAAC"}
1
+ {"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","obj","__esModule","default","_default","exports","codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":";;;;;;AACA,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,GAkB9E,IAAAG,+BAAsB,EACnC,iBACF,CAAC"}
@@ -12,6 +12,7 @@ export const {
12
12
  addCustomHeader,
13
13
  setAccessToken,
14
14
  setWellKnownTileServer,
15
+ clearData,
15
16
  getAccessToken,
16
17
  setTelemetryEnabled,
17
18
  setConnected
@@ -1 +1 @@
1
- {"version":3,"names":["NativeModules","RNMBXModule","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","getAccessToken","setTelemetryEnabled","setConnected"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;AAsC5C,MAAMC,WAAwB,GAAG;EAAE,GAAGD,aAAa,CAACC;AAAY,CAAC;AAEjE,OAAO,MAAM;EACXC,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGZ,WAAW"}
1
+ {"version":3,"names":["NativeModules","RNMBXModule","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","clearData","getAccessToken","setTelemetryEnabled","setConnected"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;AAuC5C,MAAMC,WAAwB,GAAG;EAAE,GAAGD,aAAa,CAACC;AAAY,CAAC;AAEjE,OAAO,MAAM;EACXC,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,SAAS;EACTC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGb,WAAW"}
@@ -27,6 +27,7 @@ class MarkerView extends React.PureComponent {
27
27
  y: 0.5
28
28
  },
29
29
  allowOverlap: false,
30
+ allowOverlapWithPuck: false,
30
31
  isSelected: false
31
32
  };
32
33
  static lastId = 0;
@@ -66,6 +67,7 @@ class MarkerView extends React.PureComponent {
66
67
  coordinate: this._getCoordinate(this.props.coordinate),
67
68
  anchor: anchor,
68
69
  allowOverlap: this.props.allowOverlap,
70
+ allowOverlapWithPuck: this.props.allowOverlapWithPuck,
69
71
  isSelected: this.props.isSelected,
70
72
  onTouchEnd: e => {
71
73
  e.stopPropagation();
@@ -1 +1 @@
1
- {"version":3,"names":["React","Platform","NativeModules","toJSONString","makePoint","NativeMarkerViewComponent","RNMBXMakerViewContentCoponent","PointAnnotation","Mapbox","RNMBXModule","MarkerView","PureComponent","defaultProps","anchor","x","y","allowOverlap","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","render","props","console","warn","OS","MapboxV10","createElement","_extends","id","RNMBXMarkerView","style","flex","alignSelf","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}
1
+ {"version":3,"names":["React","Platform","NativeModules","toJSONString","makePoint","NativeMarkerViewComponent","RNMBXMakerViewContentCoponent","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","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":"AACA,OAAOA,sBAAsB,MAAM,yDAAyD;AAiB5F,eAAeA,sBAAsB,CACnC,iBACF,CAAC"}
1
+ {"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":"AACA,OAAOA,sBAAsB,MAAM,yDAAyD;AAkB5F,eAAeA,sBAAsB,CACnC,iBACF,CAAC"}
@@ -18,5 +18,5 @@ export declare const StyleURL: {
18
18
  DefaultSourceID: string;
19
19
  }, TileServers: {
20
20
  Mapbox: string;
21
- }, removeCustomHeader: (headerName: string) => void, addCustomHeader: (headerName: string, headerValue: string) => void, setAccessToken: (accessToken: string | null) => Promise<string | null>, setWellKnownTileServer: (tileServer: string) => void, getAccessToken: () => Promise<string>, setTelemetryEnabled: (telemetryEnabled: boolean) => void, setConnected: (connected: boolean) => void;
21
+ }, removeCustomHeader: (headerName: string) => void, addCustomHeader: (headerName: string, headerValue: string) => void, setAccessToken: (accessToken: string | null) => Promise<string | null>, setWellKnownTileServer: (tileServer: string) => void, clearData: () => Promise<void>, getAccessToken: () => Promise<string>, setTelemetryEnabled: (telemetryEnabled: boolean) => void, setConnected: (connected: boolean) => void;
22
22
  //# sourceMappingURL=RNMBXModule.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"RNMBXModule.d.ts","sourceRoot":"","sources":["../../../src/RNMBXModule.ts"],"names":[],"mappings":"AAwCA,eAAO,MACL,QAAQ;YArCE,GAAG;cACD,GAAG;WACN,GAAG;UACJ,GAAG;eACE,GAAG;qBACG,GAAG;GAiCtB,wBAAwB;cA9BZ,MAAM,GAAG,MAAM;YACjB,MAAM,GAAG,MAAM;cACb,MAAM,GAAG,MAAM;;GA6B3B,QAAQ;WAzBC,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;GAwBxB,WAAW;qBArBQ,MAAM;GAsBzB,WAAW;YAnBD,MAAM;GAoBhB,kBAAkB,eAjBa,MAAM,KAAG,IAAI,EAkB5C,eAAe,eAjBa,MAAM,eAAe,MAAM,KAAG,IAAI,EAkB9D,cAAc,gBAjBc,MAAM,GAAG,IAAI,KAAG,QAAQ,MAAM,GAAG,IAAI,CAAC,EAkBlE,sBAAsB,eAjBa,MAAM,KAAG,IAAI,EAkBhD,cAAc,QAjBI,QAAQ,MAAM,CAAC,EAkBjC,mBAAmB,qBAjBmB,OAAO,KAAG,IAAI,EAkBpD,YAAY,cAjBY,OAAO,KAAG,IAkBrB,CAAC"}
1
+ {"version":3,"file":"RNMBXModule.d.ts","sourceRoot":"","sources":["../../../src/RNMBXModule.ts"],"names":[],"mappings":"AAyCA,eAAO,MACL,QAAQ;YAtCE,GAAG;cACD,GAAG;WACN,GAAG;UACJ,GAAG;eACE,GAAG;qBACG,GAAG;GAkCtB,wBAAwB;cA/BZ,MAAM,GAAG,MAAM;YACjB,MAAM,GAAG,MAAM;cACb,MAAM,GAAG,MAAM;;GA8B3B,QAAQ;WA1BC,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;GAyBxB,WAAW;qBAtBQ,MAAM;GAuBzB,WAAW;YApBD,MAAM;GAqBhB,kBAAkB,eAlBa,MAAM,KAAG,IAAI,EAmB5C,eAAe,eAlBa,MAAM,eAAe,MAAM,KAAG,IAAI,EAmB9D,cAAc,gBAlBc,MAAM,GAAG,IAAI,KAAG,QAAQ,MAAM,GAAG,IAAI,CAAC,EAmBlE,sBAAsB,eAlBa,MAAM,KAAG,IAAI,EAmBhD,SAAS,QAlBI,QAAQ,IAAI,CAAC,EAmB1B,cAAc,QAlBI,QAAQ,MAAM,CAAC,EAmBjC,mBAAmB,qBAlBmB,OAAO,KAAG,IAAI,EAmBpD,YAAY,cAlBY,OAAO,KAAG,IAmBrB,CAAC"}
@@ -21,6 +21,11 @@ declare type Props = ViewProps & {
21
21
  * markers will 'collapse' and only one will be shown. Defaults to false.
22
22
  */
23
23
  allowOverlap: boolean;
24
+ /**
25
+ * Whether or not nearby markers on the map should be hidden if close to a
26
+ * UserLocation puck. Defaults to false.
27
+ */
28
+ allowOverlapWithPuck: boolean;
24
29
  isSelected: boolean;
25
30
  /**
26
31
  * One or more valid React Native views.
@@ -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,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,CAIjC;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;CAmDP;AAID,eAAe,UAAU,CAAC"}
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;CAoDP;AAID,eAAe,UAAU,CAAC"}
@@ -9,6 +9,7 @@ export interface NativeProps extends ViewProps {
9
9
  coordinate?: UnsafeMixed<string>;
10
10
  anchor: UnsafeMixed<Point>;
11
11
  allowOverlap: UnsafeMixed<boolean>;
12
+ allowOverlapWithPuck: UnsafeMixed<boolean>;
12
13
  isSelected: UnsafeMixed<boolean>;
13
14
  }
14
15
  declare const _default: HostComponent<NativeProps>;
@@ -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;AAE7D,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAElE,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,MAAM,CAAC,CAAC;IACjC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CAClC;;AAED,wBAEgC"}
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;AAE7D,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAElE,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,MAAM,CAAC,CAAC;IACjC,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
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@rnmapbox/maps",
3
3
  "description": "A Mapbox react native module for creating custom maps",
4
- "version": "10.1.0-rc.1",
4
+ "version": "10.1.0-rc.3",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },
package/setup-jest.js CHANGED
@@ -98,6 +98,7 @@ NativeModules.RNMBXModule = {
98
98
  getAccessToken: () => Promise.resolve('test-token'),
99
99
  setTelemetryEnabled: jest.fn(),
100
100
  setConnected: jest.fn(),
101
+ clearData: jest.fn(),
101
102
 
102
103
  MapboxV10: true,
103
104
  };
@@ -31,6 +31,7 @@ interface RNMBXModule {
31
31
  addCustomHeader(headerName: string, headerValue: string): void;
32
32
  setAccessToken(accessToken: string | null): Promise<string | null>;
33
33
  setWellKnownTileServer(tileServer: string): void;
34
+ clearData(): Promise<void>;
34
35
  getAccessToken(): Promise<string>;
35
36
  setTelemetryEnabled(telemetryEnabled: boolean): void;
36
37
  setConnected(connected: boolean): void;
@@ -48,6 +49,7 @@ export const {
48
49
  addCustomHeader,
49
50
  setAccessToken,
50
51
  setWellKnownTileServer,
52
+ clearData,
51
53
  getAccessToken,
52
54
  setTelemetryEnabled,
53
55
  setConnected,
@@ -34,6 +34,12 @@ type Props = ViewProps & {
34
34
  */
35
35
  allowOverlap: boolean;
36
36
 
37
+ /**
38
+ * Whether or not nearby markers on the map should be hidden if close to a
39
+ * UserLocation puck. Defaults to false.
40
+ */
41
+ allowOverlapWithPuck: boolean;
42
+
37
43
  isSelected: boolean;
38
44
 
39
45
  /**
@@ -59,6 +65,7 @@ class MarkerView extends React.PureComponent<Props> {
59
65
  static defaultProps: Partial<Props> = {
60
66
  anchor: { x: 0.5, y: 0.5 },
61
67
  allowOverlap: false,
68
+ allowOverlapWithPuck: false,
62
69
  isSelected: false,
63
70
  };
64
71
 
@@ -112,6 +119,7 @@ class MarkerView extends React.PureComponent<Props> {
112
119
  coordinate={this._getCoordinate(this.props.coordinate)}
113
120
  anchor={anchor}
114
121
  allowOverlap={this.props.allowOverlap}
122
+ allowOverlapWithPuck={this.props.allowOverlapWithPuck}
115
123
  isSelected={this.props.isSelected}
116
124
  onTouchEnd={(e) => {
117
125
  e.stopPropagation();
@@ -13,6 +13,7 @@ export interface NativeProps extends ViewProps {
13
13
  coordinate?: UnsafeMixed<string>;
14
14
  anchor: UnsafeMixed<Point>;
15
15
  allowOverlap: UnsafeMixed<boolean>;
16
+ allowOverlapWithPuck: UnsafeMixed<boolean>;
16
17
  isSelected: UnsafeMixed<boolean>;
17
18
  }
18
19