@rnmapbox/maps 10.0.15 → 10.1.0-beta.4

package/rnmapbox-maps.podspec

@@ -21,103 +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'
-
-# DEPRECATIONS
+rnMapboxMapsDefaultImpl = 'mapbox'
 
+new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
-if ENV["REACT_NATIVE_MAPBOX_GL_USE_FRAMEWORKS"]
-  puts "REACT_NATIVE_MAPBOX_GL_USE_FRAMEWORKS is now deprecated!"
-end
+# DEPRECATIONS
 
 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
@@ -154,6 +108,12 @@ 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']
+    end
+  end
+
   if $RNMapboxMapsSwiftPackageManager
     return if $RNMapboxMapsSwiftPackageManager == "manual"
 
@@ -234,7 +194,12 @@ Pod::Spec.new do |s|
   s.homepage    	= "https://github.com/rnmapbox/maps#readme"
   s.source      	= { :git => "https://github.com/rnmapbox/maps.git" }
   s.license     	= "MIT"
-  s.platform    	= :ios, "11.0"
+  if $RNMapboxMapsUseV11
+    s.platform    	= :ios, "13.0"
+  else
+    s.platform    	= :ios, "11.0"
+  end
+  s.header_dir = "rnmapbox_maps"
 
   unless $RNMapboxMapsSwiftPackageManager
     case $RNMapboxMapsImpl
@@ -242,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
 
@@ -257,12 +218,13 @@ Pod::Spec.new do |s|
   s.subspec 'DynamicLibrary' do |sp|
     case $RNMapboxMapsImpl
     when 'mapbox'
-      sp.source_files = "ios/RCTMGL-v10/**/*.{h,m,swift}"
-    when 'mapbox-gl'
-      sp.source_files	= "ios/RCTMGL/**/*.{h,m}"
-    when 'maplibre'
-      sp.source_files	= "ios/RCTMGL/**/*.{h,m}"
-      sp.compiler_flags = '-DRNMBGL_USE_MAPLIBRE=1'
+      sp.source_files = "ios/RCTMGL-v10/**/*.{h,m,mm,swift}"
+
+      if new_arch_enabled
+        install_modules_dependencies(sp)
+      end
+    else
+      fail "$RNMapboxMapsImpl should be mapbox but was: $RNMapboxMapsImpl"
     end
   end
 

package/setup-jest.js

@@ -118,6 +118,22 @@ NativeModules.MGLLocationModule = {
   pause: jest.fn(),
 };
 
+NativeModules.MBXMapViewModule = {
+  takeSnap: jest.fn(),
+  queryTerrainElevation: jest.fn(),
+  setSourceVisibility: jest.fn(),
+  getCenter: jest.fn(),
+  getCoordinateFromView: jest.fn(),
+  getPointInView: jest.fn(),
+  getZoom: jest.fn(),
+  getVisibleBounds: jest.fn(),
+  queryRenderedFeaturesAtPoint: jest.fn(),
+  queryRenderedFeaturesInRect: jest.fn(),
+  setHandledMapChangedEvents: jest.fn(),
+  clearData: jest.fn(),
+  querySourceFeatures: jest.fn(),
+};
+
 // Mock for global AbortController
 global.AbortController = class {
   signal = 'test-signal';

package/src/components/MapView.tsx

@@ -3,15 +3,19 @@ import {
   View,
   StyleSheet,
   NativeModules,
-  requireNativeComponent,
   ViewProps,
   NativeSyntheticEvent,
   NativeMethods,
   HostComponent,
   LayoutChangeEvent,
+  findNodeHandle,
 } from 'react-native';
 import { debounce } from 'debounce';
+import { GeoJsonProperties, Geometry } from 'geojson';
 
+import NativeMapView from '../specs/MBXMapViewNativeComponent';
+import NativeAndroidTextureMapView from '../specs/MBXAndroidTextureMapViewNativeComponent';
+import NativeMapViewModule from '../specs/NativeMapViewModule';
 import {
   isFunction,
   isAndroid,
@@ -40,9 +44,8 @@ if (!MGLModule.MapboxV10) {
   );
 }
 
-export const NATIVE_MODULE_NAME = 'RCTMGLMapView';
-
-export const ANDROID_TEXTURE_NATIVE_MODULE_NAME = 'RCTMGLAndroidTextureMapView';
+// TODO: check if this can be removed
+export const NATIVE_MODULE_NAME = 'MBXMapView';
 
 const styles = StyleSheet.create({
   matchParent: { flex: 1 },
@@ -738,8 +741,10 @@ class MapView extends NativeBridgeComponent(
     methodName: string,
     args: NativeArg[] = [],
   ): Promise<ReturnType> {
-    return super._runNativeCommand<typeof RCTMGLMapView, ReturnType>(
+    return this._runNativeCommand<typeof RCTMGLMapView, ReturnType>(
       methodName,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore TODO: fix types
       this._nativeRef as HostComponent<NativeProps> | undefined,
       args,
     );
@@ -848,9 +853,44 @@ class MapView extends NativeBridgeComponent(
     return this._runNativeCommand('showAttribution', this._nativeRef);
   }
 
+  _runNativeCommand<RefType, ReturnType = NativeArg>(
+    methodName: string,
+    nativeRef: RefType | undefined,
+    args?: NativeArg[],
+  ): Promise<ReturnType> {
+    // when this method is called after component mounts, the ref is not yet set
+    // schedule it to be called after a timeout
+    if (!this._nativeRef) {
+      return new Promise((resolve) => setTimeout(resolve, 1)).then(() => {
+        return this._runNativeCommand(methodName, this._nativeRef, args);
+      });
+    }
+
+    const handle = findNodeHandle(nativeRef as any);
+
+    // @ts-expect-error TS says that string cannot be used to index NativeMapViewModule.
+    // It can, it's just not pretty.
+    return NativeMapViewModule[methodName]?.(
+      handle,
+      ...(args ?? []),
+    ) as Promise<ReturnType>;
+  }
+
+  _decodePayload<G extends Geometry | null = Geometry, P = GeoJsonProperties>(
+    payload: GeoJSON.Feature<G, P> | string,
+  ): GeoJSON.Feature<G, P> {
+    // we check whether the payload is a string, since the strict type safety is enforced only on iOS on the new arch
+    // on Android, on both archs, the payload is an object
+    if (typeof payload === 'string') {
+      return JSON.parse(payload);
+    } else {
+      return payload;
+    }
+  }
+
   _onPress(e: NativeSyntheticEvent<{ payload: GeoJSON.Feature }>) {
     if (isFunction(this.props.onPress)) {
-      this.props.onPress(e.nativeEvent.payload);
+      this.props.onPress(this._decodePayload(e.nativeEvent.payload));
     }
   }
 
@@ -898,7 +938,9 @@ class MapView extends NativeBridgeComponent(
   ) {
     const { regionWillChangeDebounceTime, regionDidChangeDebounceTime } =
       this.props;
-    const { type, payload } = e.nativeEvent;
+    const { type } = e.nativeEvent;
+    const payload = this._decodePayload(e.nativeEvent.payload);
+
     let propName: CallbablePropKeys | '' = '';
     let deprecatedPropName: CallbablePropKeys | '' = '';
 
@@ -1079,6 +1121,8 @@ class MapView extends NativeBridgeComponent(
       );
     } else if (this.state.isReady) {
       mapView = (
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore TODO: fix types
         <RCTMGLMapView {...props} {...callbacks}>
           {this.props.children}
         </RCTMGLMapView>
@@ -1107,13 +1151,13 @@ type NativeProps = Omit<
 };
 
 type RCTMGLMapViewRefType = Component<NativeProps> & Readonly<NativeMethods>;
-const RCTMGLMapView = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
+// const RCTMGLMapView = requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);
+// TODO: figure out how to pick the correct implementation
+const RCTMGLMapView = NativeMapView;
 
-let RCTMGLAndroidTextureMapView: typeof RCTMGLMapView;
+let RCTMGLAndroidTextureMapView: any;
 if (isAndroid()) {
-  RCTMGLAndroidTextureMapView = requireNativeComponent<NativeProps>(
-    ANDROID_TEXTURE_NATIVE_MODULE_NAME,
-  );
+  RCTMGLAndroidTextureMapView = NativeAndroidTextureMapView;
 }
 
 export default MapView;

package/src/specs/MBXAndroidTextureMapViewNativeComponent.ts

@@ -0,0 +1,63 @@
+import type { HostComponent, ViewProps } from 'react-native';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {
+  WithDefault,
+  DirectEventHandler,
+  Int32,
+} from 'react-native/Libraries/Types/CodegenTypes';
+
+import type { UnsafeMixed } from './codegenUtils';
+
+type OnCameraChangedEventType = { type: string; payload: string };
+type OnPressEventType = { type: string; payload: string };
+type OnMapChangeEventType = { type: string; payload: string };
+
+type Point = {
+  x: Int32;
+  y: Int32;
+};
+
+type LocalizeLabels = {
+  locale: string;
+  layerIds?: string[];
+};
+
+export interface NativeProps extends ViewProps {
+  onCameraChanged?: DirectEventHandler<OnCameraChangedEventType>;
+
+  attributionEnabled?: boolean;
+  attributionPosition?: UnsafeMixed;
+
+  logoEnabled?: boolean;
+  logoPosition?: UnsafeMixed;
+
+  compassEnabled?: boolean;
+  compassFadeWhenNorth?: boolean;
+  compassPosition?: UnsafeMixed;
+  compassViewPosition?: Int32;
+  compassViewMargins?: Point;
+  compassImage?: string;
+
+  scaleBarEnabled?: boolean;
+  scaleBarPosition?: UnsafeMixed;
+
+  zoomEnabled?: boolean;
+  scrollEnabled?: boolean;
+  rotateEnabled?: boolean;
+  pitchEnabled?: boolean;
+
+  requestDisallowInterceptTouchEvent?: boolean;
+
+  projection?: WithDefault<'mercator' | 'globe', 'mercator'>;
+  localizeLabels?: LocalizeLabels;
+
+  styleURL?: string;
+
+  onPress?: DirectEventHandler<OnPressEventType>;
+  onLongPress?: DirectEventHandler<OnPressEventType>;
+  onMapChange?: DirectEventHandler<OnMapChangeEventType>;
+}
+
+export default codegenNativeComponent<NativeProps>('MBXAndroidTextureMapView', {
+  excludedPlatforms: ['iOS'],
+}) as HostComponent<NativeProps>;

package/src/specs/MBXMapViewNativeComponent.ts

@@ -0,0 +1,63 @@
+import type { HostComponent, ViewProps } from 'react-native';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {
+  WithDefault,
+  DirectEventHandler,
+  Int32,
+} from 'react-native/Libraries/Types/CodegenTypes';
+
+import type { UnsafeMixed } from './codegenUtils';
+
+type OnCameraChangedEventType = { type: string; payload: string };
+type OnPressEventType = { type: string; payload: string };
+type OnMapChangeEventType = { type: string; payload: string };
+
+type Point = {
+  x: Int32;
+  y: Int32;
+};
+
+type LocalizeLabels = {
+  locale: string;
+  layerIds?: string[];
+};
+
+export interface NativeProps extends ViewProps {
+  onCameraChanged?: DirectEventHandler<OnCameraChangedEventType>;
+
+  attributionEnabled?: boolean;
+  attributionPosition?: UnsafeMixed;
+
+  logoEnabled?: boolean;
+  logoPosition?: UnsafeMixed;
+
+  compassEnabled?: boolean;
+  compassFadeWhenNorth?: boolean;
+  compassPosition?: UnsafeMixed;
+  compassViewPosition?: Int32;
+  compassViewMargins?: Point;
+  compassImage?: string;
+
+  scaleBarEnabled?: boolean;
+  scaleBarPosition?: UnsafeMixed;
+
+  zoomEnabled?: boolean;
+  scrollEnabled?: boolean;
+  rotateEnabled?: boolean;
+  pitchEnabled?: boolean;
+
+  requestDisallowInterceptTouchEvent?: boolean;
+
+  projection?: WithDefault<'mercator' | 'globe', 'mercator'>;
+  localizeLabels?: LocalizeLabels;
+
+  styleURL?: string;
+
+  onPress?: DirectEventHandler<OnPressEventType>;
+  onLongPress?: DirectEventHandler<OnPressEventType>;
+  onMapChange?: DirectEventHandler<OnMapChangeEventType>;
+}
+
+export default codegenNativeComponent<NativeProps>(
+  'MBXMapView',
+) as HostComponent<NativeProps>;

package/src/specs/NativeMapViewModule.ts

@@ -0,0 +1,54 @@
+/* eslint-disable @typescript-eslint/ban-types */
+import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
+import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  takeSnap: (viewRef: Int32 | null, writeToDisk: boolean) => Promise<Object>;
+  queryTerrainElevation: (
+    viewRef: Int32 | null,
+    coordinates: ReadonlyArray<number>,
+  ) => Promise<Object>;
+  setSourceVisibility: (
+    viewRef: Int32 | null,
+    visible: boolean,
+    sourceId: string,
+    sourceLayerId: string,
+  ) => Promise<Object>;
+  getCenter: (viewRef: Int32 | null) => Promise<Object>;
+  getCoordinateFromView: (
+    viewRef: Int32 | null,
+    atPoint: ReadonlyArray<number>,
+  ) => Promise<Object>;
+  getPointInView: (
+    viewRef: Int32 | null,
+    atCoordinate: ReadonlyArray<number>,
+  ) => Promise<Object>;
+  getZoom: (viewRef: Int32 | null) => Promise<Object>;
+  getVisibleBounds: (viewRef: Int32 | null) => Promise<Object>;
+  queryRenderedFeaturesAtPoint: (
+    viewRef: Int32 | null,
+    atPoint: ReadonlyArray<number>,
+    withFilter: ReadonlyArray<Object>,
+    withLayerIDs: ReadonlyArray<string>,
+  ) => Promise<Object>;
+  queryRenderedFeaturesInRect: (
+    viewRef: Int32 | null,
+    withBBox: ReadonlyArray<number>,
+    withFilter: ReadonlyArray<Object>,
+    withLayerIDs: ReadonlyArray<string>,
+  ) => Promise<Object>;
+  setHandledMapChangedEvents: (
+    viewRef: Int32 | null,
+    events: ReadonlyArray<string>,
+  ) => Promise<Object>;
+  clearData: (viewRef: Int32 | null) => Promise<Object>;
+  querySourceFeatures: (
+    viewRef: Int32 | null,
+    sourceId: string,
+    withFilter: ReadonlyArray<Object>,
+    withSourceLayerIDs: ReadonlyArray<string>,
+  ) => Promise<Object>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('MBXMapViewModule');

package/src/specs/codegenUtils.ts

@@ -0,0 +1,4 @@
+// codegen will generate folly::dynamic in place of this type, but it's not exported by RN
+// since codegen doesn't really follow imports, this way we can trick it into generating the correct type
+// while keeping typescript happy
+export type UnsafeMixed = any;

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;
-    }
-}