update profiles to v5.18.0

Author: datendelphin

bike-city.lua

@@ -2,21 +2,27 @@
 
 api_version = 1
 
-local find_access_tag = require("lib/access").find_access_tag
-local Set = require('lib/set')
-local Sequence = require('lib/sequence')
-local Handlers = require("lib/handlers")
+
+Set = require('lib/set')
+Sequence = require('lib/sequence')
+Handlers = require("lib/way_handlers")
+find_access_tag = require("lib/access").find_access_tag
 local next = next       -- bind to local for speed
 local Tags = require('lib/tags')
 
-properties.max_speed_for_map_matching    = 40/3.6 -- kmph -> m/s
-properties.use_turn_restrictions         = false
-properties.continue_straight_at_waypoint = false
-properties.weight_name                   = 'routability'
-
 local walking_speed = 10
 
 local profile = {
+
+    properties = {
+      weight_name                   = 'routability',
+      max_speed_for_map_matching    = 40/3.6, -- kmph -> m/s
+      call_tagless_node_function    = false,
+      traffic_light_penalty         = 2,
+      u_turn_penalty                = 2,
+      continue_straight_at_waypoint = false,
+      use_turn_restrictions         = false,
+    },
   default_mode            = mode.walking,
   default_speed           = 10,
   designated_speed        = 12,
@@ -68,11 +74,18 @@ local profile = {
     'customers',
   },
 
+  restricted_highway_whitelist = Set { },
+
+  construction_whitelist = Set {},
+
   access_tags_hierarchy = Sequence {
     'foot',
     'access'
   },
 
+  -- tags disallow access to in combination with highway=service
+  service_access_tag_blacklist = Set { },
+
   restrictions = Sequence {
     'foot'
   },
@@ -137,15 +150,18 @@ local profile = {
   bridge_speeds = {
   },
 
-  surface_penalties = { 
-    ["gravel"] = 0.7,
-    ["ground"] = 0.8,
-    ["unpaved"] = 0.8,
-    ["grass"] = 0.5,
-    ["dirt"] = 0.5,
-    ["compacted"] = 0.9,
-    ["grit"] = 0.8,
-    ["sand"] = 0.6
+  surface_speeds = { 
+    ["fine_gravel"] = walking_speed*0.8,
+    ["gravel"] = walking_speed*0.7,
+    ["pebblestone"] = walking_speed*0.7,
+    ["mud"] = walking_speed*0.5,
+    ["ground"] = walking_speed*0.8,
+    ["unpaved"] = walking_speed*0.8,
+    ["grass"] = walking_speed*0.5,
+    ["dirt"] = walking_speed*0.5,
+    ["compacted"] = walking_speed*0.9,
+    ["grit"] = walking_speed*0.8,
+    ["sand"] = walking_speed*0.6
   },
 
   tracktype_speeds = {
@@ -238,45 +254,49 @@ function way_function(way, result)
   local handlers = Sequence {
     -- set the default mode for this profile. if can be changed later
     -- in case it turns we're e.g. on a ferry
-    'handle_default_mode',
+    WayHandlers.default_mode,
 
     -- check various tags that could indicate that the way is not
     -- routable. this includes things like status=impassable,
     -- toll=yes and oneway=reversible
-    'handle_blocked_ways',
+    WayHandlers.blocked_ways,
 
     -- determine access status by checking our hierarchy of
     -- access tags, e.g: motorcar, motor_vehicle, vehicle
-    'handle_access',
+    WayHandlers.access,
 
     -- check whether forward/backward directons are routable
-    'handle_oneway',
+    WayHandlers.oneway,
 
     -- check whether forward/backward directons are routable
-    'handle_destinations',
+    WayHandlers.destinations,
 
     -- check whether we're using a special transport mode
-    'handle_ferries',
-    'handle_movables',
+    WayHandlers.ferries,
+    WayHandlers.movables,
 
     -- compute speed taking into account way type, maxspeed tags, etc.
-    'handle_speed_foot',
+    WayHandlers.speed,
+    WayHandlers.surface,
 
     -- set speed for path
-    'adjust_speed_for_path',
+    WayHandlers.adjust_speed_for_path,
 
     -- handle turn lanes and road classification, used for guidance
-    'handle_classification',
+    WayHandlers.classification,
 
     -- handle various other flags
-    'handle_roundabouts',
-    'handle_startpoint',
+    WayHandlers.roundabouts,
+    WayHandlers.startpoint,
 
     -- set name, ref and pronunciation
-    'handle_names'
+    WayHandlers.names,
+
+    -- set weight properties of the way
+    WayHandlers.weights
   }
 
-  Handlers.run(handlers,way,result,data,profile)
+  WayHandlers.run(profile, way, result, data, handlers)
 
   if result.forward_rate == -1 and result.forward_speed > 0 then
     result.forward_rate = result.forward_speed / 3.6;

bike-touring.lua

@@ -2,21 +2,27 @@
 
 api_version = 1
 
-local find_access_tag = require("lib/access").find_access_tag
-local Set = require('lib/set')
-local Sequence = require('lib/sequence')
-local Handlers = require("lib/handlers")
+
+Set = require('lib/set')
+Sequence = require('lib/sequence')
+Handlers = require("lib/way_handlers")
+find_access_tag = require("lib/access").find_access_tag
 local next = next       -- bind to local for speed
 local Tags = require('lib/tags')
 
-properties.max_speed_for_map_matching    = 40/3.6 -- kmph -> m/s
-properties.use_turn_restrictions         = false
-properties.continue_straight_at_waypoint = false
-properties.weight_name                   = 'routability'
-
 local walking_speed = 10
 
 local profile = {
+
+    properties = {
+      weight_name                   = 'routability',
+      max_speed_for_map_matching    = 40/3.6, -- kmph -> m/s
+      call_tagless_node_function    = false,
+      traffic_light_penalty         = 2,
+      u_turn_penalty                = 2,
+      continue_straight_at_waypoint = false,
+      use_turn_restrictions         = false,
+    },
   default_mode            = mode.walking,
   default_speed           = 10,
   designated_speed        = 12,
@@ -68,11 +74,18 @@ local profile = {
     'customers',
   },
 
+  restricted_highway_whitelist = Set { },
+
+  construction_whitelist = Set {},
+
   access_tags_hierarchy = Sequence {
     'foot',
     'access'
   },
 
+  -- tags disallow access to in combination with highway=service
+  service_access_tag_blacklist = Set { },
+
   restrictions = Sequence {
     'foot'
   },
@@ -137,13 +150,14 @@ local profile = {
   bridge_speeds = {
   },
 
-  surface_penalties = { 
-    ["gravel"] = 0.9,
-    ["paved"] = 0.8,
-    ["cobblestone"] = 0.8,
-    ["pebblestone"] = 0.8,
-    ["concrete"] = 0.8,
-    ["sand"] = 0.9
+  surface_speeds = { 
+    ["gravel"] = walking_speed*0.9,
+    ["cobblestone"] = walking_speed*0.8,
+    ["pebblestone"] = walking_speed*0.8,
+    ["concrete"] = walking_speed*0.8,
+    ["mud"] = walking_speed*0.5,
+    ["paved"] = walking_speed*0.8,
+    ["sand"] = walking_speed*0.9
   },
 
   tracktype_speeds = {
@@ -235,46 +249,50 @@ function way_function(way, result)
   local handlers = Sequence {
     -- set the default mode for this profile. if can be changed later
     -- in case it turns we're e.g. on a ferry
-    'handle_default_mode',
+    WayHandlers.default_mode,
 
     -- check various tags that could indicate that the way is not
     -- routable. this includes things like status=impassable,
     -- toll=yes and oneway=reversible
-    'handle_blocked_ways',
+    WayHandlers.blocked_ways,
 
     -- determine access status by checking our hierarchy of
     -- access tags, e.g: motorcar, motor_vehicle, vehicle
-    'handle_access',
+    WayHandlers.access,
 
     -- check whether forward/backward directons are routable
-    'handle_oneway',
+    WayHandlers.oneway,
 
     -- check whether forward/backward directons are routable
-    'handle_destinations',
+    WayHandlers.destinations,
 
     -- check whether we're using a special transport mode
-    'handle_ferries',
-    'handle_movables',
+    WayHandlers.ferries,
+    WayHandlers.movables,
 
     -- compute speed taking into account way type, maxspeed tags, etc.
-    'handle_speed_foot',
+    WayHandlers.speed,
+    WayHandlers.surface,
 
     -- set speed for path
-    'adjust_speed_for_path',
+    WayHandlers.adjust_speed_for_path,
 
     -- handle turn lanes and road classification, used for guidance
-    'handle_classification',
+    WayHandlers.classification,
 
     -- handle various other flags
-    'handle_roundabouts',
-    'handle_startpoint',
+    WayHandlers.roundabouts,
+    WayHandlers.startpoint,
 
     -- set name, ref and pronunciation
-    'handle_names'
-  }
+    WayHandlers.names,
 
-  Handlers.run(handlers,way,result,data,profile)
+    -- set weight properties of the way
+    WayHandlers.weights
+  }
 
+  WayHandlers.run(profile, way, result, data, handlers)
+  
   if result.forward_rate == -1 and result.forward_speed > 0 then
     result.forward_rate = result.forward_speed / 3.6;
   end
@@ -293,7 +311,7 @@ function turn_function (turn)
   if turn.has_traffic_light then
      turn.duration = profile.traffic_light_penalty
   end
-
+  
   -- penalize turns from non-local access only segments onto local access only tags
   if not turn.source_restricted and turn.target_restricted then
       turn.weight = turn.weight + 3000

car.lua

@@ -6,19 +6,19 @@ local Guidance = {}
 -- Guidance: Default Mapping from roads to types/priorities
 highway_classes = {
   motorway = road_priority_class.motorway,
-  motorway_link = road_priority_class.link_road,
+  motorway_link = road_priority_class.motorway_link,
   trunk = road_priority_class.trunk,
-  trunk_link = road_priority_class.link_road,
+  trunk_link = road_priority_class.trunk_link,
   primary = road_priority_class.primary,
-  primary_link = road_priority_class.link_road,
+  primary_link = road_priority_class.primary_link,
   secondary = road_priority_class.secondary,
-  secondary_link = road_priority_class.link_road,
+  secondary_link = road_priority_class.secondary_link,
   tertiary = road_priority_class.tertiary,
-  tertiary_link = road_priority_class.link_road,
-  unclassified = road_priority_class.side_residential,
-  residential = road_priority_class.side_residential,
-  service = road_priority_class.connectivity,
-  living_street = road_priority_class.main_residential,
+  tertiary_link = road_priority_class.tertiary_link,
+  unclassified = road_priority_class.unclassified,
+  residential = road_priority_class.main_residential,
+  service = road_priority_class.alley,
+  living_street = road_priority_class.side_residential,
   track = road_priority_class.bike_path,
   path = road_priority_class.bike_path,
   footway = road_priority_class.foot_path,
@@ -60,17 +60,44 @@ link_types = Set {
   'tertiary_link'
 }
 
+-- roads like parking lots are very unimportant for normal driving
+parking_class = Set{
+    'parking_aisle',
+    'driveway',
+    'drive-through',
+    'emergency_access'
+}
+
 function Guidance.set_classification (highway, result, input_way)
   if motorway_types[highway] then
-    result.road_classification.motorway_class = true;
+    result.road_classification.motorway_class = true
   end
   if link_types[highway] then
-    result.road_classification.link_class = true;
+    result.road_classification.link_class = true
   end
-  if highway_classes[highway] ~= nil then
-    result.road_classification.road_priority_class = highway_classes[highway]
+
+  -- All service roads are recognised as alley
+  if highway ~= nil and highway == 'service' then
+    local service_type = input_way:get_value_by_key('service');
+    if service_type ~= nil and parking_class[service_type] then
+      result.road_classification.road_priority_class = road_priority_class.alley
+    else
+      if service_type ~= nil and service_type == 'alley' then
+        result.road_classification.road_priority_class = road_priority_class.alley
+      else
+        if serice_type == nil then
+          result.road_classification.road_priority_class = road_priority_class.alley
+        else
+          result.road_classification.road_priority_class = highway_classes[highway]
+        end
+      end
+    end
   else
-    result.road_classification.road_priority_class = default_highway_class
+    if highway_classes[highway] ~= nil then
+      result.road_classification.road_priority_class = highway_classes[highway]
+    else
+      result.road_classification.road_priority_class = default_highway_class
+    end
   end
   if road_types[highway] then
     result.road_classification.may_be_ignored = false;
@@ -137,7 +164,7 @@ function Guidance.get_turn_lanes(way,data)
   local psv_fw, psv_bw = get_psv_counts(way,data)
   local turn_lanes_fw, turn_lanes_bw = Tags.get_forward_backward_by_key(way,data,'turn:lanes')
   local vehicle_lanes_fw, vehicle_lanes_bw = Tags.get_forward_backward_by_key(way,data,'vehicle:lanes')
-  
+
   --note: backward lanes swap psv_bw and psv_fw
   return process_lanes(turn_lanes_fw,vehicle_lanes_fw,psv_bw,psv_fw) or turn_lanes,
          process_lanes(turn_lanes_bw,vehicle_lanes_bw,psv_fw,psv_bw) or turn_lanes