@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.4

package/android/src/main/mapbox-v11-compat/v11/com/mapbox/rctmgl/v11compat/Snapshot.kt

@@ -0,0 +1,22 @@
+package com.mapbox.rctmgl.v11compat.snapshot;
+
+import android.graphics.Bitmap
+import com.mapbox.maps.Image
+import com.mapbox.maps.MapSnapshotOptions
+import com.mapbox.maps.Snapshotter
+import com.mapbox.maps.toMapboxImage as _toMapboxImage
+
+fun MapSnapshotOptions.Builder.accessToken(accessToken: String?) {
+  // blank on v11
+}
+
+
+fun Snapshotter.startV11(callback: (Bitmap?, String?)-> Unit) {
+    this.start(null, callback)
+}
+
+// toMapboxImage
+
+fun Bitmap.toMapboxImage(): Image {
+    return this._toMapboxImage()
+}

package/ios/RCTMGL-v10/MBXMapViewModule.mm

@@ -33,7 +33,7 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-- (void)withMapView:(NSNumber*)viewRef block:(void (^)(MBXMapView *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
+- (void)withMapView:(nonnull NSNumber*)viewRef block:(void (^)(MBXMapView *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
 //    void (^upperBlock)(void) = ^{
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -62,28 +62,28 @@ RCT_EXPORT_MODULE();
 }
 
 
-RCT_EXPORT_METHOD(takeSnap:(NSNumber*)viewRef writeToDisk:(BOOL)writeToDisk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(takeSnap:(nonnull NSNumber*)viewRef writeToDisk:(BOOL)writeToDisk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [self withMapView:viewRef block:^(MBXMapView *view) {
         [MBXMapViewManager takeSnap:view writeToDisk:writeToDisk resolver:resolve];
     } reject:reject methodName:@"takeSnap"];
 }
 
-RCT_EXPORT_METHOD(clearData:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(clearData:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(MBXMapView *view) {
         [MBXMapViewManager clearData:view resolver:resolve rejecter:reject];
     } reject:reject methodName:@"clearData"];
 }
 
 
-RCT_EXPORT_METHOD(getCenter:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getCenter:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(MBXMapView *view) {
         [MBXMapViewManager getCenter:view resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getCenter"];
 }
 
 
-RCT_EXPORT_METHOD(getCoordinateFromView:(NSNumber*)viewRef atPoint:(NSArray *)atPoint resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getCoordinateFromView:(nonnull NSNumber*)viewRef atPoint:(NSArray *)atPoint resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(MBXMapView *view) {
         NSNumber* a = [atPoint objectAtIndex:0];
         NSNumber* b = [atPoint objectAtIndex:1];
@@ -100,14 +100,14 @@ RCT_EXPORT_METHOD(getPointInView:(nonnull NSNumber*)viewRef atCoordinate:(NSArra
 }
 
 
-RCT_EXPORT_METHOD(getVisibleBounds:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getVisibleBounds:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(MBXMapView *view) {
         [MBXMapViewManager getVisibleBounds:view resolver:resolve];
     } reject:reject methodName:@"getVisibleBounds"];
 }
 
 
-RCT_EXPORT_METHOD(getZoom:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getZoom:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(MBXMapView *view) {
         [MBXMapViewManager getZoom:view resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getZoom"];

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -206,7 +206,7 @@ open class RCTMGLMapView : MapView {
     super.removeReactSubview(subview)
   }
 
-  public required init(frame:CGRect, eventDispatcher: RCTEventDispatcherProtocol) {
+  @objc public required init(frame:CGRect, eventDispatcher: RCTEventDispatcherProtocol) {
     #if RNMBX_11
     self.eventDispatcher = eventDispatcher
     super.init(frame: frame, mapInitOptions: MapInitOptions())

package/ios/install.md

@@ -6,9 +6,7 @@ The following assumes, that you're using autolinking and installed
 
 `@rnmapbox/maps` via `npm` or `yarn`.
 
-<br>
-
-The following is required for every following setup
+<br/>
 
 Add the following to your `ios/Podfile`:
 
@@ -27,6 +25,12 @@ Add the following to your `ios/Podfile`:
   end
 ```
 
+<br>
+
+You will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
+
+
+
 Set the `$RNMapboxMapsImpl` to `mapbox` aka v10 implementation [see bellow for detailed instructions](#mapbox-maps-sdk-v10)
 
 Run `pod install` to download the proper mapbox dependency.
@@ -50,11 +54,11 @@ You are good to go!
 
 Read on if you want to edit your Mapbox version or flavor.
 
-<br>
+<br/>
 
 ## Mapbox Maps SDK (v10)
 
-This is the version we recommend, while other implementations should work, we don't plan to support them in next version.
+This is the version we recommend.
 
 Check the current version of the SDK [here](https://docs.mapbox.com/ios/maps/overview/).
 
@@ -63,59 +67,44 @@ Add the following to the beginning of your podfile
 $RNMapboxMapsImpl = 'mapbox'
 ```
 
-You can also override the version to use. *Warning:* if you set a version, then later update, the `rnamapbox/maps` library it's possible that you'll end up using Mapbox older version than supported. Make sure you revise this value with `rnmapbox/maps` updates.
+## Using a custom version of the Mapbox SDK
+
+You can also override the version to use. *Warning:* if you set a version, then later update, the `rnamapbox/maps` library it's possible that you'll end up using Mapbox older version than supported. Make sure you revise this value with `@rnmapbox/maps` updates. Also note that for 11.0 or later versions you'll need to set `$RNMapboxMapsUseV11 = true`, see bellow
 
 ```ruby
 # Warning: only for advanced use cases, only do this if you know what you're doing.
 # $RNMapboxMapsVersion = '~> 10.12.0'
 ```
 
-You will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
-
 <br/>
 
-## Maplibre
-
-[MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL
+## V11 support
 
-Current default MapLibre version is `5.12.0`
+We have experimental support for mapbox 11 beta.
 
-This is the default and requires no further setup`ios/Podfile`
-
-If you want to change the version used:
+Add the following to your Podfile:
 
 ```ruby
-$RNMapboxMapsImpl = 'maplibre' # optional as this is the default
-$RNMapboxMapsVersion = 'exactVersion 5.12.1'
+$RNMapboxMapsUseV11 = true # use 11 version
+$RNMapboxMapsVersion = '= 11.0.0-beta.3'
 ```
 
-MapLibre is consumed via Swift Package Manager, use `RNMapboxMapsSwiftPackageManager` to change other details than version
 
-```ruby
-$RNMapboxMapsSwiftPackageManager = {
-    url: "https://github.com/maplibre/maplibre-gl-native-distribution",
-    requirement: {
-      kind: "upToNextMajorVersion",
-      minimumVersion: "5.12.1"
-    },
-    product_name: "Mapbox"
-  }
-```
+## Troubleshooting
 
-<br/>
-
-## Mapbox Maps GL SDK (9.0 or earlier)
+### Pod install fails on upgrade of @rnmapbox/maps with `could not find compatible versions for pod "MapboxMaps"`
 
-This is the old version of mapbox gl (deprecated)
+Example message:
+```log
+[!] CocoaPods could not find compatible versions for pod "MapboxMaps":
+  In snapshot (Podfile.lock):
+    MapboxMaps (= 10.15.0, ~> 10.15.0)
 
-```ruby
-$RNMapboxMapsImpl = 'mapbox-gl'
-$RNMapboxMapsVersion = '~> 5.9.0'
+  In Podfile:
+    rnmapbox-maps (from `../node_modules/@rnmapbox/maps`) was resolved to 10.0.15, which depends on
+      MapboxMaps (~> 10.16.0)
 ```
 
-### Mapbox Maps GL SDK > `v6.0.0`
+Please use `pod update MapboxMaps` as suggested by cocoapods
 
-If you are using version `v6.0.0` of the SDK or later, you will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
-
-<br>
 

package/package.json

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

package/rnmapbox-maps.podspec

@@ -21,105 +21,57 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 ## Warning: these lines are scanned by autogenerate.js
 rnMapboxMapsDefaultMapboxVersion = '~> 10.16.0'
-rnMapboxMapsDefaultMapboxGLVersion = '~> 5.9.0'
-rnMapboxMapsDefaultMapLibreVersion = 'exactVersion 5.12.1'
 
-rnMapboxMapsDefaultImpl = 'maplibre'
+rnMapboxMapsDefaultImpl = 'mapbox'
 
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
 # DEPRECATIONS
 
-
-if ENV["REACT_NATIVE_MAPBOX_GL_USE_FRAMEWORKS"]
-  puts "REACT_NATIVE_MAPBOX_GL_USE_FRAMEWORKS is now deprecated!"
-end
-
 if $RNMBGL_Use_SPM
-  puts "WARNING: $RNMBGL_Use_SPM is deprecated - use $RNMapboxMapsSwiftPackageManager"
-  if $RNMBGL_Use_SPM.is_a?(Hash)
-    $RNMapboxMapsSwiftPackageManager = $RNMBGL_Use_SPM
-  else
-    $RNMapboxMapsImpl = 'maplibre' unless $RNMapboxMapsImpl
-    $RNMapboxMapsSwiftPackageManager = {
-      url: "https://github.com/maplibre/maplibre-gl-native-distribution",
-      requirement: {
-        kind: rnMapboxMapsDefaultMapLibreVersion.split.first,
-        version: rnMapboxMapsDefaultMapLibreVersion.split.last,
-      },
-      product_name: "Mapbox"
-    }
-  end
+  abort "Error: $RNMBGL_Use_SPM is deprecated - use $RNMapboxMapsSwiftPackageManager"
 end
 
 if $RNMBGL_USE_V10
-  puts "WARNING: $RNMBGL_USE_V10 is deprecated - use $RNMapboxMapsImpl = 'mapbox'"
-  $RNMapboxMapsImpl = 'mapbox'
+  abort "Error: $RNMBGL_USE_V10 is deprecated - this is the default now"
 end
 
 if $RNMBGL_USE_MAPLIBRE
-  puts "WARNING: $RNMBGL_USE_MAPLIBRE is deprecated - use $RNMapboxMapsImpl = 'maplibre'"
-  $RNMapboxMapsImpl = 'maplibre'
+  abort "Error: $RNMBGL_USE_MAPLIBRE is deprecated no mapblire is supported"
 end
 
 if ENV.has_key?("REACT_NATIVE_MAPBOX_MAPBOX_IOS_VERSION")
-  puts "WARNING: REACT_NATIVE_MAPBOX_MAPBOX_IOS_VERSION env is deprecated please use `$RNMapboxMapsVersion = \"#{ENV['REACT_NATIVE_MAPBOX_MAPBOX_IOS_VERSION']}\"`"
-  $RNMapboxMapsVersion = ENV["REACT_NATIVE_MAPBOX_MAPBOX_IOS_VERSION"]
+  abort "Error: REACT_NATIVE_MAPBOX_MAPBOX_IOS_VERSION env is deprecated please use `$RNMapboxMapsVersion = \"#{ENV['REACT_NATIVE_MAPBOX_MAPBOX_IOS_VERSION']}\"`"
 end
 
 if $ReactNativeMapboxGLIOSVersion
-  puts "WARNING: $ReactNativeMapboxGLIOSVersion is deprecated use `$RNMapboxMapsVersion = \"#{$ReactNativeMapboxGLIOSVersion}\"`"
-  $RNMapboxMapsVersion = $ReactNativeMapboxGLIOSVersion
+  abort "Error: $ReactNativeMapboxGLIOSVersion is deprecated use we default to mapbox now"
 end
 
 $RNMBGL = Object.new
 
 def $RNMBGL.pre_install(installer)
-  puts "WARNING: $RNMBGL.pre_install is deprecated - use $RNMapboxMaps.pre_install"
-  $RNMapboxMaps.pre_install(installer)
+  abort "WARNING: $RNMBGL.pre_install is removed - use $RNMapboxMaps.pre_install"
 end
 
 def $RNMBGL.post_install(installer)
-  puts "WARNING: $RNMBGL.post_install is deprecated - use $RNMapboxMaps.post_install"
-  $RNMapboxMaps.post_install(installer)
+  abort "WARNING: $RNMBGL.post_install is removed - use $RNMapboxMaps.post_install"
 end
 
 # --
 
-unless $RNMapboxMapsImpl
-  raise "Setting $RNMapboxMapsImpl is now required - https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Unset#ios"
-end
-# $RNMapboxMapsImpl = rnMapboxMapsDefaultImpl unless $RNMapboxMapsImpl
+$RNMapboxMapsImpl ||= 'mapbox'
 
 case $RNMapboxMapsImpl
 when 'mapbox'
   rnMapboxMapsTargetsToChangeToDynamic = ['MapboxMobileEvents', 'Turf', 'MapboxMaps', 'MapboxCoreMaps', 'MapboxCommon']
   $MapboxImplVersion = $RNMapboxMapsVersion || rnMapboxMapsDefaultMapboxVersion
 when 'mapbox-gl'
-  puts 'WARNING: mapbox-gl in @rnmapbox/maps is deprecated. Set $RNMapboxMapsImpl=mapbox in your Podfile. See https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#ios'
-  rnMapboxMapsTargetsToChangeToDynamic = ['MapboxMobileEvents']
-  $MapboxImplVersion = $RNMapboxMapsVersion || rnMapboxMapsDefaultMapboxGLVersion
+  abort 'Errors: mapbox-gl in @rnmapbox/maps is removed. See https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#ios'
 when 'maplibre'
-  puts 'WARNING: maplibre in @rnmapbox/maps is deprecated. Set $RNMapboxMapsImpl=mapbox in your Podfile. See https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-MapboxGL#ios'
-  rnMapboxMapsTargetsToChangeToDynamic = ['MapboxMobileEvents']
-
-  spm_version = ($RNMapboxMapsVersion || rnMapboxMapsDefaultMapLibreVersion).split
-  if spm_version.length < 2
-    spm_version.prepend('exactVersion')
-  end
-
-  unless $RNMapboxMapsSwiftPackageManager
-    $RNMapboxMapsSwiftPackageManager = {
-      url: "https://github.com/maplibre/maplibre-gl-native-distribution",
-      requirement: {
-        kind: spm_version[0],
-        version: spm_version[1],
-      },
-      product_name: "Mapbox"
-    }
-  end
+  abort 'Error: maplibre in @rnmapbox/maps is removed. See https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-MapboxGL#ios'
 else
-  fail "$RNMapboxMapsImpl should be one of mapbox, mapbox-gl, maplibre"
+  fail "$RNMapboxMapsImpl should be one of mapbox"
 end
 
 $RNMapboxMaps = Object.new
@@ -156,7 +108,6 @@ def $RNMapboxMaps._add_spm_to_target(project, target, url, requirement, product_
 end
 
 def $RNMapboxMaps.post_install(installer)
-
   if $RNMapboxMapsUseV11
     installer.pods_project.build_configurations.each do |config|
       config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)', '-D RNMBX_11']
@@ -256,12 +207,8 @@ Pod::Spec.new do |s|
       s.dependency 'MapboxMaps', $MapboxImplVersion
       s.dependency 'Turf'
       s.swift_version = '5.0'
-    when 'mapbox-gl'
-      s.dependency 'Mapbox-iOS-SDK', $MapboxImplVersion
-    when 'maplibre'
-      fail "internal error: maplibre requires $RNMapboxMapsSwiftPackageManager"
     else
-      fail "$RNMapboxMapsImpl should be one of mapbox, mapbox-gl, maplibre"
+      fail "$RNMapboxMapsImpl should be mapbox but was: $RNMapboxMapsImpl"
     end
   end
 
@@ -276,11 +223,8 @@ Pod::Spec.new do |s|
       if new_arch_enabled
         install_modules_dependencies(sp)
       end
-    when 'mapbox-gl'
-      sp.source_files	= "ios/RCTMGL/**/*.{h,m,mm}"
-    when 'maplibre'
-      sp.source_files	= "ios/RCTMGL/**/*.{h,m,mm}"
-      sp.compiler_flags = '-DRNMBGL_USE_MAPLIBRE=1'
+    else
+      fail "$RNMapboxMapsImpl should be mapbox but was: $RNMapboxMapsImpl"
     end
   end
 

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/RCTMGLPackage.java

@@ -1,99 +0,0 @@
-package com.mapbox.rctmgl;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.mapbox.rctmgl.components.annotation.RCTMGLCalloutManager;
-import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotationManager;
-import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerViewManager;
-import com.mapbox.rctmgl.components.camera.RCTMGLCameraManager;
-import com.mapbox.rctmgl.components.images.RCTMGLImagesManager;
-import com.mapbox.rctmgl.components.location.RCTMGLNativeUserLocationManager;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapViewManager;
-import com.mapbox.rctmgl.components.mapview.RCTMGLAndroidTextureMapViewManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLBackgroundLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLCircleLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLFillExtrusionLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLFillLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLHeatmapLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLLineLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLRasterLayerManager;
-import com.mapbox.rctmgl.components.styles.layers.RCTMGLSymbolLayerManager;
-import com.mapbox.rctmgl.components.styles.light.RCTMGLLightManager;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLImageSourceManager;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLRasterSourceManager;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLShapeSourceManager;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLVectorSourceManager;
-import com.mapbox.rctmgl.modules.RCTMGLLocationModule;
-import com.mapbox.rctmgl.modules.RCTMGLLogging;
-import com.mapbox.rctmgl.modules.RCTMGLModule;
-import com.mapbox.rctmgl.modules.RCTMGLOfflineModule;
-import com.mapbox.rctmgl.modules.RCTMGLSnapshotModule;
-
-/**
- * Created by nickitaliano on 8/18/17.
- */
-
-public class RCTMGLPackage implements ReactPackage {
-
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
-        List<NativeModule> modules = new ArrayList<>();
-
-        modules.add(new RCTMGLModule(reactApplicationContext));
-        modules.add(new RCTMGLOfflineModule(reactApplicationContext));
-        modules.add(new RCTMGLSnapshotModule(reactApplicationContext));
-        modules.add(new RCTMGLLocationModule(reactApplicationContext));
-        modules.add(new RCTMGLLogging(reactApplicationContext));
-
-        return modules;
-    }
-
-    @Deprecated
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
-        List<ViewManager> managers = new ArrayList<>();
-
-        // components
-        managers.add(new RCTMGLCameraManager(reactApplicationContext));
-        managers.add(new RCTMGLMapViewManager(reactApplicationContext));
-        managers.add(new RCTMGLMarkerViewManager(reactApplicationContext));
-        managers.add(new RCTMGLAndroidTextureMapViewManager(reactApplicationContext));
-        managers.add(new RCTMGLLightManager());
-        managers.add(new RCTMGLPointAnnotationManager(reactApplicationContext));
-        managers.add(new RCTMGLCalloutManager());
-        managers.add(new RCTMGLNativeUserLocationManager());
-
-        // sources
-        managers.add(new RCTMGLVectorSourceManager(reactApplicationContext));
-        managers.add(new RCTMGLShapeSourceManager(reactApplicationContext));
-        managers.add(new RCTMGLRasterSourceManager(reactApplicationContext));
-        managers.add(new RCTMGLImageSourceManager());
-
-        // images
-        managers.add(new RCTMGLImagesManager(reactApplicationContext));
-
-        // layers
-        managers.add(new RCTMGLFillLayerManager());
-        managers.add(new RCTMGLFillExtrusionLayerManager());
-        managers.add(new RCTMGLHeatmapLayerManager());
-        managers.add(new RCTMGLLineLayerManager());
-        managers.add(new RCTMGLCircleLayerManager());
-        managers.add(new RCTMGLSymbolLayerManager());
-        managers.add(new RCTMGLRasterLayerManager());
-        managers.add(new RCTMGLBackgroundLayerManager());
-
-        return managers;
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/components/AbstractEvent.java

@@ -1,35 +0,0 @@
-package com.mapbox.rctmgl.components;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-import javax.annotation.Nullable;
-
-public class AbstractEvent extends Event<AbstractEvent> {
-    private String mEventName;
-    private final boolean mCanCoalesce;
-    private WritableMap mEvent;
-
-    public AbstractEvent(int viewId, String eventName, boolean canCoalesce, @Nullable WritableMap event) {
-        super(viewId);
-        mEventName = eventName;
-        mCanCoalesce = canCoalesce;
-        mEvent = event;
-    }
-
-    @Override
-    public String getEventName() {
-        return mEventName;
-    }
-
-    @Override
-    public void dispatch(RCTEventEmitter rctEventEmitter) {
-        rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEvent);
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        return mCanCoalesce;
-    }
-}

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

@@ -1,80 +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 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/src/main/java-mapboxgl/common/com/mapbox/rctmgl/components/AbstractMapFeature.java

@@ -1,19 +0,0 @@
-package com.mapbox.rctmgl.components;
-
-import android.content.Context;
-
-import com.facebook.react.views.view.ReactViewGroup;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView;
-
-/**
- * Created by nickitaliano on 9/6/17.
- */
-
-public abstract class AbstractMapFeature extends ReactViewGroup {
-    public AbstractMapFeature(Context context) {
-        super(context);
-    }
-
-    public abstract void addToMap(RCTMGLMapView mapView);
-    public abstract void removeFromMap(RCTMGLMapView mapView);
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/components/annotation/MarkerView.java

@@ -1,23 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-/**
- * Subclass of MarkerView so we MarkerViewManager can implement remove/restoreViews
- */
-public class MarkerView extends com.mapbox.mapboxsdk.plugins.markerview.MarkerView {
-    View view;
-
-    public MarkerView(@NonNull LatLng latLng, @NonNull View view) {
-        super(latLng, view);
-        this.view = view;
-    }
-
-    public View getView() {
-        return this.view;
-    }
-}