@maplibre/maplibre-react-native 10.0.0-beta.2 → 10.0.0-beta.21

package/README.md

@@ -1,13 +1,13 @@
 [![MapLibre Logo](https://maplibre.org/img/maplibre-logo-big.svg)](https://maplibre.org)
 
 # MapLibre React Native
-[![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE.md)
-[![Version](https://img.shields.io/npm/v/@maplibre/maplibre-react-native)](https://www.npmjs.com/package/@maplibre/maplibre-react-native)
-[![Actions](https://img.shields.io/github/actions/workflow/status/maplibre/maplibre-react-native/review.yml?label=Actions
-)](https://github.com/maplibre/maplibre-react-native/actions/workflows/review.yml)
 
+[![License](https://img.shields.io/badge/License-MIT-blue.svg)](/LICENSE.md)
+[![Version](https://img.shields.io/npm/v/@maplibre/maplibre-react-native)](https://www.npmjs.com/package/@maplibre/maplibre-react-native)
+[![Actions](https://img.shields.io/github/actions/workflow/status/maplibre/maplibre-react-native/review.yml?label=Actions)](https://github.com/maplibre/maplibre-react-native/actions/workflows/review.yml)
 
-_React Native library for creating maps with [MapLibre Native for Android & iOS](https://github.com/maplibre/maplibre-gl-native)_.
+_React Native library for creating maps
+with [MapLibre Native for Android & iOS](https://github.com/maplibre/maplibre-gl-native)._
 
 This project originated as a fork of [rnmapbox](https://github.com/rnmapbox/maps), a community-maintained
 React Native library for building maps with the Mapbox iOS and Android mobile SDKs. The original product
@@ -15,69 +15,25 @@ supported both Mapbox and MapLibre for some time, but as the MapLibre and Mapbox
 diverged, it has become necessary to separate the projects into specific wrappers by underlying renderer.
 
 <p align="center">
-    <img src="/docs/assets/device-android.png"
+    <img src="/docs/static/screenshots/index/device-android.png"
          alt="Indoor Building Map Android"
-         height="480"
+         height="320"
           />
-    <img src="/docs/assets/device-ios.png"
+    <img src="/docs/static/screenshots/index/device-ios.png"
          alt="Indoor Building Map iOS"
-         height="480"
+         height="320"
           />
 </p>
 
 ## Documentation
 
-- [Getting Started](/docs/guides/setup/GettingStarted.md)
-- Installation
-  - React Native  
-    - [Android](/docs/guides/setup/Android.md)
-    - [iOS](/docs/guides/setup/iOS.md)
-  - [Expo](/docs/guides/setup/Expo.md)
-
-### Components
-
-- [MapView](/docs/components/MapView.md)
-- [Light](/docs/components/Light.md)
-- [PointAnnotation](/docs/components/PointAnnotation.md)
-- [MarkerView](/docs/components/MarkerView.md)
-- [Callout](/docs/components/Callout.md)
-- [Camera](docs/components/Camera.md)
-- [UserLocation](docs/components/UserLocation.md)
-- [Images](docs/components/Images.md)
-
-### Sources
-
-- [VectorSource](/docs/components/VectorSource.md)
-- [ShapeSource](/docs/components/ShapeSource.md)
-- [RasterSource](/docs/components/RasterSource.md)
-
-### Layers
-
-- [BackgroundLayer](/docs/components/BackgroundLayer.md)
-- [CircleLayer](/docs/components/CircleLayer.md)
-- [FillExtrusionLayer](/docs/components/FillExtrusionLayer.md)
-- [FillLayer](/docs/components/FillLayer.md)
-- [LineLayer](/docs/components/LineLayer.md)
-- [RasterLayer](/docs/components/RasterLayer.md)
-- [SymbolLayer](/docs/components/SymbolLayer.md)
-- [HeatmapLayer](/docs/components/HeatmapLayer.md)
-
-### Modules
-
-- [OfflineManager](/docs/modules/offlineManager.md)
-- [SnapshotManager](/docs/modules/snapshotManager.md)
-
-### Misc
-
-- [MapLibreGL](/docs/guides/MapLibreGL.md)
-- [Custom HTTP Headers](/docs/guides/CustomHTTPHeaders.md)
-- [Logger](/docs/guides/Logger.md)
+https://maplibre.org/maplibre-react-native/
 
 ## Contributing & Development
 
-Read the [CONTRIBUTING.md](CONTRIBUTING.md) guide in order to get familiar with how we do things around here and
+Read the [CONTRIBUTING](/CONTRIBUTING.md) guide in order to get familiar with how we do things around here and
 set up your local development environment.
 
 ## Community
 
-Join the `#maplibre-react-native` or `#maplibre` [Slack channels at OSMUS](https://slack.openstreetmap.us/).
+Join the [`#maplibre-react-native`](https://osmus.slack.com/archives/C065DB4T2UB) or [`#maplibre`](https://osmus.slack.com/archives/C01G3D28DAB) [on the Open Street Map Slack](https://slack.openstreetmap.us/).

package/android/build.gradle

@@ -1,69 +1,139 @@
-apply plugin: 'com.android.library'
+buildscript {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["org.maplibre.reactnative.kotlinVersion"]
+
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
+}
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
 def isNewArchitectureEnabled() {
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
-buildscript {
-    ext {
-        buildToolsVersion = "33.0.0"
-        minSdkVersion = 16
-        compileSdkVersion = 34
-        targetSdkVersion = 33
-        supportLibVersion = "28.0.0"
-    }
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
-    repositories {
-        google()
-        mavenCentral()
-    }
+// TODO: Currently breaks new arch support, but works without
+// if (isNewArchitectureEnabled()) {
+//   apply plugin: "com.facebook.react"
+// }
+
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["org.maplibre.reactnative." + name]
+}
+
+def getConfigurableExtOrDefault(name) {
+    return rootProject.ext.has("org.maplibre.reactnative." + name) ? rootProject.ext.get("org.maplibre.reactnative." + name) : project.properties["org.maplibre.reactnative." + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["org.maplibre.reactnative." + name]).toInteger()
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
 }
 
 android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 33)
-    buildToolsVersion safeExtGet("buildToolsVersion", '33.0.1')
-
-    defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 26)
-        versionCode 1
-        versionName "1.0"
-        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
+  if (supportsNamespace()) {
+    namespace "org.maplibre.reactnative"
+
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
     }
+  }
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+  sourceSets {
+    main {
+      java.srcDirs = ['src/main/java']
+
+      if (getConfigurableExtOrDefault("locationEngine") == "default") {
+        java.srcDirs += 'src/main/location-engine-default'
+      } else if (getConfigurableExtOrDefault("locationEngine") == "google") {
+        java.srcDirs += 'src/main/location-engine-google'
+      } else {
+        throw new GradleException("org.maplibre.reactnative.locationEngine.locationEngine should be one of [\"default\", \"google\"]`. \"${getConfigurableExtOrDefault("locationEngine")}\" was provided.")
+      }
     }
+  }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
+repositories {
+  mavenCentral()
+  google()
+}
+
+def kotlin_version = getExtOrDefault("kotlinVersion")
+
 dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-
-    // MapLibre SDK
-    implementation "org.maplibre.gl:android-sdk:11.5.0"
-    implementation "org.maplibre.gl:android-sdk-turf:6.0.1"
-
-    // Dependencies
-    implementation "androidx.vectordrawable:vectordrawable:1.1.0"
-    implementation "androidx.annotation:annotation:1.7.0"
-    implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "com.squareup.okhttp3:okhttp:${safeExtGet('okhttpVersion', '4.9.0')}"
-    implementation "com.squareup.okhttp3:okhttp-urlconnection:${safeExtGet('okhttpVersion', '4.9.0')}"
-
-    // MapLibre plugins
-    implementation ("org.maplibre.gl:android-plugin-localization-v9:3.0.1")
-    implementation ("org.maplibre.gl:android-plugin-annotation-v9:3.0.1")
-    implementation ("org.maplibre.gl:android-plugin-markerview-v9:3.0.1")
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+  // MapLibre Native
+  implementation "org.maplibre.gl:android-sdk:${getConfigurableExtOrDefault('nativeVersion')}"
+
+  // MapLibre Plugins
+  implementation "org.maplibre.gl:android-plugin-localization-v9:${getConfigurableExtOrDefault('pluginVersion')}"
+  implementation "org.maplibre.gl:android-plugin-annotation-v9:${getConfigurableExtOrDefault('pluginVersion')}"
+  implementation "org.maplibre.gl:android-plugin-markerview-v9:${getConfigurableExtOrDefault('pluginVersion')}"
+
+  // Dependencies
+  implementation "org.maplibre.gl:android-sdk-turf:${getConfigurableExtOrDefault('turfVersion')}"
+  implementation "com.squareup.okhttp3:okhttp:${getConfigurableExtOrDefault('okhttpVersion')}"
+  implementation "com.squareup.okhttp3:okhttp-urlconnection:${getConfigurableExtOrDefault('okhttpVersion')}"
+  implementation "androidx.vectordrawable:vectordrawable:1.1.0"
+  implementation "androidx.annotation:annotation:1.7.0"
+  implementation "androidx.appcompat:appcompat:1.6.1"
+
+  // Dependencies for Google Location Engine
+  if (getConfigurableExtOrDefault("locationEngine") == "google") {
+    implementation "com.google.android.gms:play-services-location:${getConfigurableExtOrDefault('googlePlayServicesLocationVersion')}"
+  }
 }

package/android/gradle.properties

@@ -0,0 +1,15 @@
+org.maplibre.reactnative.kotlinVersion=1.7.0
+org.maplibre.reactnative.minSdkVersion=21
+org.maplibre.reactnative.targetSdkVersion=31
+org.maplibre.reactnative.compileSdkVersion=31
+org.maplibre.reactnative.ndkVersion=21.4.7075529
+
+# MapLibre React Native
+org.maplibre.reactnative.nativeVersion=11.8.0
+org.maplibre.reactnative.pluginVersion=3.0.2
+org.maplibre.reactnative.turfVersion=6.0.1
+org.maplibre.reactnative.okhttpVersion=4.9.0
+# Available values: default, google
+org.maplibre.reactnative.locationEngine=default
+# Only applied if locationEngine=google
+org.maplibre.reactnative.googlePlayServicesLocationVersion=21.3.0

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.maplibre.reactnative">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.maplibre.reactnative">
+
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 </manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+</manifest>

package/android/src/main/java/org/maplibre/reactnative/MLRNPackage.java

@@ -52,11 +52,6 @@ public class MLRNPackage implements ReactPackage {
         return modules;
     }
 
-    @Deprecated
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
         List<ViewManager> managers = new ArrayList<>();

package/android/src/main/java/org/maplibre/reactnative/components/camera/MLRNCamera.java

@@ -2,6 +2,7 @@ package org.maplibre.reactnative.components.camera;
 
 import android.content.Context;
 import android.location.Location;
+import android.util.Log;
 
 import org.maplibre.android.camera.CameraPosition;
 import org.maplibre.android.camera.CameraUpdate;
@@ -11,13 +12,9 @@ import org.maplibre.android.geometry.LatLngBounds;
 import org.maplibre.android.geometry.VisibleRegion;
 import org.maplibre.android.location.OnCameraTrackingChangedListener;
 import org.maplibre.android.location.modes.CameraMode;
-import org.maplibre.android.location.modes.RenderMode;
 import org.maplibre.android.maps.MapLibreMap;
 import org.maplibre.android.maps.Style;
-import org.maplibre.android.location.LocationComponent;
-import org.maplibre.android.location.LocationComponentOptions;
-import org.maplibre.android.location.LocationComponentActivationOptions;
-// import org.maplibre.android.plugins.locationlayer.LocationLayerPlugin;
+
 import org.maplibre.reactnative.components.AbstractMapFeature;
 import org.maplibre.reactnative.components.location.LocationComponentManager;
 import org.maplibre.reactnative.components.mapview.MLRNMapView;
@@ -31,8 +28,6 @@ import org.maplibre.reactnative.location.UserTrackingMode;
 import org.maplibre.reactnative.location.UserTrackingState;
 import org.maplibre.reactnative.utils.GeoJSONUtils;
 
-import org.maplibre.reactnative.R;
-
 import org.maplibre.reactnative.events.constants.EventTypes;
 
 import com.facebook.react.bridge.WritableMap;
@@ -87,12 +82,12 @@ public class MLRNCamera extends AbstractMapFeature {
     private LocationManager.OnUserLocationChange mLocationChangeListener = new LocationManager.OnUserLocationChange() {
         @Override
         public void onLocationChange(Location nextLocation) {
-        if (getMapboxMap() == null || mLocationComponentManager == null || !mLocationComponentManager.hasLocationComponent() || (!mFollowUserLocation)) {
-            return;
-        }
+            if (getMapboxMap() == null || mLocationComponentManager == null || !mLocationComponentManager.hasLocationComponent() || (!mFollowUserLocation)) {
+                return;
+            }
 
-        mUserLocation.setCurrentLocation(nextLocation);
-        sendUserLocationUpdateEvent(nextLocation);
+            mUserLocation.setCurrentLocation(nextLocation);
+            sendUserLocationUpdateEvent(nextLocation);
         }
     };
 
@@ -236,12 +231,7 @@ public class MLRNCamera extends AbstractMapFeature {
             }
         }
 
-        return new CameraPosition.Builder()
-                .target(center)
-                .bearing(getDirectionForUserLocationUpdate())
-                .tilt(mPitch)
-                .zoom(zoomLevel)
-                .build();
+        return new CameraPosition.Builder().target(center).bearing(getDirectionForUserLocationUpdate()).tilt(mPitch).zoom(zoomLevel).build();
     }
 
     private double getDirectionForUserLocationUpdate() {
@@ -260,7 +250,7 @@ public class MLRNCamera extends AbstractMapFeature {
     }
 
     private void sendUserLocationUpdateEvent(Location location) {
-        if(location == null){
+        if (location == null) {
             return;
         }
         IEvent event = new MapChangeEvent(this, EventTypes.USER_LOCATION_UPDATED, makeLocationChangePayload(location));
@@ -376,37 +366,38 @@ public class MLRNCamera extends AbstractMapFeature {
         }
 
         mLocationComponentManager.update(style);
-
-        if (mFollowUserLocation) {
-            mLocationComponentManager.setCameraMode(UserTrackingMode.getCameraMode(mUserTrackingMode));
-        }
         mLocationComponentManager.setFollowUserLocation(mFollowUserLocation);
 
         if (mFollowUserLocation) {
             mLocationComponentManager.setCameraMode(UserTrackingMode.getCameraMode(mUserTrackingMode));
             mLocationComponentManager.addOnCameraTrackingChangedListener(new OnCameraTrackingChangedListener() {
-                    @Override public void onCameraTrackingChanged(int currentMode) {
-                        int userTrackingMode = UserTrackingMode.NONE;
-                        switch (currentMode) {
-                            case CameraMode.NONE:
-                                userTrackingMode = UserTrackingMode.NONE;
-                                break;
-                            case CameraMode.TRACKING:
-                                userTrackingMode = UserTrackingMode.FOLLOW;
-                                break;
-                            case CameraMode.TRACKING_COMPASS:
-                                userTrackingMode = UserTrackingMode.FollowWithHeading;
-                                break;
-                            case CameraMode.TRACKING_GPS:
-                                userTrackingMode = UserTrackingMode.FollowWithCourse;
-                                break;
-                            default:
-                                userTrackingMode = UserTrackingMode.NONE;
-                        }
-                        updateUserTrackingMode(userTrackingMode);
-                    }
-                    @Override public void onCameraTrackingDismissed() {
+                @Override
+                public void onCameraTrackingChanged(int currentMode) {
+                    int userTrackingMode;
+
+                    switch (currentMode) {
+                        case CameraMode.NONE:
+                            userTrackingMode = UserTrackingMode.NONE;
+                            break;
+                        case CameraMode.TRACKING:
+                            userTrackingMode = UserTrackingMode.FOLLOW;
+                            break;
+                        case CameraMode.TRACKING_COMPASS:
+                            userTrackingMode = UserTrackingMode.FollowWithHeading;
+                            break;
+                        case CameraMode.TRACKING_GPS:
+                            userTrackingMode = UserTrackingMode.FollowWithCourse;
+                            break;
+                        default:
+                            userTrackingMode = UserTrackingMode.NONE;
                     }
+
+                    updateUserTrackingMode(userTrackingMode);
+                }
+
+                @Override
+                public void onCameraTrackingDismissed() {
+                }
             });
         } else {
             mLocationComponentManager.setCameraMode(CameraMode.NONE);
@@ -429,10 +420,7 @@ public class MLRNCamera extends AbstractMapFeature {
     }
 
     private CameraPosition buildCamera(CameraPosition previousPosition, boolean shouldUpdateTarget) {
-        CameraPosition.Builder builder = new CameraPosition.Builder(previousPosition)
-                .bearing(mHeading)
-                .tilt(mPitch)
-                .zoom(mZoomLevel);
+        CameraPosition.Builder builder = new CameraPosition.Builder(previousPosition).bearing(mHeading).tilt(mPitch).zoom(mZoomLevel);
 
         if (shouldUpdateTarget) {
             builder.target(GeoJSONUtils.toLatLng(mCenterCoordinate));
@@ -507,6 +495,7 @@ public class MLRNCamera extends AbstractMapFeature {
     /**
      * Create a payload of the location data per the web api geolocation spec
      * https://dev.w3.org/geo/api/spec-source.html#position
+     *
      * @return
      */
     private WritableMap makeLocationChangePayload(Location location) {

package/android/src/main/java/org/maplibre/reactnative/components/location/LocationComponentManager.java

@@ -46,6 +46,8 @@ public class LocationComponentManager {
 
     private boolean mShowingUserLocation = false;
 
+    private OnCameraTrackingChangedListener mOnCameraTrackingChangedListener = null;
+
     public void showUserLocation(boolean showUserLocation) {
         mShowUserLocation = showUserLocation;
         stateChanged();
@@ -68,16 +70,21 @@ public class LocationComponentManager {
     }
 
     public void setPreferredFramesPerSecond(int preferredFramesPerSecond) {
-       if(mLocationComponent == null || preferredFramesPerSecond <= 0) {
+        if (mLocationComponent == null || preferredFramesPerSecond <= 0) {
             return;
-       }
+        }
 
         mLocationComponent.setMaxAnimationFps(preferredFramesPerSecond);
     }
 
-
     public void addOnCameraTrackingChangedListener(OnCameraTrackingChangedListener onCameraTrackingChangedListener) {
-        mLocationComponent.addOnCameraTrackingChangedListener(onCameraTrackingChangedListener);
+        if (mOnCameraTrackingChangedListener != null) {
+            mLocationComponent.removeOnCameraTrackingChangedListener(mOnCameraTrackingChangedListener);
+        }
+
+        mOnCameraTrackingChangedListener = onCameraTrackingChangedListener;
+
+        mLocationComponent.addOnCameraTrackingChangedListener(mOnCameraTrackingChangedListener);
     }
 
     @SuppressLint("MissingPermission")
@@ -111,7 +118,7 @@ public class LocationComponentManager {
     public void update(boolean displayUserLocation, @NonNull Style style) {
         Integer tintColor = mMapView.getTintColor();
 
-        if (mLocationComponent == null || tintColor != null ) {
+        if (mLocationComponent == null || tintColor != null) {
             mLocationComponent = mMap.getLocationComponent();
 
             LocationComponentActivationOptions locationComponentActivationOptions = LocationComponentActivationOptions
@@ -148,10 +155,10 @@ public class LocationComponentManager {
                     .accuracyAlpha(0.0f);
         } else if (tintColor != null) {
             builder = builder
-                .enableStaleState(false)
-                .bearingTintColor(tintColor)
-                .foregroundTintColor(tintColor)
-                .accuracyColor(tintColor);
+                    .enableStaleState(false)
+                    .bearingTintColor(tintColor)
+                    .foregroundTintColor(tintColor)
+                    .accuracyColor(tintColor);
         }
         return builder.build();
     }

package/android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNMapView.java

@@ -8,7 +8,6 @@ import android.graphics.RectF;
 import android.location.Location;
 import android.os.Handler;
 import androidx.annotation.NonNull;
-import androidx.annotation.UiThread;
 
 import android.util.DisplayMetrics;
 import android.util.Pair;
@@ -53,7 +52,6 @@ import org.maplibre.reactnative.R;
 import org.maplibre.reactnative.components.AbstractMapFeature;
 import org.maplibre.reactnative.components.annotation.MLRNPointAnnotation;
 import org.maplibre.reactnative.components.annotation.MLRNMarkerView;
-import org.maplibre.reactnative.components.annotation.MarkerView;
 import org.maplibre.reactnative.components.annotation.MarkerViewManager;
 import org.maplibre.reactnative.components.camera.MLRNCamera;
 import org.maplibre.reactnative.components.images.MLRNImages;
@@ -69,6 +67,7 @@ import org.maplibre.reactnative.events.IEvent;
 import org.maplibre.reactnative.events.MapChangeEvent;
 import org.maplibre.reactnative.events.MapClickEvent;
 import org.maplibre.reactnative.events.constants.EventTypes;
+import org.maplibre.reactnative.modules.MLRNModule;
 import org.maplibre.reactnative.utils.BitmapUtils;
 import org.maplibre.reactnative.utils.GeoJSONUtils;
 import org.maplibre.reactnative.utils.GeoViewport;
@@ -85,7 +84,6 @@ import org.json.*;
 import javax.annotation.Nullable;
 
 import static org.maplibre.android.style.layers.PropertyFactory.visibility;
-import static org.maplibre.reactnative.modules.MLRNOfflineModule.DEFAULT_STYLE_URL;
 
 @SuppressWarnings({ "MissingPermission" })
 public class MLRNMapView extends MapView implements OnMapReadyCallback, MapLibreMap.OnMapClickListener,
@@ -117,7 +115,7 @@ public class MLRNMapView extends MapView implements OnMapReadyCallback, MapLibre
 
     private LocalizationPlugin mLocalizationPlugin;
 
-    private String mStyleURL;
+    private String mMapStyle;
 
     private Integer mPreferredFramesPerSecond;
     private boolean mLocalizeLabels;
@@ -171,7 +169,7 @@ public class MLRNMapView extends MapView implements OnMapReadyCallback, MapLibre
 
         mHandler = new Handler();
 
-        mStyleURL = DEFAULT_STYLE_URL;
+        mMapStyle = MLRNModule.DEFAULT_STYLE_URL;
 
         setLifecycleListeners();
 
@@ -436,10 +434,10 @@ public class MLRNMapView extends MapView implements OnMapReadyCallback, MapLibre
     public void onMapReady(final MapLibreMap mapboxMap) {
         mMap = mapboxMap;
 
-        if (isJSONValid(mStyleURL)) {
-            mMap.setStyle(new Style.Builder().fromJson(mStyleURL));
+        if (isJSONValid(mMapStyle)) {
+            mMap.setStyle(new Style.Builder().fromJson(mMapStyle));
         } else {
-            mMap.setStyle(new Style.Builder().fromUri(mStyleURL));
+            mMap.setStyle(new Style.Builder().fromUri(mMapStyle));
         }
 
         reflow();
@@ -776,21 +774,21 @@ public class MLRNMapView extends MapView implements OnMapReadyCallback, MapLibre
         return mContext.getResources().getDisplayMetrics().density;
     }
 
-    public void setReactStyleURL(String styleURL) {
-        mStyleURL = styleURL;
+    public void setReactMapStyle(String mapStyle) {
+        mMapStyle = mapStyle;
 
         if (mMap != null) {
             removeAllSourcesFromMap();
 
-            if (isJSONValid(mStyleURL)) {
-                mMap.setStyle(new Style.Builder().fromJson(mStyleURL), new Style.OnStyleLoaded() {
+            if (isJSONValid(mMapStyle)) {
+                mMap.setStyle(new Style.Builder().fromJson(mMapStyle), new Style.OnStyleLoaded() {
                     @Override
                     public void onStyleLoaded(@NonNull Style style) {
                         addAllSourcesToMap();
                     }
                 });
             } else {
-                mMap.setStyle(styleURL, new Style.OnStyleLoaded() {
+                mMap.setStyle(mapStyle, new Style.OnStyleLoaded() {
                     @Override
                     public void onStyleLoaded(@NonNull Style style) {
                         addAllSourcesToMap();