diff --git a/Examples/bicycle/bicycle.json b/Examples/bicycle/bicycle.json index 45567e9..e423de7 100644 --- a/Examples/bicycle/bicycle.json +++ b/Examples/bicycle/bicycle.json @@ -2,10 +2,22 @@ "name": "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": { - "#maxspeed": 25, + "#defaultSpeed": 15, "#timeNeeded": 0, "#distance": 0, + "#comfort": 0 }, "access": "$bicycle.legal_access", @@ -20,21 +32,27 @@ "behaviours": { "fastest": { "description": "The fastest route to your destination", - "#timeNeeded": 1, + "#timeNeeded": 1 }, "shortest": { "description": "The shortest route, independent of of speed", - "#distance": 1, + "#distance": 1 }, "comfort": { "description": "A comfortable route preferring well-paved roads, smaller roads and a bit of scenery at the cost of speed", "#comfort": 1 + }, + "electric":{ + "description": "An electrical bicycle", + "#defaultSpeed": 25, + "#comfort":1, + "#timeNeeded": 5 } }, "priority": { "#comfort": "$bicycle.comfort", "#timeNeeded": "$speed", - "#distance": "$distance", + "#distance": "$distance" } } diff --git a/Examples/bicycle/tests/bicycle.fastest.behaviour_test.csv b/Examples/bicycle/tests/bicycle.fastest.behaviour_test.csv index 3bed6e1..3aa8458 100644 --- a/Examples/bicycle/tests/bicycle.fastest.behaviour_test.csv +++ b/Examples/bicycle/tests/bicycle.fastest.behaviour_test.csv @@ -1,14 +1,9 @@ access,oneway,speed,priority,highway,bicycle,surface,cycleway:left,oneway,oneway:bicycle,access,maxspeed,junction no,both,0,0,,,,,,,,, designated,both,15,15,cycleway,,,,,,,, -no,both,15,-15,primary,,,,,,,, -no,both,15,-15,primary,yes,,,,,,, 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,unclassified,,,track,yes,no,,, yes,both,15,15,service,,,,,,,, yes,both,15,15,tertiary,,,,,,yes,50, yes,with,15,15,residential,,,,,,,,roundabout -dismount,both,2.25,2.25,footway,dismount \ No newline at end of file diff --git a/Examples/bicycle/tests/bicycle.shortest.behaviour_test.csv b/Examples/bicycle/tests/bicycle.shortest.behaviour_test.csv index fa37c20..aecb78f 100644 --- a/Examples/bicycle/tests/bicycle.shortest.behaviour_test.csv +++ b/Examples/bicycle/tests/bicycle.shortest.behaviour_test.csv @@ -1,5 +1,4 @@ access,oneway,speed,priority,highway,surface no,both,0,0,, designated,both,15,1,cycleway, -yes,both,5.25,1,path,ground -no,both,15,-29,primary, +yes,both,15,1,path,ground