@maplibre/maplibre-react-native 10.0.0-alpha.10 → 10.0.0-alpha.12

package/CHANGELOG.md

@@ -6,6 +6,19 @@ PR Title ([#123](link to my pr))
 
 ```
 
+## 10.0.0-alpha.12
+
+Specify in install.md the correct SPM variable name to use a different native iOS library version
+([#438](https://github.com/maplibre/maplibre-react-native/pull/438))
+
+Remove deprecated defaultProps for functional component ([#431](https://github.com/maplibre/maplibre-react-native/pull/431))
+
+feat: [feat: extract android UserLocation FPS](<[#428](https://github.com/maplibre/maplibre-react-native/pull/428)>)
+
+## 10.0.0-alpha.11
+
+Chore: [bump maplibre native ios to 6.5.4](https://github.com/maplibre/maplibre-react-native/pull/437)
+
 ## 10.0.0-alpha.10
 
 Fix: [move @types/ packages to deps and remove assets.d.ts #423](https://github.com/maplibre/maplibre-react-native/pull/423)

package/android/rctmln/.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +1,2 @@
-connection.project.dir=
+connection.project.dir=../../example/android
 eclipse.preferences.version=1

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/LocationComponentManager.java

@@ -67,6 +67,15 @@ public class LocationComponentManager {
         }
     }
 
+    public void setPreferredFramesPerSecond(int preferredFramesPerSecond) {
+       if(preferredFramesPerSecond <= 0) {
+            return;
+       }
+
+        mLocationComponent.setMaxAnimationFps(preferredFramesPerSecond);
+    }
+
+
     public void addOnCameraTrackingChangedListener(OnCameraTrackingChangedListener onCameraTrackingChangedListener) {
         mLocationComponent.addOnCameraTrackingChangedListener(onCameraTrackingChangedListener);
     }

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/RCTMLNNativeUserLocation.java

@@ -17,6 +17,7 @@ public class RCTMLNNativeUserLocation extends AbstractMapFeature implements OnMa
     private MapLibreMap mMap;
     private RCTMLNMapView mMapView;
     private @RenderMode.Mode int mRenderMode = RenderMode.COMPASS;
+    private int mPreferredFramesPerSecond;
 
     public RCTMLNNativeUserLocation(Context context) {
         super(context);
@@ -28,6 +29,7 @@ public class RCTMLNNativeUserLocation extends AbstractMapFeature implements OnMa
         mMapView = mapView;
         mapView.getMapAsync(this);
         setRenderMode(mRenderMode);
+        setPreferredFramesPerSecond(mPreferredFramesPerSecond);
     }
 
     @Override
@@ -63,4 +65,12 @@ public class RCTMLNNativeUserLocation extends AbstractMapFeature implements OnMa
             locationComponent.setRenderMode(renderMode);
         }
     }
+
+    public void setPreferredFramesPerSecond(int framesPerSecond) {
+        mPreferredFramesPerSecond = framesPerSecond;
+        if (mMapView != null) {
+            LocationComponentManager locationComponent = mMapView.getLocationComponentManager();
+            locationComponent.setPreferredFramesPerSecond(framesPerSecond);
+        }
+    }
 }

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/RCTMLNNativeUserLocationManager.java

@@ -27,6 +27,11 @@ public class RCTMLNNativeUserLocationManager extends ViewGroupManager<RCTMLNNati
        }
     }
 
+    @ReactProp(name="androidPreferredFramesPerSecond")
+    public void setPreferredFramesPerSecond(RCTMLNNativeUserLocation userLocation, int preferredFramesPerSecond) {
+       userLocation.setPreferredFramesPerSecond(preferredFramesPerSecond);
+    }
+
     @Nonnull
     @Override
     protected RCTMLNNativeUserLocation createViewInstance(@Nonnull ThemedReactContext reactContext) {

package/docs/NativeUserLocation.md

@@ -7,5 +7,6 @@
 | ---- | :--: | :-----: | :------: | :----------: |
 | androidRenderMode | `"normal" \| "compass" \| "gps"` | `none` | `false` | Android render mode.<br/><br/> - normal: just a circle<br/> - compass: triangle with heading<br/> - gps: large arrow<br/><br/>@platform android |
 | iosShowsUserHeadingIndicator | `boolean` | `none` | `false` | iOS only. A Boolean value indicating whether the user location annotation may display a permanent heading indicator.<br/><br/>@platform ios |
+| androidPreferredFramesPerSecond | `number` | `none` | `false` | Android only. Set max FPS at which location animators can output updates. Use this setting to limit animation rate of the location puck on higher zoom levels to decrease the stress on the device's CPU which can directly improve battery life, without sacrificing UX. |
 
 

package/docs/UserLocation.md

@@ -11,6 +11,7 @@
 | visible | `boolean` | `true` | `false` | Whether location icon is visible |
 | showsUserHeadingIndicator | `boolean` | `false` | `false` | Show or hide small arrow which indicates direction the device is pointing relative to north. |
 | minDisplacement | `number` | `0` | `false` | Minimum amount of movement before GPS location is updated in meters |
+| androidPreferredFramesPerSecond | `number` | `none` | `false` | Android only. Set max FPS at which location animators can output updates. Use this setting to limit animation rate of the location puck on higher zoom levels to decrease the stress on the device's CPU which can directly improve battery life, without sacrificing UX.<br/><br/>@platform android |
 | children | `ReactElement \| ReactElement[]` | `none` | `false` | Custom location icon of type mapbox-gl-native components<br/><br/>NOTE: Forking maintainer does not understand the above comment. |
 
 ### methods

package/docs/docs.json

@@ -2659,6 +2659,13 @@
         "type": "boolean",
         "default": "none",
         "description": "iOS only. A Boolean value indicating whether the user location annotation may display a permanent heading indicator.\n\n@platform ios"
+      },
+      {
+        "name": "androidPreferredFramesPerSecond",
+        "required": false,
+        "type": "number",
+        "default": "none",
+        "description": "Android only. Set max FPS at which location animators can output updates. Use this setting to limit animation rate of the location puck on higher zoom levels to decrease the stress on the device's CPU which can directly improve battery life, without sacrificing UX."
       }
     ],
     "fileNameWithExt": "NativeUserLocation.tsx",
@@ -4843,6 +4850,13 @@
         "default": "0",
         "description": "Minimum amount of movement before GPS location is updated in meters"
       },
+      {
+        "name": "androidPreferredFramesPerSecond",
+        "required": false,
+        "type": "number",
+        "default": "none",
+        "description": "Android only. Set max FPS at which location animators can output updates. Use this setting to limit animation rate of the location puck on higher zoom levels to decrease the stress on the device's CPU which can directly improve battery life, without sacrificing UX.\n\n@platform android"
+      },
       {
         "name": "children",
         "required": false,

package/ios/RCTMLN.xcodeproj/project.pbxproj

@@ -676,7 +676,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../react-native/React";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -719,7 +719,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../react-native/React";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

package/ios/install.md

@@ -12,7 +12,7 @@ Add the following to your `ios/Podfile`:
   end
 ```
 
-Running `pod install` will add version `6.4.0` of the MapLibre SDK.
+Running `pod install` will add version `6.5.4` of the MapLibre SDK.
 
 ```sh
 # Go to the ios directory
@@ -33,16 +33,16 @@ until this is fixed upstream. iOS devs can open the workspace in Xcode and run f
 
 ## Installing a specific version
 
-The current default MapLibre version is `6.4.0`.
+The current default MapLibre version is `6.5.4`.
 If you want to install a different version, you can override as follows in
 your `Podfile`:
 
 ```ruby
-$RCTMLN_Use_SPM = {
+$RCTMLN_SPM_Spec = {
   url: "https://github.com/maplibre/maplibre-gl-native-distribution",
   requirement: {
     kind: "upToNextMajorVersion",
-    minimumVersion: "6.4.0"
+    minimumVersion: "6.5.4"
   },
   product_name: "MapLibre"
 }

package/javascript/components/MarkerView.tsx

@@ -53,14 +53,20 @@ interface NativeProps extends ViewProps {
  * This is based on [MakerView plugin](https://docs.mapbox.com/android/plugins/overview/markerview/) on Android
  * and PointAnnotation on iOS.
  */
-const MarkerView = (props: MarkerViewProps): ReactElement => {
+const MarkerView = ({
+  anchor = { x: 0.5, y: 0.5 },
+  allowOverlap = false,
+  isSelected = false,
+  ...rest
+}: MarkerViewProps): ReactElement => {
+  const props = { anchor, allowOverlap, isSelected, ...rest };
   const coordinate = props.coordinate
     ? toJSONString(makePoint(props.coordinate))
     : undefined;
 
   const idForPointAnnotation = useMemo(() => {
-    MarkerView.lastId = MarkerView.lastId + 1;
-    return `MV-${MarkerView.lastId}`;
+    lastId = lastId + 1;
+    return `MV-${lastId}`;
   }, []);
 
   if (Platform.OS === "ios") {
@@ -75,12 +81,7 @@ const MarkerView = (props: MarkerViewProps): ReactElement => {
   return <RCTMLNMarkerView {...propsToSend}>{props.children}</RCTMLNMarkerView>;
 };
 
-MarkerView.lastId = 0;
-MarkerView.defaultProps = {
-  anchor: { x: 0.5, y: 0.5 },
-  allowOverlap: false,
-  isSelected: false,
-};
+let lastId = 0;
 
 const RCTMLNMarkerView =
   requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);

package/javascript/components/NativeUserLocation.tsx

@@ -20,6 +20,10 @@ interface NativeUserLocationProps {
    * @platform ios
    */
   iosShowsUserHeadingIndicator?: boolean;
+  /**
+   * Android only. Set max FPS at which location animators can output updates. Use this setting to limit animation rate of the location puck on higher zoom levels to decrease the stress on the device's CPU which can directly improve battery life, without sacrificing UX.
+   */
+  androidPreferredFramesPerSecond?: number;
 }
 
 const NativeUserLocation = (props: NativeUserLocationProps): ReactElement => {

package/javascript/components/UserLocation.tsx

@@ -93,6 +93,12 @@ interface UserLocationProps {
    * Minimum amount of movement before GPS location is updated in meters
    */
   minDisplacement?: number;
+  /**
+   * Android only. Set max FPS at which location animators can output updates. Use this setting to limit animation rate of the location puck on higher zoom levels to decrease the stress on the device's CPU which can directly improve battery life, without sacrificing UX.
+   *
+   * @platform android
+   */
+  androidPreferredFramesPerSecond?: number;
   /**
    * Custom location icon of type mapbox-gl-native components
    *
@@ -128,6 +134,7 @@ const UserLocation = React.memo(
         minDisplacement = 0,
         renderMode = "normal",
         androidRenderMode,
+        androidPreferredFramesPerSecond,
         children,
         onUpdate,
         onPress,
@@ -259,6 +266,7 @@ const UserLocation = React.memo(
         const props = {
           androidRenderMode,
           iosShowsUserHeadingIndicator: showsUserHeadingIndicator,
+          androidPreferredFramesPerSecond,
         };
 
         return <NativeUserLocation {...props} />;

package/maplibre-react-native.podspec

@@ -28,7 +28,7 @@ def $RCTMLN.post_install(installer)
     url: "https://github.com/maplibre/maplibre-gl-native-distribution",
     requirement: {
       kind: "exactVersion",
-      version: "6.4.0"
+      version: "6.5.4"
     },
     product_name: "MapLibre"
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "A MapLibre GL Native plugin for creating maps in React Native",
-  "version": "10.0.0-alpha.10",
+  "version": "10.0.0-alpha.12",
   "publishConfig": {
     "access": "public"
   },