Feat/valhalls custom speed (#513)

* speed override

* rm unused import

* fix broken apt sources

* fix broken apt sources

Author: iferencik

Dockerfile

@@ -16,7 +16,8 @@ ENV UV_LINK_MODE=copy
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
 # Install heavy C++ compilers required for building python wheels
-RUN apt-get update && \
+RUN grep -lr 'apache.jfrog.io' /etc/apt/sources.list.d/ | xargs -r rm -f && \
+    apt-get update && \
     apt-get install -y --no-install-recommends \
       python3-pip python3-dev gcc g++ git cmake libgeos-dev
 
@@ -61,7 +62,8 @@ COPY --from=python-builder --chown=1000:1000 /rapida/.venv /rapida/.venv
 
 # Install ONLY runtime dependencies (Playwright needs system UI libraries for Chromium)
 # We do this in one layer and immediately purge the apt cache
-RUN apt-get update && \
+RUN grep -lr 'apache.jfrog.io' /etc/apt/sources.list.d/ | xargs -r rm -f && \
+    apt-get update && \
     playwright install chromium --with-deps && \
     apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/*
 

rapida/connectivity/graph.py

@@ -6,7 +6,66 @@
 from valhalla.config import _sanitize_config, default_config
 from typing import Union
 from pathlib import Path
-
+import re
+import logging
+import sys
+import valhalla
+logger = logging.getLogger(__name__)
+
+DEFAULT_SPEEDS = {
+    "motorway": 105,
+    "trunk": 90,
+    "primary": 75,
+    "secondary": 60,
+    "tertiary": 50,
+    "unclassified": 40,
+    "residential": 35,
+    "service": 25
+}
+# by CB guys
+# SPEED_OVERRIDES = \
+# {
+#     "motorway": 60,
+#     "trunk": 50,
+#     "primary": 35,
+#     "secondary": 25,
+#     "tertiary": 20,
+#     "unclassified": 15,
+#     "residential": 12,
+#     "service": 8
+# }
+
+
+
+def fetch_default_lua():
+    import urllib.request
+    url = "https://raw.githubusercontent.com/valhalla/valhalla/refs/heads/master/lua/graph.lua"
+    with urllib.request.urlopen(url) as response:
+        return response.read().decode('utf-8')
+
+def get_speed_overrides() -> dict:
+    """
+    Returns a dictionary of {valhalla_index: final_speed}
+    merging defaults with any os.environ MJOLNIR_*_SPEED overrides.
+    """
+    # Since Python 3.7, dicts maintain insertion order.
+    # roads.index("motorway") will correctly yield 0.
+    roads = list(DEFAULT_SPEEDS.keys())
+    final_speeds = {}
+
+    for env_key, env_val in os.environ.items():
+        if env_key.startswith("MJOLNIR_") and env_key.endswith("_SPEED"):
+            try:
+                _, road_class, _ = env_key.lower().split('_')
+                if road_class in roads and env_val.isdigit():
+                    default_speed = DEFAULT_SPEEDS[road_class]
+                    final_speeds[road_class] = int(env_val)
+                    logger.warning(f'Overriding default speed for {road_class} road type from {default_speed} to {env_val}')
+            except ValueError:
+                # Safely ignore env vars that don't match the exact 3-part split
+                continue
+    # Convert the text tags back to Valhalla's expected integer indices
+    return {roads.index(road): speed for road, speed in final_speeds.items()}
 
 def get_config_fixed(
     tile_extract: Union[str, Path] = "valhalla_tiles.tar",
@@ -79,6 +138,48 @@ async def compile_valhalla_graph(pbf_path: str, dst_dir: str, progress=None) ->
         valhalla_conf["service_limits"]["isochrone"]["max_locations"] = 5000
         # ---------------------------------------------------------
 
+    # ---------------------------------------------------------
+    # APPLY AUTOMATED JSON SPEED OVERRIDES
+    # ---------------------------------------------------------
+    overrides = get_speed_overrides()
+
+    if overrides:
+        # Merge overrides with the defined default_speed fallback
+        default_vals = list(DEFAULT_SPEEDS.values())
+        way_speeds = [overrides.get(i, default_vals[i]) for i in range(8)]
+
+        # Valhalla's C++ parser strictly requires ALL schema keys to exist.
+        # Python 'None' outputs as JSON 'null', which tells Valhalla to safely ignore
+        # these fields and fall back to its internal heuristics.
+        null_array_5 = [None] * 5
+        null_array_8 = [None] * 8
+
+        speed_profile = {
+            "way": way_speeds,
+            "link_exiting": null_array_5,
+            "link_turning": null_array_5,
+            "roundabout": null_array_8,
+            "driveway": None,
+            "alley": None,
+            "parking_aisle": None,
+            "drive-through": None
+        }
+
+        speeds_config_path = os.path.join(dst_dir, "default_speeds.json")
+        speed_schema = [
+            {
+                "rural": speed_profile,
+                "suburban": speed_profile,
+                "urban": speed_profile
+            }
+        ]
+
+        with open(speeds_config_path, "w") as f:
+            json.dump(speed_schema, f, indent=4)
+
+        valhalla_conf["mjolnir"]["default_speeds_config"] = speeds_config_path
+        # ---------------------------------------------------------
+
     with open(config_path, "w") as f:
         json.dump(valhalla_conf, f, indent=4)