@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.5

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.kt → java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.mapview
+package com.rnmapbox.rnmbx.components.mapview
 
 import android.content.Context
 import android.graphics.BitmapFactory
@@ -24,7 +24,6 @@ import com.mapbox.maps.*
 import com.mapbox.maps.extension.localization.localizeLabels
 import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData
 import com.mapbox.maps.extension.observable.eventdata.RenderFrameFinishedEventData
-import com.mapbox.maps.extension.observable.getMapLoadingErrorEventData
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.Layer
 import com.mapbox.maps.extension.style.layers.generated.*
@@ -48,34 +47,42 @@ import com.mapbox.maps.plugin.logo.logo
 import com.mapbox.maps.plugin.scalebar.generated.ScaleBarSettings
 import com.mapbox.maps.plugin.scalebar.scalebar
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
-import com.mapbox.rctmgl.R
-import com.mapbox.rctmgl.components.AbstractMapFeature
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerView
-import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerViewManager
-import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotation
-import com.mapbox.rctmgl.components.camera.RCTMGLCamera
-import com.mapbox.rctmgl.components.images.RCTMGLImages
-import com.mapbox.rctmgl.components.location.LocationComponentManager
-import com.mapbox.rctmgl.components.location.RCTMGLNativeUserLocation
-import com.mapbox.rctmgl.components.mapview.helpers.CameraChangeReason
-import com.mapbox.rctmgl.components.mapview.helpers.CameraChangeTracker
-import com.mapbox.rctmgl.components.styles.layers.RCTLayer
-import com.mapbox.rctmgl.components.styles.light.RCTMGLLight
-import com.mapbox.rctmgl.components.styles.sources.RCTSource
-import com.mapbox.rctmgl.components.styles.terrain.RCTMGLTerrain
-import com.mapbox.rctmgl.events.AndroidCallbackEvent
-import com.mapbox.rctmgl.events.IEvent
-import com.mapbox.rctmgl.events.MapChangeEvent
-import com.mapbox.rctmgl.events.CameraChangeEvent
-import com.mapbox.rctmgl.events.MapClickEvent
-import com.mapbox.rctmgl.events.constants.EventTypes
-import com.mapbox.rctmgl.utils.*
-import com.mapbox.rctmgl.utils.extensions.toReadableArray
+import com.rnmapbox.rnmbx.R
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerView
+import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewManager
+import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotation
+import com.rnmapbox.rnmbx.components.camera.RNMBXCamera
+import com.rnmapbox.rnmbx.components.images.RNMBXImages
+import com.rnmapbox.rnmbx.components.location.LocationComponentManager
+import com.rnmapbox.rnmbx.components.location.RNMBXNativeUserLocation
+import com.rnmapbox.rnmbx.components.mapview.helpers.CameraChangeReason
+import com.rnmapbox.rnmbx.components.mapview.helpers.CameraChangeTracker
+import com.rnmapbox.rnmbx.components.styles.layers.RCTLayer
+import com.rnmapbox.rnmbx.components.styles.light.RNMBXLight
+import com.rnmapbox.rnmbx.components.styles.sources.RCTSource
+import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrain
+import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
+import com.rnmapbox.rnmbx.events.IEvent
+import com.rnmapbox.rnmbx.events.MapChangeEvent
+import com.rnmapbox.rnmbx.events.CameraChangeEvent
+import com.rnmapbox.rnmbx.events.MapClickEvent
+import com.rnmapbox.rnmbx.events.constants.EventTypes
+import com.rnmapbox.rnmbx.utils.*
+import com.rnmapbox.rnmbx.utils.extensions.toReadableArray
+import com.rnmapbox.rnmbx.v11compat.annotation.AnnotationID
+import com.rnmapbox.rnmbx.v11compat.annotation.INVALID_ANNOTATION_ID
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
 
+import com.mapbox.maps.MapboxMap.*;
+
+import com.rnmapbox.rnmbx.v11compat.event.*
+import com.rnmapbox.rnmbx.v11compat.feature.*
+import com.rnmapbox.rnmbx.v11compat.mapboxmap.*
+import com.rnmapbox.rnmbx.v11compat.ornamentsettings.*
 
 data class OrnamentSettings(
     var enabled : Boolean? = false,
@@ -91,16 +98,16 @@ enum class MapGestureType {
  * Mapbox's MapView observers lifecycle events see MapboxLifecyclePluginImpl - (ON_START, ON_STOP, ON_DESTROY)
  * We need to emulate those.
  */
-interface RCTMGLLifeCycleOwner : LifecycleOwner {
+interface RNMBXLifeCycleOwner : LifecycleOwner {
     fun handleLifecycleEvent(event: Lifecycle.Event)
 }
 
-class RCTMGLLifeCycle {
-    private var lifecycleOwner : RCTMGLLifeCycleOwner? = null
+class RNMBXLifeCycle {
+    private var lifecycleOwner : RNMBXLifeCycleOwner? = null
 
     fun onAttachedToWindow(view: View) {
         if (lifecycleOwner == null) {
-            lifecycleOwner = object : RCTMGLLifeCycleOwner {
+            lifecycleOwner = object : RNMBXLifeCycleOwner {
                 private lateinit var lifecycleRegistry: LifecycleRegistry
                 init {
                     lifecycleRegistry = LifecycleRegistry(this)
@@ -111,7 +118,7 @@ class RCTMGLLifeCycle {
                     try {
                         lifecycleRegistry.handleLifecycleEvent(event)
                     } catch (e: RuntimeException) {
-                        Log.e("RCTMGLMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
+                        Log.e("RNMBXMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
                     }
                 }
 
@@ -149,7 +156,7 @@ data class FeatureEntry(val feature: AbstractMapFeature?, val view: View?, var a
 
 }
 
-open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapViewManager, options: MapInitOptions?) : FrameLayout(mContext), OnMapClickListener, OnMapLongClickListener, OnLayoutChangeListener {
+open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapViewManager, options: MapInitOptions?) : FrameLayout(mContext), OnMapClickListener, OnMapLongClickListener, OnLayoutChangeListener {
     /**
      * `PointAnnotations` are rendered to a canvas, but the React Native `Image` component is
      * implemented on top of Fresco (https://frescolib.org), which does not load images for
@@ -159,18 +166,18 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     public var offscreenAnnotationViewContainer: ViewGroup? = null
 
     private val mSources: MutableMap<String, RCTSource<*>>
-    private val mImages: MutableList<RCTMGLImages>
+    private val mImages: MutableList<RNMBXImages>
     private var mPointAnnotationManager: PointAnnotationManager? = null
-    private var mActiveMarkerID: Long = -1
+    private var mActiveMarkerID: AnnotationID = INVALID_ANNOTATION_ID
     private var mProjection: ProjectionName = ProjectionName.MERCATOR
     private var mLocaleString: String? = null
     private var mLocaleLayerIds: List<String>? = null
     private var mStyleURL: String? = null
     val isDestroyed = false
-    private var mCamera: RCTMGLCamera? = null
+    private var mCamera: RNMBXCamera? = null
     private val mFeatures = mutableListOf<FeatureEntry>()
     private var mQueuedFeatures: MutableList<AbstractMapFeature>? = ArrayList()
-    private val mPointAnnotations: MutableMap<String, RCTMGLPointAnnotation>
+    private val mPointAnnotations: MutableMap<String, RNMBXPointAnnotation>
     private val mCameraChangeTracker = CameraChangeTracker()
     private val mMap: MapboxMap?
 
@@ -216,7 +223,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                 gesturesPlugin.removeOnMapClickListener(_this)
                 gesturesPlugin.removeOnMapLongClickListener(_this)
 
-                mPointAnnotationManager = mapView.annotations.createPointAnnotationManager(AnnotationConfig(layerId = "rctmgl-mapview-annotations"))
+                mPointAnnotationManager = mapView.annotations.createPointAnnotationManager(AnnotationConfig(layerId = "RNMBX-mapview-annotations"))
                 mPointAnnotationManager?.addClickListener(OnPointAnnotationClickListener { pointAnnotation ->
                         onMarkerClick(pointAnnotation)
                         false
@@ -225,7 +232,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                 mPointAnnotationManager?.addDragListener(object : OnPointAnnotationDragListener {
                     override fun onAnnotationDragStarted(_annotation: Annotation<*>) {
                         mAnnotationDragged = true;
-                        var reactAnnotation: RCTMGLPointAnnotation? = null
+                        var reactAnnotation: RNMBXPointAnnotation? = null
                         for (key in mPointAnnotations.keys) {
                             val annotation = mPointAnnotations[key]
                             val curMarkerID = annotation?.mapboxID
@@ -237,7 +244,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                     }
 
                    override fun onAnnotationDrag(_annotation: Annotation<*>) {
-                        var reactAnnotation: RCTMGLPointAnnotation? = null
+                        var reactAnnotation: RNMBXPointAnnotation? = null
                         for (key in mPointAnnotations.keys) {
                             val annotation = mPointAnnotations[key]
                             val curMarkerID = annotation?.mapboxID
@@ -250,7 +257,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
 
                     override fun onAnnotationDragFinished(_annotation: Annotation<*>) {
                         mAnnotationDragged = false;
-                        var reactAnnotation: RCTMGLPointAnnotation? = null
+                        var reactAnnotation: RNMBXPointAnnotation? = null
                         for (key in mPointAnnotations.keys) {
                             val annotation = mPointAnnotations[key]
                             val curMarkerID = annotation?.mapboxID
@@ -411,22 +418,22 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             val source = childView
             mSources[source.iD.toString()] = source
             feature = childView as AbstractMapFeature?
-        } else if (childView is RCTMGLImages) {
+        } else if (childView is RNMBXImages) {
             mImages.add(childView)
             feature = childView
-        } else if (childView is RCTMGLLight) {
+        } else if (childView is RNMBXLight) {
             feature = childView
-        } else if (childView is RCTMGLTerrain) {
+        } else if (childView is RNMBXTerrain) {
             feature = childView as AbstractMapFeature?
-        } else if (childView is RCTMGLNativeUserLocation) {
+        } else if (childView is RNMBXNativeUserLocation) {
             feature = childView
-        } else if (childView is RCTMGLPointAnnotation) {
+        } else if (childView is RNMBXPointAnnotation) {
             val annotation = childView
             mPointAnnotations[annotation.iD.toString()] = annotation
             feature = childView
-        } else if (childView is RCTMGLMarkerView) {
+        } else if (childView is RNMBXMarkerView) {
             feature = childView
-        } else if (childView is RCTMGLCamera) {
+        } else if (childView is RNMBXCamera) {
             mCamera = childView
             feature = childView
         } else if (childView is RCTLayer<*>) {
@@ -455,13 +462,13 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         val feature = entry.feature
         if (feature is RCTSource<*>) {
             mSources.remove(feature.iD)
-        } else if (feature is RCTMGLPointAnnotation) {
+        } else if (feature is RNMBXPointAnnotation) {
             val annotation = feature
             if (annotation.mapboxID == mActiveMarkerID) {
-                mActiveMarkerID = -1
+                mActiveMarkerID = INVALID_ANNOTATION_ID
             }
             mPointAnnotations.remove(annotation.iD)
-        } else if (feature is RCTMGLImages) {
+        } else if (feature is RNMBXImages) {
             mImages.remove(feature)
         }
         if (entry.addedToMap) {
@@ -721,8 +728,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     fun onMarkerClick(symbol: PointAnnotation) {
         mAnnotationClicked = true
         val selectedMarkerID = symbol.id
-        var activeAnnotation: RCTMGLPointAnnotation? = null
-        var nextActiveAnnotation: RCTMGLPointAnnotation? = null
+        var activeAnnotation: RNMBXPointAnnotation? = null
+        var nextActiveAnnotation: RNMBXPointAnnotation? = null
         for (key in mPointAnnotations.keys) {
             val annotation = mPointAnnotations[key]
             val curMarkerID = annotation?.mapboxID
@@ -737,13 +744,13 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         nextActiveAnnotation?.let { selectAnnotation(it) }
     }
 
-    fun selectAnnotation(annotation: RCTMGLPointAnnotation) {
+    fun selectAnnotation(annotation: RNMBXPointAnnotation) {
         mActiveMarkerID = annotation.mapboxID
         annotation.onSelect(true)
     }
 
-    fun deselectAnnotation(annotation: RCTMGLPointAnnotation) {
-        mActiveMarkerID = -1
+    fun deselectAnnotation(annotation: RNMBXPointAnnotation) {
+        mActiveMarkerID = INVALID_ANNOTATION_ID
         annotation.onDeselect()
     }
 
@@ -1022,13 +1029,15 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             if (snapshot == null) {
                 response.error("snapshot failed")
             } else {
-                val uri: String = if (writeToDisk) BitmapUtils.createTempFile(
+                val uri: String? = if (writeToDisk) BitmapUtils.createTempFile(
                     mContext,
                     snapshot
                 ) else BitmapUtils.createBase64(snapshot)
 
                 response.success {
-                    it.putString("uri", uri)
+                    uri?.let { uri ->
+                        it.putString("uri", uri)
+                    }
                 }
             }
         }
@@ -1102,7 +1111,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     // endregion
 
     companion object {
-        const val LOG_TAG = "RCTMGLMapView"
+        const val LOG_TAG = "RNMBXMapView"
     }
 
     init {
@@ -1139,7 +1148,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             }
         })
 
-        RCTMGLMarkerViewManager.markerViewContainerSizeFixer(this, mapView.viewAnnotationManager)
+        RNMBXMarkerViewManager.markerViewContainerSizeFixer(this, mapView.viewAnnotationManager)
 
         this.addOnLayoutChangeListener(this)
         this.setupEvents()
@@ -1305,7 +1314,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     // region Attribution
-    var mAttributionSettings = OrnamentSettings(enabled = AttributionSettings().enabled)
+    var mAttributionSettings = OrnamentSettings(enabled = getAttributionSettings().enabled)
 
     fun setReactAttributionEnabled(attributionEnabled: Boolean?) {
         mAttributionSettings.enabled = attributionEnabled
@@ -1371,7 +1380,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     // endregion
 
     // region lifecycle
-    private val lifecycle : RCTMGLLifeCycle by lazy { RCTMGLLifeCycle() }
+    private val lifecycle : RNMBXLifeCycle by lazy { RNMBXLifeCycle() }
 
     fun getLifecycleState() : Lifecycle.State {
         return this.lifecycle.getState()
@@ -1430,7 +1439,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
 }
 
 // region requestDisallowInterceptTouchEvent
-fun RCTMGLMapView.updateRequestDisallowInterceptTouchEvent(oldValue: Boolean, value: Boolean) {
+fun RNMBXMapView.updateRequestDisallowInterceptTouchEvent(oldValue: Boolean, value: Boolean) {
     if (oldValue == value) {
         return
     }
@@ -1479,87 +1488,4 @@ fun OrnamentSettings.setPosAndMargins(posAndMargins: ReadableMap?) {
     this.margins = margins
 }
 
-interface GenericOrnamentSettings {
-    fun setHMargins(left: Float?, right: Float?)
-    fun setVMargins(top: Float?, bottom: Float?)
-    var enabled: Boolean
-    var position: Int
-}
-
-fun ScaleBarSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private val settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) { settings.position = value }
-}
-
-fun CompassSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}
-
-fun LogoSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}
 
-fun AttributionSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings;
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}