@rnmapbox/maps 10.0.0-beta.38 → 10.0.0-beta.39

package/android/install.md

@@ -2,63 +2,67 @@
 
 ## We're supporting 3 implementations at the moment:
 
-  - maplibre: *DEFAULT* open source fork of older open source mapbox libraries with many improvements
-  - mapbox: v10 latest mapbox implementation - not opensource requires access for download
-  - mapbox-gl: classic mapbox libraries - should work but will be dropped, recent versions are not open source and requires acess for download
+  - mapbox: v10 latest mapbox implementation - *recommended*, not opensource requires access for download
+  - maplibre: *DEFAULT* open source fork of older open source mapbox libraries with many improvements, will be removed in next version
+  - mapbox-gl: classic mapbox libraries - should work but will be dropped, recent versions are not open source and requires acess for download, will be removed in next version
 
+## Mapbox Maps SDK v10
 
-## Using MapLibre
-
-[MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL.
-This is the default, and should work without any changes in gradle files.
+Add `RNMapboxMapsImpl = "mapbox"` to your gradle file - see bellow for details.
 
 ### Custom versions
 
+*Warning*: If you set a custome version make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version to what we exepect will likely result in a build error.
+
 Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
 
+
 ```groovy
 buildscript {
     ext {
         // ...
-        RNMapboxMapsImpl = "maplibre" // optional - as this is the default
+        RNMapboxMapsImpl = "mapbox" // required for v10
 
         RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation ("org.maplibre.gl:android-sdk:9.5.2")
-            implementation ("org.maplibre.gl:android-sdk-turf:5.9.0")
-
-            implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
+            implementation 'com.mapbox.maps:android:10.6.0'
+            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
         }
     }
 }
 ```
 
-Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/main/example/android/build.gradle) for inspiration!
 
-## Mapbox Maps SDK v10
 
-Add `RNMapboxMapsImpl = "mapbox"` to your gradle file - see bellow for details.
+## Using MapLibre
+
+[MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL.
+This is the default, and should work without any changes in gradle files.
 
 ### Custom versions
 
 Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
 
-
 ```groovy
 buildscript {
     ext {
         // ...
-        RNMapboxMapsImpl = "mapbox" // required for v10
+        RNMapboxMapsImpl = "maplibre" // optional - as this is the default
 
         RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation 'com.mapbox.maps:android:10.6.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
+            implementation ("org.maplibre.gl:android-sdk:9.5.2")
+            implementation ("org.maplibre.gl:android-sdk-turf:5.9.0")
+
+            implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
+            implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
+            implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
         }
     }
 }
 ```
 
+Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/main/example/android/build.gradle) for inspiration!
+
+
 ## Mapbox Maps GL Native SDK (pre v10)
 
 

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -910,5 +910,16 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
     manager.annotations.append(annotation)
     manager.syncSourceAndLayerIfNeeded()
   }
+
+  func refresh(_ annotation: PointAnnotation) {
+    let index = manager.annotations.firstIndex { $0.id == annotation.id }
+    if let index = index {
+      manager.annotations[index] = annotation
+      manager.syncSourceAndLayerIfNeeded()
+    } else {
+      Logger.log(level: .warn, message: "RCTMGL - PointAnnotation.refresh: expected annotation already there - adding")
+      add(annotation)
+    }
+  }
 }
 

package/ios/RCTMGL-v10/RCTMGLPointAnnotation.swift

@@ -36,12 +36,17 @@ class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
     return result
   }
 
+  func _refresh(_ annotation: PointAnnotation) {
+    map?.pointAnnotationManager.refresh(annotation)
+  }
+
   func _updateCoordinate() {
     guard let point = point() else {
       return
     }
     if var annotation = annotation {
       annotation.point = point
+      _refresh(annotation)
     } else {
       annotation = _create(point: point)
       setAnnotationImage(inital: true)

package/javascript/components/AbstractLayer.js

@@ -11,7 +11,7 @@ class AbstractLayer extends React.PureComponent {
       ...this.props,
       id: this.props.id,
       sourceID: this.props.sourceID,
-      reactStyle: this.getStyle(),
+      reactStyle: this.getStyle(this.props.style),
       minZoomLevel: this.props.minZoomLevel,
       maxZoomLevel: this.props.maxZoomLevel,
       aboveLayerID: this.props.aboveLayerID,
@@ -28,8 +28,8 @@ class AbstractLayer extends React.PureComponent {
     }
   }
 
-  getStyle() {
-    return transformStyle(this.props.style);
+  getStyle(style) {
+    return transformStyle(style);
   }
 
   setNativeProps(props) {

package/javascript/components/Light.js

@@ -34,7 +34,7 @@ class Light extends AbstractLayer {
         testID="rctmglLight"
         {...this.props}
         style={undefined}
-        reactStyle={this.getStyle()}
+        reactStyle={this.getStyle(this.props.style)}
       />
     );
   }

package/javascript/components/ShapeSource.js

@@ -285,7 +285,7 @@ class ShapeSource extends NativeBridgeComponent(AbstractSource) {
     const shallowProps = Object.assign({}, props);
 
     // Adds support for Animated
-    if (shallowProps.shape && typeof shallowProps !== 'string') {
+    if (shallowProps.shape && typeof shallowProps.shape !== 'string') {
       shallowProps.shape = JSON.stringify(shallowProps.shape);
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-beta.38",
+  "version": "10.0.0-beta.39",
   "publishConfig": {
     "access": "public"
   },