@rnmapbox/maps 10.1.15 → 10.1.17

package/src/utils/Logger.ts

@@ -9,8 +9,8 @@ export type LogLevel = 'error' | 'warning' | 'info' | 'debug' | 'verbose';
 
 export interface LogObject {
   level: LogLevel;
-  message: string;
   tag: string;
+  message: string;
 }
 
 type LogCallback = (object: LogObject) => boolean;
@@ -58,9 +58,9 @@ class Logger {
    * This callback is displayed as part of the Requester class.
    * @callback Logger~logCallback
    * @param {object} log
-   * @param {string} log.message - the message of the log
    * @param {string} log.level - log level
    * @param {string} log.tag - optional tag used on android
+   * @param {string} log.message - the message of the log
    */
 
   /**
@@ -116,14 +116,22 @@ class Logger {
 
   onLog(log: LogObject) {
     if (!this.logCallback || !this.logCallback(log)) {
-      const { message } = log;
-      const level = this.effectiveLevel(log);
-      if (level === 'error') {
-        console.error('Mapbox error', message, log);
-      } else if (level === 'warning') {
-        console.warn('Mapbox warning', message, log);
+      const { tag, message } = log;
+
+      const _level = this.effectiveLevel(log);
+      const _levelDisp = `Mapbox [${_level}]`;
+
+      let _message = message;
+      if (tag) {
+        _message = `${tag} | ${_message}`;
+      }
+
+      if (_level === 'error') {
+        console.error(_levelDisp, _message);
+      } else if (_level === 'warning') {
+        console.warn(_levelDisp, _message);
       } else {
-        console.log(`Mapbox [${level}]`, message, log);
+        console.log(_levelDisp, _message);
       }
     }
   }

package/android/src/main/java/com/rnmapbox/rnmbx/shape_animators/RNMBXMovePointShapeAnimatorModule.kt

@@ -1,55 +0,0 @@
-package com.rnmapbox.rnmbx.shape_animators
-
-import com.facebook.react.bridge.ReadableArray
-import com.rnmapbox.rnmbx.NativeRNMBXMovePointShapeAnimatorModuleSpec
-import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotation
-
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.module.annotations.ReactModule
-import com.google.gson.JsonObject
-import com.mapbox.geojson.GeoJson
-import com.mapbox.geojson.Point
-import com.rnmapbox.rnmbx.NativeRNMBXPointAnnotationModuleSpec
-import com.rnmapbox.rnmbx.utils.Logger
-import com.rnmapbox.rnmbx.utils.ViewTagResolver
-import org.json.JSONObject
-import java.util.Date
-import java.util.Timer
-import java.util.TimerTask
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.DurationUnit
-
-
-/// Simple dummy animator that moves the point lng, lat by 0.01, 0.01 each second.
-class MovePointShapeAnimator(tag: Tag, val lng: Double, val lat: Double) : ShapeAnimatorCommon(tag) {
-   override fun getAnimatedShape(timeSinceStart: Duration): Pair<GeoJson, Boolean> {
-       return Pair(Point.fromLngLat(lng + timeSinceStart.toDouble(DurationUnit.SECONDS) * 0.01, lat + timeSinceStart.toDouble(DurationUnit.SECONDS) * 0.01), true);
-   }
-}
-
-
-@ReactModule(name = RNMBXMovePointShapeAnimatorModule.NAME)
-class RNMBXMovePointShapeAnimatorModule(reactContext: ReactApplicationContext?, val shapeAnimatorManager: ShapeAnimatorManager) :
-    NativeRNMBXMovePointShapeAnimatorModuleSpec(reactContext) {
-
-    companion object {
-        const val LOG_TAG = "RNMBXMovePointShapeAnimatorModule"
-        const val NAME = "RNMBXMovePointShapeAnimatorModule"
-    }
-
-    @ReactMethod
-    override fun start(tag: Double, promise: Promise?) {
-        shapeAnimatorManager?.get(tag.toLong())?.let {
-            it.start()
-        }
-    }
-
-    @ReactMethod
-    override fun create(tag: Double, from: ReadableArray, promise: Promise) {
-        shapeAnimatorManager.add(MovePointShapeAnimator(tag.toLong(), from.getDouble(0), from.getDouble(1)))
-        promise.resolve(tag.toInt())
-    }
-}

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

@@ -1,110 +0,0 @@
-package com.rnmapbox.rnmbx.shape_animators
-
-import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
-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
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
-
-typealias Tag = Long
-
-interface ShapeAnimationConsumer {
-    fun shapeUpdated(geoJson: GeoJson)
-}
-abstract class ShapeAnimator(val tag: Tag) {
-
-    abstract fun getShape(): GeoJson;
-    abstract fun start()
-
-    abstract fun subscribe(consumer: ShapeAnimationConsumer)
-    abstract fun unsubscribe(consumer: ShapeAnimationConsumer)
-}
-
-abstract class ShapeAnimatorCommon(tag: Tag): ShapeAnimator(tag) {
-    var timer: Timer? = null
-    var progress: Duration? = null
-
-    // region subscribers
-    var subscribers = mutableListOf<ShapeAnimationConsumer>()
-
-    override fun subscribe(consumer: ShapeAnimationConsumer) {
-        subscribers.add(consumer)
-    }
-
-    override fun unsubscribe(consumer: ShapeAnimationConsumer) {
-        subscribers.remove(consumer)
-    }
-    // endregion
-
-    override fun start() {
-        timer?.let { it.cancel() }
-        timer = null
-
-        val fps = 30.0
-        val period = (1000.0 / fps).toLong()
-        val start = Date()
-        val timer = Timer()
-        this.timer = timer
-        val animator = this
-
-        timer.schedule(object : TimerTask() {
-            override fun run() {
-
-                val now = Date()
-                val diff = now.time - start.time
-                val progress = diff.milliseconds
-                animator.progress = progress
-
-                val (shape,doContinue) = getAnimatedShape(progress)
-                if (!doContinue) {
-                    timer.cancel()
-                }
-                runOnUiThread {
-                    subscribers.forEach { it.shapeUpdated(shape) }
-                }
-            }
-        },0, period)
-    }
-
-    override fun getShape(): GeoJson {
-        return getAnimatedShape(progress ?: 0.0.milliseconds).first
-    }
-    abstract fun getAnimatedShape(timeSinceStart: Duration): Pair<GeoJson,Boolean>
-
-}
-class ShapeAnimatorManager {
-    private val animators = hashMapOf<Tag, ShapeAnimator>();
-    fun add(animator: ShapeAnimator) {
-        animators.put(animator.tag, animator)
-    }
-
-    fun isShapeAnimatorTag(shape: String): Boolean {
-        return shape.startsWith("{\"__nativeTag\":")
-    }
-
-    fun get(tag: String): ShapeAnimator? {
-        if (isShapeAnimatorTag(tag)) {
-            val obj = JSONObject(tag)
-            val tag = obj.getLong("__nativeTag")
-            return get(tag);
-        }
-        else {
-            return 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
-    }
-
-    companion object {
-        const val LOG_TAG = "RNMBXShapeAnimators"
-    }
-}

package/lib/commonjs/shape_animators/MovePointShapeAnimator.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_NativeRNMBXMovePointShapeAnimatorModule","_interopRequireDefault","require","_ShapeAnimatorManager","obj","__esModule","default","MovePointShapeAnimator","constructor","from","tag","ShapeAnimatorManager","nextTag","NativeRNMBXMovePointShapeAnimatorModule","create","__nativeTag","start","exports"],"sourceRoot":"../../../src","sources":["shape_animators/MovePointShapeAnimator.ts"],"mappings":";;;;;;AACA,IAAAA,wCAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,qBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAA0D,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAE3C,MAAMG,sBAAsB,CAAC;EAG1CC,WAAWA,CAACC,IAAc,EAAE;IAC1B,MAAMC,GAAG,GAAGC,6BAAoB,CAACC,OAAO,CAAC,CAAC;IAC1CC,gDAAuC,CAACC,MAAM,CAACJ,GAAG,EAAE,CAACD,IAAI,CAAC,CAAC,CAAC,EAAEA,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,IAAI,CAACM,WAAW,GAAGL,GAAG;EACxB;EAEAM,KAAKA,CAAA,EAAG;IACNH,gDAAuC,CAACG,KAAK,CAAC,IAAI,CAACD,WAAW,CAAC;EACjE;AACF;AAACE,OAAA,CAAAX,OAAA,GAAAC,sBAAA"}

package/lib/commonjs/shape_animators/ShapeAnimatorManager.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["ShapeAnimatorManager","tag","nextTag","exports","default"],"sourceRoot":"../../../src","sources":["shape_animators/ShapeAnimatorManager.tsx"],"mappings":";;;;;;AAAe,MAAMA,oBAAoB,CAAC;EACxC,OAAOC,GAAG,GAAG,EAAE;EAEf,OAAOC,OAAOA,CAAA,EAAW;IACvB,IAAI,CAACD,GAAG,IAAI,CAAC;IACb,OAAO,IAAI,CAACA,GAAG;EACjB;AACF;AAACE,OAAA,CAAAC,OAAA,GAAAJ,oBAAA"}

package/lib/module/shape_animators/MovePointShapeAnimator.js

@@ -1,13 +0,0 @@
-import NativeRNMBXMovePointShapeAnimatorModule from '../specs/NativeRNMBXMovePointShapeAnimatorModule';
-import ShapeAnimatorManager from './ShapeAnimatorManager';
-export default class MovePointShapeAnimator {
-  constructor(from) {
-    const tag = ShapeAnimatorManager.nextTag();
-    NativeRNMBXMovePointShapeAnimatorModule.create(tag, [from[0], from[1]]);
-    this.__nativeTag = tag;
-  }
-  start() {
-    NativeRNMBXMovePointShapeAnimatorModule.start(this.__nativeTag);
-  }
-}
-//# sourceMappingURL=MovePointShapeAnimator.js.map

package/lib/module/shape_animators/MovePointShapeAnimator.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["NativeRNMBXMovePointShapeAnimatorModule","ShapeAnimatorManager","MovePointShapeAnimator","constructor","from","tag","nextTag","create","__nativeTag","start"],"sourceRoot":"../../../src","sources":["shape_animators/MovePointShapeAnimator.ts"],"mappings":"AACA,OAAOA,uCAAuC,MAAM,kDAAkD;AAEtG,OAAOC,oBAAoB,MAAM,wBAAwB;AAEzD,eAAe,MAAMC,sBAAsB,CAAC;EAG1CC,WAAWA,CAACC,IAAc,EAAE;IAC1B,MAAMC,GAAG,GAAGJ,oBAAoB,CAACK,OAAO,CAAC,CAAC;IAC1CN,uCAAuC,CAACO,MAAM,CAACF,GAAG,EAAE,CAACD,IAAI,CAAC,CAAC,CAAC,EAAEA,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,IAAI,CAACI,WAAW,GAAGH,GAAG;EACxB;EAEAI,KAAKA,CAAA,EAAG;IACNT,uCAAuC,CAACS,KAAK,CAAC,IAAI,CAACD,WAAW,CAAC;EACjE;AACF"}

package/lib/module/shape_animators/ShapeAnimatorManager.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["ShapeAnimatorManager","tag","nextTag"],"sourceRoot":"../../../src","sources":["shape_animators/ShapeAnimatorManager.tsx"],"mappings":"AAAA,eAAe,MAAMA,oBAAoB,CAAC;EACxC,OAAOC,GAAG,GAAG,EAAE;EAEf,OAAOC,OAAOA,CAAA,EAAW;IACvB,IAAI,CAACD,GAAG,IAAI,CAAC;IACb,OAAO,IAAI,CAACA,GAAG;EACjB;AACF"}

package/lib/typescript/src/shape_animators/MovePointShapeAnimator.d.ts

@@ -1,7 +0,0 @@
-import { Position } from '../types/Position';
-export default class MovePointShapeAnimator {
-    __nativeTag: number;
-    constructor(from: Position);
-    start(): void;
-}
-//# sourceMappingURL=MovePointShapeAnimator.d.ts.map

package/lib/typescript/src/shape_animators/MovePointShapeAnimator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MovePointShapeAnimator.d.ts","sourceRoot":"","sources":["../../../../src/shape_animators/MovePointShapeAnimator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK7C,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC,WAAW,EAAE,MAAM,CAAC;gBAER,IAAI,EAAE,QAAQ;IAM1B,KAAK;CAGN"}

package/lib/typescript/src/shape_animators/ShapeAnimatorManager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ShapeAnimatorManager.d.ts","sourceRoot":"","sources":["../../../../src/shape_animators/ShapeAnimatorManager.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,MAAM,CAAC,GAAG,SAAM;IAEhB,MAAM,CAAC,OAAO,IAAI,MAAM;CAIzB"}

package/src/shape_animators/MovePointShapeAnimator.ts

@@ -1,18 +0,0 @@
-import { Position } from '../types/Position';
-import NativeRNMBXMovePointShapeAnimatorModule from '../specs/NativeRNMBXMovePointShapeAnimatorModule';
-
-import ShapeAnimatorManager from './ShapeAnimatorManager';
-
-export default class MovePointShapeAnimator {
-  __nativeTag: number;
-
-  constructor(from: Position) {
-    const tag = ShapeAnimatorManager.nextTag();
-    NativeRNMBXMovePointShapeAnimatorModule.create(tag, [from[0], from[1]]);
-    this.__nativeTag = tag;
-  }
-
-  start() {
-    NativeRNMBXMovePointShapeAnimatorModule.start(this.__nativeTag);
-  }
-}