@rnmapbox/maps 10.0.0-rc.0 → 10.0.0-rc.10

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/FeatureCollection.kt

@@ -0,0 +1,10 @@
+package com.mapbox.rctmgl.utils.extensions
+
+import com.mapbox.geojson.FeatureCollection
+import com.mapbox.geojson.GeometryCollection
+
+fun FeatureCollection.toGeometryCollection(): GeometryCollection {
+    return GeometryCollection.fromGeometries(
+        this.features()!!.map { it.geometry() !! }
+    )
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/Geometry.kt

@@ -0,0 +1,22 @@
+package com.mapbox.rctmgl.utils.extensions
+
+import com.mapbox.geojson.BoundingBox
+import com.mapbox.geojson.Geometry
+import com.mapbox.geojson.Polygon
+import com.mapbox.turf.TurfMeasurement
+import org.json.JSONObject
+
+fun Geometry.toJSONObject(): JSONObject? {
+    return JSONObject(this.toJson())
+}
+
+fun Geometry.calculateBoundingBox(): BoundingBox {
+    val storedBBox = bbox()
+    if (storedBBox != null) {
+        return storedBBox
+    }
+    val bbox = TurfMeasurement.bbox(this)
+    return BoundingBox.fromLngLats(
+        bbox[0], bbox[1], bbox[2], bbox[3]
+    )
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/JSONObject.kt

@@ -0,0 +1,78 @@
+package com.mapbox.rctmgl.utils.extensions
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
+import com.mapbox.bindgen.Value
+import com.mapbox.geojson.Geometry
+import com.mapbox.geojson.Polygon
+import com.mapbox.rctmgl.utils.Logger
+import org.json.JSONArray
+import org.json.JSONObject
+
+fun JSONObject.toGeometry(): Geometry? {
+    when (this.optString("type")) {
+        "polygon" -> return Polygon.fromJson(this.toString())
+        else -> {
+            Logger.w("JSONObject", "Unexpected geometry: ${this.toString()}")
+            return null
+        }
+    }
+}
+
+fun JSONObject.toMapboxValue(): Value {
+    return Value.fromJson(this.toString()).value!!
+}
+
+fun JSONObject.toWritableMap(): WritableMap? {
+    val result = Arguments.createMap()
+    val iterator = keys()
+    while (iterator.hasNext()) {
+        val key = iterator.next()
+        val value = get(key)
+        if (value is JSONObject) {
+            result.putMap(key, value.toReadableMap());
+        } else if (value is JSONArray) {
+            result.putArray(key, value.toReadableArray());
+        } else if (value is  Boolean) {
+            result.putBoolean(key, value);
+        } else if (value is  Int) {
+            result.putInt(key, value);
+        } else if (value is  Double) {
+            result.putDouble(key, value);
+        } else if (value is String)  {
+            result.putString(key, value);
+        } else {
+            result.putString(key, value.toString());
+        }
+    }
+    return result
+}
+
+fun JSONObject.toReadableMap(): ReadableMap? {
+    return toWritableMap()
+}
+
+fun JSONArray.toReadableArray(): ReadableArray? {
+    val result = Arguments.createArray()
+    for (i in 0 until length()) {
+        val value: Any = get(i)
+        if (value is JSONObject) {
+            result.pushMap(value.toReadableMap())
+        } else if (value is JSONArray) {
+            result.pushArray(value.toReadableArray())
+        } else if (value is Boolean) {
+            result.pushBoolean(value)
+        } else if (value is Int) {
+            result.pushInt(value)
+        } else if (value is Double) {
+            result.pushDouble(value)
+        } else if (value is String) {
+            result.pushString(value)
+        } else {
+            result.pushString(value.toString())
+        }
+    }
+    return result
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/ReadableArray.kt

@@ -20,4 +20,4 @@ fun ReadableArray.toScreenCoordinate() : ScreenCoordinate {
         Logger.e("ReadableArray.toCoordinate","Cannot convert $this to point, 2 coordinates are required")
     }
     return ScreenCoordinate(getDouble(0), getDouble(1))
-}
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/Value.kt

@@ -0,0 +1,9 @@
+package com.mapbox.rctmgl.utils.extensions
+
+import com.mapbox.bindgen.Value
+import org.json.JSONObject
+
+fun Value.toJSONObject(): JSONObject? {
+    val jsonString = this.toJson()
+    return JSONObject(jsonString)
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/writeableMapArrayOf.kt

@@ -0,0 +1,41 @@
+package com.mapbox.rctmgl.utils
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
+
+fun writableMapOf(vararg values: Pair<String, *>): WritableMap {
+    val map = Arguments.createMap()
+    for ((key, value) in values) {
+        when (value) {
+            null -> map.putNull(key)
+            is Boolean -> map.putBoolean(key, value)
+            is Double -> map.putDouble(key, value)
+            is Int -> map.putInt(key, value)
+            is Long -> map.putInt(key, value.toInt())
+            is String -> map.putString(key, value)
+            is WritableMap -> map.putMap(key, value)
+            is WritableArray -> map.putArray(key, value)
+            else -> throw IllegalArgumentException("Unsupported value type ${value::class.java.name} for key [$key]")
+        }
+    }
+    return map
+}
+
+fun writableArrayOf(vararg values: Any): WritableArray {
+    val array = Arguments.createArray()
+    for (value in values) {
+        when (value) {
+            null -> array.pushNull()
+            is Boolean -> array.pushBoolean(value)
+            is Double -> array.pushDouble(value)
+            is Int -> array.pushInt(value)
+            is Long -> array.pushInt(value.toInt())
+            is String -> array.pushString(value)
+            is WritableMap -> array.pushMap(value)
+            is WritableArray -> array.pushArray(value)
+            else -> throw IllegalArgumentException("Unsupported value type ${value::class.java.name}")
+        }
+    }
+    return array
+}

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -290,17 +290,12 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
       case .none:
         Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
       case .compass:
-        map.location.options.puckBearingEnabled = true
-        map.location.options.puckBearingSource = PuckBearingSource.heading
         followOptions.bearing = FollowPuckViewportStateBearing.heading
         trackingModeChanged = true
       case .course:
-        map.location.options.puckBearingEnabled = true
-        map.location.options.puckBearingSource = PuckBearingSource.course
         followOptions.bearing = FollowPuckViewportStateBearing.course
         trackingModeChanged = true
       case .normal:
-        map.location.options.puckBearingEnabled = false
         followOptions.bearing = nil
         trackingModeChanged = true
       }
@@ -576,7 +571,7 @@ extension RCTMGLCamera : ViewportStatusObserver {
     if reason == .idleRequested {
       return "idleRequested"
     } else if reason == .transitionFailed {
-      return "transitionFailied"
+      return "transitionFailed"
     } else if reason == .transitionStarted {
       return "transitionStarted"
     } else if reason == .transitionSucceeded {

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -55,7 +55,6 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
   func addToMap(_ map: RCTMGLMapView, style: Style) {
     self.style = style
     map.images.append(self)
-    map.setupEvents()
     
     self.addNativeImages(style: style, nativeImages: nativeImageInfos)
     self.addRemoteImages(style: style, remoteImages: images)

package/ios/RCTMGL-v10/RCTMGLLocationModule.m

@@ -12,9 +12,9 @@ RCT_EXTERN_METHOD(getLastKnownLocation)
 RCT_EXTERN_METHOD(setMinDisplacement:(CLLocationDistance)minDisplacement)
 RCT_EXTERN_METHOD(setRequestsAlwaysUse:(BOOL)requestsAlwaysUse)
 
-RCT_EXTERN_METHOD(setLocationEventThrottle:(NSNumber *)throttleValue)
+RCT_EXTERN_METHOD(setLocationEventThrottle:(nonnull NSNumber *)throttleValue)
 
-RCT_EXTERN_METHOD(simulateHeading:(nonnull NSNumber)changesPerSecond increment:(nonnull NSNumber))
+RCT_EXTERN_METHOD(simulateHeading:(nonnull NSNumber*)changesPerSecond increment:(nonnull NSNumber*))
 
 
 @end

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -26,6 +26,8 @@ open class RCTMGLMapView : MapView {
   
   var handleMapChangedEvents = Set<RCTMGLEvent.EventType>()
 
+  var eventListeners : [Cancelable] = []
+
   private var isPendingInitialLayout = true
   private var wasGestureActive = false
   private var isGestureActive = false
@@ -347,11 +349,15 @@ open class RCTMGLMapView : MapView {
 
 extension RCTMGLMapView {
   private func onEvery<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RCTMGLMapView, MapEvent<Payload>) -> Void) {
-    self.mapView.mapboxMap.onEvery(event: event) { [weak self](mapEvent) in
+    let eventListener = self.mapView.mapboxMap.onEvery(event: event) { [weak self](mapEvent) in
       guard let self = self else { return }
 
       handler(self, mapEvent)
     }
+    eventListeners.append(eventListener)
+    if eventListeners.count > 20 {
+      Logger.log(level:.warn, message: "RCTMGLMapView.onEvery, too much handler installed");
+    }
   }
 
   private func onNext<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RCTMGLMapView, MapEvent<Payload>) -> Void) {