a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-24 01:15:12 +03:00
Code Issues Projects Releases Wiki Activity

Add some disabled validation that paths don't enter an access-restricted zone when they shouldn't.

Browse Source 
I'm working on an overhaul to pathfinding and zones in another branch,
and need some more debugging tools. This one's ready to be checked in
now.
This commit is contained in:
Dustin Carlino 2021-03-22 09:38:53 -07:00
parent c68d0fdc6b
commit 9d2da632be
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
map_model/src/pathfind/mod.rs
View File

@ -132,6 +132,9 @@ impl Path {
if false {
validate_restrictions(map, &steps);
}
if false {
validate_zones(map, &steps, &orig_req);
}
let mut path = Path {
steps: VecDeque::from(steps),
orig_req,
@ -645,6 +648,33 @@ fn validate_restrictions(map: &Map, steps: &Vec<PathStep>) {
}
}
fn validate_zones(map: &Map, steps: &Vec<PathStep>, req: &PathRequest) {
let z1 = map.get_parent(req.start.lane()).get_zone(map);
let z2 = map.get_parent(req.end.lane()).get_zone(map);
for step in steps {
if let PathStep::Turn(t) = step {
if map
.get_parent(t.src)
.access_restrictions
.allow_through_traffic
.contains(req.constraints)
&& !map
.get_parent(t.dst)
.access_restrictions
.allow_through_traffic
.contains(req.constraints)
{
// Maybe it's fine
let into_zone = map.get_parent(t.dst).get_zone(map);
if into_zone != z1 && into_zone != z2 {
error!("{} causes illegal entrance into a zone at {}", req, t);
}
}
}
}
}
/// Tuneable parameters for all types of routing.
// These will maybe become part of the PathRequest later, but that's an extremely invasive and
// space-expensive change right now.