valhalla · gknisely · May 28, 2021 · May 24, 2021 · May 24, 2021 · May 26, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 * **Removed**
 * **Bug Fix**
    * FIXED: Fix heading on small edge [#3114](https://github.com/valhalla/valhalla/pull/3114)
+   * FIXED: Added support for `access=psv`, which disables routing on these nodes and edges unless the mode is taxi or bus [#3107](https://github.com/valhalla/valhalla/pull/3107)
 
 * **Enhancement**
 

diff --git a/lua/graph.lua b/lua/graph.lua
@@ -92,7 +92,8 @@ access = {
 ["public"] = "true",
 ["restricted"] = "true",
 ["allowed"] = "true",
-["emergency"] = "false"
+["emergency"] = "false",
+["psv"] = "false"
 }
 
 private = {
@@ -895,6 +896,14 @@ function filter_tags_generic(kv)
       end
     end
 
+    if kv["access"] == "psv" then
+      kv["taxi_forward"] = "true"
+      kv["taxi_tag"] = "true"
+
+      kv["bus_forward"] = "true"
+      kv["bus_tag"] = "true"
+    end
+
     if kv["motorroad"] == "yes" then
       kv["motorroad_tag"] = "true"
     end
@@ -972,6 +981,14 @@ function filter_tags_generic(kv)
         end
       end
 
+      if kv["access"] == "psv" then
+        kv["taxi_forward"] = "true"
+        kv["taxi_tag"] = "true"
+
+        kv["bus_forward"] = "true"
+        kv["bus_tag"] = "true"
+      end
+
       if kv["motorroad"] == "yes" then
         kv["motorroad_tag"] = "true"
       end
@@ -1685,7 +1702,17 @@ function nodes_proc (kv, nokeys)
   if auto_tag == nil then
     auto_tag = motor_vehicle_tag
   end
-  local bus_tag = bus_node[kv["bus"]]
+  local bus_tag
+  local taxi_tag
+
+  if (kv["access"] == "psv") then
+    bus_tag = 64
+    taxi_tag = 32
+  else
+    bus_tag = bus_node[kv["bus"]]
+    taxi_tag = taxi_node[kv["taxi"]]
+  end
+
   if bus_tag == nil then
     bus_tag = psv_bus_node[kv["psv"]]
   end
@@ -1704,7 +1731,6 @@ function nodes_proc (kv, nokeys)
     hov_tag = 128
   end
 
-  local taxi_tag = taxi_node[kv["taxi"]]
   if taxi_tag == nil then
     taxi_tag = psv_taxi_node[kv["psv"]]
   end

diff --git a/taginfo.json b/taginfo.json
@@ -195,6 +195,15 @@
       ],
       "description": "Overrides access flags for emergency vehicles.  Emergency Routing is allowed."
     },
+    {
+      "key": "access",
+      "value": "psv",
+      "object_types": [
+        "node",
+        "way"
+      ],
+      "description": "Sets access to false for all modes except for taxis and buses"
+    },
     {
       "key": "admin_level",
       "value": "2",

diff --git a/test/gurka/test_access_psv.cc b/test/gurka/test_access_psv.cc
@@ -0,0 +1,99 @@
+#include "gurka.h"
+#include <gtest/gtest.h>
+
+#if !defined(VALHALLA_SOURCE_DIR)
+#define VALHALLA_SOURCE_DIR
+#endif
+
+using namespace valhalla;
+
+const std::unordered_map<std::string, std::string> build_config{
+    {"mjolnir.admin", {VALHALLA_SOURCE_DIR "test/data/netherlands_admin.sqlite"}}};
+
+const std::vector<std::string>& costing = {"auto",          "hov",        "taxi",
+                                           "bus",           "truck",      "bicycle",
+                                           "motor_scooter", "motorcycle", "pedestrian"};
+
+TEST(Standalone, AccessPsvWay) {
+  constexpr double gridsize_metres = 10;
+
+  const std::string ascii_map = R"(
+
+        A---B---C---D---E
+                |       |
+                F-------G
+                |
+                H
+    )";
+
+  const gurka::ways ways = {
+      {"AB", {{"highway", "primary"}}},
+      {"BC", {{"highway", "primary"}}},
+      {"CD", {{"highway", "primary"}}},
+      {"DE", {{"highway", "primary"}}},
+      {"EG", {{"highway", "primary"}}},
+      {"FG", {{"highway", "primary"}}},
+      {"CF",
+       {
+           {"highway", "primary"},
+           {"access", "psv"}, // access key wins over bus or taxi tag
+           {"bike", "no"},
+           {"bus", "no"},
+       }},
+      {"FH", {{"highway", "primary"}}},
+
+  };
+
+  const auto layout =
+      gurka::detail::map_to_coordinates(ascii_map, gridsize_metres, {5.1079374, 52.0887174});
+  auto map = gurka::buildtiles(layout, ways, {}, {}, "test/data/gurka_access_psv_way", build_config);
+  for (auto& c : costing) {
+    auto result = gurka::do_action(valhalla::Options::route, map, {"A", "H"}, c);
+
+    if (c == "bus" || c == "taxi")
+      gurka::assert::raw::expect_path(result, {"AB", "BC", "CF", "FH"});
+    else
+      gurka::assert::raw::expect_path(result, {"AB", "BC", "CD", "DE", "EG", "FG", "FH"});
+  }
+}
+
+TEST(Standalone, AccessPsvNode) {
+  constexpr double gridsize_metres = 10;
+
+  const std::string ascii_map = R"(
+
+        A---B---C---D---E
+                |       |
+                F       |
+                |       |
+                H-------G
+    )";
+
+  const gurka::ways ways = {
+      {"AB", {{"highway", "primary"}}}, {"BC", {{"highway", "primary"}}},
+      {"CD", {{"highway", "primary"}}}, {"DE", {{"highway", "primary"}}},
+      {"EG", {{"highway", "primary"}}}, {"HG", {{"highway", "primary"}}},
+      {"CF", {{"highway", "primary"}}}, {"FH", {{"highway", "primary"}}},
+
+  };
+
+  const gurka::nodes nodes = {{"F",
+                               {
+                                   {"access", "psv"}, // access tag wins over bus or taxi tag
+                                   {"taxi", "no"},
+                                   {"bus", "no"},
+                               }}};
+
+  const auto layout =
+      gurka::detail::map_to_coordinates(ascii_map, gridsize_metres, {5.1079374, 52.0887174});
+  auto map =
+      gurka::buildtiles(layout, ways, nodes, {}, "test/data/gurka_access_psv_way", build_config);
+  for (auto& c : costing) {
+    auto result = gurka::do_action(valhalla::Options::route, map, {"A", "H"}, c);
+
+    if (c == "bus" || c == "taxi")
+      gurka::assert::raw::expect_path(result, {"AB", "BC", "CF", "FH"});
+    else
+      gurka::assert::raw::expect_path(result, {"AB", "BC", "CD", "DE", "EG", "HG"});
+  }
+}