[web] make use of travel_type

Author: Stunkymonkey

pre/src/main.rs

@@ -24,7 +24,7 @@ struct Way {
     target: usize,
     speed: usize,
     distance: usize,
-    kind: usize,
+    travel_type: usize,
 }
 
 #[derive(Serialize, Debug, Clone)]
@@ -166,8 +166,8 @@ fn main() {
             for way in groups::ways(&group, &block) {
                 if way.tags.contains_key("highway") {
                     let highway = way.tags.get("highway").unwrap().trim();
-                    let kind = get_street_kind(highway);
-                    if kind == 100 {
+                    let travel_type = get_street_kind(highway);
+                    if travel_type == 100 {
                         continue;
                     }
                     let mut max_speed: &str = "";
@@ -201,7 +201,7 @@ fn main() {
                             target: id,
                             speed: speed,
                             distance: 0,
-                            kind: kind,
+                            travel_type: travel_type,
                         });
                         prev_id = id;
                     }

web/src/graph.rs

@@ -52,7 +52,8 @@ impl Graph {
     }
 
     /// returns closes point of given long & lat
-    pub fn get_point_id(&self, lat: f32, long: f32) -> usize {
+    pub fn get_point_id(&self, lat: f32, long: f32, travel_type: usize) -> usize {
+        // TODO check if travel_type can be used
         let mut min_distance: f32 = std::f32::MAX;
         let mut min_distance_id: usize = 0;
         let adjacent_nodes = self.get_adjacent_node_ids(lat, long);
@@ -77,13 +78,14 @@ impl Graph {
     }
 
     /// returns the edge weight from source to target
-    fn get_edge_weight(&self, way: Way, use_distance: bool) -> usize {
+    fn get_edge_weight(&self, way: Way, travel_type: usize, use_distance: bool) -> usize {
         if use_distance {
             return way.distance;
         } else {
             if way.speed == 0 {
                 return way.distance;
             }
+            // TODO fix speed with correct travel_type
             return way.distance / way.speed;
         }
     }
@@ -128,7 +130,7 @@ impl Graph {
         &self,
         start: usize,
         end: usize,
-        is_car: bool,
+        travel_type: usize,
         use_distance: bool,
     ) -> Option<(Vec<usize>, f32)> {
         let mut dist = vec![(usize::MAX, None); self.nodes.len()];
@@ -152,17 +154,33 @@ impl Graph {
                 path.reverse();
                 return Some((path, cost as f32 / COST_MULTIPLICATOR as f32));
             }
-
             if cost > dist[node].0 {
                 continue;
             }
             for edge in self.offset[node]..self.offset[node + 1] {
                 let current_way: Way = self.ways[edge];
-                // TODO check if should skip due to is_car
+                // skip way, if the type does not match
+                match travel_type {
+                    0 => match current_way.travel_type {
+                        0 | 1 | 5 => (),
+                        _ => continue,
+                    },
+                    1 => match current_way.travel_type {
+                        1 | 2 | 3 | 5 => (),
+                        _ => continue,
+                    },
+                    2 => match current_way.travel_type {
+                        3 | 4 | 5 => (),
+                        _ => continue,
+                    },
+                    _ => unreachable!(),
+                }
+                // calculate costs
                 let next = State {
                     node: current_way.target,
-                    cost: cost + self.get_edge_weight(current_way, use_distance),
+                    cost: cost + self.get_edge_weight(current_way, travel_type, use_distance),
                 };
+                // add way to heap
                 if next.cost < dist[next.node].0 {
                     dist[next.node] = (next.cost, Some(node));
                     heap.push(next);

web/src/main.rs

@@ -23,7 +23,7 @@ pub struct Way {
     target: usize,
     speed: usize,
     distance: usize,
-    kind: usize,
+    travel_type: usize,
 }
 
 #[derive(Copy, Clone, Deserialize, Serialize, Debug)]
@@ -44,7 +44,7 @@ struct Input {
 struct Query {
     start: Node,
     end: Node,
-    use_car: bool,
+    travel_type: String,
     by_distance: bool,
 }
 
@@ -59,18 +59,23 @@ fn query(request: web::Json<Query>, dijkstra: web::Data<Graph>) -> web::Json<Res
     // extract points
     let start: &Node = &request.start;
     let end: &Node = &request.end;
-    let use_car: bool = request.use_car;
+    let travel_type = match request.travel_type.as_ref() {
+        "car" => 0,
+        "bicycle" => 1,
+        "foot" => 2,
+        _ => 0,
+    };
     let by_distance: bool = request.by_distance;
     // println!("Start: {},{}", start.latitude, start.longitude);
     // println!("End: {},{}", end.latitude, end.longitude);
-    // println!("use_car: {}, by_distance: {}", use_car, by_distance);
+    // println!("travel_type: {}, by_distance: {}", travel_type, by_distance);
 
     // search for clicked points
-    let start_id: usize = dijkstra.get_point_id(start.latitude, start.longitude);
-    let end_id: usize = dijkstra.get_point_id(end.latitude, end.longitude);
+    let start_id: usize = dijkstra.get_point_id(start.latitude, start.longitude, travel_type);
+    let end_id: usize = dijkstra.get_point_id(end.latitude, end.longitude, travel_type);
 
     let timing = Instant::now();
-    let tmp = dijkstra.find_path(start_id, end_id, use_car, by_distance);
+    let tmp = dijkstra.find_path(start_id, end_id, travel_type, by_distance);
     println!("### duration for find_path(): {:?}", timing.elapsed());
 
     let result: Vec<Node>;

web/static/index.html

@@ -30,6 +30,7 @@ <h4>Travel by</h4>
 				</label-big>
 				<select id="travel-type">
 					<option value="car">car</option>
+					<option value="bicycle">bicycle</option>
 					<option value="foot">foot</option>
 				</select>
 			</div>

web/static/leaflet_script.js

@@ -70,6 +70,7 @@ function setEnd() {
 }
 
 function query() {
+	hide_result();
 	hide_invalid_request();
 	hide_no_path_found();
 	hide_select_start_and_end();
@@ -101,7 +102,7 @@ function query() {
 		}
 	};
 
-	var travel_type = document.getElementById("travel-type").value == "car";
+	var travel_type = document.getElementById("travel-type").value;
 	var optimization = document.getElementById("optimization").value == "distance";
 	var body = {
 		"start": {
@@ -112,7 +113,7 @@ function query() {
 			"latitude": endPoint.lat,
 			"longitude": endPoint.lng
 		},
-		"use_car": travel_type,
+		"travel_type": travel_type,
 		"by_distance": optimization,
 	};
 	var data = JSON.stringify(body);