Update utils/utils.py

utils/utils.py

@@ -10,7 +10,7 @@ from ipyleaflet import AwesomeIcon
 
 from shiny.express import ui
 
-from utils.config import ors_api_key, BRANDCOLORS, BASEMAPS, ONE_WEEK_SEC, LOCATIONS, TRIP_DISTANCE
+from utils.config import MAPS_API_KEY, BRANDCOLORS, BASEMAPS, ONE_WEEK_SEC, LOCATIONS, TRIP_DISTANCE
 
 
 # Cache expires after 1 week
@@ -40,9 +40,9 @@ def get_bounds(country: str) -> Tuple[float]:
 
 
 @cached(cache=TTLCache(maxsize=3000, ttl=ONE_WEEK_SEC))  # Memory
-def ops_trip_distance(origin: tuple, destination: tuple) -> float:
+def google_maps_trip_distance(origin: tuple, destination: tuple) -> float:
     """
-    The road distance calculated using openrouteservice with the driving car is the shortest 
+    The road distance calculated using Google Maps distance matrix api with the driving car is the shortest 
     or optimal road distance based on the available road data and routing algorithm.
 
     origin is a tuple of lat, lon
@@ -51,28 +51,27 @@ def ops_trip_distance(origin: tuple, destination: tuple) -> float:
     Returns: the calculiated trip distance or a default value
     """
 
-    # OpenRouteService API URL
-    # https://giscience.github.io/openrouteservice/api-reference/endpoints/directions/extra-info/
-    url = 'https://api.openrouteservice.org/v2/directions/driving-car'
+    # Google Maps API URL
+    url = f"https://maps.googleapis.com/maps/api/distancematrix/json?origins={origin[0]},{origin[1]}&destinations={destination[0]},{destination[1]}&key={MAPS_API_KEY}"
 
-    # Request parameters
-    params = {
-        'api_key': ors_api_key,
-        'start': f'{origin[1]},{origin[0]}',  # lon, lat
-        'end': f'{destination[1]},{destination[0]}'  # lon, lat
-    }
 
     # Send request
-    # https://openrouteservice.org/dev/#/api-docs/v2/directions/{profile}/get
-    response = requests.get(url, params=params)
-    data = response.json()
-
-    # Extract distance
-    if response.status_code == 200 and data.get('features'):
-        # Distance in meters
-        distance = data['features'][0]['properties']['summary']['distance']
+    response = requests.get(url)
+
+    if response.status_code == 200:
+        # Decode the response
+        data = response.json()
+    
+        # Extract distance information
+        if "rows" in data and len(data["rows"]) > 0:
+            distance_info = data["rows"][0]["elements"][0]["distance"]
+            distance = float(distance_info['value'])
+        else:
+            distance = TRIP_DISTANCE # Default
+            back_to_nairobi()
     else:
         distance = TRIP_DISTANCE # Default
+        # print(response.status_code)
         back_to_nairobi()
 
     return distance