@rnmapbox/maps 10.1.0 → 10.1.1

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,
+        return new FeatureClickEvent(view, EventKeys.SHAPE_SOURCE_LAYER_CLICK.getValue(),
                 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,
+        return new FeatureClickEvent(view, EventKeys.VECTOR_SOURCE_LAYER_CLICK.getValue(),
                 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,
+        return new FeatureClickEvent(view, EventKeys.RASTER_SOURCE_LAYER_CLICK.getValue(),
                 EventTypes.RASTER_SOURCE_LAYER_CLICK, event.getFeatures(), event.getLatLng(), event.getScreenPoint());
     }
 }

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

@@ -2,12 +2,9 @@ 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,
+        return new ImageMissingEvent(view, EventKeys.IMAGES_MISSING.getValue(),
                 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
+        get() = EventKeys.USER_LOCATION_UPDATE.value
 
     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
+        get() = EventKeys.MAP_ONCHANGE.value
 
     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;
+            return EventKeys.MAP_LONG_CLICK.getValue();
         }
 
-        return EventKeys.MAP_CLICK;
+        return EventKeys.MAP_CLICK.getValue();
     }
 
     @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;
+        get() = EventKeys.MAP_USER_TRACKING_MODE_CHANGE.value
 
     override val payload : WritableMap
-        get() = {
+        get() {
             val payload = basePayload?.copy() ?: Arguments.createMap()
             payload.putBoolean("followUserLocation", userTrackingMode != UserTrackingMode.NONE)
             payload.putString("followUserMode", UserTrackingMode.toString(userTrackingMode))
-            payload
-        }.invoke()
+            return payload
+        }
 }

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 : EventKeys.POINT_ANNOTATION_DESELECTED;
+        return getType().equals(EventTypes.ANNOTATION_SELECTED) ? EventKeys.POINT_ANNOTATION_SELECTED.getValue() : EventKeys.POINT_ANNOTATION_DESELECTED.getValue();
     }
 
     @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;
+            return EventKeys.POINT_ANNOTATION_DRAG_START.getValue();
         }
         if (eventType.equals(EventTypes.ANNOTATION_DRAG_END)) {
-            return EventKeys.POINT_ANNOTATION_DRAG_END;
+            return EventKeys.POINT_ANNOTATION_DRAG_END.getValue();
         }
 
-        return EventKeys.POINT_ANNOTATION_DRAG;
+        return EventKeys.POINT_ANNOTATION_DRAG.getValue();
     }
 
     @Override

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

@@ -0,0 +1,44 @@
+package com.rnmapbox.rnmbx.events.constants
+
+private fun ns(name: String): String {
+    val namespace = "rct.mapbox"
+    return String.format("%s.%s", namespace, name)
+}
+enum class EventKeys(val value: String) {
+    // map events
+    MAP_CLICK(ns("map.press")),
+    MAP_LONG_CLICK(ns("map.longpress")),
+    MAP_ONCHANGE(ns("map.change")),
+    MAP_ON_LOCATION_CHANGE(ns("map.location.change")),
+    MAP_ANDROID_CALLBACK(ns("map.androidcallback")),
+    MAP_USER_TRACKING_MODE_CHANGE(ns("map.usertrackingmodechange")),
+
+    // point annotation events
+    POINT_ANNOTATION_SELECTED(ns("pointannotation.selected")),
+    POINT_ANNOTATION_DESELECTED(ns("pointannotation.deselected")),
+    POINT_ANNOTATION_DRAG_START(ns("pointannotation.dragstart")),
+    POINT_ANNOTATION_DRAG(ns("pointannotation.drag")),
+    POINT_ANNOTATION_DRAG_END(ns("pointannotation.dragend")),
+
+    // source events
+    SHAPE_SOURCE_LAYER_CLICK(ns("shapesource.layer.pressed")),
+    VECTOR_SOURCE_LAYER_CLICK(ns("vectorsource.layer.pressed")),
+    RASTER_SOURCE_LAYER_CLICK(ns("rastersource.layer.pressed")),
+
+    // images event
+    IMAGES_MISSING(ns("images.missing")),
+
+    // location events
+    USER_LOCATION_UPDATE(ns("user.location.update")),
+
+    // viewport events
+    VIEWPORT_STATUS_CHANGE(ns("viewport.statuschange"))
+}
+
+fun eventMapOf(vararg values: Pair<EventKeys, String>): Map<String, String> {
+    val mapped = values.map { (k,v) -> Pair(k.value, v) }
+
+    return mapOf(
+        *mapped.toTypedArray()
+    )
+}

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

@@ -14,12 +14,15 @@ 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(
@@ -128,6 +131,19 @@ 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 {
@@ -138,7 +154,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
 
     @ReactMethod
     fun setWellKnownTileServer(tileServer: String?) {
-        // NO-OP
+        Logger.e(LOG_TAG, "setWellKnownTileServer is deprecated and will be removed")
     }
 
     @ReactMethod
@@ -153,6 +169,7 @@ 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,6 +30,7 @@ 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) {
 
@@ -103,7 +104,9 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
 
 
     val tileStore: TileStore by lazy {
-        TileStore.create()
+        val result = TileStore.create()
+        result.setAccessToken(RNMBXModule.getAccessToken(mReactContext));
+        result
     }
 
     val offlineManager: OfflineManager by lazy {