@rnmapbox/maps 10.0.15 → 10.1.0-beta.4

package/android/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapViewManager.kt

@@ -11,6 +11,10 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.mapbox.rctmgl.events.constants.EventKeys
 import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.MBXMapViewManagerDelegate
+import com.facebook.react.viewmanagers.MBXMapViewManagerInterface
+import com.mapbox.maps.MapInitOptions
 import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionName
 import com.mapbox.maps.plugin.gestures.gestures
 import com.mapbox.maps.plugin.logo.logo
@@ -43,8 +47,19 @@ interface CommandResponse {
 }
 
 open class RCTMGLMapViewManager(context: ReactApplicationContext) :
-    AbstractEventEmitter<RCTMGLMapView>(context) {
+    AbstractEventEmitter<RCTMGLMapView>(context), MBXMapViewManagerInterface<RCTMGLMapView> {
     private val mViews: MutableMap<Int, RCTMGLMapView>
+
+    private val mDelegate: ViewManagerDelegate<RCTMGLMapView>
+
+    init {
+        mDelegate = MBXMapViewManagerDelegate<RCTMGLMapView, RCTMGLMapViewManager>(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RCTMGLMapView>? {
+        return mDelegate
+    }
+
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -105,19 +120,19 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
 
     // region React Props
     @ReactProp(name = "projection")
-    fun setProjection(mapView: RCTMGLMapView, projection: String?) {
+    override fun setProjection(mapView: RCTMGLMapView, projection: String?) {
         mapView.setReactProjection( if (projection == "globe") ProjectionName.GLOBE else ProjectionName.MERCATOR )
     }
 
     @ReactProp(name = "localizeLabels")
-    fun setLocalizeLabels(mapView: RCTMGLMapView, localeMap: ReadableMap?) {
+    override fun setLocalizeLabels(mapView: RCTMGLMapView, localeMap: ReadableMap?) {
         val locale = localeMap?.getString("locale")
         val layerIds = localeMap?.getArray("layerIds")?.toArrayList()?.mapNotNull {it?.toString()}
         mapView.setReactLocalizeLabels(locale, layerIds)
     }
 
     @ReactProp(name = "styleURL")
-    fun setStyleURL(mapView: RCTMGLMapView, styleURL: String?) {
+    override fun setStyleURL(mapView: RCTMGLMapView, styleURL: String?) {
         mapView.setReactStyleURL(styleURL!!)
     }
 
@@ -127,7 +142,7 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
     }
 
     @ReactProp(name = "zoomEnabled")
-    fun setZoomEnabled(map: RCTMGLMapView, zoomEnabled: Boolean) {
+    override fun setZoomEnabled(map: RCTMGLMapView, zoomEnabled: Boolean) {
         val mapView = map.mapView
         mapView.gestures.pinchToZoomEnabled = zoomEnabled
         mapView.gestures.doubleTouchToZoomOutEnabled = zoomEnabled
@@ -135,66 +150,66 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
     }
 
     @ReactProp(name = "scrollEnabled")
-    fun setScrollEnabled(map: RCTMGLMapView, scrollEnabled: Boolean) {
+    override fun setScrollEnabled(map: RCTMGLMapView, scrollEnabled: Boolean) {
         val mapView = map.mapView
         mapView.gestures.scrollEnabled = scrollEnabled
     }
 
     @ReactProp(name = "pitchEnabled")
-    fun setPitchEnabled(map: RCTMGLMapView, pitchEnabled: Boolean) {
+    override fun setPitchEnabled(map: RCTMGLMapView, pitchEnabled: Boolean) {
         val mapView = map.mapView
         mapView.gestures.pitchEnabled = pitchEnabled
     }
 
     @ReactProp(name = "rotateEnabled")
-    fun setRotateEnabled(map: RCTMGLMapView, rotateEnabled: Boolean) {
+    override fun setRotateEnabled(map: RCTMGLMapView, rotateEnabled: Boolean) {
         val mapView = map.mapView
         mapView.gestures.rotateEnabled = rotateEnabled
     }
 
     @ReactProp(name = "attributionEnabled")
-    fun setAttributionEnabled(mapView: RCTMGLMapView?, attributionEnabled: Boolean?) {
-        mapView!!.setReactAttributionEnabled(attributionEnabled);
+    override fun setAttributionEnabled(mapView: RCTMGLMapView, attributionEnabled: Boolean) {
+        mapView.setReactAttributionEnabled(attributionEnabled)
     }
 
     @ReactProp(name = "attributionPosition")
-    fun setAttributionPosition(mapView: RCTMGLMapView?, attributionPosition: ReadableMap?) {
-        mapView!!.setReactAttributionPosition(attributionPosition);
+    fun setAttributionPosition(mapView: RCTMGLMapView, attributionPosition: ReadableMap) {
+        mapView.setReactAttributionPosition(attributionPosition)
     }
 
     @ReactProp(name = "attributionViewMargins")
-    fun setAttributionViewMargins(mapView: RCTMGLMapView?, scaleBarMargins: ReadableMap?) {
-        mapView!!.setReactAttributionViewMargins(scaleBarMargins!!);
+    fun setAttributionViewMargins(mapView: RCTMGLMapView, scaleBarMargins: ReadableMap) {
+        mapView.setReactAttributionViewMargins(scaleBarMargins)
     }
 
     @ReactProp(name = "attributionViewPosition")
-    fun setAttributionViewPosition(mapView: RCTMGLMapView?, scaleBarPosition: Int) {
-        mapView!!.setReactAttributionViewPosition(scaleBarPosition!!)
+    fun setAttributionViewPosition(mapView: RCTMGLMapView, scaleBarPosition: Int) {
+        mapView.setReactAttributionViewPosition(scaleBarPosition)
     }
 
     @ReactProp(name = "logoEnabled")
-    fun setLogoEnabled(mapView: RCTMGLMapView?, logoEnabled: Boolean?) {
-        mapView!!.setReactLogoEnabled(logoEnabled);
+    override fun setLogoEnabled(mapView: RCTMGLMapView, logoEnabled: Boolean) {
+        mapView.setReactLogoEnabled(logoEnabled)
     }
 
     @ReactProp(name = "logoPosition")
-    fun setLogoPosition(mapView: RCTMGLMapView?, logoPosition: ReadableMap?) {
-        mapView!!.setReactLogoPosition(logoPosition);
+    fun setLogoPosition(mapView: RCTMGLMapView, logoPosition: ReadableMap?) {
+        mapView.setReactLogoPosition(logoPosition)
     }
 
     @ReactProp(name = "scaleBarEnabled")
-    fun setScaleBarEnabled(mapView: RCTMGLMapView?, scaleBarEnabled: Boolean) {
-        mapView!!.setReactScaleBarEnabled(scaleBarEnabled);
+    override fun setScaleBarEnabled(mapView: RCTMGLMapView, scaleBarEnabled: Boolean) {
+        mapView.setReactScaleBarEnabled(scaleBarEnabled)
     }
 
     @ReactProp(name = "scaleBarViewMargins")
-    fun setScaleBarViewMargins(mapView: RCTMGLMapView?, scaleBarMargins: ReadableMap?) {
-        mapView!!.setReactScaleBarViewMargins(scaleBarMargins!!);
+    fun setScaleBarViewMargins(mapView: RCTMGLMapView, scaleBarMargins: ReadableMap) {
+        mapView.setReactScaleBarViewMargins(scaleBarMargins)
     }
 
     @ReactProp(name = "scaleBarViewPosition")
-    fun setScaleBarViewPosition(mapView: RCTMGLMapView?, scaleBarPosition: Int) {
-        mapView!!.setReactScaleBarViewPosition(scaleBarPosition!!)
+    fun setScaleBarViewPosition(mapView: RCTMGLMapView, scaleBarPosition: Int) {
+        mapView.setReactScaleBarViewPosition(scaleBarPosition)
     }
 
     @ReactProp(name = "scaleBarPosition")
@@ -203,45 +218,65 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
     }
 
     @ReactProp(name = "compassEnabled")
-    fun setCompassEnabled(mapView: RCTMGLMapView?, compassEnabled: Boolean) {
-        mapView!!.setReactCompassEnabled(compassEnabled);
+    override fun setCompassEnabled(mapView: RCTMGLMapView, compassEnabled: Boolean) {
+        mapView.setReactCompassEnabled(compassEnabled)
     }
 
     @ReactProp(name = "compassFadeWhenNorth")
-    fun setCompassFadeWhenNorth(mapView: RCTMGLMapView?, compassFadeWhenNorth: Boolean) {
-        mapView!!.setReactCompassFadeWhenNorth(compassFadeWhenNorth!!);
+    override fun setCompassFadeWhenNorth(mapView: RCTMGLMapView, compassFadeWhenNorth: Boolean) {
+        mapView.setReactCompassFadeWhenNorth(compassFadeWhenNorth)
     }
 
     @ReactProp(name = "compassViewMargins")
-    fun setCompassViewMargins(mapView: RCTMGLMapView?, compassViewMargins: ReadableMap?) {
-        mapView!!.setReactCompassViewMargins(compassViewMargins!!);
+    override fun setCompassViewMargins(mapView: RCTMGLMapView, compassViewMargins: ReadableMap?) {
+        mapView.setReactCompassViewMargins(compassViewMargins ?: return)
     }
 
     @ReactProp(name = "compassViewPosition")
-    fun setCompassViewPosition(mapView: RCTMGLMapView?, compassViewPosition: Int) {
-        mapView!!.setReactCompassViewPosition(compassViewPosition!!)
+    override fun setCompassViewPosition(mapView: RCTMGLMapView, compassViewPosition: Int) {
+        mapView.setReactCompassViewPosition(compassViewPosition)
     }
 
     @ReactProp(name = "compassPosition")
-    fun setCompassPosition(mapView: RCTMGLMapView?, compassMargins: ReadableMap) {
-        mapView!!.setReactCompassPosition(compassMargins)
+    fun setCompassPosition(mapView: RCTMGLMapView, compassMargins: ReadableMap) {
+        mapView.setReactCompassPosition(compassMargins)
     }
 
     @ReactProp(name = "contentInset")
-    fun setContentInset(mapView: RCTMGLMapView?, array: ReadableArray?) {
+    fun setContentInset(mapView: RCTMGLMapView, array: ReadableArray) {
         //mapView.setReactContentInset(array);
     }
 
     @ReactProp(name = "tintColor", customType = "Color")
-    fun setTintColor(mapView: RCTMGLMapView?, tintColor: Int?) {
+    fun setTintColor(mapView: RCTMGLMapView, tintColor: Int) {
         //mapView.setTintColor(tintColor);
     }
 
     @ReactProp(name = "requestDisallowInterceptTouchEvent")
-    fun setRequestDisallowInterceptTouchEvent(mapView: RCTMGLMapView, requestDisallowInterceptTouchEvent: Boolean) {
+    override fun setRequestDisallowInterceptTouchEvent(mapView: RCTMGLMapView, requestDisallowInterceptTouchEvent: Boolean) {
         mapView.requestDisallowInterceptTouchEvent = requestDisallowInterceptTouchEvent
     }
 
+    override fun setAttributionPosition(view: RCTMGLMapView, value: Dynamic) {
+        this.setAttributionPosition(view, value.asMap())
+    }
+
+    override fun setLogoPosition(view: RCTMGLMapView, value: Dynamic) {
+        this.setLogoPosition(view, value.asMap())
+    }
+
+    override fun setCompassPosition(view: RCTMGLMapView, value: Dynamic) {
+        this.setCompassPosition(view, value.asMap())
+    }
+
+    override fun setCompassImage(view: RCTMGLMapView, value: String?) {
+        // TODO: No-op on Android?
+    }
+
+    override fun setScaleBarPosition(view: RCTMGLMapView, value: Dynamic) {
+        // TODO: should this call setScaleBarViewPosition?
+    }
+
     //endregion
     //region Custom Events
     override fun customEvents(): Map<String, String>? {
@@ -260,126 +295,6 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
             "_useCommandName" to 1
         );
     }
-
-    fun sendResponse(mapView: RCTMGLMapView, callbackId: String, responseBuilder: (WritableMap) -> Unit) {
-        val payload: WritableMap = WritableNativeMap()
-        responseBuilder(payload)
-        var event = AndroidCallbackEvent(mapView, callbackId, payload)
-        handleEvent(event)
-    }
-
-    override fun receiveCommand(mapView: RCTMGLMapView, command: String, args: ReadableArray?) {
-        val callbackId = args!!.getString(0);
-        // allows method calls to work with componentDidMount
-        val mapboxMap = mapView.getMapboxMap()
-            ?: //            mapView.enqueuePreRenderMapMethod(commandID, args);
-            return
-        val response = object : CommandResponse {
-            override fun success(builder: (WritableMap) -> Unit) {
-                sendResponse(mapView, callbackId, builder)
-            }
-
-            override fun error(message: String) {
-                Logger.e(REACT_CLASS, "Command: ${command} failed with: ${message}")
-                sendResponse(mapView, callbackId) {
-                    it.putNull("data")
-                    it.putString("error", message)
-                }
-            }
-        }
-        when (command) {
-            "queryTerrainElevation" -> {
-                val coords = args!!.getArray(1)
-                mapView.queryTerrainElevation(
-                    coords.getDouble(0),
-                    coords.getDouble(1),
-                    response
-                )
-            }
-            "getZoom" -> {
-                mapView.getZoom(response)
-            }
-            "getCenter" -> {
-                mapView.getCenter(response)
-            }
-            "getPointInView" -> {
-                mapView.getPointInView(args.getArray(1).toCoordinate(), response)
-            }
-            "getCoordinateFromView" -> {
-                mapView.getCoordinateFromView(args.getArray(1).toScreenCoordinate(), response)
-            }
-            "setSourceVisibility" -> {
-                mapView!!.setSourceVisibility(
-                    args!!.getBoolean(1),
-                    args!!.getString(2),
-                    args!!.getString(3)
-                );
-            }
-            "queryRenderedFeaturesAtPoint" -> {
-                mapView.queryRenderedFeaturesAtPoint(
-                    ConvertUtils.toPointF(args!!.getArray(1)),
-                    ExpressionParser.from(args!!.getArray(2)),
-                    ConvertUtils.toStringList(args!!.getArray(3)),
-                    response
-                )
-            }
-            "queryRenderedFeaturesInRect" -> {
-                val layerIds = ConvertUtils.toStringList(args!!.getArray(3))
-                mapView.queryRenderedFeaturesInRect(
-                        if ((args.getArray(1)?.size() ?: 0) == 0) null else  args.getArray(1).toRectF(),
-                        ExpressionParser.from(args!!.getArray(2)),
-                        if (layerIds.size == 0) null else layerIds,
-                        response
-                )
-            }
-            "querySourceFeatures" -> {
-                val sourceLayerIds = ConvertUtils.toStringList(args!!.getArray(3))
-                mapView.querySourceFeatures(
-                        args!!.getString(1),
-                        ExpressionParser.from(args!!.getArray(2)),
-                        if (sourceLayerIds.size == 0) null else sourceLayerIds,
-                        response
-                );
-            }
-            "getVisibleBounds" -> {
-                mapView.getVisibleBounds(response)
-            }
-            "takeSnap" -> {
-                mapView.takeSnap(args!!.getBoolean(1), response)
-            }
-            "setHandledMapChangedEvents" -> {
-                args?.let {
-                    mapView.setHandledMapChangedEvents(it.getArray(1).asArrayString());
-                }
-            }
-            "clearData" -> {
-                mapView.clearData(response)
-            }
-            else -> {
-                Logger.w("RCTMGLMapView.receiveCommand", "unexpected command: ${command}")
-            }
-        }
-        /*
-        switch (commandID) {
-            case METHOD_TAKE_SNAP:
-                mapView.takeSnap(args.getString(0), args.getBoolean(1));
-                break;
-            case METHOD_SET_HANDLED_MAP_EVENTS:
-                if(args != null) {
-                    ArrayList<String> eventsArray = new ArrayList<>();
-                    for (int i = 1; i < args.size(); i++) {
-                        eventsArray.add(args.getString(i));
-                    }
-                    mapView.setHandledMapChangedEvents(eventsArray);
-                }
-                break;
-            case METHOD_SHOW_ATTRIBUTION:
-                mapView.showAttribution();
-                break;
-
-
-        }*/
-    }
     //endregion
 
     private class MapShadowNode(private val mViewManager: RCTMGLMapViewManager) :
@@ -409,7 +324,7 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
 
     companion object {
         const val LOG_TAG = "RCTMGLMapViewManager"
-        const val REACT_CLASS = "RCTMGLMapView"
+        const val REACT_CLASS = "MBXMapView"
     }
 
     init {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/RCTMGLStyle.kt

@@ -29,11 +29,14 @@ class RCTMGLStyle(private val mContext: Context, reactStyle: ReadableMap?, map:
             return keys
         }
 
-    fun getStyleValueForKey(styleKey: String?): RCTMGLStyleValue? {
-        val styleValueConfig = mReactStyle!!.getMap(styleKey!!)
-            ?: // TODO: throw exeception here
-            return null
-        return RCTMGLStyleValue(styleValueConfig)
+    fun getStyleValueForKey(styleKey: String): RCTMGLStyleValue {
+        val styleValueConfig = mReactStyle!!.getMap(styleKey)
+        if (styleValueConfig != null) {
+            return RCTMGLStyleValue(styleValueConfig)
+        } else {
+            Logger.e("RCTMGLStyle", "Value for ${styleKey} not found")
+            throw Exception("RCTMGLStyle - Value for ${styleKey} not found")
+        }
     }
 
     fun imageEntry(styleValue: RCTMGLStyleValue): ImageEntry {