Adding functionality for turn restriction exceptions to profile

profiles/bicycle.lua

@@ -8,6 +8,7 @@ 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 }
 service_tag_restricted = { ["parking_aisle"] = true }
+restriction_exception_tags = { "bicycle", "vehicle", "access" }
 
 default_speed = 16
 
@@ -70,7 +71,11 @@ u_turn_penalty 			= 20
 
 -- End of globals
 
---find first tag in access hierachy which is set
+function get_exceptions(vector)
+	for i,v in ipairs(restriction_exception_tags) do 
+		vector:Add(v)
+	end
+end
 
 function node_function (node)
 	local barrier = node.tags:Find ("barrier")

profiles/car.lua

@@ -1,4 +1,5 @@
 -- Begin of globals
+require("lib/access")
 
 barrier_whitelist = { ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true}
 access_tag_whitelist = { ["yes"] = true, ["motorcar"] = true, ["motor_vehicle"] = true, ["vehicle"] = true, ["permissive"] = true, ["designated"] = true  }
@@ -8,6 +9,7 @@ access_tags = { "motorcar", "motor_vehicle", "vehicle" }
 access_tags_hierachy = { "motorcar", "motor_vehicle", "vehicle", "access" }
 service_tag_restricted = { ["parking_aisle"] = true }
 ignore_in_grid = { ["ferry"] = true }
+restriction_exception_tags = { "motorcar", "motor_vehicle", "vehicle" }
 
 speed_profile = { 
   ["motorway"] = 90, 
@@ -39,24 +41,9 @@ u_turn_penalty 			= 20
 
 -- End of globals
 
---find first tag in access hierachy which is set
-local function find_access_tag(source)
-	for i,v in ipairs(access_tags_hierachy) do 
-		if source.tags:Holds(v) then 
-			local tag = source.tags:Find(v)
-			if tag ~= '' then --and tag ~= "" then
-				return tag
-			end
-		end
-	end
-	return nil
-end
-
-local function find_in_keyvals(keyvals, tag)
-	if keyvals:Holds(tag) then
-		return keyvals:Find(tag)
-	else
-		return nil
+function get_exceptions(vector)
+	for i,v in ipairs(restriction_exception_tags) do 
+		vector:Add(v)
 	end
 end
 
@@ -76,7 +63,7 @@ end
 
 function node_function (node)
   local barrier = node.tags:Find ("barrier")
-  local access = find_access_tag(node)
+  local access = Access.find_access_tag(node, access_tags_hierachy)
   local traffic_signal = node.tags:Find("highway")
   
   --flag node if it carries a traffic light
@@ -121,7 +108,7 @@ function way_function (way, numberOfNodesInWay)
     local duration  = way.tags:Find("duration")
     local service  = way.tags:Find("service")
     local area = way.tags:Find("area")
-    local access = find_access_tag(way)
+    local access = Access.find_access_tag(way, access_tags_hierachy)
 
   -- Second, parse the way according to these properties
 

profiles/foot.lua

@@ -9,6 +9,7 @@ access_tag_restricted = { ["destination"] = true, ["delivery"] = true }
 access_tags = { "foot" }
 service_tag_restricted = { ["parking_aisle"] = true }
 ignore_in_grid = { ["ferry"] = true }
+restriction_exception_tags = { "foot" }
 
 speed_profile = { 
   ["primary"] = 5,
@@ -43,6 +44,12 @@ u_turn_penalty 			= 2
 
 -- End of globals
 
+function get_exceptions(vector)
+	for i,v in ipairs(restriction_exception_tags) do 
+		vector:Add(v)
+	end
+end
+
 function node_function (node)
   local barrier = node.tags:Find ("barrier")
   local access = node.tags:Find ("access")