@rnmapbox/maps 10.0.9-rc.0 → 10.0.9-rc.1

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.kt

@@ -22,6 +22,7 @@ import com.mapbox.geojson.Point
 import com.mapbox.maps.*
 import com.mapbox.maps.extension.localization.localizeLabels
 import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData
+import com.mapbox.maps.extension.observable.getMapLoadingErrorEventData
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.Layer
 import com.mapbox.maps.extension.style.layers.generated.*
@@ -354,7 +355,15 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             }
         })
 
-        map.subscribe({ event -> Logger.e(LOG_TAG, String.format("Map load failed: %s", event.data.toString())) }, Arrays.asList(MapEvents.MAP_LOADING_ERROR))
+        map.subscribe({ event ->
+            Logger.e(LOG_TAG, String.format("Map load failed: %s", event.data.toString()))
+            val errorMessage = event.getMapLoadingErrorEventData().message
+            val event = MapChangeEvent(this, EventTypes.MAP_LOADING_ERROR, writableMapOf(
+                    "error" to errorMessage
+            ))
+            mManager.handleEvent(event)
+
+                      }, Arrays.asList(MapEvents.MAP_LOADING_ERROR))
     }
 
     fun<T> mapGestureBegin(type:MapGestureType, gesture: T) {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/constants/EventTypes.kt

@@ -21,6 +21,7 @@ object EventTypes {
     const val DID_FINISH_RENDERING_MAP = "didfinishrenderingmap"
     const val DID_FINISH_RENDERING_MAP_FULLY = "didfinishrenderingmapfully"
     const val DID_FINISH_LOADING_STYLE = "didfinishloadingstyle"
+    const val MAP_LOADING_ERROR = "maploadingerror"
 
     // point annotation event types
     const val ANNOTATION_SELECTED = "annotationselected"

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/modules/RCTMGLModule.kt

@@ -69,6 +69,7 @@ class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactCo
         eventTypes["DidFinishRenderingMap"] = EventTypes.DID_FINISH_RENDERING_MAP
         eventTypes["DidFinishRenderingMapFully"] = EventTypes.DID_FINISH_RENDERING_MAP_FULLY
         eventTypes["DidFinishLoadingStyle"] = EventTypes.DID_FINISH_LOADING_STYLE
+        eventTypes["MapLoadingError"] = EventTypes.MAP_LOADING_ERROR
 
         // style source constants
         val styleSourceConsts: MutableMap<String, String> = HashMap()

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -340,7 +340,12 @@ open class RCTMGLMapView : MapView {
     self.styleLoaded = false
     if let value = value {
       if let _ = URL(string: value) {
-        mapView.mapboxMap.loadStyleURI(StyleURI(rawValue: value)!)
+          if let styleURI = StyleURI(rawValue: value) {
+              mapView.mapboxMap.loadStyleURI(styleURI)
+          } else {
+              let event = RCTMGLEvent(type:.mapLoadingError, payload: ["error": "invalid URI: \(value)"]);
+              self.fireEvent(event: event, callback: self.reactOnMapChange)
+          }
       } else {
         if RCTJSONParse(value, nil) != nil {
           mapView.mapboxMap.loadStyleJSON(value)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.9-rc.0",
+  "version": "10.0.9-rc.1",
   "publishConfig": {
     "access": "public"
   },