@rnmapbox/maps 10.1.6 → 10.1.8

package/README.md

@@ -154,7 +154,7 @@ const styles = StyleSheet.create({
 - [Callout](/docs/Callout.md)
 - [Camera](docs/Camera.md)
 - [UserLocation](docs/UserLocation.md)
-- [LocaitonPuck](docs/LocationPuck.md)
+- [LocationPuck](docs/LocationPuck.md)
 - [Images](docs/Images.md)
 - [Image](docs/Image.md)
 - [Models](docs/Models.md)

package/android/build.gradle

@@ -1,5 +1,5 @@
 def defaultMapboxMapsImpl = "mapbox"
-def defaultMapboxMapsVersion = "10.16.3"
+def defaultMapboxMapsVersion = "10.16.4"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

package/android/install.md

@@ -46,7 +46,7 @@ Set `RNMapboxMapsVersion` in `android/build.gradle > buildscript > ext` section
 ```groovy
 buildscript {
     ext {
-        RNMapboxMapsVersion = '11.0.0'
+        RNMapboxMapsVersion = '11.1.0'
     }
 }
 ```

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt

@@ -1512,14 +1512,18 @@ fun RNMBXMapView.updateRequestDisallowInterceptTouchEvent(oldValue: Boolean, val
         return
     }
     if (value) {
-        mapView.setOnTouchListener { view, event ->
-            this.requestDisallowInterceptTouchEvent(true)
-            mapView.onTouchEvent(event)
-            true
+        withMapView {
+            it.setOnTouchListener { view, event ->
+                this.requestDisallowInterceptTouchEvent(true)
+                mapView.onTouchEvent(event)
+                true
+            }
         }
     } else {
-        mapView.setOnTouchListener { view, event ->
-            mapView.onTouchEvent(event)
+        withMapView {
+            it.setOnTouchListener { view, event ->
+                mapView.onTouchEvent(event)
+            }
         }
     }
 }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSource.kt

@@ -21,6 +21,9 @@ import com.rnmapbox.rnmbx.v11compat.feature.*
 // import com.rnmapbox.rnmbx.utils.DownloadMapImageTask;
 class RNMBXRasterDemSource(context: Context?, private val mManager: RNMBXRasterDemSourceManager) :
     RNMBXTileSource<RasterDemSource?>(context) {
+
+    private var tileSize: Long? = null
+
     override fun onPress(event: OnPressEvent?) {
         mManager.handleEvent(FeatureClickEvent.makeVectorSourceEvent(this, event))
     }
@@ -35,15 +38,18 @@ class RNMBXRasterDemSource(context: Context?, private val mManager: RNMBXRasterD
             return mMap!!.getStyle()!!.getSource(DEFAULT_ID) as RasterDemSource
         }
         val configurationUrl = uRL
-        return if (configurationUrl != null) {
-            RasterDemSource(
-                RasterDemSource.Builder(id)
-                    .url(configurationUrl)
-            )
-        } else RasterDemSource(
+
+        val builder = if (configurationUrl != null) {
+            RasterDemSource.Builder(id)
+                .url(configurationUrl)
+        } else {
             RasterDemSource.Builder(id)
                 .tileSet(buildTileset())
-        )
+        }
+
+        tileSize?.let { builder.tileSize(it) }
+
+        return RasterDemSource(builder)
     }
 
     fun querySourceFeatures(
@@ -81,4 +87,8 @@ class RNMBXRasterDemSource(context: Context?, private val mManager: RNMBXRasterD
     override fun hasNoDataSoRefersToExisting(): Boolean {
         return uRL == null && tileUrlTemplates.isEmpty()
     }
+
+    fun setTileSize(tileSize: Int) {
+        this.tileSize = tileSize.toLong()
+    }
 }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSourceManager.kt

@@ -39,6 +39,6 @@ class RNMBXRasterDemSourceManager(private val mContext: ReactApplicationContext)
 
     @ReactProp(name = "tileSize")
     override fun setTileSize(view: RNMBXRasterDemSource, value: Dynamic) {
-        Logger.e("RNMBXRasterDemSourceManager", "tileSize not implemented")
+        view.setTileSize(value.asInt())
     }
 }

package/ios/install.md

@@ -69,7 +69,7 @@ We have support for mapbox 11.
 Add the following to your Podfile:
 
 ```ruby
-$RNMapboxMapsVersion = '= 11.0.0'
+$RNMapboxMapsVersion = '= 11.1.0'
 ```
 
 If using expo managed workflow, set the "RNMapboxMapsVersion" variable. See the [expo guide](/plugin/install.md)

package/lib/commonjs/classes/AnimatedRouteCoordinatesArray.js

@@ -22,7 +22,7 @@ class AnimatedRouteCoordinatesArray extends _AnimatedCoordinatesArray.default {
    * Calculate initial state
    *
    * @param {*} args - to value from animate
-   * @param {} options - options, example
+   * @param {{end?: {from?: number}}} options - options, example
    * @returns {object} - the state object
    */
   onInitialState(coordinatesArray, options = null) {
@@ -34,9 +34,7 @@ class AnimatedRouteCoordinatesArray extends _AnimatedCoordinatesArray.default {
     }
     return {
       fullRoute: coordinatesArray.map(coord => [coord[0], coord[1]]),
-      end: {
-        from: 0
-      }
+      end
     };
   }
 
@@ -63,8 +61,6 @@ class AnimatedRouteCoordinatesArray extends _AnimatedCoordinatesArray.default {
       end
     } = state;
     const currentEnd = end.from * (1.0 - progress) + progress * end.to;
-
-    // console.log("Current end:", end, currentEnd);
     let prevsum = 0;
     let actsum = 0;
     let i = fullRoute.length - 1;
@@ -75,6 +71,10 @@ class AnimatedRouteCoordinatesArray extends _AnimatedCoordinatesArray.default {
     }
     if (actsum <= currentEnd) {
       const actRoute = [...fullRoute.slice(0, i + 1)];
+      const minLineStringElements = 2;
+      if (actRoute.length < minLineStringElements) {
+        actRoute.push(actRoute[0]);
+      }
       return {
         fullRoute,
         end: {

package/lib/commonjs/classes/AnimatedRouteCoordinatesArray.js.map

@@ -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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"}
+{"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":"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"}

package/lib/module/classes/AnimatedRouteCoordinatesArray.js

@@ -17,7 +17,7 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
    * Calculate initial state
    *
    * @param {*} args - to value from animate
-   * @param {} options - options, example
+   * @param {{end?: {from?: number}}} options - options, example
    * @returns {object} - the state object
    */
   onInitialState(coordinatesArray, options = null) {
@@ -29,9 +29,7 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
     }
     return {
       fullRoute: coordinatesArray.map(coord => [coord[0], coord[1]]),
-      end: {
-        from: 0
-      }
+      end
     };
   }
 
@@ -58,8 +56,6 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
       end
     } = state;
     const currentEnd = end.from * (1.0 - progress) + progress * end.to;
-
-    // console.log("Current end:", end, currentEnd);
     let prevsum = 0;
     let actsum = 0;
     let i = fullRoute.length - 1;
@@ -70,6 +66,10 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
     }
     if (actsum <= currentEnd) {
       const actRoute = [...fullRoute.slice(0, i + 1)];
+      const minLineStringElements = 2;
+      if (actRoute.length < minLineStringElements) {
+        actRoute.push(actRoute[0]);
+      }
       return {
         fullRoute,
         end: {

package/lib/module/classes/AnimatedRouteCoordinatesArray.js.map

@@ -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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"}
+{"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

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.6",
+  "version": "10.1.8",
   "publishConfig": {
     "access": "public"
   },

package/plugin/install.md

@@ -20,7 +20,7 @@ After installing this package, add the [config plugin](https://docs.expo.io/guid
       [
         "@rnmapbox/maps",
         {
-          "RNMapboxMapsVersion": "11.0.0"
+          "RNMapboxMapsVersion": "11.1.0"
         }
       ]
     ]
@@ -93,7 +93,7 @@ To use V11 just set the version to a 11 version, see [the ios guide](/ios/instal
       [
         "@rnmapbox/maps",
         {
-          "RNMapboxMapsVersion": "11.0.0",
+          "RNMapboxMapsVersion": "11.1.0",
           "RNMapboxMapsDownloadToken": "sk.ey...qg",
         }
       ]

package/rnmapbox-maps.podspec

@@ -20,7 +20,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 ## Warning: these lines are scanned by autogenerate.js
-rnMapboxMapsDefaultMapboxVersion = '~> 10.16.3'
+rnMapboxMapsDefaultMapboxVersion = '~> 10.16.4'
 
 rnMapboxMapsDefaultImpl = 'mapbox'
 

package/setup-jest.js

@@ -40,6 +40,7 @@ NativeModules.RNMBXModule = {
   EventTypes: keyMirror([
     'MapClick',
     'MapLongClick',
+    'MapIdle',
     'RegionWillChange',
     'RegionIsChanging',
     'RegionDidChange',

package/src/classes/AnimatedRouteCoordinatesArray.js

@@ -22,7 +22,7 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
    * Calculate initial state
    *
    * @param {*} args - to value from animate
-   * @param {} options - options, example
+   * @param {{end?: {from?: number}}} options - options, example
    * @returns {object} - the state object
    */
   onInitialState(coordinatesArray, options = null) {
@@ -32,7 +32,7 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
     }
     return {
       fullRoute: coordinatesArray.map((coord) => [coord[0], coord[1]]),
-      end: { from: 0 },
+      end,
     };
   }
 
@@ -57,7 +57,6 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
     const { fullRoute, end } = state;
     const currentEnd = end.from * (1.0 - progress) + progress * end.to;
 
-    // console.log("Current end:", end, currentEnd);
     let prevsum = 0;
     let actsum = 0;
     let i = fullRoute.length - 1;
@@ -72,6 +71,10 @@ export class AnimatedRouteCoordinatesArray extends AnimatedCoordinatesArray {
     }
     if (actsum <= currentEnd) {
       const actRoute = [...fullRoute.slice(0, i + 1)];
+      const minLineStringElements = 2;
+      if (actRoute.length < minLineStringElements) {
+        actRoute.push(actRoute[0]);
+      }
       return { fullRoute, end: { ...end, current: currentEnd }, actRoute };
     }
     const r = (currentEnd - prevsum) / (actsum - prevsum);