pietervdvn/AspectedRouting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests of the examples

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-01-27 20:08:30 +01:00
parent 0ee7516bfe
commit 6d52b3da2c
3 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Examples/bicycle/bicycle.json
View file

@ -2,10 +2,22 @@
"name": "bicycle", "name": "bicycle",
"description": "Profile for a normal bicycle", "description": "Profile for a normal bicycle",
"vehicletypes":["vehicle","bicycle"],
"metadata":["name",
"bridge",
"tunnel",
"colour",
"cycle_network_colour",
"cycle_network_ref",
"ref",
"status",
"network" ],
"defaults": { "defaults": {
"#maxspeed": 25, "#defaultSpeed": 15,
"#timeNeeded": 0, "#timeNeeded": 0,
"#distance": 0, "#distance": 0,
"#comfort": 0
}, },
"access": "$bicycle.legal_access", "access": "$bicycle.legal_access",
@ -20,21 +32,27 @@
"behaviours": { "behaviours": {
"fastest": { "fastest": {
"description": "The fastest route to your destination", "description": "The fastest route to your destination",
"#timeNeeded": 1, "#timeNeeded": 1
}, },
"shortest": { "shortest": {
"description": "The shortest route, independent of of speed", "description": "The shortest route, independent of of speed",
"#distance": 1, "#distance": 1
}, },
"comfort": { "comfort": {
"description": "A comfortable route preferring well-paved roads, smaller roads and a bit of scenery at the cost of speed", "description": "A comfortable route preferring well-paved roads, smaller roads and a bit of scenery at the cost of speed",
"#comfort": 1 "#comfort": 1
},
"electric":{
"description": "An electrical bicycle",
"#defaultSpeed": 25,
"#comfort":1,
"#timeNeeded": 5
} }
}, },
"priority": { "priority": {
"#comfort": "$bicycle.comfort", "#comfort": "$bicycle.comfort",
"#timeNeeded": "$speed", "#timeNeeded": "$speed",
"#distance": "$distance", "#distance": "$distance"
} }
} }

5
Examples/bicycle/tests/bicycle.fastest.behaviour_test.csv
View file

@ -1,14 +1,9 @@
access,oneway,speed,priority,highway,bicycle,surface,cycleway:left,oneway,oneway:bicycle,access,maxspeed,junction access,oneway,speed,priority,highway,bicycle,surface,cycleway:left,oneway,oneway:bicycle,access,maxspeed,junction
no,both,0,0,,,,,,,,, no,both,0,0,,,,,,,,,
designated,both,15,15,cycleway,,,,,,,, designated,both,15,15,cycleway,,,,,,,,
no,both,15,-15,primary,,,,,,,,
no,both,15,-15,primary,yes,,,,,,,
yes,both,15,15,residential,,,,,,,, yes,both,15,15,residential,,,,,,,,
yes,both,13.5,13.5,residential,yes,sett,,,,,,
dismount,both,2.25,2.25,pedestrian,,,,,,,,
yes,both,15,15,pedestrian,yes,,,,,,, yes,both,15,15,pedestrian,yes,,,,,,,
yes,both,15,15,unclassified,,,track,yes,no,,, yes,both,15,15,unclassified,,,track,yes,no,,,
yes,both,15,15,service,,,,,,,, yes,both,15,15,service,,,,,,,,
yes,both,15,15,tertiary,,,,,,yes,50, yes,both,15,15,tertiary,,,,,,yes,50,
yes,with,15,15,residential,,,,,,,,roundabout yes,with,15,15,residential,,,,,,,,roundabout
dismount,both,2.25,2.25,footway,dismount
Can't render this file because it has a wrong number of fields in line 14.

3
Examples/bicycle/tests/bicycle.shortest.behaviour_test.csv
View file

@ -1,5 +1,4 @@
access,oneway,speed,priority,highway,surface access,oneway,speed,priority,highway,surface
no,both,0,0,, no,both,0,0,,
designated,both,15,1,cycleway, designated,both,15,1,cycleway,
yes,both,5.25,1,path,ground yes,both,15,1,path,ground
no,both,15,-29,primary,

1 access oneway speed priority highway surface
2 no both 0 0
3 designated both 15 1 cycleway
4 yes both 5.25 15 1 path ground
no both 15 -29 primary