Fix tag misspellings in profiles + tests: forestry, pebblestone

This commit is contained in:
Lauren Budorick 2015-06-09 20:16:58 -07:00
parent 9967dbbaa9
commit eec4f173a7
8 changed files with 16 additions and 17 deletions

View File

@ -120,7 +120,7 @@ Feature: Bike - Access tags on ways
| no | | | |
| private | | | |
| agricultural | | | |
| forestery | | | |
| forestry | | | |
| | yes | | x |
| | permissive | | x |
| | designated | | x |
@ -128,7 +128,7 @@ Feature: Bike - Access tags on ways
| | no | | |
| | private | | |
| | agricultural | | |
| | forestery | | |
| | forestry | | |
| | | yes | x |
| | | permissive | x |
| | | designated | x |
@ -136,7 +136,7 @@ Feature: Bike - Access tags on ways
| | | no | |
| | | private | |
| | | agricultural | |
| | | forestery | |
| | | forestry | |
Scenario: Bike - Access tags on both node and way
Then routability should be

View File

@ -46,7 +46,7 @@ Feature: Bike - Access tags on nodes
| no | | | |
| private | | | |
| agricultural | | | |
| forestery | | | |
| forestry | | | |
| | yes | | x |
| | permissive | | x |
| | designated | | x |
@ -54,7 +54,7 @@ Feature: Bike - Access tags on nodes
| | no | | |
| | private | | |
| | agricultural | | |
| | forestery | | |
| | forestry | | |
| | | yes | x |
| | | permissive | x |
| | | designated | x |
@ -62,4 +62,4 @@ Feature: Bike - Access tags on nodes
| | | no | |
| | | private | |
| | | agricultural | |
| | | forestery | |
| | | forestry | |

View File

@ -16,7 +16,7 @@ Feature: Bike - Surfaces
| cycleway | unpaved | 120s |
| cycleway | fine_gravel | 120s |
| cycleway | gravel | 120s |
| cycleway | pebbelstone | 120s |
| cycleway | pebblestone | 120s |
| cycleway | dirt | 120s |
| cycleway | earth | 120s |
| cycleway | grass | 120s |

View File

@ -51,7 +51,7 @@ Feature: Foot - Access tags on ways
| no | | |
| private | | |
| agricultural | | |
| forestery | | |
| forestry | | |
| | yes | x |
| | permissive | x |
| | designated | x |
@ -59,7 +59,7 @@ Feature: Foot - Access tags on ways
| | no | |
| | private | |
| | agricultural | |
| | forestery | |
| | forestry | |
Scenario: Foot - Access tags on both node and way
Then routability should be

View File

@ -39,7 +39,7 @@ Feature: Foot - Access tags on nodes
| no | | |
| private | | |
| agricultural | | |
| forestery | | |
| forestry | | |
| no | yes | x |
| no | permissive | x |
| no | designated | x |
@ -47,4 +47,4 @@ Feature: Foot - Access tags on nodes
| yes | no | |
| yes | private | |
| yes | agricultural | |
| yes | forestery | |
| yes | forestry | |

View File

@ -10,6 +10,6 @@ Feature: Foot - Surfaces
| footway | | 145s ~10% |
| footway | fine_gravel | 193s ~10% |
| footway | gravel | 193s ~10% |
| footway | pebbelstone | 193s ~10% |
| footway | pebblestone | 193s ~10% |
| footway | mud | 289s ~10% |
| footway | sand | 289s ~10% |

View File

@ -6,7 +6,7 @@ local limit = require("lib/maxspeed").limit
-- Begin of globals
barrier_whitelist = { [""] = true, ["cycle_barrier"] = true, ["bollard"] = true, ["entrance"] = true, ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true, ["no"] = true }
access_tag_whitelist = { ["yes"] = true, ["permissive"] = true, ["designated"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestery"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true }
access_tag_restricted = { ["destination"] = true, ["delivery"] = true }
access_tags_hierachy = { "bicycle", "vehicle", "access" }
cycleway_tags = {["track"]=true,["lane"]=true,["opposite"]=true,["opposite_lane"]=true,["opposite_track"]=true,["share_busway"]=true,["sharrow"]=true,["shared"]=true }
@ -81,8 +81,7 @@ surface_speeds = {
["unpaved"] = 6,
["fine_gravel"] = 6,
["gravel"] = 6,
["fine_gravel"] = 6,
["pebbelstone"] = 6,
["pebblestone"] = 6,
["ground"] = 6,
["dirt"] = 6,
["earth"] = 6,

View File

@ -5,7 +5,7 @@ local find_access_tag = require("lib/access").find_access_tag
-- Begin of globals
barrier_whitelist = { [""] = true, ["cycle_barrier"] = true, ["bollard"] = true, ["entrance"] = true, ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true, ["no"] = true}
access_tag_whitelist = { ["yes"] = true, ["foot"] = true, ["permissive"] = true, ["designated"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestery"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true }
access_tag_restricted = { ["destination"] = true, ["delivery"] = true }
access_tags_hierachy = { "foot", "access" }
service_tag_restricted = { ["parking_aisle"] = true }
@ -55,7 +55,7 @@ man_made_speeds = {
surface_speeds = {
["fine_gravel"] = walking_speed*0.75,
["gravel"] = walking_speed*0.75,
["pebbelstone"] = walking_speed*0.75,
["pebblestone"] = walking_speed*0.75,
["mud"] = walking_speed*0.5,
["sand"] = walking_speed*0.5
}