@rnmapbox/maps 10.0.15 → 10.1.0-beta.10

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

@@ -1,69 +0,0 @@
-package com.mapbox.rctmgl.components.styles.sources
-
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.common.MapBuilder
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.mapbox.rctmgl.events.constants.EventKeys
-import com.mapbox.rctmgl.utils.ConvertUtils
-import com.mapbox.rctmgl.utils.ExpressionParser
-import javax.annotation.Nonnull
-
-class RCTMGLVectorSourceManager(reactApplicationContext: ReactApplicationContext) :
-    RCTMGLTileSourceManager<RCTMGLVectorSource?>(reactApplicationContext) {
-    @Nonnull
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    @Nonnull
-    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RCTMGLVectorSource {
-        return RCTMGLVectorSource(reactContext, this)
-    }
-
-    @ReactProp(name = "hasPressListener")
-    fun setHasPressListener(source: RCTMGLVectorSource, hasPressListener: Boolean) {
-        source.setHasPressListener(hasPressListener)
-    }
-
-    @ReactProp(name = "hitbox")
-    fun setHitbox(source: RCTMGLVectorSource, map: ReadableMap?) {
-        source.setHitbox(map!!)
-    }
-
-    override fun customEvents(): Map<String, String>? {
-        return MapBuilder.builder<String, String>()
-            .put(EventKeys.VECTOR_SOURCE_LAYER_CLICK, "onMapboxVectorSourcePress")
-            .put(EventKeys.MAP_ANDROID_CALLBACK, "onAndroidCallback")
-            .build()
-    }
-
-    override fun getCommandsMap(): Map<String, Int>? {
-        return MapBuilder.builder<String, Int>()
-            .put("features", METHOD_FEATURES)
-            .build()
-    }
-
-    override fun receiveCommand(
-        vectorSource: RCTMGLVectorSource,
-        commandID: Int,
-        args: ReadableArray?
-    ) {
-        when (commandID) {
-            METHOD_FEATURES -> vectorSource.querySourceFeatures(
-                args!!.getString(0),
-                ConvertUtils.toStringList(args.getArray(1)),
-                ExpressionParser.from(args.getArray(2))
-            )
-        }
-    }
-
-    companion object {
-        const val REACT_CLASS = "RCTMGLVectorSource"
-
-        //region React Methods
-        const val METHOD_FEATURES = 102
-    }
-}

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

@@ -1,241 +0,0 @@
-package com.mapbox.rctmgl.components.styles.sources
-
-import android.content.Context
-import com.mapbox.maps.extension.style.sources.getSource
-import com.mapbox.maps.extension.style.sources.addSource
-import com.mapbox.rctmgl.components.AbstractMapFeature
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.maps.MapboxMap
-import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
-import com.facebook.react.bridge.ReadableMap
-import com.mapbox.rctmgl.components.styles.sources.RCTSource
-import android.graphics.PointF
-import android.view.View
-import com.facebook.react.common.MapBuilder
-import com.mapbox.geojson.Feature
-import com.mapbox.maps.Style
-import com.mapbox.maps.extension.style.StyleContract
-import com.mapbox.maps.extension.style.sources.Source
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.styles.sources.RCTSource.OnPressEvent
-import com.mapbox.rctmgl.utils.LatLng
-import com.mapbox.rctmgl.utils.Logger
-import java.lang.ClassCastException
-import java.util.ArrayList
-import java.util.HashMap
-
-data class FeatureInfo(val feature: AbstractMapFeature?, var added: Boolean) {
-}
-
-abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(context) {
-    @JvmField
-    protected var mMap: MapboxMap? = null
-    var iD: String? = null
-    @JvmField
-    protected var mSource: T? = null
-    protected var mHasPressListener = false
-    protected var mTouchHitbox: Map<String, Double>? = null
-    private var mSubFeatures = mutableListOf<FeatureInfo>()
-
-    val layerIDs: List<String>
-        get() {
-           return mSubFeatures.mapIndexed { index, featureInfo ->
-                if (featureInfo.added && featureInfo.feature is AbstractSourceConsumer)  {
-                    featureInfo.feature.iD
-                } else {
-                    null
-                }
-            }.filterNotNull()
-        }
-
-    abstract fun hasNoDataSoRefersToExisting(): Boolean;
-
-    public var mExisting: Boolean? = null
-
-    val existing: Boolean
-        get() {
-            var result: Boolean = false
-            mExisting?.also {
-                result = it
-            } ?: run {
-                if (hasNoDataSoRefersToExisting()) {
-                    Logger.w(
-                        LOG_TAG,
-                        "RCTSource: soure with id: $id seems to refer to existing value but existing flag is not set. This is deprecated."
-                    )
-                    result = true
-                } else {
-                    result = false
-                }
-            }
-            return result
-        }
-
-    private fun getSourceAs(style: Style, id: String?): T? {
-        val result = iD?.let { style.getSource(it) }
-        return try {
-            result as T?
-        } catch (exception: ClassCastException) {
-            null
-        }
-    }
-
-    open fun hasPressListener(): Boolean {
-        return mHasPressListener
-    }
-
-    fun setHasPressListener(hasPressListener: Boolean) {
-        mHasPressListener = hasPressListener
-    }
-
-    fun setHitbox(map: ReadableMap) {
-        val hitbox: MutableMap<String, Double> = HashMap()
-        hitbox["width"] = map.getDouble("width")
-        hitbox["height"] = map.getDouble("height")
-        mTouchHitbox = hitbox
-    }
-
-    val touchHitbox: Map<String, Double>?
-        get() {
-            if (!hasPressListener()) {
-                return null
-            }
-            return if (mTouchHitbox == null) {
-                MapBuilder.builder<String, Double>()
-                        .put("width", DEFAULT_HITBOX_WIDTH)
-                        .put("height", DEFAULT_HITBOX_HEIGHT)
-                        .build()
-            } else mTouchHitbox
-        }
-
-    fun addToMap(existings: Boolean, style: Style, mapView: RCTMGLMapView) {
-        mSource = null
-        val existingSource = getSourceAs(style, iD)
-        if (existingSource != null) {
-            mSource = existingSource
-            if (!existings) {
-                Logger.w(LOG_TAG, "Source $iD was not marked as existing but found in style, it's deprecated: https://github.com/rnmapbox/maps/wiki/Deprecated-ExistingSourceLayer")
-            }
-        } else {
-            if (existings) {
-                Logger.w(
-                    LOG_TAG,
-                    "Source $iD was marked as existing but was not found in style, it's deprecated: https://github.com/rnmapbox/maps/wiki/Deprecated-ExistingSourceLayer"
-                )
-            }
-        }
-        if (mSource == null) {
-            mSource = makeSource()
-            style.addSource(mSource as StyleContract.StyleSourceExtension)
-        }
-        mSubFeatures?.forEach {
-            it.feature?.let {
-                it.addToMap(mapView)
-            }
-            it.added = true
-        }
-     }
-
-    override fun addToMap(mapView: RCTMGLMapView) {
-        super.addToMap(mapView)
-        mMap = mapView.getMapboxMap()
-        val map = mMap
-        if (map == null) {
-            Logger.e("RCTSource", "map is exepted to be valid but was null, $iD")
-            return
-        }
-        val style = map.getStyle()
-        if (existing || style == null) {
-            map.getStyle(object : Style.OnStyleLoaded {
-                override fun onStyleLoaded(style: Style) {
-                    addToMap(existing, style, mapView)
-                }
-            })
-        } else {
-            addToMap(existing, style, mapView)
-        }
-
-    }
-
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
-
-        mSubFeatures.forEach { it
-            var featureInfo = it
-            featureInfo.feature?.let {
-                if (it.removeFromMap(mapView, reason)) {
-                    featureInfo.added = false
-                }
-            }
-        }
-        if (mMap != null && mSource != null && mMap!!.getStyle() != null) {
-            try {
-                iD?.let { mMap?.getStyle()?.removeStyleSource(it) }
-            } catch (ex: Throwable) {
-                Logger.w(LOG_TAG, String.format("RCTSource.removeFromMap: %s - %s", mSource, ex.message), ex)
-            }
-        }
-        return super.removeFromMap(mapView, reason)
-    }
-
-    fun addLayer(childView: View?, childPosition: Int) {
-        var feature: AbstractMapFeature? = null
-        if (childView !is AbstractMapFeature) {
-            Logger.w(LOG_TAG, "Attempted to insert view: $childView to shape source: $iD, since it's not a MapFeature it will not be added")
-        } else {
-            feature = childView
-        }
-
-        val mapView = mMapView
-
-        val added = if (mapView != null && feature != null) {
-            feature.addToMap(mapView)
-            true
-        } else {
-            false
-        }
-        mSubFeatures.add(childPosition, FeatureInfo(feature, added))
-    }
-
-    fun removeLayer(childPosition: Int) {
-        var featureInfo = mSubFeatures[childPosition]
-        if (featureInfo.added) {
-            val mapView = mMapView
-            if (mapView != null) {
-                featureInfo.feature?.let { it.removeFromMap(mapView, RemovalReason.VIEW_REMOVAL) }
-            }
-            featureInfo.added = false
-        }
-        mSubFeatures.removeAt(childPosition)
-    }
-
-    val childViews: List<AbstractMapFeature>
-        get() = mSubFeatures.map { it.feature }.filterNotNull()
-
-    override fun getChildAt(childPosition: Int): View {
-        return childViews[childPosition]
-    }
-
-    override fun getChildCount(): Int {
-        return childViews.size;
-    }
-
-
-    abstract fun makeSource(): T
-    class OnPressEvent(var features: List<Feature>, var latLng: LatLng, var screenPoint: PointF)
-
-    abstract fun onPress(event: OnPressEvent?)
-
-    companion object {
-        const val DEFAULT_ID = "composite"
-        const val LOG_TAG = "RCTSource"
-        const val DEFAULT_HITBOX_WIDTH = 44.0
-        const val DEFAULT_HITBOX_HEIGHT = 44.0
-        @JvmStatic
-        fun isDefaultSource(sourceID: String): Boolean {
-            return DEFAULT_ID == sourceID
-        }
-    }
-
-    init {
-    }
-}

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

@@ -1,66 +0,0 @@
-package com.mapbox.rctmgl.components.styles.terrain
-
-import android.content.Context
-import com.facebook.react.bridge.ReadableMap
-import com.mapbox.maps.MapboxMap
-import com.mapbox.maps.extension.style.terrain.generated.Terrain
-import com.mapbox.maps.extension.style.terrain.generated.removeTerrain
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.styles.RCTMGLStyle
-import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
-import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
-import com.mapbox.rctmgl.utils.Logger
-
-class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
-    override var iD: String? = null
-    protected var mSourceID: String? = null
-    protected var mTerrain: Terrain? = null
-
-    // beginregion RCTLayer
-    @JvmField
-    protected var mMap: MapboxMap? = null
-
-    @JvmField
-    protected var mReactStyle: ReadableMap? = null
-
-    fun setReactStyle(reactStyle: ReadableMap?) {
-        mReactStyle = reactStyle
-        if (mTerrain != null) {
-            addStyles()
-        }
-    }
-    // endregion RCTLayer
-
-    fun setSourceID(sourceID: String?) {
-        mSourceID = sourceID
-    }
-
-    override fun addToMap(mapView: RCTMGLMapView) {
-        super.addToMap(mapView)
-        mMap = mapView.getMapboxMap()
-        val terrain = makeTerrain()
-        mTerrain = terrain
-        addStyles()
-        mapView.savedStyle?.let { terrain.bindTo(it) }
-    }
-
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
-        mapView.savedStyle?.let { it.removeTerrain() }
-        mMap = null
-        return super.removeFromMap(mapView, reason)
-    }
-
-    fun makeTerrain(): Terrain {
-        return Terrain(mSourceID!!)
-    }
-
-    fun addStyles() {
-        RCTMGLStyleFactory.setTerrainLayerStyle(
-            mTerrain, RCTMGLStyle(
-                context, mReactStyle!!,
-                mMap!!
-            )
-        )
-    }
-}

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

@@ -1,35 +0,0 @@
-package com.mapbox.rctmgl.components.styles.terrain
-
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewGroupManager
-import com.facebook.react.uimanager.annotations.ReactProp
-
-class RCTMGLTerrainManager : ViewGroupManager<RCTMGLTerrain>() {
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLTerrain {
-        return RCTMGLTerrain(reactContext)
-    }
-
-    @ReactProp(name = "id")
-    fun setId(layer: RCTMGLTerrain, id: String?) {
-        layer.iD = id
-    }
-
-    @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RCTMGLTerrain, sourceID: String?) {
-        layer.setSourceID(sourceID)
-    }
-
-    @ReactProp(name = "reactStyle")
-    fun setReactStyle(terrain: RCTMGLTerrain, reactStyle: ReadableMap?) {
-        terrain.setReactStyle(reactStyle)
-    }
-
-    companion object {
-        const val REACT_CLASS = "RCTMGLTerrain"
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/events/AbstractEvent.kt

@@ -1,49 +0,0 @@
-package com.mapbox.rctmgl.events
-
-import android.view.View
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-
-abstract class AbstractEvent(view: View?, private val mEventType: String) : IEvent {
-    private var mTagID = 0
-    private val mTimestamp: Long
-
-    constructor(eventType: String) : this(null, eventType) {}
-
-    init {
-        if (view != null) {
-            mTagID = view.id
-        }
-        mTimestamp = System.currentTimeMillis()
-    }
-
-    override val iD
-        get() = mTagID
-
-    override val type
-        get() = mEventType
-
-    override fun equals(event: IEvent): Boolean {
-        return key == event.key && mEventType == event.type
-    }
-
-    override val payload
-        get() = Arguments.createMap()
-
-    override val timestamp
-        get() = mTimestamp
-
-    override fun toJSON(): WritableMap {
-        val map = Arguments.createMap()
-        map.putString("type", type)
-        val payloadClone = Arguments.createMap()
-        payloadClone.merge(payload)
-        map.putMap("payload", payloadClone)
-        return map
-    }
-
-    override fun canCoalesce(): Boolean {
-        // default behavior of com.facebook.react.uimanager.events.Event
-        return true
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/events/AndroidCallbackEvent.java

@@ -1,34 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.view.View;
-
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-
-public class AndroidCallbackEvent extends AbstractEvent {
-    private final WritableMap mPayload;
-
-    public AndroidCallbackEvent(View view, String callbackID, WritableMap payload) {
-        super(view, callbackID);
-        mPayload = payload;
-    }
-
-    @Override
-    public String getKey() {
-        return EventKeys.MAP_ANDROID_CALLBACK;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        return mPayload;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        // Make sure EventDispatcher never merges EventKeys.MAP_ANDROID_CALLBACK events.
-        // These events are couples to unique callbacks references (promises) on the JS side which
-        // each expect response with their corresponding callbackID
-        return false;
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/events/EventEmitter.java

@@ -1,45 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.util.Log;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-
-public class EventEmitter {
-    public static final String LOG_TAG = "EventEmitter";
-
-
-    private static ReactContext getCurrentReactContext(ReactApplicationContext reactApplicationContext) {
-        if (reactApplicationContext.getApplicationContext() instanceof ReactApplication) {
-            ReactApplication reactApplication = ((ReactApplication) reactApplicationContext
-                    .getApplicationContext());
-
-            return reactApplication
-                    .getReactNativeHost()
-                    .getReactInstanceManager()
-                    .getCurrentReactContext();
-        } else {
-            Log.d(LOG_TAG, "getApplicationContext() application doesn't implement ReactApplication");
-            return reactApplicationContext;
-        }
-    }
-
-
-    public static RCTNativeAppEventEmitter getModuleEmitter(ReactApplicationContext reactApplicationContext) {
-        RCTNativeAppEventEmitter emitter = null;
-
-        try {
-            emitter = getCurrentReactContext(reactApplicationContext)
-                    .getJSModule(RCTNativeAppEventEmitter.class);
-        } catch (NullPointerException e) {
-            Log.d(LOG_TAG, e.getLocalizedMessage());
-        }
-
-        return emitter;
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/events/FeatureClickEvent.java

@@ -1,79 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.graphics.PointF;
-import android.view.View;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.mapbox.geojson.Feature;
-import com.mapbox.rctmgl.components.styles.sources.RCTSource;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.ConvertUtils;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-import com.mapbox.rctmgl.utils.LatLng;
-
-import java.util.List;
-
-/**
- * Created by nickitaliano on 11/7/17.
- */
-
-public class FeatureClickEvent extends AbstractEvent {
-    private String mEventKey;
-    private List<Feature> mFeatures;
-    private LatLng mLatLng;
-    private PointF mPoint;
-
-    public FeatureClickEvent(View view, String eventKey, String eventType, List<Feature> features, LatLng latLng, PointF point) {
-        super(view, eventType);
-        mFeatures = features;
-        mEventKey = eventKey;
-        mLatLng = latLng;
-        mPoint = point;
-    }
-
-    @Override
-    public String getKey() {
-        return mEventKey;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap map = Arguments.createMap();
-        WritableArray features = Arguments.createArray();
-
-        for(Feature feature : mFeatures) {
-            features.pushMap(GeoJSONUtils.fromFeature(feature));
-        }
-        map.putArray("features", features);
-
-        WritableMap coordinates = Arguments.createMap();
-        coordinates.putDouble("latitude", mLatLng.getLatitude());
-        coordinates.putDouble("longitude", mLatLng.getLongitude());
-        map.putMap("coordinates", coordinates);
-
-        WritableMap point = Arguments.createMap();
-        point.putDouble("x", mPoint.x);
-        point.putDouble("y", mPoint.y);
-        map.putMap("point", point);
-
-        return map;
-    }
-
-    public static FeatureClickEvent makeShapeSourceEvent(View view, RCTSource.OnPressEvent event) {
-        return new FeatureClickEvent(view, EventKeys.SHAPE_SOURCE_LAYER_CLICK,
-                EventTypes.SHAPE_SOURCE_LAYER_CLICK, event.getFeatures(), event.getLatLng(), event.getScreenPoint());
-    }
-
-    public static FeatureClickEvent makeVectorSourceEvent(View view, RCTSource.OnPressEvent event) {
-        return new FeatureClickEvent(view, EventKeys.VECTOR_SOURCE_LAYER_CLICK,
-                EventTypes.VECTOR_SOURCE_LAYER_CLICK, event.getFeatures(), event.getLatLng(), event.getScreenPoint());
-    }
-
-    public static FeatureClickEvent makeRasterSourceEvent(View view, RCTSource.OnPressEvent event) {
-        return new FeatureClickEvent(view, EventKeys.RASTER_SOURCE_LAYER_CLICK,
-                EventTypes.RASTER_SOURCE_LAYER_CLICK, event.getFeatures(), event.getLatLng(), event.getScreenPoint());
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/events/IEvent.kt

@@ -1,17 +0,0 @@
-package com.mapbox.rctmgl.events
-
-import com.facebook.react.bridge.WritableMap
-
-/**
- * Created by nickitaliano on 8/23/17.
- */
-interface IEvent {
-    val iD: Int
-    val key: String?
-    val type: String?
-    val timestamp: Long
-    fun equals(event: IEvent): Boolean
-    fun canCoalesce(): Boolean
-    val payload: WritableMap
-    fun toJSON(): WritableMap
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/events/ImageMissingEvent.java

@@ -1,42 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-
-import android.view.View;
-
-public class ImageMissingEvent extends AbstractEvent {
-    private String mEventKey;
-    private String mImageKey;
-
-    public ImageMissingEvent(View view, String eventKey, String eventType, String imageKey) {
-        super(view, eventType);
-        mImageKey = imageKey;
-        mEventKey = eventKey;
-    }
-
-    @Override
-    public String getKey() {
-        return mEventKey;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap imageMissingProperties = new WritableNativeMap();
-        imageMissingProperties.putString("imageKey", mImageKey);
-        return imageMissingProperties;
-
-    }
-
-    public static ImageMissingEvent makeImageMissingEvent(View view, String imageKey) {
-        return new ImageMissingEvent(view, EventKeys.IMAGES_MISSING,
-                EventTypes.IMAGES_MISSING, imageKey);
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        return false;
-    }
-}