@rnmapbox/maps 10.1.15 → 10.1.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (100) hide show
  1. package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt +13 -2
  2. package/android/src/main/java/com/rnmapbox/rnmbx/components/AbstractEventEmitter.kt +13 -7
  3. package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSource.kt +23 -17
  4. package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceManager.kt +1 -2
  5. package/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/AnimatableElement.kt +38 -0
  6. package/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt +217 -0
  7. package/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXMovePointShapeAnimatorModule.kt +108 -0
  8. package/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/ShapeAnimatorCommon.kt +142 -0
  9. package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec.java +52 -0
  10. package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXMovePointShapeAnimatorModuleSpec.java +2 -2
  11. package/ios/RNMBX/RNMBXCircleLayer.swift +48 -1
  12. package/ios/RNMBX/RNMBXFillExtrusionLayer.swift +47 -1
  13. package/ios/RNMBX/RNMBXFillLayer.swift +47 -1
  14. package/ios/RNMBX/RNMBXLineLayer.swift +44 -1
  15. package/ios/RNMBX/RNMBXLogging.swift +78 -39
  16. package/ios/RNMBX/RNMBXModelLayer.swift +44 -1
  17. package/ios/RNMBX/RNMBXRasterLayer.swift +48 -2
  18. package/ios/RNMBX/RNMBXShapeSource.swift +30 -17
  19. package/ios/RNMBX/RNMBXSkyLayer.swift +22 -1
  20. package/ios/RNMBX/RNMBXSymbolLayer.swift +47 -1
  21. package/ios/RNMBX/ShapeAnimators/AnimatableElement.swift +48 -0
  22. package/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.m +64 -0
  23. package/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.swift +214 -0
  24. package/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.m +5 -10
  25. package/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.swift +92 -24
  26. package/ios/RNMBX/ShapeAnimators/ShapeAnimatorCommon.swift +71 -33
  27. package/ios/RNMBX/ShapeAnimators/ShapeAnimatorManager.swift +3 -1
  28. package/ios/RNMBX/codeparts/LayerPropsCommon.codepart-swift.ejs +51 -0
  29. package/lib/commonjs/Mapbox.js +4 -2
  30. package/lib/commonjs/Mapbox.js.map +1 -1
  31. package/lib/commonjs/components/ShapeSource.js.map +1 -1
  32. package/lib/commonjs/shapeAnimators/ChangeLineOffsetsShapeAnimator.js +27 -0
  33. package/lib/commonjs/shapeAnimators/ChangeLineOffsetsShapeAnimator.js.map +1 -0
  34. package/lib/commonjs/{shape_animators → shapeAnimators}/MovePointShapeAnimator.js +4 -4
  35. package/lib/commonjs/shapeAnimators/MovePointShapeAnimator.js.map +1 -0
  36. package/lib/commonjs/shapeAnimators/ShapeAnimatorManager.js.map +1 -0
  37. package/lib/commonjs/shapeAnimators/index.js +2 -0
  38. package/lib/commonjs/shapeAnimators/index.js.map +1 -0
  39. package/lib/commonjs/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.js +10 -0
  40. package/lib/commonjs/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.js.map +1 -0
  41. package/lib/commonjs/specs/NativeRNMBXMovePointShapeAnimatorModule.js.map +1 -1
  42. package/lib/commonjs/utils/Logger.js +13 -7
  43. package/lib/commonjs/utils/Logger.js.map +1 -1
  44. package/lib/module/Mapbox.js +4 -2
  45. package/lib/module/Mapbox.js.map +1 -1
  46. package/lib/module/components/ShapeSource.js.map +1 -1
  47. package/lib/module/shapeAnimators/ChangeLineOffsetsShapeAnimator.js +19 -0
  48. package/lib/module/shapeAnimators/ChangeLineOffsetsShapeAnimator.js.map +1 -0
  49. package/lib/module/shapeAnimators/MovePointShapeAnimator.js +13 -0
  50. package/lib/module/shapeAnimators/MovePointShapeAnimator.js.map +1 -0
  51. package/lib/module/shapeAnimators/ShapeAnimatorManager.js.map +1 -0
  52. package/lib/module/shapeAnimators/index.js +2 -0
  53. package/lib/module/shapeAnimators/index.js.map +1 -0
  54. package/lib/module/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.js +6 -0
  55. package/lib/module/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.js.map +1 -0
  56. package/lib/module/specs/NativeRNMBXMovePointShapeAnimatorModule.js.map +1 -1
  57. package/lib/module/utils/Logger.js +13 -7
  58. package/lib/module/utils/Logger.js.map +1 -1
  59. package/lib/typescript/src/Mapbox.d.ts +3 -1
  60. package/lib/typescript/src/Mapbox.d.ts.map +1 -1
  61. package/lib/typescript/src/components/ShapeSource.d.ts +2 -1
  62. package/lib/typescript/src/components/ShapeSource.d.ts.map +1 -1
  63. package/lib/typescript/src/shapeAnimators/ChangeLineOffsetsShapeAnimator.d.ts +24 -0
  64. package/lib/typescript/src/shapeAnimators/ChangeLineOffsetsShapeAnimator.d.ts.map +1 -0
  65. package/lib/typescript/src/shapeAnimators/MovePointShapeAnimator.d.ts +11 -0
  66. package/lib/typescript/src/shapeAnimators/MovePointShapeAnimator.d.ts.map +1 -0
  67. package/lib/typescript/src/shapeAnimators/ShapeAnimatorManager.d.ts.map +1 -0
  68. package/lib/typescript/src/shapeAnimators/index.d.ts +4 -0
  69. package/lib/typescript/src/shapeAnimators/index.d.ts.map +1 -0
  70. package/lib/typescript/src/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.d.ts +13 -0
  71. package/lib/typescript/src/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.d.ts.map +1 -0
  72. package/lib/typescript/src/specs/NativeRNMBXMovePointShapeAnimatorModule.d.ts +2 -2
  73. package/lib/typescript/src/specs/NativeRNMBXMovePointShapeAnimatorModule.d.ts.map +1 -1
  74. package/lib/typescript/src/utils/Logger.d.ts +2 -2
  75. package/lib/typescript/src/utils/Logger.d.ts.map +1 -1
  76. package/package.json +1 -1
  77. package/setup-jest.js +5 -0
  78. package/src/Mapbox.ts +3 -1
  79. package/src/components/ShapeSource.tsx +3 -1
  80. package/src/shapeAnimators/ChangeLineOffsetsShapeAnimator.ts +57 -0
  81. package/src/shapeAnimators/MovePointShapeAnimator.ts +27 -0
  82. package/src/shapeAnimators/index.ts +3 -0
  83. package/src/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.ts +37 -0
  84. package/src/specs/NativeRNMBXMovePointShapeAnimatorModule.ts +6 -2
  85. package/src/utils/Logger.ts +17 -9
  86. package/android/src/main/java/com/rnmapbox/rnmbx/shape_animators/RNMBXMovePointShapeAnimatorModule.kt +0 -55
  87. package/android/src/main/java/com/rnmapbox/rnmbx/shape_animators/ShapeAnimatorCommon.kt +0 -110
  88. package/lib/commonjs/shape_animators/MovePointShapeAnimator.js.map +0 -1
  89. package/lib/commonjs/shape_animators/ShapeAnimatorManager.js.map +0 -1
  90. package/lib/module/shape_animators/MovePointShapeAnimator.js +0 -13
  91. package/lib/module/shape_animators/MovePointShapeAnimator.js.map +0 -1
  92. package/lib/module/shape_animators/ShapeAnimatorManager.js.map +0 -1
  93. package/lib/typescript/src/shape_animators/MovePointShapeAnimator.d.ts +0 -7
  94. package/lib/typescript/src/shape_animators/MovePointShapeAnimator.d.ts.map +0 -1
  95. package/lib/typescript/src/shape_animators/ShapeAnimatorManager.d.ts.map +0 -1
  96. package/src/shape_animators/MovePointShapeAnimator.ts +0 -18
  97. /package/lib/commonjs/{shape_animators → shapeAnimators}/ShapeAnimatorManager.js +0 -0
  98. /package/lib/module/{shape_animators → shapeAnimators}/ShapeAnimatorManager.js +0 -0
  99. /package/lib/typescript/src/{shape_animators → shapeAnimators}/ShapeAnimatorManager.d.ts +0 -0
  100. /package/src/{shape_animators → shapeAnimators}/ShapeAnimatorManager.tsx +0 -0
@@ -1,55 +0,0 @@
1
- package com.rnmapbox.rnmbx.shape_animators
2
-
3
- import com.facebook.react.bridge.ReadableArray
4
- import com.rnmapbox.rnmbx.NativeRNMBXMovePointShapeAnimatorModuleSpec
5
- import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotation
6
-
7
- import com.facebook.react.bridge.Promise
8
- import com.facebook.react.bridge.ReactApplicationContext
9
- import com.facebook.react.bridge.ReactMethod
10
- import com.facebook.react.module.annotations.ReactModule
11
- import com.google.gson.JsonObject
12
- import com.mapbox.geojson.GeoJson
13
- import com.mapbox.geojson.Point
14
- import com.rnmapbox.rnmbx.NativeRNMBXPointAnnotationModuleSpec
15
- import com.rnmapbox.rnmbx.utils.Logger
16
- import com.rnmapbox.rnmbx.utils.ViewTagResolver
17
- import org.json.JSONObject
18
- import java.util.Date
19
- import java.util.Timer
20
- import java.util.TimerTask
21
- import kotlin.time.Duration
22
- import kotlin.time.Duration.Companion.milliseconds
23
- import kotlin.time.DurationUnit
24
-
25
-
26
- /// Simple dummy animator that moves the point lng, lat by 0.01, 0.01 each second.
27
- class MovePointShapeAnimator(tag: Tag, val lng: Double, val lat: Double) : ShapeAnimatorCommon(tag) {
28
- override fun getAnimatedShape(timeSinceStart: Duration): Pair<GeoJson, Boolean> {
29
- return Pair(Point.fromLngLat(lng + timeSinceStart.toDouble(DurationUnit.SECONDS) * 0.01, lat + timeSinceStart.toDouble(DurationUnit.SECONDS) * 0.01), true);
30
- }
31
- }
32
-
33
-
34
- @ReactModule(name = RNMBXMovePointShapeAnimatorModule.NAME)
35
- class RNMBXMovePointShapeAnimatorModule(reactContext: ReactApplicationContext?, val shapeAnimatorManager: ShapeAnimatorManager) :
36
- NativeRNMBXMovePointShapeAnimatorModuleSpec(reactContext) {
37
-
38
- companion object {
39
- const val LOG_TAG = "RNMBXMovePointShapeAnimatorModule"
40
- const val NAME = "RNMBXMovePointShapeAnimatorModule"
41
- }
42
-
43
- @ReactMethod
44
- override fun start(tag: Double, promise: Promise?) {
45
- shapeAnimatorManager?.get(tag.toLong())?.let {
46
- it.start()
47
- }
48
- }
49
-
50
- @ReactMethod
51
- override fun create(tag: Double, from: ReadableArray, promise: Promise) {
52
- shapeAnimatorManager.add(MovePointShapeAnimator(tag.toLong(), from.getDouble(0), from.getDouble(1)))
53
- promise.resolve(tag.toInt())
54
- }
55
- }
@@ -1,110 +0,0 @@
1
- package com.rnmapbox.rnmbx.shape_animators
2
-
3
- import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
4
- import com.mapbox.geojson.GeoJson
5
- import com.rnmapbox.rnmbx.utils.Logger
6
- import org.json.JSONObject
7
- import java.util.Date
8
- import java.util.Timer
9
- import java.util.TimerTask
10
- import kotlin.time.Duration
11
- import kotlin.time.Duration.Companion.milliseconds
12
-
13
- typealias Tag = Long
14
-
15
- interface ShapeAnimationConsumer {
16
- fun shapeUpdated(geoJson: GeoJson)
17
- }
18
- abstract class ShapeAnimator(val tag: Tag) {
19
-
20
- abstract fun getShape(): GeoJson;
21
- abstract fun start()
22
-
23
- abstract fun subscribe(consumer: ShapeAnimationConsumer)
24
- abstract fun unsubscribe(consumer: ShapeAnimationConsumer)
25
- }
26
-
27
- abstract class ShapeAnimatorCommon(tag: Tag): ShapeAnimator(tag) {
28
- var timer: Timer? = null
29
- var progress: Duration? = null
30
-
31
- // region subscribers
32
- var subscribers = mutableListOf<ShapeAnimationConsumer>()
33
-
34
- override fun subscribe(consumer: ShapeAnimationConsumer) {
35
- subscribers.add(consumer)
36
- }
37
-
38
- override fun unsubscribe(consumer: ShapeAnimationConsumer) {
39
- subscribers.remove(consumer)
40
- }
41
- // endregion
42
-
43
- override fun start() {
44
- timer?.let { it.cancel() }
45
- timer = null
46
-
47
- val fps = 30.0
48
- val period = (1000.0 / fps).toLong()
49
- val start = Date()
50
- val timer = Timer()
51
- this.timer = timer
52
- val animator = this
53
-
54
- timer.schedule(object : TimerTask() {
55
- override fun run() {
56
-
57
- val now = Date()
58
- val diff = now.time - start.time
59
- val progress = diff.milliseconds
60
- animator.progress = progress
61
-
62
- val (shape,doContinue) = getAnimatedShape(progress)
63
- if (!doContinue) {
64
- timer.cancel()
65
- }
66
- runOnUiThread {
67
- subscribers.forEach { it.shapeUpdated(shape) }
68
- }
69
- }
70
- },0, period)
71
- }
72
-
73
- override fun getShape(): GeoJson {
74
- return getAnimatedShape(progress ?: 0.0.milliseconds).first
75
- }
76
- abstract fun getAnimatedShape(timeSinceStart: Duration): Pair<GeoJson,Boolean>
77
-
78
- }
79
- class ShapeAnimatorManager {
80
- private val animators = hashMapOf<Tag, ShapeAnimator>();
81
- fun add(animator: ShapeAnimator) {
82
- animators.put(animator.tag, animator)
83
- }
84
-
85
- fun isShapeAnimatorTag(shape: String): Boolean {
86
- return shape.startsWith("{\"__nativeTag\":")
87
- }
88
-
89
- fun get(tag: String): ShapeAnimator? {
90
- if (isShapeAnimatorTag(tag)) {
91
- val obj = JSONObject(tag)
92
- val tag = obj.getLong("__nativeTag")
93
- return get(tag);
94
- }
95
- else {
96
- return null
97
- }
98
- }
99
- fun get(tag: Tag): ShapeAnimator? {
100
- val result = animators[tag]
101
- if (result == null) {
102
- Logger.e(LOG_TAG, "Shape animator for tag: $tag was not found")
103
- }
104
- return result
105
- }
106
-
107
- companion object {
108
- const val LOG_TAG = "RNMBXShapeAnimators"
109
- }
110
- }
@@ -1 +0,0 @@
1
- {"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"}
@@ -1 +0,0 @@
1
- {"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"}
@@ -1,13 +0,0 @@
1
- import NativeRNMBXMovePointShapeAnimatorModule from '../specs/NativeRNMBXMovePointShapeAnimatorModule';
2
- import ShapeAnimatorManager from './ShapeAnimatorManager';
3
- export default class MovePointShapeAnimator {
4
- constructor(from) {
5
- const tag = ShapeAnimatorManager.nextTag();
6
- NativeRNMBXMovePointShapeAnimatorModule.create(tag, [from[0], from[1]]);
7
- this.__nativeTag = tag;
8
- }
9
- start() {
10
- NativeRNMBXMovePointShapeAnimatorModule.start(this.__nativeTag);
11
- }
12
- }
13
- //# sourceMappingURL=MovePointShapeAnimator.js.map
@@ -1 +0,0 @@
1
- {"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"}
@@ -1 +0,0 @@
1
- {"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"}
@@ -1,7 +0,0 @@
1
- import { Position } from '../types/Position';
2
- export default class MovePointShapeAnimator {
3
- __nativeTag: number;
4
- constructor(from: Position);
5
- start(): void;
6
- }
7
- //# sourceMappingURL=MovePointShapeAnimator.d.ts.map
@@ -1 +0,0 @@
1
- {"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"}
@@ -1 +0,0 @@
1
- {"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"}
@@ -1,18 +0,0 @@
1
- import { Position } from '../types/Position';
2
- import NativeRNMBXMovePointShapeAnimatorModule from '../specs/NativeRNMBXMovePointShapeAnimatorModule';
3
-
4
- import ShapeAnimatorManager from './ShapeAnimatorManager';
5
-
6
- export default class MovePointShapeAnimator {
7
- __nativeTag: number;
8
-
9
- constructor(from: Position) {
10
- const tag = ShapeAnimatorManager.nextTag();
11
- NativeRNMBXMovePointShapeAnimatorModule.create(tag, [from[0], from[1]]);
12
- this.__nativeTag = tag;
13
- }
14
-
15
- start() {
16
- NativeRNMBXMovePointShapeAnimatorModule.start(this.__nativeTag);
17
- }
18
- }