Merge pull request #353 from phenobarbital/dev

fix on waypoint route

Author: phenobarbital

navigator/actions/google/maps.py

@@ -388,6 +388,7 @@ async def waypoint_route(
             "travelMode": payload.travel_mode,
             "routingPreference": payload.routing_preference or "TRAFFIC_AWARE",
             "computeAlternativeRoutes": False,
+            "optimizeWaypointOrder": False,
             "routeModifiers": {
                 "avoidTolls": False,
                 "avoidHighways": False,
@@ -475,6 +476,7 @@ async def waypoint_route(
                     static_duration += int(static_duration_str.rstrip('s'))
                     # Distance:
                     distance_meters = leg.get('distanceMeters', 0)
+                    distance_miles = distance_meters / 1609.34 if distance_meters else 0
                     total_distance += distance_meters
                     if leg.get('steps') and len(leg['steps']) > 0:
                         # Get the first step's navigation instruction
@@ -484,13 +486,13 @@ async def waypoint_route(
                             # Get localized distance for this leg
                             leg_distance = leg.get(
                                 'localizedValues', {}
-                            ).get('distance', {}).get('text', f"{leg['distanceMeters']/1609.34:.1f} mi") or f"{distance_meters/1609.34:.1f} mi"  # noqa: E501
+                            ).get('distance', {}).get('text', f"{distance_miles:.1f} mi")  # noqa: E501
                             bestroute.append(f"Leg {i+1}: {instruction} for {leg_distance}")
                         else:
                             # Fallback if no navigation instruction
                             leg_distance = leg.get(
                                 'localizedValues', {}
-                            ).get('distance', {}).get('text', f"{leg['distanceMeters']/1609.34:.1f} mi") or f"{distance_meters/1609.34:.1f} mi"  # noqa: E501
+                            ).get('distance', {}).get('text', f"{distance_miles:.1f} mi")  # noqa: E501
                             bestroute.append(f"Leg {i+1}: Continue for {leg_distance}")
                 # Convert duration to minutes
                 total_duration_min = total_duration / 60 if total_duration > 0 else 0

navigator/actions/google/models.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Union, Optional
 from datetime import datetime
 from datamodel import BaseModel, Field
 
@@ -10,6 +10,10 @@ class Location(BaseModel):
     address: str = Field(required=False, label="Address")
     place_id: str = Field(required=False)
     formatted_address: str = Field(required=False)
+    timestamp: Optional[datetime] = Field(
+        required=False,
+        description="Timestamp of the location data"
+    )
 
     class Meta:
         strict: bool = True

navigator/version.py

@@ -4,7 +4,7 @@
 __description__ = (
     "Navigator Web Framework based on aiohttp, " "with batteries included."
 )
-__version__ = "2.12.26"
+__version__ = "2.12.27"
 __copyright__ = "Copyright (c) 2020-2024 Jesus Lara"
 __author__ = "Jesus Lara"
 __author_email__ = "jesuslarag@gmail.com"