@rnmapbox/maps 10.0.1 → 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)
       }
     }
@@ -486,7 +495,8 @@ class RCTMGLOfflineModule: RCTEventEmitter {
       if let expires = region.expires {
         result["expires"] = expires.toJSONString()
       }
-      
+
+      return result
     }
     return [:]
   }

package/ios/RCTMGL-v10/RCTMGLShapeSource.swift

@@ -3,7 +3,25 @@ import Turf
 
 @objc
 class RCTMGLShapeSource : RCTMGLSource {
-  @objc var url : String?
+  @objc var url : String? {
+    didSet {
+      parseJSON(url) { [weak self] result in
+        guard let self = self else { return }
+
+        switch result {
+          case .success(let obj):
+            self.doUpdate { (style) in
+              logged("RCTMGLShapeSource.setUrl") {
+                try style.updateGeoJSONSource(withId: self.id, geoJSON: obj)
+              }
+            }
+
+          case .failure(let error):
+            Logger.log(level: .error, message: ":: Error - update url failed \(error) \(error.localizedDescription)")
+        }
+      }
+    }
+  }
 
   @objc var shape : String? {
     didSet {
@@ -18,7 +36,7 @@ class RCTMGLShapeSource : RCTMGLSource {
       }
     }
   }
-  
+
   @objc var cluster : NSNumber?
   @objc var clusterRadius : NSNumber?
   @objc var clusterMaxZoomLevel : NSNumber? {
@@ -35,12 +53,12 @@ class RCTMGLShapeSource : RCTMGLSource {
     }
   }
   @objc var clusterProperties : [String: [Any]]?;
-  
+
   @objc var maxZoomLevel : NSNumber?
   @objc var buffer : NSNumber?
   @objc var tolerance : NSNumber?
   @objc var lineMetrics : NSNumber?
-  
+
   override func sourceType() -> Source.Type {
     return GeoJSONSource.self
   }
@@ -48,7 +66,7 @@ class RCTMGLShapeSource : RCTMGLSource {
   override func makeSource() -> Source
   {
     var result =  GeoJSONSource()
-    
+
     if let shape = shape {
       do {
         result.data = try parse(shape)
@@ -57,52 +75,52 @@ class RCTMGLShapeSource : RCTMGLSource {
         result.data = emptyShape()
       }
     }
-    
+
     if let url = url {
       result.data = .url(URL(string: url)!)
     }
-    
+
     if let cluster = cluster {
       result.cluster = cluster.boolValue
     }
-    
+
     if let clusterRadius = clusterRadius {
       result.clusterRadius = clusterRadius.doubleValue
     }
-    
+
     if let clusterMaxZoomLevel = clusterMaxZoomLevel {
       result.clusterMaxZoom = clusterMaxZoomLevel.doubleValue
     }
-    
+
     do {
       if let clusterProperties = clusterProperties {
         result.clusterProperties = try clusterProperties.mapValues { (params : [Any]) in
           let data = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
           let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
-          
+
           return decodedExpression
         }
       }
     } catch {
       Logger.log(level: .error, message: "RCTMGLShapeSource.parsing clusterProperties failed", error: error)
     }
-    
+
     if let maxZoomLevel = maxZoomLevel {
       result.maxzoom = maxZoomLevel.doubleValue
     }
-    
+
     if let buffer = buffer {
       result.buffer = buffer.doubleValue
     }
-    
+
     if let tolerance = tolerance {
       result.tolerance = tolerance.doubleValue
     }
-    
+
     if let lineMetrics = lineMetrics {
       result.lineMetrics = lineMetrics.boolValue
     }
-    
+
     return result
   }
 
@@ -112,11 +130,11 @@ class RCTMGLShapeSource : RCTMGLSource {
           map.mapboxMap.style.sourceExists(withId: id) else {
       return
     }
-    
+
     let style = map.mapboxMap.style
     update(style)
   }
-  
+
   func updateSource(property: String, value: Any) {
     doUpdate { style in
       try! style.setSourceProperty(for: id, property: property, value: value)
@@ -124,6 +142,32 @@ class RCTMGLShapeSource : RCTMGLSource {
   }
 }
 
+// MARK: - parseJSON(url)
+
+extension RCTMGLShapeSource
+{
+  func parseJSON(_ url: String?, completion: @escaping (Result<GeoJSONObject, Error>) -> Void) {
+    guard let url = url else { return }
+
+    DispatchQueue.global().async { [url] in
+      let result: Result<GeoJSONObject, Error>
+
+      do {
+        let data = try Data(contentsOf: URL(string: url)!)
+        let obj = try JSONDecoder().decode(GeoJSONObject.self, from: data)
+
+        result = .success(obj)
+      } catch {
+        result = .failure(error)
+      }
+
+      DispatchQueue.main.async {
+        completion(result)
+      }
+    }
+  }
+}
+
 // MARK: - parse(shape)
 
 extension RCTMGLShapeSource
@@ -145,7 +189,7 @@ extension RCTMGLShapeSource
       }
     }
   }
-  
+
   func parse(_ shape: String) throws -> Feature {
     guard let data = shape.data(using: .utf8) else {
       throw RCTMGLError.parseError("shape is not utf8")
@@ -163,8 +207,8 @@ extension RCTMGLShapeSource
       return emptyGeoJSONObject()
     case .feature(let feature):
       return .feature(feature)
-    case .featureCollection(let featureColleciton):
-      return .featureCollection(featureColleciton)
+    case .featureCollection(let featureCollection):
+      return .featureCollection(featureCollection)
     case .geometry(let geometry):
       return .geometry(geometry)
     case .url(_):
@@ -224,7 +268,7 @@ extension RCTMGLShapeSource
             completion(.failure(RCTMGLError.failed("getClusterExpansionZoom: not a number")))
             return
           }
-          
+
           completion(.success(value.intValue))
         case .failure(let error):
           completion(.failure(error))
@@ -232,7 +276,7 @@ extension RCTMGLShapeSource
       }
     }
   }
-  
+
   func getClusterLeaves(_ featureJSON: String,
                               number: uint,
                               offset: uint,
@@ -242,7 +286,7 @@ extension RCTMGLShapeSource
       completion(.failure(RCTMGLError.failed("getClusterLeaves: no mapView")))
       return
     }
-    
+
     logged("RCTMGLShapeSource.getClusterLeaves", rejecter: { (_,_,error) in
       completion(.failure(error!))
     }) {

package/package.json

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