address PR issues

Author: davidgamez

functions-python/pmtiles_builder/src/csv_cache.py

@@ -98,20 +98,7 @@ def _read_csv(self, filename) -> list[dict]:
         except Exception as e:
             raise Exception(f"Failed to read CSV file {filename}: {e}") from e
 
-    def get_trip_from_route(self, route_id):
-        if self.route_to_trip is None:
-            self.route_to_trip = {}
-            for row in self.get_file(TRIPS_FILE):
-                route_id = row["route_id"]
-                trip_id = row["trip_id"]
-                if trip_id:
-                    if self.route_to_trip.get(route_id):
-                        self.route_to_trip[route_id] = trip_id
-                    else:
-                        self.route_to_trip.setdefault(route_id, trip_id)
-        return self.route_to_trip.get(route_id, "")
-
-    def get_shape_from_route(self, route_id) -> List[ShapeTrips]:
+    def get_shape_from_route(self, route_id) -> Dict[str, List[ShapeTrips]]:
         """
         Returns a list of shape_ids with associated trip_ids information with a given route_id from the trips file.
         The relationship from the route to the shape is via the trips file.
@@ -152,7 +139,7 @@ def get_shape_from_route(self, route_id) -> List[ShapeTrips]:
                             trip_no_shapes = []
                             self.trips_no_shapes_per_route[route_id] = trip_no_shapes
                         trip_no_shapes.append(trip_id)
-        return self.route_to_shape.get(route_id, [])
+        return self.route_to_shape.get(route_id, {})
 
     def get_trips_without_shape_from_route(self, route_id) -> List[str]:
         return (

functions-python/pmtiles_builder/src/main.py

@@ -521,7 +521,7 @@ def get_route_coordinates(self, route_id, shapes_index) -> List[RouteCoordinates
                     )
                 else:
                     self.logger.info(
-                        "Coordinates were not have the right formatting for stops of trip_id %s on route_id %s",
+                        "Coordinates do not have the right formatting for stops of trip_id %s on route_id %s",
                         trip_id,
                         route_id,
                     )

functions-python/pmtiles_builder/src/scripts/pmtiles_builder_verifier.py

@@ -19,22 +19,35 @@
 )
 
 feeds = [
-    {"stable_id": "mdb-437", "dataset_stable_id": "mdb-437-202507081733"},
+    {"stable_id": "mdb-437", "dataset_stable_id": "mdb-437-202507081733", "env": "dev"},
+    {
+        "stable_id": "mdb-2841",
+        "dataset_stable_id": "mdb-2841-202509032137",
+        "env": "prod",
+    },
 ]
-run_with_feed_index = 0  # Change this index to run with a different feed
+run_with_feed_index = 1  # Change this index to run with a different feed
 
 FILES = [STOP_TIMES_FILE, SHAPES_FILE, TRIPS_FILE, ROUTES_FILE, STOPS_FILE, AGENCY_FILE]
 
 
-def download_feed_files(feed_stable_id: str, dataset_stable_id: str):
-    FILES_URL = "https://dev-files.mobilitydatabase.org"
+def download_feed_files(
+    feed_stable_id: str,
+    dataset_stable_id: str,
+    env: str = "dev",
+    force_download: bool = False,
+):
+    url_prefix = "" if env == "prod" else f"{env}-"
+    FILES_URL = f"https://{url_prefix}files.mobilitydatabase.org"
     base_url = f"{FILES_URL}/{feed_stable_id}/{dataset_stable_id}/extracted"
     for file in FILES:
         url = f"{base_url}/{file}"
         logging.info(f"Downloading {url}")
         filename = f"{dataset_stable_id}/extracted/{file}"
         try:
-            download_to_local(feed_stable_id, url, filename, False)
+            download_to_local(
+                feed_stable_id, url, filename, force_download=force_download
+            )
         except Exception as e:
             logging.warning(f"Failed to download {file}: {e}")
 
@@ -65,7 +78,7 @@ def download_feed_files(feed_stable_id: str, dataset_stable_id: str):
         )
     try:
         server = setup_local_storage_emulator()
-        download_feed_files(feed_stable_id, dataset_stable_id)
+        download_feed_files(feed_stable_id, dataset_stable_id, feed_dict["env"])
         response = build_pmtiles_handler(request)
         logging.info(response)
     except Exception as e: