@rnmapbox/maps 10.1.15 → 10.1.17

package/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/ShapeAnimatorCommon.kt

@@ -0,0 +1,142 @@
+package com.rnmapbox.rnmbx.shapeAnimators
+
+import android.util.Log
+import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
+import com.mapbox.geojson.FeatureCollection
+import com.mapbox.geojson.GeoJson
+import com.rnmapbox.rnmbx.utils.Logger
+import org.json.JSONObject
+import java.util.Date
+import java.util.Timer
+import java.util.TimerTask
+
+typealias Tag = Long
+
+interface ShapeAnimationConsumer {
+    fun shapeUpdated(geoJson: GeoJson)
+}
+
+abstract class ShapeAnimator(val tag: Tag) {
+    abstract fun getShape(): GeoJson
+    abstract fun getAnimatedShape(animatorAgeSec: Double): GeoJson
+    abstract fun subscribe(consumer: ShapeAnimationConsumer)
+    abstract fun unsubscribe(consumer: ShapeAnimationConsumer)
+    abstract fun refresh()
+    abstract fun start()
+    abstract fun stop()
+}
+
+private const val LOG_TAG = "RNMBXShapeAnimator"
+
+abstract class ShapeAnimatorCommon(tag: Tag): ShapeAnimator(tag) {
+    val emptyGeoJsonObj: FeatureCollection = FeatureCollection.fromFeatures(listOf())
+
+    private var timer: Timer? = null
+    private var startedAt = Date()
+
+    private val fps = 30.0
+    private val period = 1.0 / fps
+
+    /** The number of seconds the animator has been running continuously. */
+    fun getAnimatorAgeSec(): Double {
+        val now = Date()
+        return (now.time - startedAt.time).toDouble() / 1000
+    }
+
+    // region subscribers
+    private var subscribers = mutableListOf<ShapeAnimationConsumer>()
+
+    override fun subscribe(consumer: ShapeAnimationConsumer) {
+        if (subscribers.contains(consumer)) {
+            return
+        }
+
+        subscribers.add(consumer)
+    }
+
+    override fun unsubscribe(consumer: ShapeAnimationConsumer) {
+        subscribers.remove(consumer)
+        if (subscribers.isEmpty()) {
+            stop()
+        }
+    }
+    // endregion
+
+    override fun refresh() {
+        val timestamp = getAnimatorAgeSec()
+//        Log.d(
+//            LOG_TAG,
+//            "Refreshing animator for tag $tag (timestamp: $timestamp, subscribers: ${subscribers.count()})"
+//        )
+
+        val shape = getAnimatedShape(timestamp)
+        runOnUiThread {
+            subscribers.forEach {
+                it.shapeUpdated(shape)
+            }
+        }
+    }
+
+    override fun start() {
+        if (timer != null) {
+            Log.d(LOG_TAG, "Timer for animator $tag is already running (subscribers: ${subscribers.count()})")
+            return
+        }
+
+        Log.d(LOG_TAG, "Started timer for animator $tag (subscribers: ${subscribers.count()})")
+
+        startedAt = Date()
+        timer = Timer()
+        timer?.schedule(object : TimerTask() {
+            override fun run() {
+                refresh()
+            }
+        }, 0, (period * 1000).toLong())
+    }
+
+    override fun stop() {
+        if (timer == null) {
+            Log.d(LOG_TAG, "Timer for animator $tag is already stopped (subscribers: ${subscribers.count()})")
+            return
+        }
+
+        Log.d(LOG_TAG,"Stopped timer for animator $tag (subscribers: ${subscribers.count()})")
+
+        timer?.cancel()
+        timer = null
+    }
+
+    override fun getShape(): GeoJson {
+        return getAnimatedShape(getAnimatorAgeSec())
+    }
+}
+
+class ShapeAnimatorManager {
+    private val animators = hashMapOf<Tag, ShapeAnimator>();
+
+    fun add(animator: ShapeAnimator) {
+        animators[animator.tag] = animator
+    }
+
+    fun isShapeAnimatorTag(shape: String): Boolean {
+        return shape.startsWith("{\"__nativeTag\":")
+    }
+
+    fun get(tag: String): ShapeAnimator? {
+        return if (isShapeAnimatorTag(tag)) {
+            val obj = JSONObject(tag)
+            val _tag = obj.getLong("__nativeTag")
+            get(_tag);
+        } else {
+            null
+        }
+    }
+
+    fun get(tag: Tag): ShapeAnimator? {
+        val result = animators[tag]
+        if (result == null) {
+            Logger.e(LOG_TAG, "Shape animator for tag $tag was not found")
+        }
+        return result
+    }
+}

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec.java

@@ -0,0 +1,52 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.rnmapbox.rnmbx;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+
+public abstract class NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public static final String NAME = "RNMBXChangeLineOffsetsShapeAnimatorModule";
+
+  public NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void create(double tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setLineString(double tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setStartOffset(double tag, double offset, double duration, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setEndOffset(double tag, double offset, double duration, Promise promise);
+}

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXMovePointShapeAnimatorModuleSpec.java

@@ -36,9 +36,9 @@ public abstract class NativeRNMBXMovePointShapeAnimatorModuleSpec extends ReactC
 
   @ReactMethod
   @DoNotStrip
-  public abstract void create(double tag, ReadableArray from, Promise promise);
+  public abstract void create(double tag, ReadableArray coordinate, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void start(double tag, Promise promise);
+  public abstract void moveTo(double tag, ReadableArray coordinate, double duration, Promise promise);
 }

package/ios/RNMBX/RNMBXCircleLayer.swift

@@ -20,14 +20,61 @@ public class RNMBXCircleLayer: RNMBXVectorLayer {
   override func layerType() -> Layer.Type {
     return LayerType.self
   }
-  
+
+
+// @{codepart-replace-start(LayerPropsCommon.codepart-swift.ejs,{layerType:"Circle"})}
+  func setCommonOptions(_ layer: inout CircleLayer) -> Bool {
+    var changed = false
+
+    #if RNMBX_11
+    if let sourceLayerID = sourceLayerID {
+      layer.sourceLayer = sourceLayerID
+      changed = true
+    }
+
+    if let sourceID = sourceID {
+      if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
+        layer.source = sourceID
+        changed = true
+      }
+    }
+
+    if let filter = filter, filter.count > 0 {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        layer.filter = decodedExpression
+        changed = true
+      } catch {
+        Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
+      }
+    }
+    #endif
+
+    return changed
+  }
+
+  override func setOptions(_ layer: inout Layer) {
+    if var actualLayer = layer as? LayerType {
+      if self.setCommonOptions(&actualLayer) {
+        layer = actualLayer
+      }
+    } else {
+      Logger.log(level: .error, message: "Expected layer type to be Circle but was \(type(of: layer))")
+    }
+  }
+
   override func apply(style : Style) throws {
     try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout CircleLayer) in
+      if self.styleLayer != nil {
+        self.setOptions(&self.styleLayer!)
+      }
       if let styleLayer = self.styleLayer as? LayerType {
         layer = styleLayer
       }
     }
   }
+// @{codepart-replace-end}
 
   override func addStyles() {
     if let style : Style = self.style,

package/ios/RNMBX/RNMBXFillExtrusionLayer.swift

@@ -19,14 +19,60 @@ public class RNMBXFillExtrusionLayer: RNMBXVectorLayer {
   override func layerType() -> Layer.Type {
     return LayerType.self
   }
-  
+
+// @{codepart-replace-start(LayerPropsCommon.codepart-swift.ejs,{layerType:"FillExtrusion"})}
+  func setCommonOptions(_ layer: inout FillExtrusionLayer) -> Bool {
+    var changed = false
+
+    #if RNMBX_11
+    if let sourceLayerID = sourceLayerID {
+      layer.sourceLayer = sourceLayerID
+      changed = true
+    }
+
+    if let sourceID = sourceID {
+      if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
+        layer.source = sourceID
+        changed = true
+      }
+    }
+
+    if let filter = filter, filter.count > 0 {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        layer.filter = decodedExpression
+        changed = true
+      } catch {
+        Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
+      }
+    }
+    #endif
+
+    return changed
+  }
+
+  override func setOptions(_ layer: inout Layer) {
+    if var actualLayer = layer as? LayerType {
+      if self.setCommonOptions(&actualLayer) {
+        layer = actualLayer
+      }
+    } else {
+      Logger.log(level: .error, message: "Expected layer type to be FillExtrusion but was \(type(of: layer))")
+    }
+  }
+
   override func apply(style : Style) throws {
     try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout FillExtrusionLayer) in
+      if self.styleLayer != nil {
+        self.setOptions(&self.styleLayer!)
+      }
       if let styleLayer = self.styleLayer as? LayerType {
         layer = styleLayer
       }
     }
   }
+// @{codepart-replace-end}
 
   override func addStyles() {
     if let style : Style = self.style,

package/ios/RNMBX/RNMBXFillLayer.swift

@@ -20,14 +20,60 @@ public class RNMBXFillLayer: RNMBXVectorLayer {
   override func layerType() -> Layer.Type {
     return LayerType.self
   }
-  
+
+// @{codepart-replace-start(LayerPropsCommon.codepart-swift.ejs,{layerType:"Fill"})}
+  func setCommonOptions(_ layer: inout FillLayer) -> Bool {
+    var changed = false
+
+    #if RNMBX_11
+    if let sourceLayerID = sourceLayerID {
+      layer.sourceLayer = sourceLayerID
+      changed = true
+    }
+
+    if let sourceID = sourceID {
+      if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
+        layer.source = sourceID
+        changed = true
+      }
+    }
+
+    if let filter = filter, filter.count > 0 {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        layer.filter = decodedExpression
+        changed = true
+      } catch {
+        Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
+      }
+    }
+    #endif
+
+    return changed
+  }
+
+  override func setOptions(_ layer: inout Layer) {
+    if var actualLayer = layer as? LayerType {
+      if self.setCommonOptions(&actualLayer) {
+        layer = actualLayer
+      }
+    } else {
+      Logger.log(level: .error, message: "Expected layer type to be Fill but was \(type(of: layer))")
+    }
+  }
+
   override func apply(style : Style) throws {
     try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout FillLayer) in
+      if self.styleLayer != nil {
+        self.setOptions(&self.styleLayer!)
+      }
       if let styleLayer = self.styleLayer as? LayerType {
         layer = styleLayer
       }
     }
   }
+// @{codepart-replace-end}
 
   override func addStyles() {
     if let style : Style = self.style,

package/ios/RNMBX/RNMBXLineLayer.swift

@@ -20,16 +20,59 @@ public class RNMBXLineLayer: RNMBXVectorLayer {
     return LayerType.self
   }
 
+// @{codepart-replace-start(LayerPropsCommon.codepart-swift.ejs,{layerType:"Line"})}
+  func setCommonOptions(_ layer: inout LineLayer) -> Bool {
+    var changed = false
+
+    #if RNMBX_11
+    if let sourceLayerID = sourceLayerID {
+      layer.sourceLayer = sourceLayerID
+      changed = true
+    }
+
+    if let sourceID = sourceID {
+      if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
+        layer.source = sourceID
+        changed = true
+      }
+    }
+
+    if let filter = filter, filter.count > 0 {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        layer.filter = decodedExpression
+        changed = true
+      } catch {
+        Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
+      }
+    }
+    #endif
+
+    return changed
+  }
+
+  override func setOptions(_ layer: inout Layer) {
+    if var actualLayer = layer as? LayerType {
+      if self.setCommonOptions(&actualLayer) {
+        layer = actualLayer
+      }
+    } else {
+      Logger.log(level: .error, message: "Expected layer type to be Line but was \(type(of: layer))")
+    }
+  }
+
   override func apply(style : Style) throws {
     try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout LineLayer) in
       if self.styleLayer != nil {
         self.setOptions(&self.styleLayer!)
       }
-      if let styleLayer = self.styleLayer as? LineLayer {
+      if let styleLayer = self.styleLayer as? LayerType {
         layer = styleLayer
       }
     }
   }
+// @{codepart-replace-end}
   
   override func addStyles() {
     if let style : Style = self.style {

package/ios/RNMBX/RNMBXLogging.swift

@@ -12,7 +12,7 @@ public enum RNMBXError: Error, LocalizedError {
 }
 
 public class Logger {
-  public enum LogLevel : String, Comparable {
+  public enum LogLevel: String, Comparable {
     public static func < (lhs: Logger.LogLevel, rhs: Logger.LogLevel) -> Bool {
       return lhs.intValue < rhs.intValue
     }
@@ -42,79 +42,119 @@ public class Logger {
     }
   }
   
-  static let sharedInstance = Logger()
+  internal static let sharedInstance = Logger()
   
-  var level: LogLevel = .info
-  var handler : (LogLevel, String) -> Void = { (level, message) in
+  fileprivate var level: LogLevel = .info
+  fileprivate var handler: (LogLevel, String) -> Void = { (level, message) in
     fatalError("Handler not yet installed")
   }
   
-  func log(level: LogLevel, message: String) {
-    print("LOG \(level) \(message)")
+  public func log(level: LogLevel, tag: String, message: String) {
+    log(level: level, message: "\(tag) | \(message)")
+  }
+    
+  @available(*, deprecated, message: "Use log(level:tag:message:) instead.")
+  public func log(level: LogLevel, message: String) {
+    print("\(level) | \(message)")
     if self.level <= level {
       handler(level, message)
     }
   }
   
-  public static func log(level: LogLevel, message: String) {
-    sharedInstance.log(level: level, message: message)
+  public static func log(level: LogLevel, tag: String, message: String, error: Error? = nil) {
+    if let error = error {
+      sharedInstance.log(level: level, message: "\(tag) | \(message), \(error.localizedDescription), \(error)")
+    } else {
+      sharedInstance.log(level: level, message: "\(tag) | \(message)")
+    }
   }
   
-  static func log(level: LogLevel, message: String, error: Error) {
-    sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
+  @available(*, deprecated, message: "Use log(level:tag:message:error:) instead.")
+  public static func log(level: LogLevel, message: String, error: Error? = nil) {
+    if let error = error {
+      sharedInstance.log(level: level, message: "\(message), \(error.localizedDescription), \(error)")
+    } else {
+      sharedInstance.log(level: level, message: message)
+    }
   }
-
-  static func error(_ message: String) {
+  
+  public static func error(_ message: String) {
     log(level: .error, message: message)
   }
 
-  static func assert(_ message: String) {
+  public static func assert(_ message: String) {
     log(level: .error, message: "Assertion failure: \(message)")
   }
 }
 
-func errorMessage(_ error: Error) -> String {
-  if case DecodingError.typeMismatch(let _, let context) = error {
-    return "\(error.localizedDescription) \(context.codingPath) \(context.debugDescription)"
-  } else if let mapError = error as? MapError {
-    return "MapError: \(mapError.errorDescription)"
-  } else {
-    return "\(error.localizedDescription)"
-  }
+/// Logs tag and message if `fn` throws and returns nil
+public func logged<T>(_ tag: String, _ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn: () throws -> T) -> T? {
+  logged(
+    "\(tag) | \(msg)",
+    info: info,
+    level: level,
+    rejecter: rejecter, 
+    fn: fn
+  )
 }
 
-/// log message if optional returned by `fn` is nil
-func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn: () -> T?) ->T? {
-  let ret = fn()
-  if ret == nil {
-    Logger.log(level:level, message: "\(msg) \(info?() ?? "")")
-    rejecter?(msg, "\(info?() ?? "")", NSError(domain:"is null", code: 0))
-    return nil
-  } else {
-    return ret
-  }
+/// Logs tag and message if `fn` returns nil
+public func logged<T>(_ tag: String, _ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn: () -> T) -> T? {
+  logged(
+    "\(tag) | \(msg)",
+    info: info,
+    level: level,
+    rejecter: rejecter, 
+    fn: fn
+  )
 }
 
-/// log message if `fn` throws and return nil
-func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
+@available(*, deprecated, message: "Use logged(tag:msg:info:level:rejecter:fn:) instead.")
+public func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn: () throws -> T) -> T? {
   do {
     return try fn()
   } catch {
-    Logger.log(level:level, message: "\(msg) \(info?() ?? "") \(errorMessage(error))")
-    rejecter?(msg, "\(info?() ?? "") \(errorMessage(error))", error)
+    let _info = info?() ?? ""
+    let _error = errorMessage(error)
+    Logger.log(level: level, message: "\(msg) \(_info) \(_error)")
+    rejecter?(msg, "\(_info) \(_error)", error)
+    return nil
+  }
+}
+
+@available(*, deprecated, message: "Use logged(tag:msg:info:level:rejecter:fn:) instead.")
+public func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn: () -> T?) ->T? {
+  if let ret = fn() {
+    return ret
+  } else {
+    let _info = info?() ?? ""
+    Logger.log(level: level, message: "\(msg) \(_info)")
+    rejecter?(msg, _info, NSError(domain: "is null", code: 0))
     return nil
   }
 }
 
-func logged<T>(_ msg: String, info: (() -> String)? = nil, errorResult: (Error) -> T, level: Logger.LogLevel = .error, fn : () throws -> T) -> T {
+@available(*, deprecated, message: "Use logged(tag:msg:info:level:rejecter:fn:) instead.")
+public func logged<T>(_ msg: String, info: (() -> String)? = nil, errorResult: (Error) -> T, level: Logger.LogLevel = .error, fn: () throws -> T) -> T {
   do {
     return try fn()
   } catch {
-    Logger.log(level:level, message: "\(msg) \(info?() ?? "") \(error.localizedDescription)")
+    let _info = info?() ?? ""
+    Logger.log(level: level, message: "\(msg) \(_info) \(error.localizedDescription)")
     return errorResult(error)
   }
 }
 
+private func errorMessage(_ error: Error) -> String {
+  if case DecodingError.typeMismatch(let _, let context) = error {
+    return "\(error.localizedDescription) \(context.codingPath) \(context.debugDescription)"
+  } else if let mapError = error as? MapError {
+    return "MapError: \(mapError.errorDescription)"
+  } else {
+    return "\(error.localizedDescription)"
+  }
+}
+
 @objc(RNMBXLogger)
 public class RNMBXLogger : NSObject {
   @objc
@@ -165,8 +205,7 @@ class RNMBXLogging: RCTEventEmitter {
   }
   
   @objc
-  override func supportedEvents() -> [String]
-  {
+  override func supportedEvents() -> [String] {
       return ["LogEvent"];
   }
 }