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

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

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.mapview;
+package com.maplibre.rctmln.components.mapview;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -17,7 +17,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import com.mapbox.mapboxsdk.log.Logger;
+import org.maplibre.android.log.Logger;
 
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactContext;
@@ -27,51 +27,51 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.android.gestures.MoveGestureDetector;
-import com.mapbox.geojson.Feature;
-import com.mapbox.geojson.FeatureCollection;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.VisibleRegion;
-import com.mapbox.mapboxsdk.maps.AttributionDialogManager;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.mapboxsdk.maps.UiSettings;
-import com.mapbox.mapboxsdk.plugins.localization.LocalizationPlugin;
-import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolClickListener;
-import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolDragListener;
-import com.mapbox.mapboxsdk.plugins.annotation.Symbol;
-import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager;
-import com.mapbox.mapboxsdk.style.expressions.Expression;
-import com.mapbox.mapboxsdk.style.layers.Layer;
-import com.mapbox.mapboxsdk.style.layers.Property;
-import com.mapbox.rctmgl.R;
-import com.mapbox.rctmgl.components.AbstractMapFeature;
-import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotation;
-import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerView;
-import com.mapbox.rctmgl.components.annotation.MarkerView;
-import com.mapbox.rctmgl.components.annotation.MarkerViewManager;
-import com.mapbox.rctmgl.components.camera.RCTMGLCamera;
-import com.mapbox.rctmgl.components.images.RCTMGLImages;
-import com.mapbox.rctmgl.components.location.LocationComponentManager;
-import com.mapbox.rctmgl.components.location.RCTMGLNativeUserLocation;
-import com.mapbox.rctmgl.components.mapview.helpers.CameraChangeTracker;
-import com.mapbox.rctmgl.components.styles.layers.RCTLayer;
-import com.mapbox.rctmgl.components.styles.light.RCTMGLLight;
-import com.mapbox.rctmgl.components.styles.sources.RCTMGLShapeSource;
-import com.mapbox.rctmgl.components.styles.sources.RCTSource;
-import com.mapbox.rctmgl.events.AndroidCallbackEvent;
-import com.mapbox.rctmgl.events.IEvent;
-import com.mapbox.rctmgl.events.MapChangeEvent;
-import com.mapbox.rctmgl.events.MapClickEvent;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.BitmapUtils;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-import com.mapbox.rctmgl.utils.GeoViewport;
+import org.maplibre.android.gestures.MoveGestureDetector;
+import org.maplibre.geojson.Feature;
+import org.maplibre.geojson.FeatureCollection;
+import org.maplibre.android.camera.CameraPosition;
+import org.maplibre.android.camera.CameraUpdate;
+import org.maplibre.android.geometry.LatLng;
+import org.maplibre.android.geometry.VisibleRegion;
+import org.maplibre.android.maps.AttributionDialogManager;
+import org.maplibre.android.maps.MapView;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.MapLibreMapOptions;
+import org.maplibre.android.maps.OnMapReadyCallback;
+import org.maplibre.android.maps.Style;
+import org.maplibre.android.maps.UiSettings;
+import org.maplibre.android.plugins.localization.LocalizationPlugin;
+import org.maplibre.android.plugins.annotation.OnSymbolClickListener;
+import org.maplibre.android.plugins.annotation.OnSymbolDragListener;
+import org.maplibre.android.plugins.annotation.Symbol;
+import org.maplibre.android.plugins.annotation.SymbolManager;
+import org.maplibre.android.style.expressions.Expression;
+import org.maplibre.android.style.layers.Layer;
+import org.maplibre.android.style.layers.Property;
+import com.maplibre.rctmln.R;
+import com.maplibre.rctmln.components.AbstractMapFeature;
+import com.maplibre.rctmln.components.annotation.RCTMLNPointAnnotation;
+import com.maplibre.rctmln.components.annotation.RCTMLNMarkerView;
+import com.maplibre.rctmln.components.annotation.MarkerView;
+import com.maplibre.rctmln.components.annotation.MarkerViewManager;
+import com.maplibre.rctmln.components.camera.RCTMLNCamera;
+import com.maplibre.rctmln.components.images.RCTMLNImages;
+import com.maplibre.rctmln.components.location.LocationComponentManager;
+import com.maplibre.rctmln.components.location.RCTMLNNativeUserLocation;
+import com.maplibre.rctmln.components.mapview.helpers.CameraChangeTracker;
+import com.maplibre.rctmln.components.styles.layers.RCTLayer;
+import com.maplibre.rctmln.components.styles.light.RCTMLNLight;
+import com.maplibre.rctmln.components.styles.sources.RCTMLNShapeSource;
+import com.maplibre.rctmln.components.styles.sources.RCTSource;
+import com.maplibre.rctmln.events.AndroidCallbackEvent;
+import com.maplibre.rctmln.events.IEvent;
+import com.maplibre.rctmln.events.MapChangeEvent;
+import com.maplibre.rctmln.events.MapClickEvent;
+import com.maplibre.rctmln.events.constants.EventTypes;
+import com.maplibre.rctmln.utils.BitmapUtils;
+import com.maplibre.rctmln.utils.GeoJSONUtils;
+import com.maplibre.rctmln.utils.GeoViewport;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -84,40 +84,40 @@ import org.json.*;
 
 import javax.annotation.Nullable;
 
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
-import static com.mapbox.rctmgl.modules.RCTMGLOfflineModule.DEFAULT_STYLE_URL;
+import static org.maplibre.android.style.layers.PropertyFactory.visibility;
+import static com.maplibre.rctmln.modules.RCTMLNOfflineModule.DEFAULT_STYLE_URL;
 
 /**
  * Created by nickitaliano on 8/18/17.
  */
 
 @SuppressWarnings({ "MissingPermission" })
-public class RCTMGLMapView extends MapView implements OnMapReadyCallback, MapboxMap.OnMapClickListener,
-        MapboxMap.OnMapLongClickListener, MapView.OnCameraIsChangingListener, MapView.OnCameraDidChangeListener,
+public class RCTMLNMapView extends MapView implements OnMapReadyCallback, MapLibreMap.OnMapClickListener,
+        MapLibreMap.OnMapLongClickListener, MapView.OnCameraIsChangingListener, MapView.OnCameraDidChangeListener,
         MapView.OnDidFailLoadingMapListener, MapView.OnDidFinishLoadingMapListener,
-        MapView.OnWillStartRenderingFrameListener, MapView.OnDidFinishRenderingFrameListener,
-        MapView.OnWillStartRenderingMapListener, MapView.OnDidFinishRenderingMapListener,
+        MapView.OnWillStartRenderingFrameListener, MapView.OnWillStartRenderingMapListener,
+        MapView.OnDidFinishRenderingFrameListener, MapView.OnDidFinishRenderingMapListener,
         MapView.OnDidFinishLoadingStyleListener, MapView.OnStyleImageMissingListener {
-    public static final String LOG_TAG = "RCTMGLMapView";
+    public static final String LOG_TAG = "RCTMLNMapView";
 
-    private RCTMGLMapViewManager mManager;
+    private RCTMLNMapViewManager mManager;
     private Context mContext;
     private Handler mHandler;
     private LifecycleEventListener mLifeCycleListener;
     private boolean mPaused;
     private boolean mDestroyed;
 
-    private RCTMGLCamera mCamera;
+    private RCTMLNCamera mCamera;
     private List<AbstractMapFeature> mFeatures;
     private List<AbstractMapFeature> mQueuedFeatures;
-    private Map<String, RCTMGLPointAnnotation> mPointAnnotations;
+    private Map<String, RCTMLNPointAnnotation> mPointAnnotations;
     private Map<String, RCTSource> mSources;
-    private List<RCTMGLImages> mImages;
+    private List<RCTMLNImages> mImages;
 
     private CameraChangeTracker mCameraChangeTracker = new CameraChangeTracker();
     private List<Pair<Integer, ReadableArray>> mPreRenderMethods = new ArrayList<>();
 
-    private MapboxMap mMap;
+    private MapLibreMap mMap;
 
     private LocalizationPlugin mLocalizationPlugin;
 
@@ -156,7 +156,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
 
     private @Nullable Integer mTintColor = null;
 
-    public RCTMGLMapView(Context context, RCTMGLMapViewManager manager, MapboxMapOptions options) {
+    public RCTMLNMapView(Context context, RCTMLNMapViewManager manager, MapLibreMapOptions options) {
         super(context, options);
 
         mContext = context;
@@ -221,23 +221,23 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             RCTSource source = (RCTSource) childView;
             mSources.put(source.getID(), source);
             feature = (AbstractMapFeature) childView;
-        } else if (childView instanceof RCTMGLImages) {
-            RCTMGLImages images = (RCTMGLImages) childView;
+        } else if (childView instanceof RCTMLNImages) {
+            RCTMLNImages images = (RCTMLNImages) childView;
             mImages.add(images);
             feature = (AbstractMapFeature) childView;
-        } else if (childView instanceof RCTMGLLight) {
+        } else if (childView instanceof RCTMLNLight) {
             feature = (AbstractMapFeature) childView;
-        } else if (childView instanceof RCTMGLNativeUserLocation) {
+        } else if (childView instanceof RCTMLNNativeUserLocation) {
             feature = (AbstractMapFeature) childView;
-        }  else if (childView instanceof RCTMGLPointAnnotation) {
-            RCTMGLPointAnnotation annotation = (RCTMGLPointAnnotation) childView;
+        } else if (childView instanceof RCTMLNPointAnnotation) {
+            RCTMLNPointAnnotation annotation = (RCTMLNPointAnnotation) childView;
             mPointAnnotations.put(annotation.getID(), annotation);
             feature = (AbstractMapFeature) childView;
-        } else if (childView instanceof RCTMGLMarkerView) {
-            RCTMGLMarkerView marker = (RCTMGLMarkerView) childView;
+        } else if (childView instanceof RCTMLNMarkerView) {
+            RCTMLNMarkerView marker = (RCTMLNMarkerView) childView;
             feature = (AbstractMapFeature) childView;
-        } else if (childView instanceof RCTMGLCamera) {
-            mCamera = (RCTMGLCamera) childView;
+        } else if (childView instanceof RCTMLNCamera) {
+            mCamera = (RCTMLNCamera) childView;
             feature = (AbstractMapFeature) childView;
         } else if (childView instanceof RCTLayer) {
             feature = (RCTLayer) childView;
@@ -269,16 +269,16 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         if (feature instanceof RCTSource) {
             RCTSource source = (RCTSource) feature;
             mSources.remove(source.getID());
-        } else if (feature instanceof RCTMGLPointAnnotation) {
-            RCTMGLPointAnnotation annotation = (RCTMGLPointAnnotation) feature;
+        } else if (feature instanceof RCTMLNPointAnnotation) {
+            RCTMLNPointAnnotation annotation = (RCTMLNPointAnnotation) feature;
 
             if (annotation.getMapboxID() == mActiveMarkerID) {
                 mActiveMarkerID = -1;
             }
 
             mPointAnnotations.remove(annotation.getID());
-        } else if (feature instanceof RCTMGLImages) {
-            RCTMGLImages images = (RCTMGLImages) feature;
+        } else if (feature instanceof RCTMLNImages) {
+            RCTMLNImages images = (RCTMLNImages) feature;
             mImages.remove(images);
         }
 
@@ -338,11 +338,11 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         return mMap.getCameraPosition();
     }
 
-    public void animateCamera(CameraUpdate cameraUpdate, MapboxMap.CancelableCallback callback) {
+    public void animateCamera(CameraUpdate cameraUpdate, MapLibreMap.CancelableCallback callback) {
         mMap.animateCamera(cameraUpdate, callback);
     }
 
-    public void moveCamera(CameraUpdate cameraUpdate, MapboxMap.CancelableCallback callback) {
+    public void moveCamera(CameraUpdate cameraUpdate, MapLibreMap.CancelableCallback callback) {
         mMap.moveCamera(cameraUpdate, callback);
     }
 
@@ -350,7 +350,8 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         mMap.moveCamera(cameraUpdate);
     }
 
-    public void easeCamera(CameraUpdate cameraUpdate, int duration, boolean easingInterpolator, MapboxMap.CancelableCallback callback) {
+    public void easeCamera(CameraUpdate cameraUpdate, int duration, boolean easingInterpolator,
+            MapLibreMap.CancelableCallback callback) {
         mMap.easeCamera(cameraUpdate, duration, easingInterpolator, callback);
     }
 
@@ -358,13 +359,13 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         mMap.easeCamera(cameraUpdate);
     }
 
-    public RCTMGLPointAnnotation getPointAnnotationByID(String annotationID) {
+    public RCTMLNPointAnnotation getPointAnnotationByID(String annotationID) {
         if (annotationID == null) {
             return null;
         }
 
         for (String key : mPointAnnotations.keySet()) {
-            RCTMGLPointAnnotation annotation = mPointAnnotations.get(key);
+            RCTMLNPointAnnotation annotation = mPointAnnotations.get(key);
 
             if (annotation != null && annotationID.equals(annotation.getID())) {
                 return annotation;
@@ -374,9 +375,9 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         return null;
     }
 
-    public RCTMGLPointAnnotation getPointAnnotationByMarkerID(long markerID) {
+    public RCTMLNPointAnnotation getPointAnnotationByMarkerID(long markerID) {
         for (String key : mPointAnnotations.keySet()) {
-            RCTMGLPointAnnotation annotation = mPointAnnotations.get(key);
+            RCTMLNPointAnnotation annotation = mPointAnnotations.get(key);
 
             if (annotation != null && markerID == annotation.getMapboxID()) {
                 return annotation;
@@ -386,7 +387,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         return null;
     }
 
-    public MapboxMap getMapboxMap() {
+    public MapLibreMap getMapboxMap() {
         return mMap;
     }
 
@@ -435,9 +436,8 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         return true;
     }
 
-
     @Override
-    public void onMapReady(final MapboxMap mapboxMap) {
+    public void onMapReady(final MapLibreMap mapboxMap) {
         mMap = mapboxMap;
 
         if (isJSONValid(mStyleURL)) {
@@ -446,7 +446,6 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             mMap.setStyle(new Style.Builder().fromUri(mStyleURL));
         }
 
-
         reflow();
 
         mMap.getStyle(new Style.OnStyleLoaded() {
@@ -463,14 +462,14 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         updateInsets();
         updateUISettings();
 
-        mMap.addOnCameraIdleListener(new MapboxMap.OnCameraIdleListener() {
+        mMap.addOnCameraIdleListener(new MapLibreMap.OnCameraIdleListener() {
             @Override
             public void onCameraIdle() {
                 sendRegionDidChangeEvent();
             }
         });
 
-        mMap.addOnCameraMoveStartedListener(new MapboxMap.OnCameraMoveStartedListener() {
+        mMap.addOnCameraMoveStartedListener(new MapLibreMap.OnCameraMoveStartedListener() {
             @Override
             public void onCameraMoveStarted(int reason) {
                 mCameraChangeTracker.setReason(reason);
@@ -478,7 +477,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             }
         });
 
-        mMap.addOnCameraMoveListener(new MapboxMap.OnCameraMoveListener() {
+        mMap.addOnCameraMoveListener(new MapLibreMap.OnCameraMoveListener() {
             @Override
             public void onCameraMove() {
                 if (markerViewManager != null) {
@@ -487,7 +486,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             }
         });
 
-        mMap.addOnMoveListener(new MapboxMap.OnMoveListener() {
+        mMap.addOnMoveListener(new MapLibreMap.OnMoveListener() {
             @Override
             public void onMoveBegin(MoveGestureDetector detector) {
                 mCameraChangeTracker.setReason(CameraChangeTracker.USER_GESTURE);
@@ -501,7 +500,8 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             }
 
             @Override
-            public void onMoveEnd(MoveGestureDetector detector) {}
+            public void onMoveEnd(MoveGestureDetector detector) {
+            }
         });
     }
 
@@ -531,7 +531,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             public void onAnnotationDragStarted(Symbol symbol) {
                 mAnnotationClicked = true;
                 final long selectedMarkerID = symbol.getId();
-                RCTMGLPointAnnotation annotation = getPointAnnotationByMarkerID(selectedMarkerID);
+                RCTMLNPointAnnotation annotation = getPointAnnotationByMarkerID(selectedMarkerID);
                 if (annotation != null) {
                     annotation.onDragStart();
                 }
@@ -540,7 +540,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             @Override
             public void onAnnotationDrag(Symbol symbol) {
                 final long selectedMarkerID = symbol.getId();
-                RCTMGLPointAnnotation annotation = getPointAnnotationByMarkerID(selectedMarkerID);
+                RCTMLNPointAnnotation annotation = getPointAnnotationByMarkerID(selectedMarkerID);
                 if (annotation != null) {
                     annotation.onDrag();
                 }
@@ -550,7 +550,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             public void onAnnotationDragFinished(Symbol symbol) {
                 mAnnotationClicked = false;
                 final long selectedMarkerID = symbol.getId();
-                RCTMGLPointAnnotation annotation = getPointAnnotationByMarkerID(selectedMarkerID);
+                RCTMLNPointAnnotation annotation = getPointAnnotationByMarkerID(selectedMarkerID);
                 if (annotation != null) {
                     annotation.onDragEnd();
                 }
@@ -572,15 +572,15 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
     }
 
     private void setupLocalization(Style style) {
-      mLocalizationPlugin = new LocalizationPlugin(RCTMGLMapView.this, mMap, style);
-      if (mLocalizeLabels) {
-          try {
-              mLocalizationPlugin.matchMapLanguageWithDeviceDefault();
-          } catch (Exception e) {
-              final String localeString = Locale.getDefault().toString();
-              Logger.w(LOG_TAG, String.format("Could not find matching locale for %s", localeString));
-          }
-      }
+        mLocalizationPlugin = new LocalizationPlugin(RCTMLNMapView.this, mMap, style);
+        if (mLocalizeLabels) {
+            try {
+                mLocalizationPlugin.matchMapLanguageWithDeviceDefault();
+            } catch (Exception e) {
+                final String localeString = Locale.getDefault().toString();
+                Logger.w(LOG_TAG, String.format("Could not find matching locale for %s", localeString));
+            }
+        }
     }
 
     @Override
@@ -645,8 +645,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
                 source.onPress(new RCTSource.OnPressEvent(
                         hits.get(source.getID()),
                         point,
-                        screenPoint
-                        ));
+                        screenPoint));
                 return true;
             }
         }
@@ -672,11 +671,11 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         mAnnotationClicked = true;
         final long selectedMarkerID = symbol.getId();
 
-        RCTMGLPointAnnotation activeAnnotation = null;
-        RCTMGLPointAnnotation nextActiveAnnotation = null;
+        RCTMLNPointAnnotation activeAnnotation = null;
+        RCTMLNPointAnnotation nextActiveAnnotation = null;
 
         for (String key : mPointAnnotations.keySet()) {
-            RCTMGLPointAnnotation annotation = mPointAnnotations.get(key);
+            RCTMLNPointAnnotation annotation = mPointAnnotations.get(key);
             final long curMarkerID = annotation.getMapboxID();
             if (mActiveMarkerID == curMarkerID) {
                 activeAnnotation = annotation;
@@ -696,12 +695,12 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
 
     }
 
-    public void selectAnnotation(RCTMGLPointAnnotation annotation) {
+    public void selectAnnotation(RCTMLNPointAnnotation annotation) {
         mActiveMarkerID = annotation.getMapboxID();
         annotation.onSelect(true);
     }
 
-    public void deselectAnnotation(RCTMGLPointAnnotation annotation) {
+    public void deselectAnnotation(RCTMLNPointAnnotation annotation) {
         mActiveMarkerID = -1;
         annotation.onDeselect();
     }
@@ -732,7 +731,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
     }
 
     @Override
-    public void onDidFinishRenderingFrame(boolean fully) {
+    public void onDidFinishRenderingFrame(boolean fully, double frameEncodingTime, double frameRenderingTime) {
         if (fully) {
             handleMapChangedEvent(EventTypes.DID_FINISH_RENDERING_FRAME_FULLY);
         } else {
@@ -767,12 +766,12 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
 
     @Override
     public void onStyleImageMissing(@NonNull String id) {
-        for (RCTMGLImages images : mImages) {
+        for (RCTMLNImages images : mImages) {
             if (images.addMissingImageToStyle(id, mMap)) {
                 return;
             }
         }
-        for (RCTMGLImages images : mImages) {
+        for (RCTMLNImages images : mImages) {
             images.sendImageMissingEvent(id, mMap);
         }
     }
@@ -848,7 +847,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         if (position == null) {
             // reset from explicit to default
             if (mLogoGravity != null) {
-                MapboxMapOptions defaultOptions = MapboxMapOptions.createFromAttributes(mContext);
+                MapLibreMapOptions defaultOptions = MapLibreMapOptions.createFromAttributes(mContext);
                 mLogoGravity = defaultOptions.getLogoGravity();
                 mLogoMargins = Arrays.copyOf(defaultOptions.getLogoMargins(), 4);
                 updateUISettings();
@@ -870,11 +869,11 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             mLogoGravity |= Gravity.BOTTOM;
         }
         float density = getDisplayDensity();
-        mLogoMargins = new int[]{
-            position.hasKey("left") ? (int) density * position.getInt("left") : 0,
-            position.hasKey("top") ? (int) density * position.getInt("top") : 0,
-            position.hasKey("right") ? (int) density * position.getInt("right") : 0,
-            position.hasKey("bottom") ? (int) density * position.getInt("bottom") : 0
+        mLogoMargins = new int[] {
+                position.hasKey("left") ? (int) density * position.getInt("left") : 0,
+                position.hasKey("top") ? (int) density * position.getInt("top") : 0,
+                position.hasKey("right") ? (int) density * position.getInt("right") : 0,
+                position.hasKey("bottom") ? (int) density * position.getInt("bottom") : 0
         };
         updateUISettings();
     }
@@ -903,7 +902,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         if (position == null) {
             // reset from explicit to default
             if (mAttributionGravity != null) {
-                MapboxMapOptions defaultOptions = MapboxMapOptions.createFromAttributes(mContext);
+                MapLibreMapOptions defaultOptions = MapLibreMapOptions.createFromAttributes(mContext);
                 mAttributionGravity = defaultOptions.getAttributionGravity();
                 mAttributionMargin = Arrays.copyOf(defaultOptions.getAttributionMargins(), 4);
                 updateUISettings();
@@ -924,11 +923,11 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             mAttributionGravity |= Gravity.BOTTOM;
         }
         float density = getDisplayDensity();
-        mAttributionMargin = new int[]{
-            position.hasKey("left") ? (int) density * position.getInt("left") : 0,
-            position.hasKey("top") ? (int) density * position.getInt("top") : 0,
-            position.hasKey("right") ? (int) density * position.getInt("right") : 0,
-            position.hasKey("bottom") ? (int) density * position.getInt("bottom") : 0
+        mAttributionMargin = new int[] {
+                position.hasKey("left") ? Math.round(density * position.getInt("left")) : 0,
+                position.hasKey("top") ? Math.round(density * position.getInt("top")) : 0,
+                position.hasKey("right") ? Math.round(density * position.getInt("right")) : 0,
+                position.hasKey("bottom") ? Math.round(density * position.getInt("bottom")) : 0
         };
         updateUISettings();
     }
@@ -1016,7 +1015,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
             throw new Error("takeSnap should only be called after the map has rendered");
         }
 
-        mMap.snapshot(new MapboxMap.SnapshotReadyCallback() {
+        mMap.snapshot(new MapLibreMap.SnapshotReadyCallback() {
             @Override
             public void onSnapshotReady(Bitmap snapshot) {
                 WritableMap payload = new WritableNativeMap();
@@ -1024,7 +1023,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
                         : BitmapUtils.createBase64(snapshot);
                 payload.putString("uri", uri);
 
-                AndroidCallbackEvent event = new AndroidCallbackEvent(RCTMGLMapView.this, callbackID, payload);
+                AndroidCallbackEvent event = new AndroidCallbackEvent(RCTMLNMapView.this, callbackID, payload);
                 mManager.handleEvent(event);
             }
         });
@@ -1048,7 +1047,8 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         manager.onClick(this);
     }
 
-    public void setSourceVisibility(final boolean visible, @NonNull final String sourceId, @Nullable final String sourceLayerId) {
+    public void setSourceVisibility(final boolean visible, @NonNull final String sourceId,
+            @Nullable final String sourceLayerId) {
         if (mMap == null) {
             return;
         }
@@ -1121,15 +1121,12 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
                 (uiSettings.getAttributionMarginLeft() != mAttributionMargin[0] ||
                         uiSettings.getAttributionMarginTop() != mAttributionMargin[1] ||
                         uiSettings.getAttributionMarginRight() != mAttributionMargin[2] ||
-                        uiSettings.getAttributionMarginBottom() != mAttributionMargin[3]
-                )
-        ) {
+                        uiSettings.getAttributionMarginBottom() != mAttributionMargin[3])) {
             uiSettings.setAttributionMargins(
-                mAttributionMargin[0],
-                mAttributionMargin[1],
-                mAttributionMargin[2],
-                mAttributionMargin[3]
-            );
+                    mAttributionMargin[0],
+                    mAttributionMargin[1],
+                    mAttributionMargin[2],
+                    mAttributionMargin[3]);
         }
 
         if (mTintColor != null) {
@@ -1145,18 +1142,15 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         }
 
         if (mLogoMargins != null &&
-            (uiSettings.getLogoMarginLeft() != mLogoMargins[0] ||
-                uiSettings.getLogoMarginTop() != mLogoMargins[1] ||
-                uiSettings.getLogoMarginRight() != mLogoMargins[2] ||
-                uiSettings.getLogoMarginBottom() != mLogoMargins[3]
-            )
-        ) {
+                (uiSettings.getLogoMarginLeft() != mLogoMargins[0] ||
+                        uiSettings.getLogoMarginTop() != mLogoMargins[1] ||
+                        uiSettings.getLogoMarginRight() != mLogoMargins[2] ||
+                        uiSettings.getLogoMarginBottom() != mLogoMargins[3])) {
             uiSettings.setLogoMargins(
-                mLogoMargins[0],
-                mLogoMargins[1],
-                mLogoMargins[2],
-                mLogoMargins[3]
-            );
+                    mLogoMargins[0],
+                    mLogoMargins[1],
+                    mLogoMargins[2],
+                    mLogoMargins[3]);
         }
 
         if (mCompassEnabled != null && uiSettings.isCompassEnabled() != mCompassEnabled) {
@@ -1181,10 +1175,10 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         }
 
         if (mCompassViewMargins != null && uiSettings.isCompassEnabled()) {
-            int pixelDensity = (int)getResources().getDisplayMetrics().density;
+            float pixelDensity = getResources().getDisplayMetrics().density;
 
-            int x = mCompassViewMargins.getInt("x") * pixelDensity;
-            int y = mCompassViewMargins.getInt("y") * pixelDensity;
+            int x = Math.round(mCompassViewMargins.getInt("x") * pixelDensity);
+            int y = Math.round(mCompassViewMargins.getInt("y") * pixelDensity);
 
             switch (uiSettings.getCompassGravity()) {
                 case Gravity.TOP | Gravity.START:
@@ -1220,7 +1214,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
 
     public double[] getContentInset() {
         if (mInsets == null) {
-            double[] result = {0,0,0,0};
+            double[] result = { 0, 0, 0, 0 };
 
             return result;
         }
@@ -1245,7 +1239,8 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
 
         final DisplayMetrics metrics = mContext.getResources().getDisplayMetrics();
 
-        double[] result = {left * metrics.scaledDensity, top * metrics.scaledDensity, right * metrics.scaledDensity, bottom * metrics.scaledDensity};
+        double[] result = { left * metrics.scaledDensity, top * metrics.scaledDensity, right * metrics.scaledDensity,
+                bottom * metrics.scaledDensity };
         return result;
     }
 
@@ -1288,7 +1283,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
 
     private WritableMap makeRegionPayload(Boolean isAnimated) {
         CameraPosition position = mMap.getCameraPosition();
-        if(position == null || position.target == null) {
+        if (position == null || position.target == null) {
             return new WritableNativeMap();
         }
         LatLng latLng = new LatLng(position.target.getLatitude(), position.target.getLongitude());
@@ -1305,8 +1300,9 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         try {
             VisibleRegion visibleRegion = mMap.getProjection().getVisibleRegion();
             properties.putArray("visibleBounds", GeoJSONUtils.fromLatLngBounds(visibleRegion.latLngBounds));
-        } catch(Exception ex) {
-            Logger.e(LOG_TAG, String.format("An error occurred while attempting to make the region: %s", ex.getMessage()));
+        } catch (Exception ex) {
+            Logger.e(LOG_TAG,
+                    String.format("An error occurred while attempting to make the region: %s", ex.getMessage()));
         }
 
         return GeoJSONUtils.toPointFeature(latLng, properties);
@@ -1316,7 +1312,7 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         IEvent event = new MapChangeEvent(this, EventTypes.REGION_DID_CHANGE,
                 makeRegionPayload(new Boolean(isAnimated)));
 
-                mManager.handleEvent(event);
+        mManager.handleEvent(event);
         mCameraChangeTracker.setReason(CameraChangeTracker.EMPTY);
     }
 
@@ -1353,14 +1349,14 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
         return sources;
     }
 
-    private List<RCTMGLShapeSource> getAllShapeSources() {
-        List<RCTMGLShapeSource> shapeSources = new ArrayList<>();
+    private List<RCTMLNShapeSource> getAllShapeSources() {
+        List<RCTMLNShapeSource> shapeSources = new ArrayList<>();
 
         for (String key : mSources.keySet()) {
             RCTSource source = mSources.get(key);
 
-            if (source instanceof RCTMGLShapeSource) {
-                shapeSources.add((RCTMGLShapeSource) source);
+            if (source instanceof RCTMLNShapeSource) {
+                shapeSources.add((RCTMLNShapeSource) source);
             }
         }
 
@@ -1471,32 +1467,34 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
     }
 
     /**
-    * Adds the marker image to the map for use as a SymbolLayer icon
-    */
+     * Adds the marker image to the map for use as a SymbolLayer icon
+     */
     private void setUpImage(@NonNull Style loadedStyle) {
         loadedStyle.addImage("MARKER_IMAGE_ID", BitmapFactory.decodeResource(
-            this.getResources(), R.drawable.red_marker)
-        );
+                this.getResources(), R.drawable.red_marker));
     }
 
     /**
-     * PointAnnotations are rendered to a canvas, but react native Image component is
-     * implemented on top of Fresco, and fresco will not load images when their view is
-     * not attached to the window. So we'll have an offscreen view where we add those views
+     * PointAnnotations are rendered to a canvas, but react native Image component
+     * is
+     * implemented on top of Fresco, and fresco will not load images when their view
+     * is
+     * not attached to the window. So we'll have an offscreen view where we add
+     * those views
      * so they can rendered full to canvas.
      */
     public ViewGroup offscreenAnnotationViewContainer() {
         if (mOffscreenAnnotationViewContainer == null) {
             mOffscreenAnnotationViewContainer = new FrameLayout(getContext());
-            FrameLayout.LayoutParams flParams = new FrameLayout.LayoutParams(0,0);
-            flParams.setMargins(-10000, -10000, -10000,-10000);
+            FrameLayout.LayoutParams flParams = new FrameLayout.LayoutParams(0, 0);
+            flParams.setMargins(-10000, -10000, -10000, -10000);
             mOffscreenAnnotationViewContainer.setLayoutParams(flParams);
             addView(mOffscreenAnnotationViewContainer);
         }
         return mOffscreenAnnotationViewContainer;
     }
 
-    public MarkerViewManager getMarkerViewManager(MapboxMap map) {
+    public MarkerViewManager getMarkerViewManager(MapLibreMap map) {
         if (markerViewManager == null) {
             if (map == null) {
                 throw new Error("makerViewManager should be called one the map has loaded");
@@ -1518,10 +1516,12 @@ public class RCTMGLMapView extends MapView implements OnMapReadyCallback, Mapbox
     }
 
     public void setTintColor(@Nullable Integer tintColor) {
-        if (mTintColor == tintColor) return;
+        if (mTintColor == tintColor)
+            return;
         mTintColor = tintColor;
         updateUISettings();
-        if (mLocationComponentManager == null) return;
+        if (mLocationComponentManager == null)
+            return;
         mLocationComponentManager.update(getMapboxMap().getStyle());
     }
 }