@rnmapbox/maps 10.1.0-beta.15 → 10.1.0-beta.18

package/android/build.gradle

@@ -43,6 +43,7 @@ if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
 }
 
 android {
+    namespace = "com.rnmapbox.rnmbx"
     if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
         msg = '@rnmapbox/maps: Maplibre implementation has been removed, set RNMapboxMapsImpl to mapbox- see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
         logger.error(msg)

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.rnmapbox.rnmbx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -90,20 +90,20 @@ class RNMBXPackage : TurboReactPackage() {
 
         // annotations
         managers.add(RNMBXMarkerViewManager(reactApplicationContext))
-        managers.add(RNMBXPointAnnotationManager(reactApplicationContext))
+        managers.add(RNMBXPointAnnotationManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
         managers.add(RNMBXCalloutManager())
         managers.add(RNMBXNativeUserLocationManager())
 
         // sources
         managers.add(RNMBXVectorSourceManager(reactApplicationContext))
-        managers.add(RNMBXShapeSourceManager(reactApplicationContext))
+        managers.add(RNMBXShapeSourceManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
         managers.add(RNMBXRasterDemSourceManager(reactApplicationContext))
         managers.add(RNMBXRasterSourceManager(reactApplicationContext))
         managers.add(RNMBXImageSourceManager())
 
         // images
         managers.add(RNMBXImagesManager(reactApplicationContext))
-        managers.add(RNMBXImageManager(reactApplicationContext))
+        managers.add(RNMBXImageManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
 
         // layers
         managers.add(RNMBXFillLayerManager())

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotation.kt

@@ -74,6 +74,11 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
         mMapView?.offscreenAnnotationViewContainer?.removeView(childView)
     }
 
+    override fun setId(id: Int) {
+        super.setId(id)
+        mManager.tagAssigned(id)
+    }
+
     override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotationManager.kt

@@ -9,10 +9,12 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXPointAnnotationManagerDelegate
 import com.facebook.react.viewmanagers.RNMBXPointAnnotationManagerInterface
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSource
 import com.rnmapbox.rnmbx.events.constants.EventKeys
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
-class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationContext) : AbstractEventEmitter<RNMBXPointAnnotation>(reactApplicationContext),
+class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : AbstractEventEmitter<RNMBXPointAnnotation>(reactApplicationContext),
   RNMBXPointAnnotationManagerInterface<RNMBXPointAnnotation> {
 
     private val mDelegate: ViewManagerDelegate<RNMBXPointAnnotation>
@@ -44,6 +46,17 @@ class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationConte
         return RNMBXPointAnnotation(reactContext!!, this)
     }
 
+    override fun onDropViewInstance(view: RNMBXPointAnnotation) {
+        val reactTag = view.id
+
+        viewTagResolver.viewRemoved(reactTag)
+        super.onDropViewInstance(view)
+    }
+
+    fun tagAssigned(reactTag: Int) {
+        return viewTagResolver.tagAssigned(reactTag)
+    }
+
     @ReactProp(name = "id")
     override fun setId(annotation: RNMBXPointAnnotation, id: Dynamic) {
         annotation.iD = id.asString()

package/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImage.kt

@@ -28,6 +28,11 @@ class RNMBXImage(private val mContext: ReactApplicationContext, private val mMan
 
     var mBitmap : Bitmap? = null
 
+    override fun setId(id: Int) {
+        super.setId(id)
+        mManager.tagAssigned(id)
+    }
+
     override fun onLayoutChange(v: View, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int,
                                 oldRight: Int, oldBottom: Int) {
         if (left == 0 && top == 0 && right == 0 && bottom == 0) {

package/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImageManager.kt

@@ -7,8 +7,10 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXImageManagerInterface
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSource
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
-class RNMBXImageManager(private val mContext: ReactApplicationContext) : AbstractEventEmitter<RNMBXImage>(
+class RNMBXImageManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : AbstractEventEmitter<RNMBXImage>(
 mContext
 ), RNMBXImageManagerInterface<RNMBXImage> {
     override fun getName(): String {
@@ -23,6 +25,17 @@ mContext
         return mutableMapOf();
     }
 
+    override fun onDropViewInstance(view: RNMBXImage) {
+        val reactTag = view.id
+
+        viewTagResolver.viewRemoved(reactTag)
+        super.onDropViewInstance(view)
+    }
+
+    fun tagAssigned(reactTag: Int) {
+        return viewTagResolver.tagAssigned(reactTag)
+    }
+
     // region React properties
     @ReactProp(name="name")
     override fun setName(image: RNMBXImage, value: Dynamic) {

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

@@ -48,6 +48,11 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
         }
     }
 
+    override fun setId(id: Int) {
+        super.setId(id)
+        mManager.tagAssigned(id)
+    }
+
     override fun makeSource(): GeoJsonSource {
         val builder = GeoJsonSource.Builder(iD.toString())
         getOptions(builder)

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

@@ -14,13 +14,14 @@ import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.rnmapbox.rnmbx.events.constants.EventKeys
 import com.rnmapbox.rnmbx.utils.ExpressionParser
 import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
 import java.net.MalformedURLException
 import java.net.URL
 import java.util.ArrayList
 import java.util.HashMap
 
 
-class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext) :
+class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) :
     AbstractEventEmitter<RNMBXShapeSource>(
         mContext
     ), RNMBXShapeSourceManagerInterface<RNMBXShapeSource> {
@@ -48,6 +49,17 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext) :
         source.removeLayer(childPosition)
     }
 
+    override fun onDropViewInstance(view: RNMBXShapeSource) {
+        val reactTag = view.id
+
+        viewTagResolver.viewRemoved(reactTag)
+        super.onDropViewInstance(view)
+    }
+
+    fun tagAssigned(reactTag: Int) {
+        return viewTagResolver.tagAssigned(reactTag)
+    }
+
     @ReactProp(name = "id")
     override fun setId(source: RNMBXShapeSource, id: Dynamic) {
         source.iD = id.asString()

package/android/src/main/java/com/rnmapbox/rnmbx/utils/PropertyChanges.kt

@@ -61,8 +61,8 @@ class PropertyChanges<T : Any> {
 
     fun apply(target: T) {
         for (entry in changes.entries.iterator()) {
-            print("key => ${entry.key}")
             entry.value.apply(target)
         }
+        changes.clear()
     }
 }

package/ios/RNMBX/RNMBXAtmosphereComponentView.mm

@@ -50,7 +50,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXAtmosphereProps>(props);
+  const auto &newProps = static_cast<const RNMBXAtmosphereProps &>(*props);
     id reactStyle = RNMBXConvertFollyDynamicToId(newProps.reactStyle);
     if (reactStyle != nil) {
         _view.reactStyle = reactStyle;

package/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXBackgroundLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXBackgroundLayerProps &>(*props);
   RNMBXSetCommonLayerPropsWithoutSourceID(newProps, _view);
 
 

package/ios/RNMBX/RNMBXCalloutComponentView.mm

@@ -42,7 +42,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXCalloutProps>(props);
+  const auto &newProps = static_cast<const RNMBXCalloutProps &>(*props);
 
   [super updateProps:props oldProps:oldProps];
 }

package/ios/RNMBX/RNMBXCamera.swift

@@ -42,11 +42,11 @@ struct CameraUpdateItem {
       }
       switch mode {
         case .flight:
-          map.camera.fly(to: camera, duration: duration)
+        map.mapView.camera.fly(to: camera, duration: duration)
         case .ease:
-          map.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
+        map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
         case .linear:
-          map.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
+        map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
         default:
           map.mapboxMap.setCamera(to: camera)
       }
@@ -524,7 +524,7 @@ open class RNMBXCamera : RNMBXMapComponentBase {
       return false
     }
 
-    map.viewport.removeStatusObserver(self)
+    map.mapView.viewport.removeStatusObserver(self)
     return super.removeFromMap(map, reason:reason)
   }
 }

package/ios/RNMBX/RNMBXCameraComponentView.mm

@@ -69,7 +69,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXCameraProps>(props);
+  const auto &newProps = static_cast<const RNMBXCameraProps &>(*props);
     id maxBounds = RNMBXConvertFollyDynamicToId(newProps.maxBounds);
     if (maxBounds != nil) {
         _view.maxBounds = maxBounds;

package/ios/RNMBX/RNMBXCircleLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXCircleLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXCircleLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
   [super updateProps:props oldProps:oldProps];

package/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXFillExtrusionLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXFillExtrusionLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
 

package/ios/RNMBX/RNMBXFillLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXFillLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXFillLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
   [super updateProps:props oldProps:oldProps];

package/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm

@@ -47,7 +47,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXHeatmapLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXHeatmapLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
 

package/ios/RNMBX/RNMBXImageComponentView.mm

@@ -65,7 +65,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXImageProps>(props);
+  const auto &newProps = static_cast<const RNMBXImageProps &>(*props);
     id stretchX = RNMBXConvertFollyDynamicToId(newProps.stretchX);
     if (stretchX != nil) {
         _view.stretchX = stretchX;

package/ios/RNMBX/RNMBXImageSourceComponentView.mm

@@ -70,7 +70,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXImageSourceProps>(props);
+  const auto &newProps = static_cast<const RNMBXImageSourceProps &>(*props);
     id idx = RNMBXConvertFollyDynamicToId(newProps.id);
     if (idx != nil) {
         _view.id = idx;

package/ios/RNMBX/RNMBXImages.swift

@@ -116,7 +116,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
         if !sameImage(oldValue: oldImages[name], newValue: images[name]) {
           missingImages[name] = images[name]
         } else {
-          if hasImage(style: style, name: name) {
+          if !hasImage(style: style, name: name) {
             logged("RNMBXImages.addImagePlaceholder") {
               try style.addImage(placeholderImage, id: name, stretchX: [], stretchY: [])
               missingImages[name] = images[name]
@@ -243,7 +243,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   func addNativeImages(style: Style, nativeImages: [NativeImageInfo]) {
     for imageInfo in nativeImages {
       let imageName = imageInfo.name
-      if  hasImage(style: style, name:imageName) {
+      if  !hasImage(style: style, name: imageName) {
         if let image = UIImage(named: imageName) {
           logged("RNMBXImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,

package/ios/RNMBX/RNMBXImagesComponentView.mm

@@ -68,7 +68,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXImagesProps>(props);
+  const auto &newProps = static_cast<const RNMBXImagesProps &>(*props);
     id images = RNMBXConvertFollyDynamicToId(newProps.images);
     if (images != nil) {
         _view.images = images;

package/ios/RNMBX/RNMBXLightComponentView.mm

@@ -49,7 +49,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXLightProps>(props);
+  const auto &newProps = static_cast<const RNMBXLightProps &>(*props);
     id reactStyle = RNMBXConvertFollyDynamicToId(newProps.reactStyle);
     if (reactStyle != nil) {
         _view.reactStyle = reactStyle;

package/ios/RNMBX/RNMBXLineLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXLineLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXLineLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
   [super updateProps:props oldProps:oldProps];