diff --git a/sunnypilot/navd/navigation_helpers/nav_instructions.py b/sunnypilot/navd/navigation_helpers/nav_instructions.py index 888280f96e..a2e9148f41 100644 --- a/sunnypilot/navd/navigation_helpers/nav_instructions.py +++ b/sunnypilot/navd/navigation_helpers/nav_instructions.py @@ -13,7 +13,6 @@ class NavigationInstructions: self._no_route = False def get_route_progress(self, current_lat, current_lon) -> dict | None: - """Get current position on route and progress information""" route = self.get_current_route() if not route or not route['geometry'] or not route['steps']: return None @@ -125,7 +124,8 @@ class NavigationInstructions: return str(modifier) return 'none' - def get_current_speed_limit_from_progress(self, progress, is_metric: bool) -> int: + @staticmethod + def get_current_speed_limit_from_progress(progress, is_metric: bool) -> int: if progress and progress['current_maxspeed']: speed, _ = progress['current_maxspeed'] if is_metric: diff --git a/sunnypilot/navd/navigation_helpers/tests/test_mapbox.py b/sunnypilot/navd/navigation_helpers/tests/test_mapbox.py index cb1432a1ba..4ba70ac5bb 100644 --- a/sunnypilot/navd/navigation_helpers/tests/test_mapbox.py +++ b/sunnypilot/navd/navigation_helpers/tests/test_mapbox.py @@ -16,7 +16,7 @@ class TestMapbox: if token: cls.mapbox.params.put('MapboxToken', token) - # setup route + # route setup cls.current_lon, cls.current_lat = -119.17557, 34.23305 cls.mapbox.params.put('MapboxRoute', '740 E Ventura Blvd. Camarillo, CA') cls.postvars = {"place_name": cls.mapbox.params.get('MapboxRoute')} @@ -64,7 +64,6 @@ class TestMapbox: assert upcoming_close == expected_turn == 'right', "Should be a right turn upcoming" def test_route_progress_tracking(self): - # Test route progress tracking progress = self.nav.get_route_progress(self.current_lat, self.current_lon) assert progress is not None assert 'distance_from_route' in progress @@ -80,7 +79,6 @@ class TestMapbox: assert progress['total_time_remaining'] >= 0 assert isinstance(progress['all_maneuvers'], list) - # Test speed limit extraction speed_limit_metric = self.nav.get_current_speed_limit_from_progress(progress, True) speed_limit_imperial = self.nav.get_current_speed_limit_from_progress(progress, False) assert isinstance(speed_limit_metric, int)