Skip first pass for non-auto costing

Author: dfsnow

data/params.yaml

@@ -44,6 +44,11 @@ times:
     - pedestrian
     #- multimodal
 
+  # Costing modes in this list will do a first pass with cheaper/faster matrix
+  # API settings. Otherwise, skip straight to a more expensive second pass
+  two_pass:
+    - auto
+
   # Maximum size of chunk of origins AND destinations to process in a single call to
   # Valhalla. This is necessary because larger matrices will cause it to choke
   max_split_size: 100

data/src/calculate_times.py

@@ -7,6 +7,7 @@
 
 import pandas as pd
 import yaml
+from utils.constants import DOCKER_ENDPOINT_SECOND_PASS
 from utils.logging import create_logger
 from utils.times import (
     TravelTimeCalculator,
@@ -70,7 +71,14 @@ def main() -> None:
     # if second-pass is enabled)
     logger.info("Tiles loaded and coodinates ready, starting routing")
     tt_calc = TravelTimeCalculator(config, inputs)
-    results_df = tt_calc.many_to_many()
+    if config.args.mode not in config.params["times"]["two_pass"]:
+        logger.info("Skipping second pass for %s mode", config.args.mode)
+        results_df = tt_calc.many_to_many(
+            endpoint=DOCKER_ENDPOINT_SECOND_PASS, second_pass=False
+        )
+    else:
+        results_df = tt_calc.many_to_many()
+
     logger.info(
         "Finished calculating times for %s pairs in %s",
         len(results_df),

data/src/utils/times.py

@@ -555,7 +555,11 @@ def _binary_search(
             )
             # fmt: on
 
-    def many_to_many(self, second_pass: bool = True) -> pd.DataFrame:
+    def many_to_many(
+        self,
+        endpoint: str = DOCKER_ENDPOINT_FIRST_PASS,
+        second_pass: bool = True,
+    ) -> pd.DataFrame:
         """
         Entrypoint to calculate times for all combinations of origins and
         destinations in inputs. Includes an optional second pass which performs
@@ -587,7 +591,7 @@ def many_to_many(self, second_pass: bool = True) -> pd.DataFrame:
                             cur_depth=0,
                             origins=self.inputs.origins,
                             destinations=self.inputs.destinations,
-                            endpoint=DOCKER_ENDPOINT_FIRST_PASS,
+                            endpoint=endpoint,
                         )
                     )
             for future in futures: