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

package/CHANGELOG.md

@@ -10,12 +10,12 @@ PR Title ([#123](link to my pr))
 #### Breaking changes:
 
 The setup was changed - see install instructions for more details. In a nuthsell:
-* On both android/ios to select mapbox implementation use `RNMapboxMapsImpl`/`$RNMapboxMapsImpl` variable which can be one of (`maplibre`,`mapbox`(aka v10),`mapbox-gl`)
-* Default implementation is `maplibre` as it requires not further setup. *WARNING* using mapbox styles from `maplibre` has different pricing than mapbox native sdk-s.
-* On Podfile `$RNMBGL.(pre|post)_install` was changed `$RNMapboxMaps.(pre|post)_install`
-* Package name was changed from `@react-native-mapbox-gl/maps` to `@rnmapbox/maps`. If you just testing with the v10 version you can use something like [babel-plugin-transform-rename-import](https://www.npmjs.com/package/babel-plugin-transform-rename-import) to keep using the old imports for a while.
-* `MapboxGL.setAccessToken` now requires `MapboxGL.setWellKnownTileServer` on maplibre.
 
+- On both android/ios to select mapbox implementation use `RNMapboxMapsImpl`/`$RNMapboxMapsImpl` variable which can be one of (`maplibre`,`mapbox`(aka v10),`mapbox-gl`)
+- Default implementation is `maplibre` as it requires not further setup. _WARNING_ using mapbox styles from `maplibre` has different pricing than mapbox native sdk-s.
+- On Podfile `$RNMBGL.(pre|post)_install` was changed `$RNMapboxMaps.(pre|post)_install`
+- Package name was changed from `@react-native-mapbox-gl/maps` to `@rnmapbox/maps`. If you just testing with the v10 version you can use something like [babel-plugin-transform-rename-import](https://www.npmjs.com/package/babel-plugin-transform-rename-import) to keep using the old imports for a while.
+- `MapboxGL.setAccessToken` now requires `MapboxGL.setWellKnownTileServer` on maplibre.
 
 #### Changes:
 
@@ -97,7 +97,7 @@ Add Expo config plugin ([#1388](https://github.com/rnmapbox/maps/pull/1388))
 Android: Bump `okhttp` to `4.9.0` ([#1390](https://github.com/rnmapbox/maps/pull/1390))
 Support dynamically changing local JSON in styleURL ([#1399](https://github.com/rnmapbox/maps/pull/1399))
 Add missing types to `SymbolLayerStyle` & `ImagesProps` ([#1360](https://github.com/rnmapbox/maps/pull/1360))
-Fix error while updating coordinates of RCTMGLImageSource ([#1310](https://github.com/rnmapbox/maps/pull/1310))
+Fix error while updating coordinates of RNMBXImageSource ([#1310](https://github.com/rnmapbox/maps/pull/1310))
 
 ## 8.2.0-beta2
 

package/README.md

@@ -57,16 +57,10 @@ _A community-supported, open-source React Native library for building maps with
 ---
 
 ### Supported Implementations 
-At the moment, the following implementations are supported: 
+At the moment we support Mapbox (v10) and Mapbox (v11) beta.
+We default to Mapbox (v10).
 
-
-|*RNMapboxMapsImpl*|*Notes*|
-|----------------|-----|
-|mapbox|New [Mapbox v10](https://www.mapbox.com/mobile-maps-sdk) implementation - recommended|
-|maplibre|[MapLibre](https://github.com/maplibre/maplibre-gl-native) opensource fork of Mapbox SDKs - will be dropped in next version|
-|mapbox-gl|Legacy mapbox implementation [iOS](https://docs.mapbox.com/android/legacy/maps/guides/) [Android](https://docs.mapbox.com/ios/legacy/maps/guides/) - legacy, will be dropped in next version|
-
-_See [iOS](ios/install.md) & [Android](android/install.md) setup guide for more details on setting `RNMapboxMapsImpl`_
+_See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using v11 beta_
 
 
 

package/android/build.gradle

@@ -1,4 +1,4 @@
-def defaultMapboxMapsImpl = "maplibre"
+def defaultMapboxMapsImpl = "mabpox"
 def defaultMapboxMapsVersion = "10.16.0"
 
 def safeExtGet(prop, fallback) {
@@ -44,25 +44,24 @@ if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
 
 android {
     if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
-        logger.warn('@rnmapbox/maps: Maplibre implementation is DEPRECATED and will be removed, set RNMapboxMapsImpl to mapbox- see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android')
-        sourceSets {
-            main {
-                java.srcDirs = ['src/main/java-mapboxgl/common','src/main/java-mapboxgl/maplibre']
-            }
-        }
+        msg = '@rnmapbox/maps: Maplibre implementation has been removed, set RNMapboxMapsImpl to mapbox- see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
+        logger.error(msg)
+        throw new GradleException(msg)
     }
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox-gl") {
-        logger.warn('@rnmapbox/maps: Maplibre implementation is DEPRECATED and will be removed, set RNMapboxMapsImpl to mapbox  - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android')
-        sourceSets {
-            main {
-                java.srcDirs = ['src/main/java-mapboxgl/common','src/main/java-mapboxgl/mapbox']
-            }
-        }
+        msg = '@rnmapbox/maps: MapboxGL implementation is DEPRECATED has been removed, set RNMapboxMapsImpl to mapbox  - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
+        logger.error(msg)
+        throw new GradleException(msg)
     }
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
         sourceSets {
             main {
-                java.srcDirs = ['src/main/java-v10']
+                java.srcDirs = ['src/main/java']
+                if (safeExtGet("RNMapboxMapsUseV11", false)) {
+                    java.srcDirs += 'src/main/mapbox-v11-compat/v11'
+                } else {
+                    java.srcDirs += 'src/main/mapbox-v11-compat/v10'
+                }
             }
         }
 
@@ -74,7 +73,7 @@ android {
         }
     }
     else {
-        msg = "RNMapboxMapsImpl should be one of: mapbox, mapbox-gl, maplibre got: ${safeExtGet("mapboxV10", defaultMapboxMapsImpl)}"
+        msg = "RNMapboxMapsImpl should be one of: mapbox, mapbox-gl, maplibre got: ${safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl)}"
         logger.error(msg)
         throw new GradleException(msg)
     }
@@ -136,30 +135,14 @@ dependencies {
 
     // Mapbox SDK
     customizableDependencies('RNMapboxMapsLibs') {
-        if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
-            implementation ("org.maplibre.gl:android-sdk:9.5.2")
-            implementation ("org.maplibre.gl:android-sdk-turf:5.9.0")
-
-            implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
-        }
-        else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox-gl") {
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:6.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.8.0'
-
-                // plugins
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.6.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v9:0.4.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
-        }
-        else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
+        if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
             implementation "com.mapbox.maps:android:${safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)}"
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.11.0'
             implementation 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
+        } else {
+            msg = '@rnmapbox/maps: RNMapboxMapsImpl has invalid value - only mapbox supported - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
+            logger.error(msg)
+            throw new GradleException(msg) 
         }
     }
 

package/android/install.md

@@ -1,30 +1,8 @@
 # Android Installation
 
-## We're supporting 3 implementations at the moment:
+## Supported mapbox libraries
 
-  - mapbox: v10 latest mapbox implementation - *recommended*, not opensource requires access for download
-  - maplibre: *DEFAULT* open source fork of older open source mapbox libraries with many improvements, will be removed in next version
-  - mapbox-gl: classic mapbox libraries - should work but will be dropped, recent versions are not open source and requires access for download, will be removed in next version
-
-## Mapbox Maps SDK v10
-
-Add `RNMapboxMapsImpl = "mapbox"` to your gradle file - see bellow for details.
-
-### Setting RNMapboxMapsImpl to v10
-
-*Warning*: If you set a custom version, make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version than what we exepect will likely result in a build error.
-
-Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
-
-
-```groovy
-buildscript {
-    ext {
-        // ...
-        RNMapboxMapsImpl = "mapbox" // required for v10
-    }
-}
-```
+We're only supporting mabpox 10.0 releases. 11.0 beta has experimental support.
 
 ### Adding mapbox maven repo
 
@@ -67,124 +45,41 @@ Set `RNMapboxMapsLibs` in `android/build.gradle > buildscript > ext` section
 ```groovy
 buildscript {
     ext {
-        // ...
-        RNMapboxMapsImpl = "mapbox"
-
-        RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation 'com.mapbox.maps:android:10.6.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
-        }
+        RNMapboxMapsVersion = '10.6.0'
     }
 }
 ```
 
-
-
-If you see `2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs` issue see [possible workaround](#workaround-for-2-files-found-with-path-libarm64-v8alibc_sharedso-from-inputs).
-
-## Using MapLibre
-
-[MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL.
-This is the default, and should work without any changes in gradle files.
-
-### Custom versions
-
-Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
+you can also customize all the libraries, should it be neccesary
 
 ```groovy
 buildscript {
     ext {
         // ...
-        RNMapboxMapsImpl = "maplibre" // optional - as this is the default
-
         RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation ("org.maplibre.gl:android-sdk:9.5.2")
-            implementation ("org.maplibre.gl:android-sdk-turf:5.9.0")
-
-            implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
+            implementation 'com.mapbox.maps:android:10.6.0'
+            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
         }
     }
 }
 ```
 
-Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/main/example/android/build.gradle) for inspiration!
-
-
-## Mapbox Maps GL Native SDK (pre v10)
-
-
-### Custom versions
-
-We've set up default Mapbox dependencies for you.  
-Feel free to check em out [here](https://github.com/rnmapbox/maps/blob/eca4858744cab134b06ae455bcdacc63233318a5/android/rctmgl/build.gradle#L55-L76)
-
-However, it is also possible to set a custom version of the [Mapbox SDK](https://github.com/mapbox/mapbox-gl-native-android)  
-Which will overwrite our defaults.
-
-Add something like the following to your `android/build.gradle > buildscript > ext` section:
+### Using v11
 
 ```groovy
-// android/build.gradle
-
 buildscript {
-    // ... stuff
     ext {
-        RNMapboxMapsImpl = "mapbox-gl"
-
-        // ... stuff
-        RNMapboxMapsLibs = {
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.7.1'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.7.0'
-
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.14.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v9:0.4.0'
-        }
-    // ... more stuff?
+        RNMapboxMapsUseV11 = true
+        RNMapboxMapsVersion = '10.6.0'
     }
 }
 ```
 
-NOTICE, If you are using newer versions of the SDK, you will need to authorize your download of the Maps SDK via a secret access token with the `DOWNLOADS:READ` scope.  
-This [guide](https://docs.mapbox.com/android/maps/guides/install/#configure-credentials) explains how to `Configure credentials` and `Configure your secret token`.
 
-Then under section `allprojects/repositories` add your data:
 
-```groovy
-// android/build.gradle
+# Trhoubleshooting
 
-allprojects {
-    repositories {
-        // ...other repos
-        maven {
-            url 'https://api.mapbox.com/downloads/v2/releases/maven'
-            authentication {
-                basic(BasicAuthentication)
-            }
-            credentials {
-                // Do not change the username below.
-                // This should always be `mapbox` (not your username).
-                username = 'mapbox'
-                // Use the secret token you stored in gradle.properties as the password
-                password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-            }
-        }
-        // ...even more repos?
-    }
-}
-```
-
-Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/main/example/android/build.gradle) for inspiration!
-
-<br>
-
----
-
-<br>
+If you see `2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs` issue see [possible workaround](#workaround-for-2-files-found-with-path-libarm64-v8alibc_sharedso-from-inputs).
 
 
 ### Workaround for 2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mapbox.rctmgl">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.rnmapbox.rnmbx">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.java

@@ -0,0 +1,215 @@
+package com.rnmapbox.rnmbx;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.TurboReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.rnmapbox.rnmbx.components.camera.RNMBXCameraManager;
+
+import com.rnmapbox.rnmbx.components.annotation.RNMBXCalloutManager;
+import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationManager;
+import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewManager;
+import com.rnmapbox.rnmbx.components.images.RNMBXImageManager;
+import com.rnmapbox.rnmbx.components.images.RNMBXImagesManager;
+import com.rnmapbox.rnmbx.components.location.RNMBXNativeUserLocationManager;
+import com.rnmapbox.rnmbx.components.mapview.NativeMapViewModule;
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapViewManager;
+import com.rnmapbox.rnmbx.components.mapview.RNMBXAndroidTextureMapViewManager;
+import com.rnmapbox.rnmbx.components.styles.atmosphere.RNMBXAtmosphereManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXBackgroundLayerManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXCircleLayerManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSkyLayerManager;
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSymbolLayerManager;
+
+import com.rnmapbox.rnmbx.components.styles.light.RNMBXLightManager;
+import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrainManager;
+
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager;
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager;
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager;
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSourceManager;
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXVectorSourceManager;
+
+import com.rnmapbox.rnmbx.modules.RNMBXLogging;
+
+import com.rnmapbox.rnmbx.modules.RNMBXOfflineModule;
+import com.rnmapbox.rnmbx.modules.RNMBXSnapshotModule;
+import com.rnmapbox.rnmbx.modules.RNMBXLocationModule;
+
+import com.rnmapbox.rnmbx.modules.RNMBXModule;
+
+
+public class RNMBXPackage extends TurboReactPackage {
+
+    @Nullable
+    @Override
+    public NativeModule getModule(String s, ReactApplicationContext reactApplicationContext) {
+        switch (s) {
+            case RNMBXModule.REACT_CLASS:
+                return new RNMBXModule(reactApplicationContext);
+            case RNMBXLocationModule.REACT_CLASS:
+                return new RNMBXLocationModule(reactApplicationContext);
+            case RNMBXOfflineModule.REACT_CLASS:
+                return new RNMBXOfflineModule(reactApplicationContext);
+            case RNMBXSnapshotModule.REACT_CLASS:
+                return new RNMBXSnapshotModule(reactApplicationContext);
+            case RNMBXLogging.REACT_CLASS:
+                return new RNMBXLogging(reactApplicationContext);
+            case NativeMapViewModule.NAME:
+                return new NativeMapViewModule(reactApplicationContext);
+        }
+
+        return null;
+    }
+
+    @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 RNMBXCameraManager(reactApplicationContext));
+        managers.add(new RNMBXAndroidTextureMapViewManager(reactApplicationContext));
+        managers.add(new RNMBXMapViewManager(reactApplicationContext));
+
+        // annotations
+        managers.add(new RNMBXMarkerViewManager(reactApplicationContext));
+        managers.add(new RNMBXPointAnnotationManager(reactApplicationContext));
+        managers.add(new RNMBXCalloutManager());
+
+        managers.add(new RNMBXNativeUserLocationManager());
+
+        // sources
+        managers.add(new RNMBXVectorSourceManager(reactApplicationContext));
+        managers.add(new RNMBXShapeSourceManager(reactApplicationContext));
+        managers.add(new RNMBXRasterDemSourceManager(reactApplicationContext));
+        managers.add(new RNMBXRasterSourceManager(reactApplicationContext));
+        managers.add(new RNMBXImageSourceManager());
+
+        // images
+        managers.add(new RNMBXImagesManager(reactApplicationContext));
+        managers.add(new RNMBXImageManager(reactApplicationContext));
+
+        // layers
+        managers.add(new RNMBXFillLayerManager());
+        managers.add(new RNMBXFillExtrusionLayerManager());
+        managers.add(new RNMBXHeatmapLayerManager());
+ 
+        managers.add(new RNMBXLineLayerManager());
+        managers.add(new RNMBXCircleLayerManager());
+        managers.add(new RNMBXSymbolLayerManager());   
+        managers.add(new RNMBXRasterLayerManager());
+        managers.add(new RNMBXSkyLayerManager());
+        managers.add(new RNMBXTerrainManager());
+        managers.add(new RNMBXAtmosphereManager());
+        managers.add(new RNMBXBackgroundLayerManager());
+
+        managers.add(new RNMBXLightManager());
+
+        return managers;
+    }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return () -> {
+            final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+            boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+
+            moduleInfos.put(
+                    RNMBXModule.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RNMBXModule.REACT_CLASS,
+                            RNMBXModule.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    RNMBXLocationModule.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RNMBXLocationModule.REACT_CLASS,
+                            RNMBXLocationModule.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    RNMBXOfflineModule.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RNMBXOfflineModule.REACT_CLASS,
+                            RNMBXOfflineModule.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    RNMBXSnapshotModule.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RNMBXSnapshotModule.REACT_CLASS,
+                            RNMBXSnapshotModule.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    RNMBXLogging.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RNMBXLogging.REACT_CLASS,
+                            RNMBXLogging.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    NativeMapViewModule.NAME,
+                    new ReactModuleInfo(
+                            NativeMapViewModule.NAME,
+                            NativeMapViewModule.NAME,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            false, // hasConstants
+                            false, // isCxxModule
+                            isTurboModule // isTurboModule
+                    ));
+
+            return moduleInfos;
+        };
+    }
+}

package/android/src/main/{java-mapboxgl/common/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/AbstractEvent.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components;
+package com.rnmapbox.rnmbx.components;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/AbstractEventEmitter.kt

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components
+package com.rnmapbox.rnmbx.components
 
 import android.app.Activity
 import android.view.ViewGroup
@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.events.EventDispatcher
-import com.mapbox.rctmgl.events.IEvent
+import com.rnmapbox.rnmbx.events.IEvent
 
 /**
  * Created by nickitaliano on 8/23/17.

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/AbstractMapFeature.kt

@@ -1,8 +1,8 @@
-package com.mapbox.rctmgl.components
+package com.rnmapbox.rnmbx.components
 
 import android.content.Context
 import com.facebook.react.views.view.ReactViewGroup
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 
 enum class RemovalReason {
     VIEW_REMOVAL,
@@ -12,22 +12,22 @@ enum class RemovalReason {
 }
 
 abstract class AbstractMapFeature(context: Context?) : ReactViewGroup(context) {
-    protected var mMapView: RCTMGLMapView? = null;
-    private var mWithMapViewCallbacks: Array<((RCTMGLMapView) -> Unit)>? = null;
+    protected var mMapView: RNMBXMapView? = null;
+    private var mWithMapViewCallbacks: Array<((RNMBXMapView) -> Unit)>? = null;
 
-    open fun addToMap(mapView: RCTMGLMapView) {
+    open fun addToMap(mapView: RNMBXMapView) {
         mMapView = mapView;
         mWithMapViewCallbacks?.forEach { it(mapView) }
         mWithMapViewCallbacks = null;
     }
 
     // return false if you don not want to remove this feature based on reason
-    open fun removeFromMap(mapView: RCTMGLMapView,reason: RemovalReason) : Boolean {
+    open fun removeFromMap(mapView: RNMBXMapView,reason: RemovalReason) : Boolean {
         mMapView = null;
         return true;
     }
 
-    internal fun withMapView(callback: (mapView: RCTMGLMapView) -> Unit) {
+    internal fun withMapView(callback: (mapView: RNMBXMapView) -> Unit) {
         val mapView = mMapView;
         if (mapView == null) {
             val callbacks = mWithMapViewCallbacks ?: arrayOf();

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXCallout.kt

@@ -0,0 +1,6 @@
+package com.rnmapbox.rnmbx.components.annotation
+
+import android.content.Context
+import com.facebook.react.views.view.ReactViewGroup
+
+class RNMBXCallout(context: Context?) : ReactViewGroup(context)

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXCalloutManager.java

@@ -0,0 +1,18 @@
+package com.rnmapbox.rnmbx.components.annotation;
+
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+
+public class RNMBXCalloutManager extends ViewGroupManager<RNMBXCallout> {
+    public static final String REACT_CLASS = "RNMBXCallout";
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    protected RNMBXCallout createViewInstance(ThemedReactContext reactContext) {
+        return new RNMBXCallout(reactContext);
+    }
+}