@rnmapbox/maps 10.0.2 → 10.0.3-beta.0

package/README.md

@@ -21,11 +21,8 @@ _A community-supported, open-source React Native library for building maps with
 
 ---
 ## News & Discussions
-#### <span style="color:red">&rarr;</span> Future of this repo: participate in the [discussion thread](https://github.com/rnmapbox/maps/discussions/1680)
-
 #### <span style="color:red">&rarr;</span> Call for additional maintainers [discussion thread](https://github.com/rnmapbox/maps/discussions/1551)
 
-#### <span style="color:red">&rarr;</span> This README is for the unreleased 10* branch. Please see [v8 branch](https://github.com/rnmapbox/maps/tree/v8) for documentation on 8.* releases
 ---
 
 <table>

package/android/rctmgl/build.gradle

@@ -138,7 +138,7 @@ dependencies {
         }
         else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
             implementation "com.mapbox.maps:android:${safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)}"
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.10.0'
+            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.11.0'
             implementation 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
         }
     }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTSource.kt

@@ -110,13 +110,14 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
 
     fun addToMap(existings: Boolean, style: Style, mapView: RCTMGLMapView) {
         mSource = null
-        if (existings) {
-            val existingSource = getSourceAs(style, iD)
-            if (existingSource != null) {
-                mSource = existingSource
-            } else {
-                Logger.w(LOG_TAG, "Source $iD was makred as existing but was not found in style")
+        val existingSource = getSourceAs(style, iD)
+        if (existingSource != null) {
+            mSource = existingSource
+            if (!existings) {
+                Logger.w(LOG_TAG, "Source $iD was not marked as existing but found in style, it's deprecated: https://github.com/rnmapbox/maps/wiki/Deprecated-ExistingSourceLayer")
             }
+        } else {
+            Logger.w(LOG_TAG, "Source $iD was marked as existing but was not found in style, it's deprecated: https://github.com/rnmapbox/maps/wiki/Deprecated-ExistingSourceLayer")
         }
         if (mSource == null) {
             mSource = makeSource()

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

@@ -167,19 +167,26 @@ class RCTMGLOfflineModule(private val mReactContext: ReactApplicationContext) :
             promise.reject(Error("Pack: $name not found"))
             return
         }
-        tileStore.getTileRegionMetadata(name) { expected ->
+        tileStore.getTileRegion(name) { expected ->
             expected.value?.also {
-                val pack = TileRegionPack(
-                    name= name,
-                    metadata= it.toJSONObject() ?: JSONObject()
-                )
-                tileRegionPacks[name] = pack
-                promise.resolve(_makeRegionStatusPayload(pack))
+                val region = it
+                tileStore.getTileRegionMetadata(name) { expected ->
+                    expected.value?.also {
+                        val pack = TileRegionPack(
+                            name= name,
+                            progress= toProgress(region),
+                            metadata= toJSONObjectSupportingLegacyMetadata(it) ?: JSONObject()
+                        )
+                        tileRegionPacks[name] = pack
+                        promise.resolve(_makeRegionStatusPayload(pack))
+                    } ?: run {
+                        promise.reject(LOG_TAG, expected.error!!.message)
+                    }
+                }
             } ?: run {
                 promise.reject(LOG_TAG, expected.error!!.message)
             }
         }
-
     }
 
     @ReactMethod
@@ -370,7 +377,7 @@ class RCTMGLOfflineModule(private val mReactContext: ReactApplicationContext) :
                 writableArrayOf(
                 *results.map { (id,geometry_region_metadata) ->
                     val (geometry, region, metadata) = geometry_region_metadata
-                    val metadataJSON = metadata?.toJSONObject()
+                    val metadataJSON = if (metadata != null) { toJSONObjectSupportingLegacyMetadata(metadata) } else { null }
                     val ret = convertRegionToJSON(region, geometry, metadataJSON)
                     val pack = tileRegionPacks[region.id] ?: TileRegionPack(
                         name= region.id,
@@ -607,6 +614,19 @@ class RCTMGLOfflineModule(private val mReactContext: ReactApplicationContext) :
         )
     }
 
+    private fun toJSONObjectSupportingLegacyMetadata(value: Value): JSONObject? {
+        // see https://github.com/rnmapbox/maps/issues/2803
+        try {
+            return value.toJSONObject()
+        } catch (err: org.json.JSONException) {
+            try {
+                return JSONObject(value.toString());
+            } catch (_: org.json.JSONException) {
+               throw err;
+            }
+        }
+    }
+
     companion object {
         const val REACT_CLASS = "RCTMGLOfflineModule"
         const val LOG_TAG = REACT_CLASS

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

@@ -13,7 +13,7 @@ import org.json.JSONObject
 
 fun JSONObject.toGeometry(): Geometry? {
     when (this.optString("type")) {
-        "polygon" -> return Polygon.fromJson(this.toString())
+        "polygon", "Polygon" -> return Polygon.fromJson(this.toString())
         else -> {
             Logger.w("JSONObject", "Unexpected geometry: ${this.toString()}")
             return null

package/ios/RCTMGL-v10/RCTMGLOfflineModule.swift

@@ -189,22 +189,31 @@ class RCTMGLOfflineModule: RCTEventEmitter {
   func getPackStatus(_ name: String,
                      resolver: @escaping RCTPromiseResolveBlock,
                      rejecter: @escaping RCTPromiseRejectBlock) {
-    guard let pack = tileRegionPacks[name] else {
+    guard tileRegionPacks[name] != nil else {
       rejecter("RCTMGLOfflineModule.getPackStatus", "pack \(name) not found", nil)
       return
     }
     
-    tileStore.tileRegionMetadata(forId: name) { result in
+    tileStore.tileRegion(forId: name) { result in
       switch result {
-      case .success(let metadata):
-        var pack = TileRegionPack(
-          name: name,
-          metadata: logged("RCTMGLOfflineModule.getPackStatus") { metadata as? [String:Any] } ?? [:]
-        )
-        self.tileRegionPacks[name] = pack
-        resolver(self._makeRegionStatusPayload(pack: pack))
+      case .success(let region):
+        self.tileStore.tileRegionMetadata(forId: name) { result in
+          switch result {
+          case .success(let metadata):
+            var pack = TileRegionPack(
+              name: name,
+              progress: self.toProgress(region: region),
+              metadata: logged("RCTMGLOfflineModule.getPackStatus") { metadata as? [String:Any] } ?? [:]
+            )
+            self.tileRegionPacks[name] = pack
+            resolver(self._makeRegionStatusPayload(pack: pack))
+          case .failure(let error):
+            Logger.log(level:.error, message: "Unable to fetch metadata for \(name)")
+            rejecter("RCTMGLOfflineModule.getPackStatus", error.localizedDescription, error)
+          }
+        }
       case .failure(let error):
-        Logger.log(level:.error, message: "Unable to fetch metadata for \(name)")
+        Logger.log(level:.error, message: "Unable to fetch region for \(name)")
         rejecter("RCTMGLOfflineModule.getPackStatus", error.localizedDescription, error)
       }
     }

package/package.json

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