@rnmapbox/maps 10.1.0-beta.8 → 10.1.0-rc.0

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt

@@ -40,6 +40,8 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
     AbstractMapFeature(
         mContext
     ) {
+    override var requiresStyleLoad = false
+
     private var hasSentFirstRegion = false
     private var mDefaultStop: CameraStop? = null
     private var mCameraStop: CameraStop? = null
@@ -317,21 +319,77 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
         when (status) {
             ViewportStatus.Idle -> return null
             is ViewportStatus.State ->
-                return toFollowUserMode(status)
+                return toFollowUserMode(status.state)
             is ViewportStatus.Transition ->
                 return toFollowUserMode(status.toState)
         }
     }
 
+    fun toUserTrackingMode(state: ViewportState): Int {
+        when (state) {
+            is FollowPuckViewportState -> {
+                return when (state.options.bearing) {
+                    is FollowPuckViewportStateBearing.SyncWithLocationPuck -> {
+                        val location = mMapView?.mapView?.location2
+                        if (location?.puckBearingEnabled == true) {
+                            when (location.puckBearingSource) {
+
+                                PuckBearing.HEADING -> {
+                                    UserTrackingMode.FollowWithHeading
+                                }
+                                PuckBearing.COURSE -> {
+                                    UserTrackingMode.FollowWithCourse
+                                }
+                                else -> {
+                                    UserTrackingMode.FOLLOW
+                                }
+                            }
+                        } else {
+                            UserTrackingMode.FOLLOW
+                        }
+                    }
+
+                    is FollowPuckViewportStateBearing.Constant ->
+                        UserTrackingMode.FOLLOW
+
+                    else -> {
+                        Logger.w(LOG_TAG, "Unexpected bearing: ${state.options.bearing}")
+                        UserTrackingMode.FOLLOW
+                    }
+                }
+            }
+
+            is OverviewViewportState -> {
+                return UserTrackingMode.NONE
+            }
+
+            else -> {
+                return UserTrackingMode.NONE // TODO
+            }
+        }
+    }
+
+    fun toUserTrackingMode(status: ViewportStatus): Int {
+        return when (status) {
+            ViewportStatus.Idle -> UserTrackingMode.NONE
+            is ViewportStatus.State ->
+                toUserTrackingMode(status.state)
+
+            is ViewportStatus.Transition ->
+                toUserTrackingMode(status.toState)
+        }
+    }
+
     fun toReadableMap(status: ViewportStatus): ReadableMap {
-        when (status) {
-            ViewportStatus.Idle -> return writableMapOf("state" to "idle")
+        return when (status) {
+            ViewportStatus.Idle -> writableMapOf("state" to "idle")
             is ViewportStatus.State ->
-                return writableMapOf(
+                writableMapOf(
                     "state" to status.toString()
                 )
+
             is ViewportStatus.Transition ->
-                return writableMapOf(
+                writableMapOf(
                     "transition" to status.toString()
                 )
         }
@@ -344,12 +402,11 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
                 toStatus: ViewportStatus,
                 reason: ViewportStatusChangeReason
             ) {
-                if (reason == ViewportStatusChangeReason.USER_INTERACTION) {
+                if (reason == ViewportStatusChangeReason.USER_INTERACTION || reason == ViewportStatusChangeReason.TRANSITION_SUCCEEDED) {
                     val followUserLocation = toFollowUserLocation(toStatus)
 
-
-
-                    mManager.handleEvent(MapUserTrackingModeEvent(this@RNMBXCamera, UserTrackingMode.NONE,
+                    val mode = toUserTrackingMode(toStatus)
+                    mManager.handleEvent(MapUserTrackingModeEvent(this@RNMBXCamera, mode,
                     writableMapOf(
                         "followUserMode" to toFollowUserMode(toStatus),
                         "followUserLocation" to followUserLocation,
@@ -411,12 +468,12 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
             when (mFollowUserMode ?: "normal") {
                 "compass" -> {
                     location.puckBearingEnabled = true
-                    location.puckBearingSource = PuckBearingSource.HEADING
+                    location.puckBearingSource = PuckBearing.HEADING
                     followOptions.bearing(FollowPuckViewportStateBearing.SyncWithLocationPuck)
                 }
                 "course" -> {
                     location.puckBearingEnabled = true
-                    location.puckBearingSource = PuckBearingSource.COURSE
+                    location.puckBearingSource = PuckBearing.COURSE
                     followOptions.bearing(FollowPuckViewportStateBearing.SyncWithLocationPuck)
                 }
                 "normal" -> {

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCameraManager.kt

@@ -1,8 +1,10 @@
 package com.rnmapbox.rnmbx.components.camera
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXCameraManagerInterface
 import com.mapbox.geojson.FeatureCollection
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.components.camera.CameraStop.Companion.fromReadableMap
@@ -12,7 +14,7 @@ import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngBounds
 class RNMBXCameraManager(private val mContext: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXCamera?>(
         mContext
-    ) {
+    ), RNMBXCameraManagerInterface<RNMBXCamera> {
     override fun customEvents(): Map<String, String>? {
         return HashMap()
     }
@@ -26,82 +28,90 @@ class RNMBXCameraManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "stop")
-    fun setStop(camera: RNMBXCamera, map: ReadableMap?) {
-        if (map != null) {
-            val stop = fromReadableMap(mContext, map, null)
+    override fun setStop(camera: RNMBXCamera, map: Dynamic) {
+        if (!map.isNull) {
+            val stop = fromReadableMap(mContext, map.asMap(), null)
             camera.setStop(stop)
         }
     }
 
     @ReactProp(name = "defaultStop")
-    fun setDefaultStop(camera: RNMBXCamera, map: ReadableMap?) {
-        if (map != null) {
-            val stop = fromReadableMap(mContext, map, null)
+    override fun setDefaultStop(camera: RNMBXCamera, map: Dynamic) {
+        if (!map.isNull) {
+            val stop = fromReadableMap(mContext, map.asMap(), null)
             camera.setDefaultStop(stop)
         }
     }
 
     @ReactProp(name = "userTrackingMode")
-    fun setUserTrackingMode(camera: RNMBXCamera, userTrackingMode: Int) {
-        camera.setUserTrackingMode(userTrackingMode)
+    override fun setUserTrackingMode(camera: RNMBXCamera, userTrackingMode: Dynamic) {
+        camera.setUserTrackingMode(userTrackingMode.asInt())
         throw AssertionError("Unused code")
     }
 
     @ReactProp(name = "zoomLevel")
-    fun setZoomLevel(camera: RNMBXCamera, zoomLevel: Double) {
-        camera.setZoomLevel(zoomLevel)
+    override fun setZoomLevel(camera: RNMBXCamera, zoomLevel: Dynamic) {
+        camera.setZoomLevel(zoomLevel.asDouble())
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(camera: RNMBXCamera, value: Double) {
-        camera.setMinZoomLevel(value)
+    override fun setMinZoomLevel(camera: RNMBXCamera, value: Dynamic) {
+        camera.setMinZoomLevel(value.asDouble())
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(camera: RNMBXCamera, value: Double) {
-        camera.setMaxZoomLevel(value)
+    override fun setMaxZoomLevel(camera: RNMBXCamera, value: Dynamic) {
+        camera.setMaxZoomLevel(value.asDouble())
     }
 
     @ReactProp(name = "followUserLocation")
-    fun setFollowUserLocation(camera: RNMBXCamera, value: Boolean) {
-        camera.setFollowUserLocation(value)
+    override fun setFollowUserLocation(camera: RNMBXCamera, value: Dynamic) {
+        camera.setFollowUserLocation(value.asBoolean())
     }
 
     @ReactProp(name = "followUserMode")
-    fun setFollowUserMode(camera: RNMBXCamera, value: String?) {
-        camera.setFollowUserMode(value)
+    override fun setFollowUserMode(camera: RNMBXCamera, value: Dynamic) {
+        camera.setFollowUserMode(value.asString())
     }
 
     @ReactProp(name = "followZoomLevel")
-    fun setFollowZoomLevel(camera: RNMBXCamera, value: Double) {
-        camera.setFollowZoomLevel(value)
+    override fun setFollowZoomLevel(camera: RNMBXCamera, value: Dynamic) {
+        camera.setFollowZoomLevel(value.asDouble())
     }
 
     @ReactProp(name = "followPitch")
-    fun setFollowPitch(camera: RNMBXCamera, value: Double) {
-        camera.setFollowPitch(value)
+    override fun setFollowPitch(camera: RNMBXCamera, value: Dynamic) {
+        camera.setFollowPitch(value.asDouble())
     }
 
     @ReactProp(name = "followHeading")
-    fun setFollowHeading(camera: RNMBXCamera, value: Double) {
-        camera.setFollowHeading(value)
+    override fun setFollowHeading(camera: RNMBXCamera, value: Dynamic) {
+        camera.setFollowHeading(value.asDouble())
     }
 
     @ReactProp(name = "followPadding")
-    fun setFollowPadding(camera: RNMBXCamera, value: ReadableMap) {
-        camera.setFollowPadding(value)
+    override fun setFollowPadding(camera: RNMBXCamera, value: Dynamic) {
+        camera.setFollowPadding(value.asMap())
     }
 
     @ReactProp(name = "maxBounds")
-    fun setMaxBounds(camera: RNMBXCamera, value: String?) {
-        if (value != null) {
-            val collection = FeatureCollection.fromJson(value)
+    override fun setMaxBounds(camera: RNMBXCamera, value: Dynamic) {
+        if (!value.isNull) {
+            val collection = FeatureCollection.fromJson(value.asString())
             camera.setMaxBounds(toLatLngBounds(collection))
         } else {
             camera.setMaxBounds(null)
         }
     }
 
+    override fun setAnimationDuration(view: RNMBXCamera?, value: Dynamic) {
+        // no-op on Android
+    }
+
+    override fun setAnimationMode(view: RNMBXCamera?, value: Dynamic) {
+        // no-op on Android
+    }
+
     companion object {
         const val REACT_CLASS = "RNMBXCamera"
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXVIewportManager.kt

@@ -0,0 +1,55 @@
+package com.rnmapbox.rnmbx.components.camera
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXViewportManagerInterface
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.eventMapOf
+
+class RNMBXViewportManager(private val mContext: ReactApplicationContext) : AbstractEventEmitter<RNMBXViewport?>(
+        mContext
+    ), RNMBXViewportManagerInterface<RNMBXViewport> {
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXViewport {
+        return RNMBXViewport(reactContext, this)
+    }
+
+    @ReactProp(name = "transitionsToIdleUponUserInteraction")
+    override fun setTransitionsToIdleUponUserInteraction(view: RNMBXViewport?, value: Dynamic?) {
+        view?.transitionsToIdleUponUserInteraction = value?.asBoolean()
+    }
+
+    @ReactProp(name = "hasStatusChanged")
+    override fun setHasStatusChanged(view: RNMBXViewport?, value: Boolean) {
+        view?.hasStatusChanged = value
+    }
+
+    //region Custom Events
+    override fun customEvents(): Map<String, String>? {
+        return eventMapOf(
+            EventKeys.VIEWPORT_STATUS_CHANGE to "onStatusChanged"
+        )
+    }
+
+    override fun getCommandsMap(): Map<String, Int>? {
+        return mapOf(
+            "_useCommandName" to 1
+        );
+    }
+    //endregion
+
+    companion object {
+        const val REACT_CLASS = "RNMBXViewport"
+    }
+}