@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXCircleLayerManager.kt

@@ -8,7 +8,6 @@ import com.facebook.react.viewmanagers.RNMBXCircleLayerManagerInterface
 
 class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>(),
     RNMBXCircleLayerManagerInterface<RNMBXCircleLayer> {
-
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -17,7 +16,6 @@ class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>(),
         return RNMBXCircleLayer(reactContext)
     }
 
-    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXCircleLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXCircleLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -73,12 +71,6 @@ class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
-    @ReactProp(name = "slot")
-    override fun setSlot(layer: RNMBXCircleLayer, slot: Dynamic) {
-        layer.setSlot(slot.asString())
-    }
-    // @{codepart-replace-end}
-
     companion object {
         const val REACT_CLASS = "RNMBXCircleLayer"
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXFillLayerManager.kt

@@ -16,7 +16,6 @@ class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
         return RNMBXFillLayer(reactContext)
     }
 
-    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXFillLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXFillLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -32,6 +31,11 @@ class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
         layer.setSourceID(sourceID.asString())
     }
 
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXFillLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
     @ReactProp(name = "aboveLayerID")
     override fun setAboveLayerID(layer: RNMBXFillLayer, aboveLayerID: Dynamic) {
         layer.setAboveLayerID(aboveLayerID.asString())
@@ -62,22 +66,11 @@ class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
         layer.setReactStyle(style.asMap())
     }
 
-    @ReactProp(name = "sourceLayerID")
-    override fun setSourceLayerID(layer: RNMBXFillLayer, sourceLayerID: Dynamic) {
-        layer.setSourceLayerID(sourceLayerID.asString())
-    }
-
     @ReactProp(name = "filter")
     override fun setFilter(layer: RNMBXFillLayer, filterList: Dynamic) {
         layer.setFilter(filterList.asArray())
     }
 
-    @ReactProp(name = "slot")
-    override fun setSlot(layer: RNMBXFillLayer, slot: Dynamic) {
-        layer.setSlot(slot.asString())
-    }
-    // @{codepart-replace-end}
-
     companion object {
         const val REACT_CLASS = "RNMBXFillLayer"
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHeatmapLayerManager.kt

@@ -16,7 +16,6 @@ class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>(),
         return RNMBXHeatmapLayer(reactContext)
     }
 
-    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXHeatmapLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXHeatmapLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -72,12 +71,6 @@ class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
-    @ReactProp(name = "slot")
-    override fun setSlot(layer: RNMBXHeatmapLayer, slot: Dynamic) {
-        layer.setSlot(slot.asString())
-    }
-    // @{codepart-replace-end}
-
     companion object {
         const val REACT_CLASS = "RNMBXHeatmapLayer"
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXLayer.kt

@@ -18,7 +18,6 @@ import com.rnmapbox.rnmbx.components.RemovalReason
 import com.rnmapbox.rnmbx.utils.ExpressionParser
 import java.lang.ClassCastException
 import com.rnmapbox.rnmbx.utils.Logger
-import com.rnmapbox.rnmbx.v11compat.layer.*
 
 abstract class RNMBXLayer<T : Layer?>(protected var mContext: Context) : AbstractSourceConsumer(
     mContext
@@ -134,13 +133,6 @@ abstract class RNMBXLayer<T : Layer?>(protected var mContext: Context) : Abstrac
         }
     }
 
-    var mSlot: String? = null
-
-    fun setSlot(slot: String?) {
-        mSlot = slot
-        applySlot()
-    }
-
     fun setExisting(existing: Boolean) {
         mExisting = existing
     }
@@ -240,27 +232,16 @@ abstract class RNMBXLayer<T : Layer?>(protected var mContext: Context) : Abstrac
                     add ()
                 } } }
             }
-            applyZoomBounds()
-            applySlot()
+            setZoomBounds()
         }
     }
 
-    protected fun applyZoomBounds() {
-        mLayer?.let {layer ->
-            mMaxZoomLevel?.let {
-                layer.maxZoom(it.toDouble())
-            }
-            mMinZoomLevel?.let {
-                layer.minZoom(it.toDouble())
-            }
+    protected fun setZoomBounds() {
+        if (mMaxZoomLevel != null) {
+            mLayer!!.maxZoom(mMaxZoomLevel!!.toFloat().toDouble())
         }
-    }
-
-    protected fun applySlot() {
-        mLayer?.let { layer ->
-            mSlot?.let {
-                layer.slot(it)
-            }
+        if (mMinZoomLevel != null) {
+            mLayer!!.minZoom(mMinZoomLevel!!.toFloat().toDouble())
         }
     }
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXLineLayerManager.kt

@@ -16,7 +16,6 @@ class RNMBXLineLayerManager : ViewGroupManager<RNMBXLineLayer>(),
         return RNMBXLineLayer(reactContext)
     }
 
-    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXLineLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXLineLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -72,12 +71,6 @@ class RNMBXLineLayerManager : ViewGroupManager<RNMBXLineLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
-    @ReactProp(name = "slot")
-    override fun setSlot(layer: RNMBXLineLayer, slot: Dynamic) {
-        layer.setSlot(slot.asString())
-    }
-    // @{codepart-replace-end}
-
     companion object {
         const val REACT_CLASS = "RNMBXLineLayer"
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterLayer.kt

@@ -20,8 +20,4 @@ class RNMBXRasterLayer(context: Context?) : RNMBXLayer<RasterLayer?>(
             Logger.e("RNMBXRasterLayer", "mLayer is null")
         }
     }
-
-    fun setSourceLayerID(asString: String?) {
-        // no-op
-    }
 }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterLayerManager.kt

@@ -16,7 +16,6 @@ class RNMBXRasterLayerManager : ViewGroupManager<RNMBXRasterLayer>(),
         return RNMBXRasterLayer(reactContext)
     }
 
-    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXRasterLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXRasterLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -64,7 +63,8 @@ class RNMBXRasterLayerManager : ViewGroupManager<RNMBXRasterLayer>(),
 
     @ReactProp(name = "sourceLayerID")
     override fun setSourceLayerID(layer: RNMBXRasterLayer, sourceLayerID: Dynamic) {
-        layer.setSourceLayerID(sourceLayerID.asString())
+        // not available
+        // layer.setSourceLayerID(sourceLayerID.asString())
     }
 
     @ReactProp(name = "filter")
@@ -72,12 +72,6 @@ class RNMBXRasterLayerManager : ViewGroupManager<RNMBXRasterLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
-    @ReactProp(name = "slot")
-    override fun setSlot(layer: RNMBXRasterLayer, slot: Dynamic) {
-        layer.setSlot(slot.asString())
-    }
-    // @{codepart-replace-end}
-
     companion object {
         const val REACT_CLASS = "RNMBXRasterLayer"
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXSymbolLayerManager.kt

@@ -16,7 +16,6 @@ class RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>(),
         return RNMBXSymbolLayer(reactContext)
     }
 
-    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXSymbolLayer"})}
     @ReactProp(name = "id")
     override fun setId(layer: RNMBXSymbolLayer, id: Dynamic) {
         layer.iD = id.asString()
@@ -72,13 +71,6 @@ class RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>(),
         layer.setFilter(filterList.asArray())
     }
 
-    @ReactProp(name = "slot")
-    override fun setSlot(layer: RNMBXSymbolLayer, slot: Dynamic) {
-        layer.setSlot(slot.asString())
-    }
-
-    // @{codepart-replace-end}
-
     companion object {
         const val REACT_CLASS = "RNMBXSymbolLayer"
     }

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

@@ -14,13 +14,8 @@ import com.mapbox.bindgen.Value
 import com.mapbox.geojson.Feature
 import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
 import com.mapbox.geojson.FeatureCollection
-import com.mapbox.geojson.GeoJson
-import com.mapbox.geojson.Geometry
 import com.mapbox.maps.*
 import com.mapbox.maps.extension.style.expressions.generated.Expression
-import com.rnmapbox.rnmbx.shape_animators.ShapeAnimationConsumer
-import com.rnmapbox.rnmbx.shape_animators.ShapeAnimator
-import com.rnmapbox.rnmbx.shape_animators.ShapeAnimatorManager
 import com.rnmapbox.rnmbx.utils.Logger
 import java.net.URL
 import java.util.ArrayList
@@ -29,10 +24,9 @@ import java.util.HashMap
 import com.rnmapbox.rnmbx.v11compat.feature.*
 
 class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceManager) :
-    RNMBXSource<GeoJsonSource>(context), ShapeAnimationConsumer {
+    RNMBXSource<GeoJsonSource>(context) {
     private var mURL: URL? = null
     private var mShape: String? = null
-    private var mShapeAnimator: ShapeAnimator? = null
     private var mCluster: Boolean? = null
     private var mClusterRadius: Long? = null
     private var mClusterMaxZoom: Long? = null
@@ -76,55 +70,11 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
     }
 
     fun setShape(geoJSONStr: String) {
-        mShapeAnimator?.unsubscribe(this)
-        mShapeAnimator = null
-
-        val shapeAnimatorManager = mManager.shapeAnimatorManager
-        if (shapeAnimatorManager.isShapeAnimatorTag(geoJSONStr)) {
-            shapeAnimatorManager.get(geoJSONStr)?.let { shapeAnimator ->
-                mShapeAnimator = shapeAnimator
-                shapeAnimator.subscribe(this)
-
-                shapeUpdated(shapeAnimator.getShape())
-            }
-        } else {
-            mShape = geoJSONStr
-            if (mSource != null && mMapView != null && !mMapView!!.isDestroyed) {
-                mSource!!.data(mShape!!)
-                val result = mMap!!.getStyle()!!
-                    .setStyleSourceProperty(iD!!, "data", Value.valueOf(mShape!!))
-            }
-        }
-    }
-
-    private fun toGeoJSONSourceData(geoJson: GeoJson): GeoJSONSourceData? {
-        return when (geoJson) {
-            is Geometry ->
-                GeoJSONSourceData(geoJson)
-            is Feature ->
-                GeoJSONSourceData(geoJson)
-            is FeatureCollection ->
-                GeoJSONSourceData(geoJson.features() ?: listOf())
-            else -> {
-                Logger.e(
-                    LOG_TAG,
-                    "Cannot convert shape to GeoJSONSourceData, neitthe Geometry, nor Feature or FeatureCollection: $geoJson"
-                );
-                return null
-            }
-        }
-    }
-    override fun shapeUpdated(geoJson: GeoJson) {
-        mSource?.also {
-            if (mSource != null && mMapView != null && !mMapView!!.isDestroyed) {
-                toGeoJSONSourceData(geoJson)?.let {
-                    mMap?.getStyle()?.setStyleGeoJSONSourceData(iD!!,
-                        "animated-shape",
-                        it)
-                }
-            }
-        } ?: run {
-            mShape = geoJson.toJson()
+        mShape = geoJSONStr
+        if (mSource != null && mMapView != null && !mMapView!!.isDestroyed) {
+            mSource!!.data(mShape!!)
+            val result = mMap!!.getStyle()!!
+                .setStyleSourceProperty(iD!!, "data", Value.valueOf(mShape!!))
         }
     }
 

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

@@ -12,8 +12,6 @@ import com.facebook.react.viewmanagers.RNMBXShapeSourceManagerInterface
 import com.mapbox.bindgen.Value
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.rnmapbox.rnmbx.events.constants.EventKeys
-import com.rnmapbox.rnmbx.events.constants.eventMapOf
-import com.rnmapbox.rnmbx.shape_animators.ShapeAnimatorManager
 import com.rnmapbox.rnmbx.utils.ExpressionParser
 import com.rnmapbox.rnmbx.utils.Logger
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
@@ -23,7 +21,7 @@ import java.util.ArrayList
 import java.util.HashMap
 
 
-class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver, val shapeAnimatorManager: ShapeAnimatorManager) :
+class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) :
     AbstractEventEmitter<RNMBXShapeSource>(
         mContext
     ), RNMBXShapeSourceManagerInterface<RNMBXShapeSource> {
@@ -160,10 +158,10 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val
     }
 
     override fun customEvents(): Map<String, String>? {
-        return eventMapOf(
-            EventKeys.SHAPE_SOURCE_LAYER_CLICK to "onMapboxShapeSourcePress",
-            EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback"
-        )
+        return MapBuilder.builder<String, String>()
+            .put(EventKeys.SHAPE_SOURCE_LAYER_CLICK, "onMapboxShapeSourcePress")
+            .put(EventKeys.MAP_ANDROID_CALLBACK, "onAndroidCallback")
+            .build()
     }
 
     companion object {

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

@@ -23,7 +23,7 @@ class RNMBXVectorSource(context: Context?, private val mManager: RNMBXVectorSour
     }
 
     override fun hasNoDataSoRefersToExisting(): Boolean {
-        return uRL == null && tileUrlTemplates == null;
+        return uRL == null;
     }
 
     override fun makeSource(): VectorSource {

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

@@ -7,7 +7,6 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXVectorSourceManagerInterface
 import com.rnmapbox.rnmbx.events.constants.EventKeys
-import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import javax.annotation.Nonnull
 
 class RNMBXVectorSourceManager(reactApplicationContext: ReactApplicationContext) :
@@ -39,10 +38,10 @@ class RNMBXVectorSourceManager(reactApplicationContext: ReactApplicationContext)
     }
 
     override fun customEvents(): Map<String, String>? {
-        return eventMapOf(
-            EventKeys.VECTOR_SOURCE_LAYER_CLICK to "onMapboxVectorSourcePress",
-            EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback"
-        )
+        return MapBuilder.builder<String, String>()
+            .put(EventKeys.VECTOR_SOURCE_LAYER_CLICK, "onMapboxVectorSourcePress")
+            .put(EventKeys.MAP_ANDROID_CALLBACK, "onAndroidCallback")
+            .build()
     }
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/events/AndroidCallbackEvent.java

@@ -16,7 +16,7 @@ public class AndroidCallbackEvent extends AbstractEvent {
 
     @Override
     public String getKey() {
-        return EventKeys.MAP_ANDROID_CALLBACK.getValue();
+        return EventKeys.MAP_ANDROID_CALLBACK;
     }
 
     @Override

package/android/src/main/java/com/rnmapbox/rnmbx/events/FeatureClickEvent.java

@@ -63,17 +63,17 @@ public class FeatureClickEvent extends AbstractEvent {
     }
 
     public static FeatureClickEvent makeShapeSourceEvent(View view, RNMBXSource.OnPressEvent event) {
-        return new FeatureClickEvent(view, EventKeys.SHAPE_SOURCE_LAYER_CLICK.getValue(),
+        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, RNMBXSource.OnPressEvent event) {
-        return new FeatureClickEvent(view, EventKeys.VECTOR_SOURCE_LAYER_CLICK.getValue(),
+        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, RNMBXSource.OnPressEvent event) {
-        return new FeatureClickEvent(view, EventKeys.RASTER_SOURCE_LAYER_CLICK.getValue(),
+        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/com/rnmapbox/rnmbx/events/IEvent.kt

@@ -2,9 +2,12 @@ package com.rnmapbox.rnmbx.events
 
 import com.facebook.react.bridge.WritableMap
 
+/**
+ * Created by nickitaliano on 8/23/17.
+ */
 interface IEvent {
     val iD: Int
-    val key: String
+    val key: String?
     val type: String?
     val timestamp: Long
     fun equals(event: IEvent): Boolean

package/android/src/main/java/com/rnmapbox/rnmbx/events/ImageMissingEvent.java

@@ -31,7 +31,7 @@ public class ImageMissingEvent extends AbstractEvent {
     }
 
     public static ImageMissingEvent makeImageMissingEvent(View view, String imageKey) {
-        return new ImageMissingEvent(view, EventKeys.IMAGES_MISSING.getValue(),
+        return new ImageMissingEvent(view, EventKeys.IMAGES_MISSING,
                 EventTypes.IMAGES_MISSING, imageKey);
     }
 

package/android/src/main/java/com/rnmapbox/rnmbx/events/LocationEvent.kt

@@ -23,7 +23,7 @@ class LocationEvent(private val location: Location, private val mapView: RNMBXMa
         get() =  mapView?.id ?: -1
 
     override val key
-        get() = EventKeys.USER_LOCATION_UPDATE.value
+        get() = EventKeys.USER_LOCATION_UPDATE
 
     override val type
         get() = EventTypes.USER_LOCATION_UPDATED

package/android/src/main/java/com/rnmapbox/rnmbx/events/MapChangeEvent.kt

@@ -12,7 +12,7 @@ class MapChangeEvent constructor(
     private val mPayload: WritableMap = Arguments.createMap()
 ) : AbstractEvent(view, eventType) {
     override val key: String
-        get() = EventKeys.MAP_ONCHANGE.value
+        get() = EventKeys.MAP_ONCHANGE
 
     override val payload: WritableMap
         get() {

package/android/src/main/java/com/rnmapbox/rnmbx/events/MapClickEvent.java

@@ -35,10 +35,10 @@ public class MapClickEvent extends AbstractEvent {
         String eventType = getType();
 
         if (eventType.equals(EventTypes.MAP_LONG_CLICK)) {
-            return EventKeys.MAP_LONG_CLICK.getValue();
+            return EventKeys.MAP_LONG_CLICK;
         }
 
-        return EventKeys.MAP_CLICK.getValue();
+        return EventKeys.MAP_CLICK;
     }
 
     @Override

package/android/src/main/java/com/rnmapbox/rnmbx/events/MapUserTrackingModeEvent.kt

@@ -9,13 +9,13 @@ import com.rnmapbox.rnmbx.events.constants.EventTypes
 
 class MapUserTrackingModeEvent(view: View?, val userTrackingMode: Int, val basePayload: WritableMap? = null) : AbstractEvent(view, EventTypes.MAP_USER_TRACKING_MODE_CHANGE) {
     override val key
-        get() = EventKeys.MAP_USER_TRACKING_MODE_CHANGE.value
+        get() = EventKeys.MAP_USER_TRACKING_MODE_CHANGE;
 
     override val payload : WritableMap
-        get() {
+        get() = {
             val payload = basePayload?.copy() ?: Arguments.createMap()
             payload.putBoolean("followUserLocation", userTrackingMode != UserTrackingMode.NONE)
             payload.putString("followUserMode", UserTrackingMode.toString(userTrackingMode))
-            return payload
-        }
+            payload
+        }.invoke()
 }

package/android/src/main/java/com/rnmapbox/rnmbx/events/PointAnnotationClickEvent.java

@@ -28,7 +28,7 @@ public class PointAnnotationClickEvent extends MapClickEvent {
 
     @Override
     public String getKey() {
-        return getType().equals(EventTypes.ANNOTATION_SELECTED) ? EventKeys.POINT_ANNOTATION_SELECTED.getValue() : EventKeys.POINT_ANNOTATION_DESELECTED.getValue();
+        return getType().equals(EventTypes.ANNOTATION_SELECTED) ? EventKeys.POINT_ANNOTATION_SELECTED : EventKeys.POINT_ANNOTATION_DESELECTED;
     }
 
     @Override

package/android/src/main/java/com/rnmapbox/rnmbx/events/PointAnnotationDragEvent.java

@@ -31,13 +31,13 @@ public class PointAnnotationDragEvent extends MapClickEvent {
         String eventType = getType();
 
         if (eventType.equals(EventTypes.ANNOTATION_DRAG_START)) {
-            return EventKeys.POINT_ANNOTATION_DRAG_START.getValue();
+            return EventKeys.POINT_ANNOTATION_DRAG_START;
         }
         if (eventType.equals(EventTypes.ANNOTATION_DRAG_END)) {
-            return EventKeys.POINT_ANNOTATION_DRAG_END.getValue();
+            return EventKeys.POINT_ANNOTATION_DRAG_END;
         }
 
-        return EventKeys.POINT_ANNOTATION_DRAG.getValue();
+        return EventKeys.POINT_ANNOTATION_DRAG;
     }
 
     @Override

package/android/src/main/java/com/rnmapbox/rnmbx/events/constants/EventKeys.java

@@ -0,0 +1,39 @@
+package com.rnmapbox.rnmbx.events.constants;
+
+/**
+ * Created by nickitaliano on 8/27/17.
+ */
+
+public class EventKeys {
+    public static final String NAMESPACE = "rct.mapbox";
+
+    // map events
+    public static final String MAP_CLICK = ns("map.press");
+    public static final String MAP_LONG_CLICK = ns("map.longpress");
+    public static final String MAP_ONCHANGE = ns("map.change");
+    public static final String MAP_ON_LOCATION_CHANGE = ns("map.location.change");
+    public static final String MAP_ANDROID_CALLBACK = ns("map.androidcallback");
+    public static final String MAP_USER_TRACKING_MODE_CHANGE = ns("map.usertrackingmodechange");
+
+    // point annotation events
+    public static final String POINT_ANNOTATION_SELECTED = ns("pointannotation.selected");
+    public static final String POINT_ANNOTATION_DESELECTED = ns("pointannotation.deselected");
+    public static final String POINT_ANNOTATION_DRAG_START = ns("pointannotation.dragstart");
+    public static final String POINT_ANNOTATION_DRAG = ns("pointannotation.drag");
+    public static final String POINT_ANNOTATION_DRAG_END = ns("pointannotation.dragend");
+
+    // source events
+    public static final String SHAPE_SOURCE_LAYER_CLICK = ns("shapesource.layer.pressed");
+    public static final String VECTOR_SOURCE_LAYER_CLICK = ns("vectorsource.layer.pressed");
+    public static final String RASTER_SOURCE_LAYER_CLICK = ns("rastersource.layer.pressed");
+
+    // images event
+    public static final String IMAGES_MISSING = ns("images.missing");
+
+    // location events
+    public static final String USER_LOCATION_UPDATE = ns("user.location.update");
+
+    private static String ns(String name) {
+        return String.format("%s.%s", NAMESPACE, name);
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXModule.kt

@@ -14,15 +14,12 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.common.MapBuilder
 import com.mapbox.common.*
 import com.mapbox.maps.MapView
-import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
 import com.mapbox.maps.plugin.attribution.attribution
 import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
-import com.rnmapbox.rnmbx.utils.Logger
 import java.util.HashMap
 
 import com.rnmapbox.rnmbx.v11compat.resourceoption.*
-import com.rnmapbox.rnmbx.v11compat.mapboxmap.*
 
 @ReactModule(name = RNMBXModule.REACT_CLASS)
 class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactContextBaseJavaModule(
@@ -131,19 +128,6 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
         }
     }
 
-    @ReactMethod
-    fun clearData(promise: Promise) {
-        mReactContext.runOnUiQueueThread {
-            MapboxMap.clearData(mReactContext) {
-                if (it.isValue) {
-                    promise.resolve(it.value)
-                } else {
-                    promise.reject("error", "RNMBXModule.clearError ${it.error}")
-                }
-            }
-        }
-    }
-
     @ReactMethod
     fun setAccessToken(accessToken: String?, promise: Promise) {
         mReactContext.runOnUiQueueThread(Runnable {
@@ -154,7 +138,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
 
     @ReactMethod
     fun setWellKnownTileServer(tileServer: String?) {
-        Logger.e(LOG_TAG, "setWellKnownTileServer is deprecated and will be removed")
+        // NO-OP
     }
 
     @ReactMethod
@@ -169,7 +153,6 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
 
     companion object {
         const val REACT_CLASS = "RNMBXModule"
-        const val LOG_TAG = "RNMBXModule"
         private val customHeaderInterceptorAdded = false
         @JvmStatic
         fun getAccessToken(reactContext: ReactApplicationContext?): String {

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt

@@ -30,7 +30,6 @@ import java.nio.file.StandardCopyOption
 import java.util.concurrent.CountDownLatch
 
 import com.rnmapbox.rnmbx.v11compat.offlinemanager.*
-import com.rnmapbox.rnmbx.v11compat.resourceoption.getMapboxAccessToken
 
 data class ZoomRange(val minZoom: Byte, val maxZoom: Byte) {
 
@@ -104,9 +103,7 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
 
 
     val tileStore: TileStore by lazy {
-        val result = TileStore.create()
-        result.setAccessToken(RNMBXModule.getAccessToken(mReactContext));
-        result
+        TileStore.create()
     }
 
     val offlineManager: OfflineManager by lazy {

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

@@ -87,9 +87,6 @@ object BitmapUtils {
         if (tempFile == null) {
             return null
         }
-        if (outputStream == null) {
-            return null
-        }
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream)
         closeSnapshotOutputStream(outputStream)
         return Uri.fromFile(tempFile).toString()