Maplibre native 6.4 (#370)

* fix product name * renaming folders rctmgl -> rctmln * renaming android root rctmgl -> rctmln * renaming files * rctmgl -> rctmln * mgl -> mln * more renaming * android fixes * linter fixes * updating changelog and package with new version * fix xcode 15.2 issue * renaming mapbox folder to maplibre * rename com.mapbox to com.maplibre
maplibre · May 9, 2024 · 88b7fa0 · 88b7fa0
1 parent 69dd282
commit 88b7fa0
Show file tree

Hide file tree

Showing 351 changed files with 4,590 additions and 4,592 deletions.
diff --git a/.gitignore b/.gitignore
@@ -99,10 +99,11 @@ RNTester/Pods/*
 
 # project specific
 ios/Mapbox.framework
+ios/Maplibre.framework
 ios/temp.zip
 ios/.framework_version
 ios/Pods/
-ios/RCTMGL.xcodeproj/xcshareddata/
+ios/RCTMLN.xcodeproj/xcshareddata/
 android/build/
 android/.gradle/
 android/.idea/

diff --git a/.sonarcloud.properties b/.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=
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ 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))

diff --git a/__tests__/components/BackgroundLayer.test.js b/__tests__/components/BackgroundLayer.test.js
@@ -9,7 +9,7 @@ describe('BackgroundLayer', () => {
       <BackgroundLayer id="requiredBackgroundLayerID" />,
     );
 
-    const backgroundLayer = queryByTestId('rctmglBackgroundLayer');
+    const backgroundLayer = queryByTestId('rctmlnBackgroundLayer');
     const {props} = backgroundLayer;
 
     expect(props.sourceID).toStrictEqual('DefaultSourceID');
@@ -30,7 +30,7 @@ describe('BackgroundLayer', () => {
     };
 
     const {queryByTestId} = render(<BackgroundLayer {...testProps} />);
-    const backgroundLayer = queryByTestId('rctmglBackgroundLayer');
+    const backgroundLayer = queryByTestId('rctmlnBackgroundLayer');
     const {props} = backgroundLayer;
 
     expect(props.id).toStrictEqual(testProps.id);

diff --git a/__tests__/components/Callout.test.js b/__tests__/components/Callout.test.js
@@ -15,7 +15,7 @@ describe('Callout', () => {
   describe('_renderDefaultCallout', () => {
     test('renders default children', () => {
       const {UNSAFE_getByType, UNSAFE_getAllByType} = render(<Callout />);
-      const callout = UNSAFE_getByType('RCTMGLCallout');
+      const callout = UNSAFE_getByType('RCTMLNCallout');
 
       expect(callout).toBeDefined();
       expect(UNSAFE_getAllByType(Text).length).toBe(1);
@@ -34,7 +34,7 @@ describe('Callout', () => {
         <Callout {...testProps} />,
       );
 
-      const callout = UNSAFE_getByType('RCTMGLCallout');
+      const callout = UNSAFE_getByType('RCTMLNCallout');
       const views = UNSAFE_getAllByType(View);
       const text = UNSAFE_getByType(Text);
 
@@ -76,7 +76,7 @@ describe('Callout', () => {
           <View>{'Foo Bar'}</View>
         </Callout>,
       );
-      const callout = UNSAFE_getByType('RCTMGLCallout');
+      const callout = UNSAFE_getByType('RCTMLNCallout');
       const views = UNSAFE_getAllByType(View);
 
       const calloutWrapperTestStyle = callout.props.style[1].width;

diff --git a/__tests__/components/CircleLayer.test.js b/__tests__/components/CircleLayer.test.js
@@ -6,7 +6,7 @@ import {render} from '@testing-library/react-native';
 describe('CircleLayer', () => {
   test('renders correctly with default props', () => {
     const {queryByTestId} = render(<CircleLayer id="requiredCircleLayerID" />);
-    const circleLayer = queryByTestId('rctmglCircleLayer');
+    const circleLayer = queryByTestId('rctmlnCircleLayer');
     const {props} = circleLayer;
 
     expect(props.sourceID).toStrictEqual('DefaultSourceID');
@@ -27,7 +27,7 @@ describe('CircleLayer', () => {
     };
 
     const {queryByTestId} = render(<CircleLayer {...customProps} />);
-    const circleLayer = queryByTestId('rctmglCircleLayer');
+    const circleLayer = queryByTestId('rctmlnCircleLayer');
     const {props} = circleLayer;
 
     expect(props.id).toStrictEqual(customProps.id);

diff --git a/__tests__/components/HeatmapLayer.test.js b/__tests__/components/HeatmapLayer.test.js
@@ -8,7 +8,7 @@ describe('HeatmapLayer', () => {
     const {UNSAFE_getByType} = render(
       <HeatmapLayer id="requiredHeatmapLayerID" />,
     );
-    const heatmapLayer = UNSAFE_getByType('RCTMGLHeatmapLayer');
+    const heatmapLayer = UNSAFE_getByType('RCTMLNHeatmapLayer');
     const {props} = heatmapLayer;
     expect(props.sourceID).toStrictEqual('DefaultSourceID');
   });
@@ -27,7 +27,7 @@ describe('HeatmapLayer', () => {
       style: {visibility: 'none'},
     };
     const {UNSAFE_getByType} = render(<HeatmapLayer {...testProps} />);
-    const {props} = UNSAFE_getByType('RCTMGLHeatmapLayer');
+    const {props} = UNSAFE_getByType('RCTMLNHeatmapLayer');
 
     expect(props.id).toStrictEqual(testProps.id);
     expect(props.sourceID).toStrictEqual(testProps.sourceID);

diff --git a/__tests__/components/Light.test.js b/__tests__/components/Light.test.js
@@ -6,7 +6,7 @@ import {render} from '@testing-library/react-native';
 describe('Light', () => {
   test('renders correctly', () => {
     const {queryByTestId} = render(<Light />);
-    const light = queryByTestId('rctmglLight');
+    const light = queryByTestId('rctmlnLight');
     expect(light).toBeDefined();
   });
 
@@ -21,7 +21,7 @@ describe('Light', () => {
 
     const {queryByTestId} = render(<Light style={testStyles} />);
 
-    const customStyles = queryByTestId('rctmglLight').props.reactStyle;
+    const customStyles = queryByTestId('rctmlnLight').props.reactStyle;
     const {anchor} = customStyles;
     const {color} = customStyles;
     const {position} = customStyles;

diff --git a/__tests__/modules/location/locationManager.test.js b/__tests__/modules/location/locationManager.test.js
@@ -4,8 +4,8 @@ import LocationManager, {
 
 import {NativeModules} from 'react-native';
 
-const MapLibreGL = NativeModules.MGLModule;
-const MapLibreGLLocationManager = NativeModules.MGLLocationModule;
+const MapLibreGL = NativeModules.MLNModule;
+const MapLibreGLLocationManager = NativeModules.MLNLocationModule;
 
 const location = {
   coords: {

diff --git a/__tests__/modules/offline/OfflinePack.test.js b/__tests__/modules/offline/OfflinePack.test.js
@@ -20,7 +20,7 @@ describe('OfflinePack', () => {
 
   it('should resume pack download', () => {
     const spy = jest.spyOn(
-      NativeModules.MGLOfflineModule,
+      NativeModules.MLNOfflineModule,
       'resumePackDownload',
     );
     const offlinePack = new OfflinePack(fakeNativePack);
@@ -30,15 +30,15 @@ describe('OfflinePack', () => {
   });
 
   it('should pause pack download', () => {
-    const spy = jest.spyOn(NativeModules.MGLOfflineModule, 'pausePackDownload');
+    const spy = jest.spyOn(NativeModules.MLNOfflineModule, 'pausePackDownload');
     const offlinePack = new OfflinePack(fakeNativePack);
     offlinePack.pause();
     expect(spy).toHaveBeenCalled();
     spy.mockRestore();
   });
 
   it('should get pack status', () => {
-    const spy = jest.spyOn(NativeModules.MGLOfflineModule, 'getPackStatus');
+    const spy = jest.spyOn(NativeModules.MLNOfflineModule, 'getPackStatus');
     const offlinePack = new OfflinePack(fakeNativePack);
     offlinePack.status();
     expect(spy).toHaveBeenCalled();

diff --git a/__tests__/modules/offline/offlineManager.test.js b/__tests__/modules/offline/offlineManager.test.js
@@ -71,7 +71,7 @@ describe('offlineManager', () => {
 
   it('should set max tile count limit', () => {
     const expectedLimit = 2000;
-    const spy = jest.spyOn(NativeModules.MGLOfflineModule, 'setTileCountLimit');
+    const spy = jest.spyOn(NativeModules.MLNOfflineModule, 'setTileCountLimit');
     MapLibreGL.offlineManager.setTileCountLimit(expectedLimit);
     expect(spy).toHaveBeenCalledWith(expectedLimit);
     spy.mockRestore();
@@ -80,7 +80,7 @@ describe('offlineManager', () => {
   it('should set progress event throttle value', () => {
     const expectedThrottleValue = 500;
     const spy = jest.spyOn(
-      NativeModules.MGLOfflineModule,
+      NativeModules.MLNOfflineModule,
       'setProgressEventThrottle',
     );
     MapLibreGL.offlineManager.setProgressEventThrottle(expectedThrottleValue);
@@ -194,7 +194,7 @@ describe('offlineManager', () => {
     beforeEach(() => (Platform.OS = 'android'));
 
     it('should set pack observer manually', async () => {
-      const spy = jest.spyOn(NativeModules.MGLOfflineModule, 'setPackObserver');
+      const spy = jest.spyOn(NativeModules.MLNOfflineModule, 'setPackObserver');
 
       const name = `test-${Date.now()}`;
       const noop = () => {};
@@ -207,7 +207,7 @@ describe('offlineManager', () => {
     });
 
     it('should not set pack observer manually during create flow', async () => {
-      const spy = jest.spyOn(NativeModules.MGLOfflineModule, 'setPackObserver');
+      const spy = jest.spyOn(NativeModules.MLNOfflineModule, 'setPackObserver');
 
       const name = `test-${Date.now()}`;
       const noop = () => {};
@@ -223,7 +223,7 @@ describe('offlineManager', () => {
     beforeEach(() => (Platform.OS = 'ios'));
 
     it('should not set pack observer manually', async () => {
-      const spy = jest.spyOn(NativeModules.MGLOfflineModule, 'setPackObserver');
+      const spy = jest.spyOn(NativeModules.MLNOfflineModule, 'setPackObserver');
 
       const name = `test-${Date.now()}`;
       const noop = () => {};

diff --git a/__tests__/modules/snapshot/SnapshotOptions.test.js b/__tests__/modules/snapshot/SnapshotOptions.test.js
@@ -17,7 +17,7 @@ describe('SnapshotOptions', () => {
     const options = new SnapshotOptions({centerCoordinate});
 
     expect(options.toJSON()).toEqual({
-      styleURL: NativeModules.MGLModule.StyleURL.Default,
+      styleURL: NativeModules.MLNModule.StyleURL.Default,
       heading: 0.0,
       pitch: 0.0,
       zoomLevel: 16.0,
@@ -39,7 +39,7 @@ describe('SnapshotOptions', () => {
       height: 600,
       writeToDisk: true,
       withLogo: true,
-      styleURL: NativeModules.MGLModule.StyleURL.Default,
+      styleURL: NativeModules.MLNModule.StyleURL.Default,
     };
 
     const options = new SnapshotOptions(expectedOptions);
@@ -59,7 +59,7 @@ describe('SnapshotOptions', () => {
       ],
       width: 400,
       height: 600,
-      styleURL: NativeModules.MGLModule.StyleURL.Default,
+      styleURL: NativeModules.MLNModule.StyleURL.Default,
       writeToDisk: false,
       withLogo: true,
     };

diff --git a/android/rctmgl/src/main/java/com/mapbox/rctmgl/RCTMGLPackage.java b/android/rctmgl/src/main/java/com/mapbox/rctmgl/RCTMGLPackage.java
diff --git a/...id/rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLCalloutManager.java b/...id/rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLCalloutManager.java
diff --git a/...ctmgl/src/main/java/com/mapbox/rctmgl/components/styles/layers/RCTMGLBackgroundLayer.java b/...ctmgl/src/main/java/com/mapbox/rctmgl/components/styles/layers/RCTMGLBackgroundLayer.java