Implement parsing of node tables with locations

tests/common/mod.rs

@@ -1,4 +1,6 @@
 pub mod cli_arguments;
+pub mod file_util;
+pub mod hash_util;
 pub mod lexicographic_file_walker;
 pub mod nearest_response;
 pub mod osm;

tests/common/nearest_response.rs

@@ -3,11 +3,12 @@ use serde::Deserialize;
 
 #[derive(Deserialize, Debug)]
 pub struct Waypoint {
-    hint: String,
-    nodes: Vec<u64>,
-    distance: f64,
-    name: String,
+    pub hint: String,
+    pub nodes: Vec<u64>,
+    pub distance: f64,
+    pub name: String,
     location: [f64; 2],
+    pub data_version: Option<String>,
 }
 
 impl Waypoint {
@@ -18,6 +19,6 @@ impl Waypoint {
 
 #[derive(Deserialize, Debug)]
 pub struct NearestResponse {
-    code: String,
+    pub code: String,
     pub waypoints: Vec<Waypoint>,
 }

tests/common/osrm_world.rs

@@ -1,6 +1,11 @@
 use crate::Point;
 use cucumber::World;
-use std::{collections::HashMap, fs::File, path::PathBuf};
+use log::debug;
+use std::{
+    collections::HashMap,
+    fs::{create_dir_all, File},
+    path::PathBuf,
+};
 
 use super::{osm::OSMNode, osm_db::OSMDb};
 
@@ -17,9 +22,46 @@ pub struct OSRMWorld {
     pub known_locations: HashMap<char, Point>,
 
     pub osm_db: OSMDb,
+    pub extraction_parameters: Vec<String>,
 }
 
 impl OSRMWorld {
+    pub fn feature_cache_path(&self) -> PathBuf {
+        let full_path = self.feature_path.clone().unwrap();
+        let path = full_path
+            .ancestors()
+            .find(|p| p.ends_with("features"))
+            .expect(".feature files reside in a directory tree with the root name 'features'");
+
+        let suffix = full_path.strip_prefix(path).unwrap();
+        let path = path.parent().unwrap();
+        debug!("suffix: {suffix:?}");
+        let cache_path = path
+            .join("test")
+            .join("cache")
+            .join(suffix)
+            .join(&self.feature_digest);
+
+        debug!("{cache_path:?}");
+        if !cache_path.exists() {
+            create_dir_all(&cache_path).expect("cache path could not be created");
+        } else {
+            debug!("not creating cache dir");
+        }
+        cache_path
+    }
+
+    pub fn routed_path(&self) -> PathBuf {
+        let full_path = self.feature_path.clone().unwrap();
+        let path = full_path
+            .ancestors()
+            .find(|p| p.ends_with("features"))
+            .expect(".feature files reside in a directory tree with the root name 'features'");
+        let routed_path = path.parent().expect("cannot get parent path").join("build").join("osrm-routed");
+        assert!(routed_path.exists(), "osrm-routed binary not found");
+        routed_path
+    }
+
     pub fn set_scenario_specific_paths_and_digests(&mut self, path: Option<PathBuf>) {
         self.feature_path.clone_from(&path);
 

tests/common/task_starter.rs

@@ -29,8 +29,6 @@ impl TaskStarter {
     }
 
     pub fn spawn_wait_till_ready(&mut self, ready_token: &str) {
-        // TODO: move the child handling into a convenience struct
-
         let mut command = &mut Command::new(&self.command);
         for argument in &self.arguments {
             command = command.arg(argument);