Lots of improvements

server-rs/src/routes/hexagons.rs

@@ -18,7 +18,7 @@ use crate::parsing::{
     bounds_intersect, cell_for_row, h3_cell_bounds, needs_parent, parse_field_indices,
     parse_filters, require_bounds, row_passes_filters, validate_h3_resolution,
 };
-use crate::routes::travel_time::TravelTimeAgg;
+use crate::routes::travel_time::{parse_travel_entries, TravelTimeAgg};
 use crate::state::AppState;
 
 #[derive(Serialize)]
@@ -40,62 +40,6 @@ pub struct HexagonParams {
     travel: Option<String>,
 }
 
-struct TravelEntry {
-    mode: String,
-    slug: String,
-    use_best: bool,
-    filter_min: Option<f32>,
-    filter_max: Option<f32>,
-}
-
-/// Parse `travel` param into a list of travel entries.
-/// Format: `mode:slug` or `mode:slug:best` or `mode:slug:min:max` or `mode:slug:best:min:max`
-fn parse_travel_entries(travel_str: &str) -> Result<Vec<TravelEntry>, String> {
-    let mut entries = Vec::new();
-    let mut seen_keys = Vec::new();
-    for segment in travel_str.split('|') {
-        let parts: Vec<&str> = segment.split(':').collect();
-        if parts.len() < 2 {
-            return Err(format!(
-                "each travel entry must be 'mode:slug' or 'mode:slug:min:max', got '{}'",
-                segment
-            ));
-        }
-        let mode = parts[0].trim().to_string();
-        let slug = parts[1].trim().to_string();
-
-        let use_best = parts.len() >= 3 && parts[2].trim() == "best";
-        let filter_offset = if use_best { 1 } else { 0 };
-
-        let (filter_min, filter_max) = if parts.len() >= 4 + filter_offset {
-            let min: f32 = parts[2 + filter_offset]
-                .trim()
-                .parse()
-                .map_err(|_| format!("invalid travel filter min in '{}'", segment))?;
-            let max: f32 = parts[3 + filter_offset]
-                .trim()
-                .parse()
-                .map_err(|_| format!("invalid travel filter max in '{}'", segment))?;
-            (Some(min), Some(max))
-        } else {
-            (None, None)
-        };
-
-        let key = format!("{}:{}", mode, slug);
-        if seen_keys.contains(&key) {
-            return Err(format!("duplicate travel entry '{}'", key));
-        }
-        seen_keys.push(key);
-        entries.push(TravelEntry {
-            mode,
-            slug,
-            use_best,
-            filter_min,
-            filter_max,
-        });
-    }
-    Ok(entries)
-}
 
 /// Build feature maps from aggregated cell data, filtering to only cells that intersect the query bounds.
 #[allow(clippy::too_many_arguments)]