@rnmapbox/maps 10.0.0-rc.2 → 10.0.0-rc.3

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

@@ -0,0 +1,75 @@
+package com.mapbox.rctmgl.components
+
+import android.app.Activity
+import android.view.ViewGroup
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.mapbox.rctmgl.events.IEvent
+import javax.annotation.Nonnull
+
+/**
+ * Created by nickitaliano on 8/23/17.
+ */
+abstract class AbstractEventEmitter<T : ViewGroup?>(reactApplicationContext: ReactApplicationContext) :
+    ViewGroupManager<T>() {
+    private val mRateLimitedEvents: MutableMap<String, Long>
+    private var mEventDispatcher: EventDispatcher? = null
+    private val mRCTAppContext: ReactApplicationContext
+
+    init {
+        mRateLimitedEvents = HashMap()
+        mRCTAppContext = reactApplicationContext
+    }
+
+    val activity : Activity?
+        get() = mRCTAppContext.currentActivity
+
+    fun handleEvent(event: IEvent) {
+        val eventCacheKey = getEventCacheKey(event)
+
+        // fail safe to protect bridge from being spammed
+        if (shouldDropEvent(eventCacheKey, event)) {
+            return
+        }
+        mRateLimitedEvents[eventCacheKey] = System.currentTimeMillis()
+        mEventDispatcher!!.dispatchEvent(
+            AbstractEvent(
+                event.id,
+                event.key,
+                event.canCoalesce(),
+                event.toJSON()
+            )
+        )
+    }
+
+    override fun addEventEmitters(context: ThemedReactContext, @Nonnull view: T) {
+        mEventDispatcher = context.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
+        val events = customEvents() ?: return null
+        val exportedEvents: MutableMap<String, Any> = HashMap()
+        for ((key, value) in events) {
+            exportedEvents[key] = MapBuilder.of("registrationName", value)
+        }
+        return exportedEvents
+    }
+
+    abstract fun customEvents(): Map<String, String>?
+    private fun shouldDropEvent(cacheKey: String, event: IEvent): Boolean {
+        val lastEventTimestamp = mRateLimitedEvents[cacheKey]
+        return lastEventTimestamp != null && event.timestamp - lastEventTimestamp <= BRIDGE_TIMEOUT_MS
+    }
+
+    private fun getEventCacheKey(event: IEvent): String {
+        return String.format("%s-%s", event.key, event.type)
+    }
+
+    companion object {
+        private const val BRIDGE_TIMEOUT_MS = 10.0
+    }
+}

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerViewManager.kt

@@ -14,7 +14,7 @@ import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 
-class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext?) :
+class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
     AbstractEventEmitter<RCTMGLMarkerView?>(reactApplicationContext) {
     override fun getName(): String {
         return REACT_CLASS

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

@@ -0,0 +1,28 @@
+package com.mapbox.rctmgl.components.mapview
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+
+//import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
+/**
+ * Created by hernanmateo on 12/11/18.
+ */
+class RCTMGLAndroidTextureMapViewManager(context: ReactApplicationContext?) : RCTMGLMapViewManager(
+    context!!
+) {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(themedReactContext: ThemedReactContext): RCTMGLAndroidTextureMapView {
+        //MapboxMapOptions options = new MapboxMapOptions();
+        //options.textureMode(true);
+        val context = activity ?: themedReactContext
+        return RCTMGLAndroidTextureMapView(context, this /*, options*/)
+    }
+
+    companion object {
+        const val LOG_TAG = "RCTMGLAndroidTextureMapViewManager"
+        const val REACT_CLASS = "RCTMGLAndroidTextureMapView"
+    }
+}

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

@@ -36,8 +36,8 @@ fun ReadableArray.asArrayString(): Array<String> {
     return result
 }
 
-open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
-    AbstractEventEmitter<RCTMGLMapView?>(context) {
+open class RCTMGLMapViewManager(context: ReactApplicationContext) :
+    AbstractEventEmitter<RCTMGLMapView>(context) {
     private val mViews: MutableMap<Int, RCTMGLMapView>
     override fun getName(): String {
         return REACT_CLASS
@@ -76,7 +76,8 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
     }
 
     override fun createViewInstance(themedReactContext: ThemedReactContext): RCTMGLMapView {
-        return RCTMGLMapView(themedReactContext, this /*, null*/)
+        val context = activity ?: themedReactContext
+        return RCTMGLMapView(context, this /*, null*/)
     }
 
     override fun onDropViewInstance(mapView: RCTMGLMapView) {

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

@@ -5,7 +5,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import javax.annotation.Nonnull
 
-class RCTMGLRasterSourceManager(reactApplicationContext: ReactApplicationContext?) :
+class RCTMGLRasterSourceManager(reactApplicationContext: ReactApplicationContext) :
     RCTMGLTileSourceManager<RCTMGLRasterSource?>(reactApplicationContext) {
     @Nonnull
     override fun getName(): String {

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

@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.mapbox.rctmgl.components.AbstractEventEmitter
 
 abstract class RCTMGLTileSourceManager<T : RCTMGLTileSource<*>?> internal constructor(
-    reactApplicationContext: ReactApplicationContext?
+    reactApplicationContext: ReactApplicationContext
 ) : AbstractEventEmitter<T>(reactApplicationContext) {
     override fun getChildAt(source: T, childPosition: Int): View {
         return source!!.getChildAt(childPosition)

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

@@ -11,7 +11,7 @@ import com.mapbox.rctmgl.utils.ConvertUtils
 import com.mapbox.rctmgl.utils.ExpressionParser
 import javax.annotation.Nonnull
 
-class RCTMGLVectorSourceManager(reactApplicationContext: ReactApplicationContext?) :
+class RCTMGLVectorSourceManager(reactApplicationContext: ReactApplicationContext) :
     RCTMGLTileSourceManager<RCTMGLVectorSource?>(reactApplicationContext) {
     @Nonnull
     override fun getName(): String {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-rc.2",
+  "version": "10.0.0-rc.3",
   "publishConfig": {
     "access": "public"
   },

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/AbstractEventEmitter.java

@@ -1,82 +0,0 @@
-package com.mapbox.rctmgl.components;
-
-import android.view.ViewGroup;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.events.EventDispatcher;
-
-import com.mapbox.rctmgl.events.IEvent;
-import com.mapbox.rctmgl.components.AbstractEvent;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-/**
- * Created by nickitaliano on 8/23/17.
- */
-
-abstract public class AbstractEventEmitter<T extends ViewGroup> extends ViewGroupManager<T> {
-    private static final double BRIDGE_TIMEOUT_MS = 10;
-    private Map<String, Long> mRateLimitedEvents;
-    private EventDispatcher mEventDispatcher;
-    private ReactApplicationContext mRCTAppContext;
-
-    public AbstractEventEmitter(ReactApplicationContext reactApplicationContext) {
-        mRateLimitedEvents = new HashMap<>();
-        mRCTAppContext = reactApplicationContext;
-    }
-
-    public void handleEvent(IEvent event) {
-        String eventCacheKey = getEventCacheKey(event);
-
-        // fail safe to protect bridge from being spammed
-        if (shouldDropEvent(eventCacheKey, event)) {
-            return;
-        }
-
-        mRateLimitedEvents.put(eventCacheKey, System.currentTimeMillis());
-        mEventDispatcher.dispatchEvent(new AbstractEvent(event.getID(), event.getKey(), event.canCoalesce(), event.toJSON()));
-    }
-
-    @Override
-    protected void addEventEmitters(ThemedReactContext context, @Nonnull T view) {
-        mEventDispatcher = context.getNativeModule(UIManagerModule.class).getEventDispatcher();
-    }
-
-    @Nullable
-    @Override
-    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-        Map<String, String> events = customEvents();
-
-        if (events == null) {
-            return null;
-        }
-
-        Map<String, Object> exportedEvents = new HashMap<>();
-
-        for (Map.Entry<String, String> event : events.entrySet()) {
-            exportedEvents.put(event.getKey(), MapBuilder.of("registrationName", event.getValue()));
-        }
-
-        return exportedEvents;
-    }
-
-    @Nullable
-    public abstract Map<String, String> customEvents();
-
-    private boolean shouldDropEvent(String cacheKey, IEvent event) {
-        Long lastEventTimestamp = mRateLimitedEvents.get(cacheKey);
-        return lastEventTimestamp != null && (event.getTimestamp() - lastEventTimestamp) <= BRIDGE_TIMEOUT_MS;
-    }
-
-    private String getEventCacheKey(IEvent event) {
-        return String.format("%s-%s", event.getKey(), event.getType());
-    }
-}

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

@@ -1,31 +0,0 @@
-package com.mapbox.rctmgl.components.mapview;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-//import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-/**
- * Created by hernanmateo on 12/11/18.
- */
-
-public class RCTMGLAndroidTextureMapViewManager extends RCTMGLMapViewManager {
-    public static final String LOG_TAG = "RCTMGLAndroidTextureMapViewManager";
-    public static final String REACT_CLASS = "RCTMGLAndroidTextureMapView";
-
-    public RCTMGLAndroidTextureMapViewManager(ReactApplicationContext context) {
-        super(context);
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected RCTMGLAndroidTextureMapView createViewInstance(ThemedReactContext themedReactContext) {
-        //MapboxMapOptions options = new MapboxMapOptions();
-        //options.textureMode(true);
-        return new RCTMGLAndroidTextureMapView(themedReactContext, this/*, options*/);
-    }
-}