@rnmapbox/maps 10.1.6 → 10.1.7

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 (10) hide show
  1. package/README.md +1 -1
  2. package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSource.kt +17 -7
  3. package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSourceManager.kt +1 -1
  4. package/lib/commonjs/classes/AnimatedRouteCoordinatesArray.js +6 -6
  5. package/lib/commonjs/classes/AnimatedRouteCoordinatesArray.js.map +1 -1
  6. package/lib/module/classes/AnimatedRouteCoordinatesArray.js +6 -6
  7. package/lib/module/classes/AnimatedRouteCoordinatesArray.js.map +1 -1
  8. package/package.json +1 -1
  9. package/setup-jest.js +1 -0
  10. package/src/classes/AnimatedRouteCoordinatesArray.js +6 -3
package/README.md CHANGED
@@ -154,7 +154,7 @@ const styles = StyleSheet.create({
154
154
  - [Callout](/docs/Callout.md)
155
155
  - [Camera](docs/Camera.md)
156
156
  - [UserLocation](docs/UserLocation.md)
157
- - [LocaitonPuck](docs/LocationPuck.md)
157
+ - [LocationPuck](docs/LocationPuck.md)
158
158
  - [Images](docs/Images.md)
159
159
  - [Image](docs/Image.md)
160
160
  - [Models](docs/Models.md)
package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSource.kt CHANGED
@@ -21,6 +21,9 @@ import com.rnmapbox.rnmbx.v11compat.feature.*
21
21
  // import com.rnmapbox.rnmbx.utils.DownloadMapImageTask;
22
22
  class RNMBXRasterDemSource(context: Context?, private val mManager: RNMBXRasterDemSourceManager) :
23
23
  RNMBXTileSource<RasterDemSource?>(context) {
24
+
25
+ private var tileSize: Long? = null
26
+
24
27
  override fun onPress(event: OnPressEvent?) {
25
28
  mManager.handleEvent(FeatureClickEvent.makeVectorSourceEvent(this, event))
26
29
  }
@@ -35,15 +38,18 @@ class RNMBXRasterDemSource(context: Context?, private val mManager: RNMBXRasterD
35
38
  return mMap!!.getStyle()!!.getSource(DEFAULT_ID) as RasterDemSource
36
39
  }
37
40
  val configurationUrl = uRL
38
- return if (configurationUrl != null) {
39
- RasterDemSource(
40
- RasterDemSource.Builder(id)
41
- .url(configurationUrl)
42
- )
43
- } else RasterDemSource(
41
+
42
+ val builder = if (configurationUrl != null) {
43
+ RasterDemSource.Builder(id)
44
+ .url(configurationUrl)
45
+ } else {
44
46
  RasterDemSource.Builder(id)
45
47
  .tileSet(buildTileset())
46
- )
48
+ }
49
+
50
+ tileSize?.let { builder.tileSize(it) }
51
+
52
+ return RasterDemSource(builder)
47
53
  }
48
54
 
49
55
  fun querySourceFeatures(
@@ -81,4 +87,8 @@ class RNMBXRasterDemSource(context: Context?, private val mManager: RNMBXRasterD
81
87
  override fun hasNoDataSoRefersToExisting(): Boolean {
82
88
  return uRL == null && tileUrlTemplates.isEmpty()
83
89
  }
90
+
91
+ fun setTileSize(tileSize: Int) {
92
+ this.tileSize = tileSize.toLong()
93
+ }
84
94
  }
package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSourceManager.kt CHANGED
@@ -39,6 +39,6 @@ class RNMBXRasterDemSourceManager(private val mContext: ReactApplicationContext)
39
39
 
40
40
  @ReactProp(name = "tileSize")
41
41
  override fun setTileSize(view: RNMBXRasterDemSource, value: Dynamic) {
42
- Logger.e("RNMBXRasterDemSourceManager", "tileSize not implemented")
42
+ view.setTileSize(value.asInt())
43
43
  }
44
44
  }
package/lib/commonjs/classes/AnimatedRouteCoordinatesArray.js CHANGED
@@ -22,7 +22,7 @@ class AnimatedRouteCoordinatesArray extends _AnimatedCoordinatesArray.default {
22
22
  * Calculate initial state
23
23
  *
24
24
  * @param {*} args - to value from animate
25
- * @param {} options - options, example
25
+ * @param {{end?: {from?: number}}} options - options, example
26
26
  * @returns {object} - the state object
27
27
  */
28
28
  onInitialState(coordinatesArray, options = null) {
@@ -34,9 +34,7 @@ class AnimatedRouteCoordinatesArray extends _AnimatedCoordinatesArray.default {
34
34
  }
35
35
  return {
36
36
  fullRoute: coordinatesArray.map(coord => [coord[0], coord[1]]),
37
- end: {
38
- from: 0
39
- }
37
+ end
40
38
  };
41
39
  }
42
40
 
@@ -63,8 +61,6 @@ class AnimatedRouteCoordinatesArray extends _AnimatedCoordinatesArray.default {
63
61
  end
64
62
  } = state;
65
63
  const currentEnd = end.from * (1.0 - progress) + progress * end.to;
66
-
67
- // console.log("Current end:", end, currentEnd);
68
64
  let prevsum = 0;
69
65
  let actsum = 0;
70
66
  let i = fullRoute.length - 1;
@@ -75,6 +71,10 @@ class AnimatedRouteCoordinatesArray extends _AnimatedCoordinatesArray.default {
75
71
  }
76
72
  if (actsum <= currentEnd) {
77
73
  const actRoute = [...fullRoute.slice(0, i + 1)];
74
+ const minLineStringElements = 2;
75
+ if (actRoute.length < minLineStringElements) {
76
+ actRoute.push(actRoute[0]);
77
+ }
78
78
  return {
79
79
  fullRoute,
80
80
  end: {
package/lib/commonjs/classes/AnimatedRouteCoordinatesArray.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_helpers","require","_distance","_interopRequireDefault","_nearestPointOnLine","_length","_AnimatedCoordinatesArray","obj","__esModule","default","convertLength","convertLengthFn","convertDistanceFn","AnimatedRouteCoordinatesArray","AnimatedCoordinatesArray","onInitialState","coordinatesArray","options","end","from","fullRoute","map","coord","onGetValue","state","actRoute","onCalculate","progress","currentEnd","to","prevsum","actsum","i","length","distance","point","distconf","slice","current","r","or","onStart","toValue","toDist","console","error","along","units","ls","lineString","warn","nearest","nearestPointOnLine","properties","location","result","originalRoute","exports","_default"],"sourceRoot":"../../../src","sources":["classes/AnimatedRouteCoordinatesArray.js"],"mappings":"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"}
1
+ {"version":3,"names":["_helpers","require","_distance","_interopRequireDefault","_nearestPointOnLine","_length","_AnimatedCoordinatesArray","obj","__esModule","default","convertLength","convertLengthFn","convertDistanceFn","AnimatedRouteCoordinatesArray","AnimatedCoordinatesArray","onInitialState","coordinatesArray","options","end","from","fullRoute","map","coord","onGetValue","state","actRoute","onCalculate","progress","currentEnd","to","prevsum","actsum","i","length","distance","point","distconf","slice","minLineStringElements","push","current","r","or","onStart","toValue","toDist","console","error","along","units","ls","lineString","warn","nearest","nearestPointOnLine","properties","location","result","originalRoute","exports","_default"],"sourceRoot":"../../../src","sources":["classes/AnimatedRouteCoordinatesArray.js"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAMA,IAAAC,SAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,mBAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,OAAA,GAAAF,sBAAA,CAAAF,OAAA;AAEA,IAAAK,yBAAA,GAAAH,sBAAA,CAAAF,OAAA;AAAkE,SAAAE,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAElE,MAAMG,aAAa,GAAGC,sBAAe,IAAIC,wBAAiB;;AAE1D;AACA;AACA;AACA;AACA;AACO,MAAMC,6BAA6B,SAASC,iCAAwB,CAAC;EAC1E;AACF;AACA;AACA;AACA;AACA;AACA;EACEC,cAAcA,CAACC,gBAAgB,EAAEC,OAAO,GAAG,IAAI,EAAE;IAC/C,IAAIC,GAAG,GAAG;MAAEC,IAAI,EAAE;IAAE,CAAC;IACrB,IAAIF,OAAO,IAAIA,OAAO,CAACC,GAAG,EAAE;MAC1BA,GAAG,GAAGD,OAAO,CAACC,GAAG;IACnB;IACA,OAAO;MACLE,SAAS,EAAEJ,gBAAgB,CAACK,GAAG,CAAEC,KAAK,IAAK,CAACA,KAAK,CAAC,CAAC,CAAC,EAAEA,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;MAChEJ;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;EACEK,UAAUA,CAACC,KAAK,EAAE;IAChB,OAAOA,KAAK,CAACC,QAAQ,IAAID,KAAK,CAACJ,SAAS;EAC1C;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEM,WAAWA,CAACF,KAAK,EAAEG,QAAQ,EAAE;IAC3B,MAAM;MAAEP,SAAS;MAAEF;IAAI,CAAC,GAAGM,KAAK;IAChC,MAAMI,UAAU,GAAGV,GAAG,CAACC,IAAI,IAAI,GAAG,GAAGQ,QAAQ,CAAC,GAAGA,QAAQ,GAAGT,GAAG,CAACW,EAAE;IAElE,IAAIC,OAAO,GAAG,CAAC;IACf,IAAIC,MAAM,GAAG,CAAC;IACd,IAAIC,CAAC,GAAGZ,SAAS,CAACa,MAAM,GAAG,CAAC;IAC5B,OAAOF,MAAM,GAAGH,UAAU,IAAII,CAAC,GAAG,CAAC,EAAE;MACnCF,OAAO,GAAGC,MAAM;MAChBA,MAAM,IAAI,IAAAG,iBAAQ,EAChB,IAAAC,cAAK,EAACf,SAAS,CAACY,CAAC,CAAC,CAAC,EACnB,IAAAG,cAAK,EAACf,SAAS,CAACY,CAAC,GAAG,CAAC,CAAC,CAAC,EACvB,IAAI,CAACI,QACP,CAAC;MACDJ,CAAC,IAAI,CAAC;IACR;IACA,IAAID,MAAM,IAAIH,UAAU,EAAE;MACxB,MAAMH,QAAQ,GAAG,CAAC,GAAGL,SAAS,CAACiB,KAAK,CAAC,CAAC,EAAEL,CAAC,GAAG,CAAC,CAAC,CAAC;MAC/C,MAAMM,qBAAqB,GAAG,CAAC;MAC/B,IAAIb,QAAQ,CAACQ,MAAM,GAAGK,qBAAqB,EAAE;QAC3Cb,QAAQ,CAACc,IAAI,CAACd,QAAQ,CAAC,CAAC,CAAC,CAAC;MAC5B;MACA,OAAO;QAAEL,SAAS;QAAEF,GAAG,EAAE;UAAE,GAAGA,GAAG;UAAEsB,OAAO,EAAEZ;QAAW,CAAC;QAAEH;MAAS,CAAC;IACtE;IACA,MAAMgB,CAAC,GAAG,CAACb,UAAU,GAAGE,OAAO,KAAKC,MAAM,GAAGD,OAAO,CAAC;IACrD,MAAMY,EAAE,GAAG,GAAG,GAAGD,CAAC;;IAElB;IACA,MAAMhB,QAAQ,GAAG,CACf,GAAGL,SAAS,CAACiB,KAAK,CAAC,CAAC,EAAEL,CAAC,GAAG,CAAC,CAAC,EAC5B,CACEZ,SAAS,CAACY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAGS,CAAC,GAAGrB,SAAS,CAACY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAGU,EAAE,EAC9CtB,SAAS,CAACY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAGS,CAAC,GAAGrB,SAAS,CAACY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAGU,EAAE,CAC/C,CACF;IACD,OAAO;MAAEtB,SAAS;MAAEF,GAAG,EAAE;QAAE,GAAGA,GAAG;QAAEsB,OAAO,EAAEZ;MAAW,CAAC;MAAEH;IAAS,CAAC;EACtE;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEkB,OAAOA,CAACnB,KAAK,EAAEoB,OAAO,EAAE;IACtB,MAAM;MAAExB,SAAS;MAAEF;IAAI,CAAC,GAAGM,KAAK;IAChC,IAAIqB,MAAM;IACV,IAAI,CAACD,OAAO,CAAC1B,GAAG,EAAE;MAChB4B,OAAO,CAACC,KAAK,CACX,2EACF,CAAC;IACH;IACA,IAAIH,OAAO,CAAC1B,GAAG,CAAC8B,KAAK,IAAI,IAAI,EAAE;MAC7B,MAAM;QAAEC;MAAM,CAAC,GAAGL,OAAO;MACzB,MAAMM,EAAE,GAAG,IAAAC,mBAAU,EAAC/B,SAAS,CAAC;MAChCyB,MAAM,GAAGnC,aAAa,CAACkC,OAAO,CAAC1B,GAAG,CAAC8B,KAAK,EAAEC,KAAK,CAAC;MAChDJ,MAAM,GAAG,IAAAZ,eAAM,EAACiB,EAAE,CAAC,GAAGL,MAAM;IAC9B;IACA,IAAIA,MAAM,IAAI,IAAI,EAAE;MAClB,IAAID,OAAO,CAAC1B,GAAG,CAACiB,KAAK,EAAE;QACrBW,OAAO,CAACM,IAAI,CACV,gFACF,CAAC;MACH;IACF,CAAC,MAAM,IAAIR,OAAO,CAAC1B,GAAG,CAACiB,KAAK,EAAE;MAC5B,MAAMe,EAAE,GAAG,IAAAC,mBAAU,EAAC/B,SAAS,CAAC;MAEhC,MAAMiC,OAAO,GAAG,IAAAC,2BAAkB,EAACJ,EAAE,EAAEN,OAAO,CAAC1B,GAAG,CAACiB,KAAK,CAAC;MACzDU,MAAM,GAAG,IAAAZ,eAAM,EAACiB,EAAE,CAAC,GAAGG,OAAO,CAACE,UAAU,CAACC,QAAQ;IACnD,CAAC,MAAM;MACLV,OAAO,CAACM,IAAI,CACV,uEACF,CAAC;IACH;IAEA,MAAMK,MAAM,GAAG;MACbrC,SAAS;MACTF,GAAG,EAAE;QACH,GAAGA,GAAG;QACNC,IAAI,EAAED,GAAG,CAACsB,OAAO,IAAI,IAAI,GAAGtB,GAAG,CAACsB,OAAO,GAAGtB,GAAG,CAACC,IAAI;QAClDU,EAAE,EAAEgB;MACN;IACF,CAAC;IACD,OAAOY,MAAM;EACf;EAEA,IAAIC,aAAaA,CAAA,EAAG;IAClB,OAAO,IAAI,CAAClC,KAAK,CAACJ,SAAS;EAC7B;AACF;AAACuC,OAAA,CAAA9C,6BAAA,GAAAA,6BAAA;AAAA,IAAA+C,QAAA,GAAAD,OAAA,CAAAlD,OAAA,GAEcI,6BAA6B"}
package/lib/module/classes/AnimatedRouteCoordinatesArray.js CHANGED
@@ -17,7 +17,7 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
17
17
  * Calculate initial state
18
18
  *
19
19
  * @param {*} args - to value from animate
20
- * @param {} options - options, example
20
+ * @param {{end?: {from?: number}}} options - options, example
21
21
  * @returns {object} - the state object
22
22
  */
23
23
  onInitialState(coordinatesArray, options = null) {
@@ -29,9 +29,7 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
29
29
  }
30
30
  return {
31
31
  fullRoute: coordinatesArray.map(coord => [coord[0], coord[1]]),
32
- end: {
33
- from: 0
34
- }
32
+ end
35
33
  };
36
34
  }
37
35
 
@@ -58,8 +56,6 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
58
56
  end
59
57
  } = state;
60
58
  const currentEnd = end.from * (1.0 - progress) + progress * end.to;
61
-
62
- // console.log("Current end:", end, currentEnd);
63
59
  let prevsum = 0;
64
60
  let actsum = 0;
65
61
  let i = fullRoute.length - 1;
@@ -70,6 +66,10 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
70
66
  }
71
67
  if (actsum <= currentEnd) {
72
68
  const actRoute = [...fullRoute.slice(0, i + 1)];
69
+ const minLineStringElements = 2;
70
+ if (actRoute.length < minLineStringElements) {
71
+ actRoute.push(actRoute[0]);
72
+ }
73
73
  return {
74
74
  fullRoute,
75
75
  end: {
package/lib/module/classes/AnimatedRouteCoordinatesArray.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["lineString","point","convertDistance","convertDistanceFn","convertLength","convertLengthFn","distance","nearestPointOnLine","length","AnimatedCoordinatesArray","AnimatedRouteCoordinatesArray","onInitialState","coordinatesArray","options","end","from","fullRoute","map","coord","onGetValue","state","actRoute","onCalculate","progress","currentEnd","to","prevsum","actsum","i","distconf","slice","current","r","or","onStart","toValue","toDist","console","error","along","units","ls","warn","nearest","properties","location","result","originalRoute"],"sourceRoot":"../../../src","sources":["classes/AnimatedRouteCoordinatesArray.js"],"mappings":"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"}
1
+ {"version":3,"names":["lineString","point","convertDistance","convertDistanceFn","convertLength","convertLengthFn","distance","nearestPointOnLine","length","AnimatedCoordinatesArray","AnimatedRouteCoordinatesArray","onInitialState","coordinatesArray","options","end","from","fullRoute","map","coord","onGetValue","state","actRoute","onCalculate","progress","currentEnd","to","prevsum","actsum","i","distconf","slice","minLineStringElements","push","current","r","or","onStart","toValue","toDist","console","error","along","units","ls","warn","nearest","properties","location","result","originalRoute"],"sourceRoot":"../../../src","sources":["classes/AnimatedRouteCoordinatesArray.js"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@rnmapbox/maps",
3
3
  "description": "A Mapbox react native module for creating custom maps",
4
- "version": "10.1.6",
4
+ "version": "10.1.7",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },
package/setup-jest.js CHANGED
@@ -40,6 +40,7 @@ NativeModules.RNMBXModule = {
40
40
  EventTypes: keyMirror([
41
41
  'MapClick',
42
42
  'MapLongClick',
43
+ 'MapIdle',
43
44
  'RegionWillChange',
44
45
  'RegionIsChanging',
45
46
  'RegionDidChange',
package/src/classes/AnimatedRouteCoordinatesArray.js CHANGED
@@ -22,7 +22,7 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
22
22
  * Calculate initial state
23
23
  *
24
24
  * @param {*} args - to value from animate
25
- * @param {} options - options, example
25
+ * @param {{end?: {from?: number}}} options - options, example
26
26
  * @returns {object} - the state object
27
27
  */
28
28
  onInitialState(coordinatesArray, options = null) {
@@ -32,7 +32,7 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
32
32
  }
33
33
  return {
34
34
  fullRoute: coordinatesArray.map((coord) => [coord[0], coord[1]]),
35
- end: { from: 0 },
35
+ end,
36
36
  };
37
37
  }
38
38
 
@@ -57,7 +57,6 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
57
57
  const { fullRoute, end } = state;
58
58
  const currentEnd = end.from * (1.0 - progress) + progress * end.to;
59
59
 
60
- // console.log("Current end:", end, currentEnd);
61
60
  let prevsum = 0;
62
61
  let actsum = 0;
63
62
  let i = fullRoute.length - 1;
@@ -72,6 +71,10 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
72
71
  }
73
72
  if (actsum <= currentEnd) {
74
73
  const actRoute = [...fullRoute.slice(0, i + 1)];
74
+ const minLineStringElements = 2;
75
+ if (actRoute.length < minLineStringElements) {
76
+ actRoute.push(actRoute[0]);
77
+ }
75
78
  return { fullRoute, end: { ...end, current: currentEnd }, actRoute };
76
79
  }
77
80
  const r = (currentEnd - prevsum) / (actsum - prevsum);