@maplibre/maplibre-react-native 10.0.0-alpha.2 → 10.0.0-alpha.4

package/.eslintrc.js

@@ -41,7 +41,7 @@ module.exports = {
     'plugin:react/recommended',
     'plugin:jest/recommended',
     'prettier',
-    '@react-native-community',
+    '@react-native',
   ],
   rules: {
     'react/no-deprecated': 'warn',
@@ -144,7 +144,7 @@ module.exports = {
       // =================================
       extends: [
         'plugin:@typescript-eslint/recommended',
-        '@react-native-community',
+        '@react-native',
         'eslint:recommended',
         'plugin:react/recommended',
         'prettier',
@@ -156,6 +156,7 @@ module.exports = {
         '@typescript-eslint/explicit-function-return-type': ['error'],
         '@typescript-eslint/explicit-module-boundary-types': ['error'],
         '@typescript-eslint/no-unused-vars': ['error'],
+        '@typescript-eslint/no-explicit-any': 'off',
         'no-unused-vars': 'off',
         'no-use-before-define': 'off',
         '@typescript-eslint/no-use-before-define': ['warn'],

package/.sonarcloud.properties

@@ -1,5 +1,5 @@
 # Path to sources
-sonar.sources=javascript,android/src,ios/RCTMGL
+sonar.sources=javascript,android/src,ios/RCTMLN
 #sonar.exclusions=
 #sonar.inclusions=
 

package/.yarn/sdks/eslint/lib/unsupported-api.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require eslint/use-at-your-own-risk
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real eslint/use-at-your-own-risk your application uses
+module.exports = absRequire(`eslint/use-at-your-own-risk`);

package/.yarn/sdks/eslint/package.json

@@ -1,6 +1,14 @@
 {
   "name": "eslint",
-  "version": "8.30.0-sdk",
+  "version": "8.56.0-sdk",
   "main": "./lib/api.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "eslint": "./bin/eslint.js"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./lib/api.js",
+    "./use-at-your-own-risk": "./lib/unsupported-api.js"
+  }
 }

package/.yarn/sdks/prettier/bin/prettier.cjs

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require prettier/bin/prettier.cjs
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real prettier/bin/prettier.cjs your application uses
+module.exports = absRequire(`prettier/bin/prettier.cjs`);

package/.yarn/sdks/prettier/package.json

@@ -1,6 +1,7 @@
 {
   "name": "prettier",
-  "version": "2.8.1-sdk",
-  "main": "./index.js",
-  "type": "commonjs"
+  "version": "3.2.5-sdk",
+  "main": "./index.cjs",
+  "type": "commonjs",
+  "bin": "./bin/prettier.cjs"
 }

package/.yarn/sdks/typescript/lib/typescript.js

@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/typescript.js
+    // Setup the environment to be able to require typescript
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real typescript/lib/typescript.js your application uses
-module.exports = absRequire(`typescript/lib/typescript.js`);
+// Defer to the real typescript your application uses
+module.exports = absRequire(`typescript`);

package/.yarn/sdks/typescript/package.json

@@ -1,6 +1,10 @@
 {
   "name": "typescript",
-  "version": "4.9.4-sdk",
+  "version": "5.3.3-sdk",
   "main": "./lib/typescript.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "tsc": "./bin/tsc",
+    "tsserver": "./bin/tsserver"
+  }
 }

package/CHANGELOG.md

@@ -5,6 +5,15 @@ Please add unreleased changes in the following style:
 PR Title ([#123](link to my pr))
 ```
 
+## 10.0.0-alpha.4
+Update maplibre-native to use [new metal renderer on iOS](https://github.com/maplibre/maplibre-native/releases/tag/ios-v6.4.0)
+
+## 10.0.0-alpha.3
+
+Fix: Remove unused import breaking react-native 0.74.0 ([#365](https://github.com/maplibre/maplibre-react-native/pull/365))
+chore: resolve remaining dependabot ([#298](https://github.com/maplibre/maplibre-react-native/pull/298))
+chore: update dev dependencies ([#262](https://github.com/maplibre/maplibre-react-native/pull/262))
+
 ## 10.0.0-alpha.2
 
 Fix: Duplicated Signature issue with Xcode 15 ([#238](https://github.com/maplibre/maplibre-react-native/pull/238))

package/android/{rctmgl → rctmln}/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.maplibre.rctmln">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 </manifest>

package/android/rctmln/src/main/java/com/maplibre/rctmln/RCTMLNPackage.java

@@ -0,0 +1,99 @@
+package com.maplibre.rctmln;
+
+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.maplibre.rctmln.components.annotation.RCTMLNCalloutManager;
+import com.maplibre.rctmln.components.annotation.RCTMLNPointAnnotationManager;
+import com.maplibre.rctmln.components.annotation.RCTMLNMarkerViewManager;
+import com.maplibre.rctmln.components.camera.RCTMLNCameraManager;
+import com.maplibre.rctmln.components.images.RCTMLNImagesManager;
+import com.maplibre.rctmln.components.location.RCTMLNNativeUserLocationManager;
+import com.maplibre.rctmln.components.mapview.RCTMLNMapViewManager;
+import com.maplibre.rctmln.components.mapview.RCTMLNAndroidTextureMapViewManager;
+import com.maplibre.rctmln.components.styles.layers.RCTMLNBackgroundLayerManager;
+import com.maplibre.rctmln.components.styles.layers.RCTMLNCircleLayerManager;
+import com.maplibre.rctmln.components.styles.layers.RCTMLNFillExtrusionLayerManager;
+import com.maplibre.rctmln.components.styles.layers.RCTMLNFillLayerManager;
+import com.maplibre.rctmln.components.styles.layers.RCTMLNHeatmapLayerManager;
+import com.maplibre.rctmln.components.styles.layers.RCTMLNLineLayerManager;
+import com.maplibre.rctmln.components.styles.layers.RCTMLNRasterLayerManager;
+import com.maplibre.rctmln.components.styles.layers.RCTMLNSymbolLayerManager;
+import com.maplibre.rctmln.components.styles.light.RCTMLNLightManager;
+import com.maplibre.rctmln.components.styles.sources.RCTMLNImageSourceManager;
+import com.maplibre.rctmln.components.styles.sources.RCTMLNRasterSourceManager;
+import com.maplibre.rctmln.components.styles.sources.RCTMLNShapeSourceManager;
+import com.maplibre.rctmln.components.styles.sources.RCTMLNVectorSourceManager;
+import com.maplibre.rctmln.modules.RCTMLNLocationModule;
+import com.maplibre.rctmln.modules.RCTMLNLogging;
+import com.maplibre.rctmln.modules.RCTMLNModule;
+import com.maplibre.rctmln.modules.RCTMLNOfflineModule;
+import com.maplibre.rctmln.modules.RCTMLNSnapshotModule;
+
+/**
+ * Created by nickitaliano on 8/18/17.
+ */
+
+public class RCTMLNPackage implements ReactPackage {
+
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
+        List<NativeModule> modules = new ArrayList<>();
+
+        modules.add(new RCTMLNModule(reactApplicationContext));
+        modules.add(new RCTMLNOfflineModule(reactApplicationContext));
+        modules.add(new RCTMLNSnapshotModule(reactApplicationContext));
+        modules.add(new RCTMLNLocationModule(reactApplicationContext));
+        modules.add(new RCTMLNLogging(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 RCTMLNCameraManager(reactApplicationContext));
+        managers.add(new RCTMLNMapViewManager(reactApplicationContext));
+        managers.add(new RCTMLNMarkerViewManager(reactApplicationContext));
+        managers.add(new RCTMLNAndroidTextureMapViewManager(reactApplicationContext));
+        managers.add(new RCTMLNLightManager());
+        managers.add(new RCTMLNPointAnnotationManager(reactApplicationContext));
+        managers.add(new RCTMLNCalloutManager());
+        managers.add(new RCTMLNNativeUserLocationManager());
+
+        // sources
+        managers.add(new RCTMLNVectorSourceManager(reactApplicationContext));
+        managers.add(new RCTMLNShapeSourceManager(reactApplicationContext));
+        managers.add(new RCTMLNRasterSourceManager(reactApplicationContext));
+        managers.add(new RCTMLNImageSourceManager());
+
+        // images
+        managers.add(new RCTMLNImagesManager(reactApplicationContext));
+
+        // layers
+        managers.add(new RCTMLNFillLayerManager());
+        managers.add(new RCTMLNFillExtrusionLayerManager());
+        managers.add(new RCTMLNHeatmapLayerManager());
+        managers.add(new RCTMLNLineLayerManager());
+        managers.add(new RCTMLNCircleLayerManager());
+        managers.add(new RCTMLNSymbolLayerManager());
+        managers.add(new RCTMLNRasterLayerManager());
+        managers.add(new RCTMLNBackgroundLayerManager());
+
+        return managers;
+    }
+}

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl → rctmln/src/main/java/com/maplibre/rctmln}/components/AbstractEvent.java

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

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl → rctmln/src/main/java/com/maplibre/rctmln}/components/AbstractEventEmitter.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components;
+package com.maplibre.rctmln.components;
 
 import android.view.ViewGroup;
 
@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.events.EventDispatcher;
-import com.mapbox.rctmgl.events.IEvent;
+import com.maplibre.rctmln.events.IEvent;
 
 import java.util.HashMap;
 import java.util.Map;

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl → rctmln/src/main/java/com/maplibre/rctmln}/components/AbstractMapFeature.java

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

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl → rctmln/src/main/java/com/maplibre/rctmln}/components/annotation/MarkerView.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.annotation;
+package com.maplibre.rctmln.components.annotation;
 
 import android.view.View;
 

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl → rctmln/src/main/java/com/maplibre/rctmln}/components/annotation/MarkerViewManager.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.annotation;
+package com.maplibre.rctmln.components.annotation;
 
 import androidx.annotation.NonNull;
 

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLCallout.java → rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNCallout.java}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.annotation;
+package com.maplibre.rctmln.components.annotation;
 
 import android.content.Context;
 
@@ -8,8 +8,8 @@ import com.facebook.react.views.view.ReactViewGroup;
  * Created by nickitaliano on 10/11/17.
  */
 
-public class RCTMGLCallout extends ReactViewGroup {
-    public RCTMGLCallout(Context context) {
+public class RCTMLNCallout extends ReactViewGroup {
+    public RCTMLNCallout(Context context) {
         super(context);
     }
 }

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNCalloutManager.java

@@ -0,0 +1,22 @@
+package com.maplibre.rctmln.components.annotation;
+
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+
+/**
+ * Created by nickitaliano on 10/11/17.
+ */
+
+public class RCTMLNCalloutManager extends ViewGroupManager<RCTMLNCallout> {
+    public static final String REACT_CLASS = "RCTMLNCallout";
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    protected RCTMLNCallout createViewInstance(ThemedReactContext reactContext) {
+        return new RCTMLNCallout(reactContext);
+    }
+}

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerView.java → rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNMarkerView.java}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.annotation;
+package com.maplibre.rctmln.components.annotation;
 
 import android.content.Context;
 import android.graphics.PointF;
@@ -9,13 +9,13 @@ import androidx.annotation.NonNull;
 import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.rctmgl.components.AbstractMapFeature;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
+import com.maplibre.rctmln.components.AbstractMapFeature;
+import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
+import com.maplibre.rctmln.utils.GeoJSONUtils;
 
-public class RCTMGLMarkerView extends AbstractMapFeature implements MarkerView.OnPositionUpdateListener, View.OnLayoutChangeListener {
-    private RCTMGLMarkerViewManager mManager;
-    private RCTMGLMapView mMapView;
+public class RCTMLNMarkerView extends AbstractMapFeature implements MarkerView.OnPositionUpdateListener, View.OnLayoutChangeListener {
+    private RCTMLNMarkerViewManager mManager;
+    private RCTMLNMapView mMapView;
 
     private View mChildView;
 
@@ -26,7 +26,7 @@ public class RCTMGLMarkerView extends AbstractMapFeature implements MarkerView.O
     private Float[] mAnchor;
 
 
-    public RCTMGLMarkerView(Context context, RCTMGLMarkerViewManager manager) {
+    public RCTMLNMarkerView(Context context, RCTMLNMarkerViewManager manager) {
         super(context);
         mManager = manager;
     }
@@ -57,10 +57,10 @@ public class RCTMGLMarkerView extends AbstractMapFeature implements MarkerView.O
     }
 
     @Override
-    public void addToMap(RCTMGLMapView mapView) {
+    public void addToMap(RCTMLNMapView mapView) {
         mMapView = mapView;
 
-        final RCTMGLMarkerView rctmglMarkerView = this;
+        final RCTMLNMarkerView rctmlnMarkerView = this;
 
         mMapView.getMapAsync(
             new OnMapReadyCallback() {
@@ -70,8 +70,8 @@ public class RCTMGLMarkerView extends AbstractMapFeature implements MarkerView.O
 
                     if (mChildView != null) {
                         mMarkerView = new MarkerView(GeoJSONUtils.toLatLng(mCoordinate), mChildView);
-                        mMarkerView.setOnPositionUpdateListener(rctmglMarkerView);
-                        mChildView.addOnLayoutChangeListener(rctmglMarkerView);
+                        mMarkerView.setOnPositionUpdateListener(rctmlnMarkerView);
+                        mChildView.addOnLayoutChangeListener(rctmlnMarkerView);
                         mMarkerViewManager.addMarker(mMarkerView);
                     }
                 }
@@ -91,7 +91,7 @@ public class RCTMGLMarkerView extends AbstractMapFeature implements MarkerView.O
     }
 
     @Override
-    public void removeFromMap(RCTMGLMapView mapView) {
+    public void removeFromMap(RCTMLNMapView mapView) {
         if (mMarkerView != null) {
             mMarkerViewManager.removeMarker(mMarkerView);
             mChildView.removeOnLayoutChangeListener(this);

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerViewManager.java → rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNMarkerViewManager.java}

@@ -1,19 +1,19 @@
-package com.mapbox.rctmgl.components.annotation;
+package com.maplibre.rctmln.components.annotation;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.mapbox.rctmgl.components.AbstractEventEmitter;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
+import com.maplibre.rctmln.components.AbstractEventEmitter;
+import com.maplibre.rctmln.utils.GeoJSONUtils;
 
 import java.util.Map;
 
-public class RCTMGLMarkerViewManager extends AbstractEventEmitter<RCTMGLMarkerView> {
-    public static final String REACT_CLASS = "RCTMGLMarkerView";
+public class RCTMLNMarkerViewManager extends AbstractEventEmitter<RCTMLNMarkerView> {
+    public static final String REACT_CLASS = "RCTMLNMarkerView";
 
-    public RCTMGLMarkerViewManager(ReactApplicationContext reactApplicationContext) {
+    public RCTMLNMarkerViewManager(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
     }
 
@@ -23,18 +23,18 @@ public class RCTMGLMarkerViewManager extends AbstractEventEmitter<RCTMGLMarkerVi
     }
 
     @ReactProp(name="coordinate")
-    public void setCoordinate(RCTMGLMarkerView markerView, String geoJSONStr) {
+    public void setCoordinate(RCTMLNMarkerView markerView, String geoJSONStr) {
         markerView.setCoordinate(GeoJSONUtils.toPointGeometry(geoJSONStr));
     }
 
     @ReactProp(name="anchor")
-    public void setAnchor(RCTMGLMarkerView markerView, ReadableMap map) {
+    public void setAnchor(RCTMLNMarkerView markerView, ReadableMap map) {
         markerView.setAnchor((float) map.getDouble("x"), (float) map.getDouble("y"));
     }
 
     @Override
-    protected RCTMGLMarkerView createViewInstance(ThemedReactContext reactContext) {
-        return new RCTMGLMarkerView(reactContext, this);
+    protected RCTMLNMarkerView createViewInstance(ThemedReactContext reactContext) {
+        return new RCTMLNMarkerView(reactContext, this);
     }
 
     @Override

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotation.java → rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNPointAnnotation.java}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.annotation;
+package com.maplibre.rctmln.components.annotation;
 
 import android.content.Context;
 import android.graphics.PointF;
@@ -13,20 +13,20 @@ import com.mapbox.mapboxsdk.plugins.annotation.Symbol;
 import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager;
 import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.rctmgl.components.AbstractMapFeature;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView;
-import com.mapbox.rctmgl.events.PointAnnotationClickEvent;
-import com.mapbox.rctmgl.events.PointAnnotationDragEvent;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-import com.mapbox.rctmgl.utils.BitmapUtils;
-
-public class RCTMGLPointAnnotation extends AbstractMapFeature implements View.OnLayoutChangeListener {
+import com.maplibre.rctmln.components.AbstractMapFeature;
+import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
+import com.maplibre.rctmln.events.PointAnnotationClickEvent;
+import com.maplibre.rctmln.events.PointAnnotationDragEvent;
+import com.maplibre.rctmln.events.constants.EventTypes;
+import com.maplibre.rctmln.utils.GeoJSONUtils;
+import com.maplibre.rctmln.utils.BitmapUtils;
+
+public class RCTMLNPointAnnotation extends AbstractMapFeature implements View.OnLayoutChangeListener {
     private Context mContext;
-    private RCTMGLPointAnnotationManager mManager;
+    private RCTMLNPointAnnotationManager mManager;
     private Symbol mAnnotation;
     private MapboxMap mMap;
-    private RCTMGLMapView mMapView;
+    private RCTMLNMapView mMapView;
 
     private boolean mHasChildren;
 
@@ -51,7 +51,7 @@ public class RCTMGLPointAnnotation extends AbstractMapFeature implements View.On
 
     private static final String MARKER_IMAGE_ID = "MARKER_IMAGE_ID";
 
-    public RCTMGLPointAnnotation(Context context, RCTMGLPointAnnotationManager manager) {
+    public RCTMLNPointAnnotation(Context context, RCTMLNPointAnnotationManager manager) {
         super(context);
         mContext = context;
         mManager = manager;
@@ -59,7 +59,7 @@ public class RCTMGLPointAnnotation extends AbstractMapFeature implements View.On
 
     @Override
     public void addView(View childView, int childPosition) {
-        if (childView instanceof RCTMGLCallout) {
+        if (childView instanceof RCTMLNCallout) {
             mCalloutView = childView;
         } else {
             mChildView = childView;
@@ -91,7 +91,7 @@ public class RCTMGLPointAnnotation extends AbstractMapFeature implements View.On
     }
 
     @Override
-    public void addToMap(RCTMGLMapView mapView) {
+    public void addToMap(RCTMLNMapView mapView) {
         mMapView = mapView;
         mMap = mapView.getMapboxMap();
         makeMarker();
@@ -112,8 +112,8 @@ public class RCTMGLPointAnnotation extends AbstractMapFeature implements View.On
     }
 
     @Override
-    public void removeFromMap(RCTMGLMapView mapView) {
-        RCTMGLMapView map = (mMapView != null) ? mMapView : mapView;
+    public void removeFromMap(RCTMLNMapView mapView) {
+        RCTMLNMapView map = (mMapView != null) ? mMapView : mapView;
         if (map == null) {
             return;
         }
@@ -144,7 +144,7 @@ public class RCTMGLPointAnnotation extends AbstractMapFeature implements View.On
         Bitmap bitmap = BitmapUtils.viewToBitmap(v, left, top, right, bottom);
         String bitmapId = Integer.toString(v.getId());
         addBitmapToStyle(bitmap, bitmapId);
-        if (v instanceof RCTMGLCallout) {
+        if (v instanceof RCTMLNCallout) {
             mCalloutBitmap = bitmap;
             mCalloutBitmapId = bitmapId;
         } else {

package/android/{rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotationManager.java → rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNPointAnnotationManager.java}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.annotation;
+package com.maplibre.rctmln.components.annotation;
 
 import androidx.annotation.Nullable;
 
@@ -8,9 +8,9 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.mapbox.rctmgl.components.AbstractEventEmitter;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
+import com.maplibre.rctmln.components.AbstractEventEmitter;
+import com.maplibre.rctmln.events.constants.EventKeys;
+import com.maplibre.rctmln.utils.GeoJSONUtils;
 
 import java.util.Map;
 
@@ -18,10 +18,10 @@ import java.util.Map;
  * Created by nickitaliano on 9/27/17.
  */
 
-public class RCTMGLPointAnnotationManager extends AbstractEventEmitter<RCTMGLPointAnnotation> {
-    public static final String REACT_CLASS = "RCTMGLPointAnnotation";
+public class RCTMLNPointAnnotationManager extends AbstractEventEmitter<RCTMLNPointAnnotation> {
+    public static final String REACT_CLASS = "RCTMLNPointAnnotation";
 
-    public RCTMGLPointAnnotationManager(ReactApplicationContext reactApplicationContext) {
+    public RCTMLNPointAnnotationManager(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
     }
 
@@ -53,32 +53,32 @@ public class RCTMGLPointAnnotationManager extends AbstractEventEmitter<RCTMGLPoi
     }
 
     @Override
-    protected RCTMGLPointAnnotation createViewInstance(ThemedReactContext reactContext) {
-        return new RCTMGLPointAnnotation(reactContext, this);
+    protected RCTMLNPointAnnotation createViewInstance(ThemedReactContext reactContext) {
+        return new RCTMLNPointAnnotation(reactContext, this);
     }
 
     @ReactProp(name="id")
-    public void setId(RCTMGLPointAnnotation annotation, String id) {
+    public void setId(RCTMLNPointAnnotation annotation, String id) {
         annotation.setID(id);
     }
 
     @ReactProp(name="coordinate")
-    public void setCoordinate(RCTMGLPointAnnotation annotation, String geoJSONStr) {
+    public void setCoordinate(RCTMLNPointAnnotation annotation, String geoJSONStr) {
         annotation.setCoordinate(GeoJSONUtils.toPointGeometry(geoJSONStr));
     }
 
     @ReactProp(name="anchor")
-    public void setAnchor(RCTMGLPointAnnotation annotation, ReadableMap map) {
+    public void setAnchor(RCTMLNPointAnnotation annotation, ReadableMap map) {
         annotation.setAnchor((float) map.getDouble("x"), (float) map.getDouble("y"));
     }
 
     @ReactProp(name="draggable")
-    public void setDraggable(RCTMGLPointAnnotation annotation, Boolean draggable) {
+    public void setDraggable(RCTMLNPointAnnotation annotation, Boolean draggable) {
         annotation.setDraggable(draggable);
     }
 
     @Override
-    public void receiveCommand(RCTMGLPointAnnotation annotation, int commandID, @Nullable ReadableArray args) {
+    public void receiveCommand(RCTMLNPointAnnotation annotation, int commandID, @Nullable ReadableArray args) {
         switch (commandID) {
             case METHOD_REFRESH:
                 annotation.refresh();