reorganizating tests into car/bike/foot

This commit is contained in:
Emil Tin
2012-09-30 14:40:59 +02:00
committed by Emil Tin
parent b23a89d5a8
commit d4352b84ac
34 changed files with 790 additions and 256 deletions
+1
View File
@@ -17,6 +17,7 @@ speed_profile = {
["secondary"] = 18,
["secondary_link"] = 18,
["tertiary"] = 18,
["tertiary_link"] = 18,
["residential"] = 18,
["unclassified"] = 16,
["living_street"] = 16,
+11 -12
View File
@@ -29,14 +29,13 @@ speed_profile = {
["ferry"] = 5,
["pedestrian"] = 5,
["footway"] = 5,
["cycleway"] = 5,
["pier"] = 5,
["default"] = 5
}
take_minimum_of_speeds = true
obey_oneway = false
obey_oneway = true
obey_bollards = false
use_restrictions = false
ignore_areas = true -- future feature
@@ -87,7 +86,7 @@ function way_function (way, numberOfNodesInWay)
local man_made = way.tags:Find("man_made")
local barrier = way.tags:Find("barrier")
local oneway = way.tags:Find("oneway")
local cycleway = way.tags:Find("cycleway")
local onewayClass = way.tags:Find("oneway:foot")
local duration = way.tags:Find("duration")
local service = way.tags:Find("service")
local area = way.tags:Find("area")
@@ -173,15 +172,15 @@ function way_function (way, numberOfNodesInWay)
-- Set direction according to tags on way
if obey_oneway then
if oneway == "no" or oneway == "0" or oneway == "false" then
way.direction = Way.bidirectional
elseif oneway == "-1" then
way.direction = Way.opposite
elseif oneway == "yes" or oneway == "1" or oneway == "true" or junction == "roundabout" or highway == "motorway_link" or highway == "motorway" then
way.direction = Way.oneway
else
way.direction = Way.bidirectional
end
if onewayClass == "yes" or onewayClass == "1" or onewayClass == "true" then
way.direction = Way.oneway
elseif onewayClass == "no" or onewayClass == "0" or onewayClass == "false" then
way.direction = Way.bidirectional
elseif onewayClass == "-1" then
way.direction = Way.opposite
else
way.direction = Way.bidirectional
end
else
way.direction = Way.bidirectional
end