fix: codegen type for followingZoomLevel

jokerttu · jokerttu · commit aee9a948a0ad · 2026-04-21T11:08:03.000+03:00
diff --git a/android/src/main/java/com/google/android/react/navsdk/MapViewController.java b/android/src/main/java/com/google/android/react/navsdk/MapViewController.java
@@ -1039,15 +1039,15 @@ public void resetMinMaxZoomLevel() {
   }
 
   @SuppressLint("MissingPermission")
-  public void setFollowingPerspective(int jsValue, float zoomLevel) {
+  public void setFollowingPerspective(int jsValue, Float zoomLevel) {
     if (mGoogleMap == null) {
       return;
     }
 
     @CameraPerspective
     int perspective = EnumTranslationUtil.getCameraPerspectiveFromJsValue(jsValue);
 
-    if (zoomLevel >= 0.0f) {
+    if (zoomLevel != null) {
       FollowMyLocationOptions options =
           FollowMyLocationOptions.builder().setZoomLevel(zoomLevel).build();
       mGoogleMap.followMyLocation(perspective, options);
diff --git a/android/src/main/java/com/google/android/react/navsdk/NavAutoModule.java b/android/src/main/java/com/google/android/react/navsdk/NavAutoModule.java
@@ -393,15 +393,15 @@ public void setMyLocationEnabled(boolean enabled) {
   }
 
   @Override
-  public void setFollowingPerspective(double perspective, double zoomLevel) {
+  public void setFollowingPerspective(double perspective, Double zoomLevel) {
     int jsValue = (int) perspective;
-    float zoom = (float) zoomLevel;
     UiThreadUtil.runOnUiThread(
         () -> {
           if (mMapViewController == null) {
             return;
           }
-          mMapViewController.setFollowingPerspective(jsValue, zoom);
+          mMapViewController.setFollowingPerspective(
+              jsValue, zoomLevel == null ? null : zoomLevel.floatValue());
         });
   }
 
diff --git a/android/src/main/java/com/google/android/react/navsdk/NavViewModule.java b/android/src/main/java/com/google/android/react/navsdk/NavViewModule.java
@@ -406,7 +406,7 @@ public void setNavigationUIEnabled(String nativeID, boolean enabled, final Promi
 
   @Override
   public void setFollowingPerspective(
-      String nativeID, double perspective, double zoomLevel, final Promise promise) {
+      String nativeID, double perspective, Double zoomLevel, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
@@ -418,7 +418,8 @@ public void setFollowingPerspective(
           if (fragment instanceof INavViewFragment) {
             fragment
                 .getMapController()
-                .setFollowingPerspective((int) perspective, (float) zoomLevel);
+                .setFollowingPerspective(
+                    (int) perspective, zoomLevel == null ? null : zoomLevel.floatValue());
             promise.resolve(null);
           } else {
             promise.reject(JsErrors.NOT_NAV_VIEW_ERROR_CODE, JsErrors.NOT_NAV_VIEW_ERROR_MESSAGE);
diff --git a/ios/react-native-navigation-sdk/NavAutoModule.mm b/ios/react-native-navigation-sdk/NavAutoModule.mm
@@ -548,11 +548,11 @@ - (void)setNightMode:(NSInteger)nightMode {
   });
 }
 
-- (void)setFollowingPerspective:(NSInteger)perspective zoomLevel:(double)zoomLevel {
+- (void)setFollowingPerspective:(NSInteger)perspective zoomLevel:(NSNumber *)zoomLevel {
   dispatch_async(dispatch_get_main_queue(), ^{
     if (self->_viewController) {
       [self->_viewController setFollowingPerspective:[NSNumber numberWithInteger:perspective]
-                                           zoomLevel:(float)zoomLevel];
+                                           zoomLevel:zoomLevel];
     }
   });
 }
diff --git a/ios/react-native-navigation-sdk/NavViewController.h b/ios/react-native-navigation-sdk/NavViewController.h
@@ -45,7 +45,7 @@ typedef void (^OnArrayResult)(NSArray *_Nullable result);
 - (void)setReportIncidentButtonEnabled:(BOOL)isEnabled;
 - (void)setNavigationUIEnabled:(BOOL)isEnabled;
 - (void)setNavigationUIEnabledPreference:(int)preference;
-- (void)setFollowingPerspective:(NSNumber *)index zoomLevel:(float)zoomLevel;
+- (void)setFollowingPerspective:(NSNumber *)index zoomLevel:(NSNumber *)zoomLevel;
 - (void)setNightMode:(NSNumber *)index;
 - (void)setSpeedometerEnabled:(BOOL)isEnabled;
 - (void)setSpeedLimitIconEnabled:(BOOL)isEnabled;
diff --git a/ios/react-native-navigation-sdk/NavViewController.mm b/ios/react-native-navigation-sdk/NavViewController.mm
@@ -560,7 +560,9 @@ - (void)setMyLocationEnabled:(BOOL)isEnabled {
   _mapView.myLocationEnabled = isEnabled;
 }
 
-- (void)setFollowingPerspective:(NSNumber *)index zoomLevel:(float)zoomLevel {
+- (void)setFollowingPerspective:(NSNumber *)index zoomLevel:(NSNumber *)zoomLevel {
+  _mapView.cameraMode = GMSNavigationCameraModeFollowing;
+
   if ([index isEqual:@1]) {
     [_mapView setFollowingPerspective:GMSNavigationCameraPerspectiveTopDownNorthUp];
   } else if ([index isEqual:@2]) {
@@ -569,13 +571,11 @@ - (void)setFollowingPerspective:(NSNumber *)index zoomLevel:(float)zoomLevel {
     [_mapView setFollowingPerspective:GMSNavigationCameraPerspectiveTilted];
   }
 
-  if (zoomLevel >= 0.0f) {
-    _mapView.followingZoomLevel = zoomLevel;
+  if (zoomLevel != nil) {
+    _mapView.followingZoomLevel = zoomLevel.floatValue;
   } else {
     _mapView.followingZoomLevel = GMSNavigationNoFollowingZoomLevel;
   }
-
-  _mapView.cameraMode = GMSNavigationCameraModeFollowing;
 }
 
 - (void)setSpeedometerEnabled:(BOOL)isEnabled {
diff --git a/ios/react-native-navigation-sdk/NavViewModule.mm b/ios/react-native-navigation-sdk/NavViewModule.mm
@@ -476,14 +476,14 @@ - (void)setNavigationUIEnabled:(NSString *)nativeID
 }
 
 - (void)setFollowingPerspective:(NSString *)nativeID
-                    perspective:(double)perspective
-                      zoomLevel:(double)zoomLevel
+                    perspective:(NSInteger)perspective
+                      zoomLevel:(NSNumber *)zoomLevel
                         resolve:(RCTPromiseResolveBlock)resolve
                          reject:(RCTPromiseRejectBlock)reject {
   NavViewController *viewController = [self getViewControllerForNativeID:nativeID];
   if (viewController) {
     dispatch_async(dispatch_get_main_queue(), ^{
-      [viewController setFollowingPerspective:@((NSInteger)perspective) zoomLevel:(float)zoomLevel];
+      [viewController setFollowingPerspective:@(perspective) zoomLevel:zoomLevel];
       resolve(nil);
     });
   } else {
diff --git a/src/auto/useNavigationAuto.ts b/src/auto/useNavigationAuto.ts
@@ -170,8 +170,7 @@ export const useNavigationAuto = (): UseNavigationAutoResult => {
         perspective: number,
         options?: FollowMyLocationOptions
       ) => {
-        const zoomLevel = options?.zoomLevel ?? -1;
-        NavAutoModule.setFollowingPerspective(perspective, zoomLevel);
+        NavAutoModule.setFollowingPerspective(perspective, options?.zoomLevel);
       },
 
       sendCustomMessage: (
diff --git a/src/native/NativeNavAutoModule.ts b/src/native/NativeNavAutoModule.ts
@@ -150,7 +150,10 @@ export interface Spec extends TurboModule {
   setMyLocationButtonEnabled(enabled: boolean): void;
   setMapColorScheme(colorScheme: Int32): void;
   setNightMode(nightMode: Int32): void;
-  setFollowingPerspective(perspective: Int32, zoomLevel: Double): void;
+  setFollowingPerspective(
+    perspective: Int32,
+    zoomLevel?: WithDefault<Float, null>
+  ): void;
   setBuildingsEnabled(enabled: boolean): void;
   setZoomLevel(zoomLevel: Double): Promise<void>;
   setMapPadding(top: Double, left: Double, bottom: Double, right: Double): void;
diff --git a/src/native/NativeNavViewModule.ts b/src/native/NativeNavViewModule.ts
@@ -142,7 +142,7 @@ export interface Spec extends TurboModule {
   setFollowingPerspective(
     nativeID: string,
     perspective: Int32,
-    zoomLevel: Double
+    zoomLevel?: WithDefault<Float, null>
   ): Promise<void>;
   moveCamera(
     nativeID: string,
diff --git a/src/navigation/navigationView/navigationViewController.ts b/src/navigation/navigationView/navigationViewController.ts
@@ -50,11 +50,10 @@ export const getNavigationViewController = (
       options?: FollowMyLocationOptions
     ) => {
       try {
-        const zoomLevel = options?.zoomLevel ?? -1;
         await NavViewModule.setFollowingPerspective(
           nativeID,
           perspective,
-          zoomLevel
+          options?.zoomLevel
         );
       } catch (error) {
         console.error('Error calling setFollowingPerspective:', error);

Original file line number	Diff line number	Diff line change
`@@ -393,15 +393,15 @@ public void setMyLocationEnabled(boolean enabled) {`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`@Override`
`396`		`- public void setFollowingPerspective(double perspective, double zoomLevel) {`
	`396`	`+ public void setFollowingPerspective(double perspective, Double zoomLevel) {`
`397`	`397`	`int jsValue = (int) perspective;`
`398`		`- float zoom = (float) zoomLevel;`
`399`	`398`	`UiThreadUtil.runOnUiThread(`
`400`	`399`	`() -> {`
`401`	`400`	`if (mMapViewController == null) {`
`402`	`401`	`return;`
`403`	`402`	`}`
`404`		`- mMapViewController.setFollowingPerspective(jsValue, zoom);`
	`403`	`+ mMapViewController.setFollowingPerspective(`
	`404`	`+ jsValue, zoomLevel == null ? null : zoomLevel.floatValue());`
`405`	`405`	`});`
`406`	`406`	`}`
`407`	`407`
Original file line number	Diff line number	Diff line change
`@@ -548,11 +548,11 @@ - (void)setNightMode:(NSInteger)nightMode {`
`548`	`548`	`});`
`549`	`549`	`}`
`550`	`550`
`551`		`-- (void)setFollowingPerspective:(NSInteger)perspective zoomLevel:(double)zoomLevel {`
	`551`	`+- (void)setFollowingPerspective:(NSInteger)perspective zoomLevel:(NSNumber *)zoomLevel {`
`552`	`552`	`dispatch_async(dispatch_get_main_queue(), ^{`
`553`	`553`	`if (self->_viewController) {`
`554`	`554`	`[self->_viewController setFollowingPerspective:[NSNumber numberWithInteger:perspective]`
`555`		`- zoomLevel:(float)zoomLevel];`
	`555`	`+ zoomLevel:zoomLevel];`
`556`	`556`	`}`
`557`	`557`	`});`
`558`	`558`	`}`
Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,9 @@ - (void)setMyLocationEnabled:(BOOL)isEnabled {`
`560`	`560`	`_mapView.myLocationEnabled = isEnabled;`
`561`	`561`	`}`
`562`	`562`
`563`		`-- (void)setFollowingPerspective:(NSNumber *)index zoomLevel:(float)zoomLevel {`
	`563`	`+- (void)setFollowingPerspective:(NSNumber )index zoomLevel:(NSNumber )zoomLevel {`
	`564`	`+ _mapView.cameraMode = GMSNavigationCameraModeFollowing;`
	`565`	`+`
`564`	`566`	`if ([index isEqual:@1]) {`
`565`	`567`	`[_mapView setFollowingPerspective:GMSNavigationCameraPerspectiveTopDownNorthUp];`
`566`	`568`	`} else if ([index isEqual:@2]) {`
`@@ -569,13 +571,11 @@ - (void)setFollowingPerspective:(NSNumber *)index zoomLevel:(float)zoomLevel {`
`569`	`571`	`[_mapView setFollowingPerspective:GMSNavigationCameraPerspectiveTilted];`
`570`	`572`	`}`
`571`	`573`
`572`		`- if (zoomLevel >= 0.0f) {`
`573`		`- _mapView.followingZoomLevel = zoomLevel;`
	`574`	`+ if (zoomLevel != nil) {`
	`575`	`+ _mapView.followingZoomLevel = zoomLevel.floatValue;`
`574`	`576`	`} else {`
`575`	`577`	`_mapView.followingZoomLevel = GMSNavigationNoFollowingZoomLevel;`
`576`	`578`	`}`
`577`		`-`
`578`		`- _mapView.cameraMode = GMSNavigationCameraModeFollowing;`
`579`	`579`	`}`
`580`	`580`
`581`	`581`	`- (void)setSpeedometerEnabled:(BOOL)isEnabled {`