From 4f9a84f2ab7cd0813bb0f25a57a55c4260b8e252 Mon Sep 17 00:00:00 2001
From: Lev Dragunov <l.dragunov@corp.mail.ru>
Date: Wed, 24 Jun 2015 17:03:33 +0300
Subject: [PATCH] OSRM pedestrian edges filtering fix

---
 3party/osrm/osrm-backend/profile.lua      |  9 +++++----
 3party/osrm/osrm-backend/profiles/car.lua |  9 +++++----
 integration_tests/osrm_route_test.cpp     | 10 ++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/3party/osrm/osrm-backend/profile.lua b/3party/osrm/osrm-backend/profile.lua
index 813afd19c4..ce762f12fa 100755
--- a/3party/osrm/osrm-backend/profile.lua
+++ b/3party/osrm/osrm-backend/profile.lua
@@ -310,10 +310,11 @@ function way_function (way, result)
       end
     else
       -- Set the avg speed on ways that are marked accessible
-      if access_tag_whitelist[access] then
-        result.forward_speed = speed_profile["default"]
-        result.backward_speed = speed_profile["default"]
-      end
+      -- OMIM does not support not highway classes
+      -- if access_tag_whitelist[access] and "yes" ~= access then
+      --  result.forward_speed = speed_profile["default"]
+      --  result.backward_speed = speed_profile["default"]
+      --end
     end
     if 0 == max_speed then
       max_speed = math.huge
diff --git a/3party/osrm/osrm-backend/profiles/car.lua b/3party/osrm/osrm-backend/profiles/car.lua
index 813afd19c4..2880e44683 100755
--- a/3party/osrm/osrm-backend/profiles/car.lua
+++ b/3party/osrm/osrm-backend/profiles/car.lua
@@ -310,10 +310,11 @@ function way_function (way, result)
       end
     else
       -- Set the avg speed on ways that are marked accessible
-      if access_tag_whitelist[access] then
-        result.forward_speed = speed_profile["default"]
-        result.backward_speed = speed_profile["default"]
-      end
+      -- OMIM does not support non highway classes
+      --if access_tag_whitelist[access] and "yes" ~= access then
+      --  result.forward_speed = speed_profile["default"]
+      --  result.backward_speed = speed_profile["default"]
+      --end
     end
     if 0 == max_speed then
       max_speed = math.huge
diff --git a/integration_tests/osrm_route_test.cpp b/integration_tests/osrm_route_test.cpp
index 24b2c0817a..3cb1f16155 100644
--- a/integration_tests/osrm_route_test.cpp
+++ b/integration_tests/osrm_route_test.cpp
@@ -34,6 +34,16 @@ namespace
         MercatorBounds::FromLatLon(37.33498, -122.03575), 1438.);
   }
 
+  // ASSERT on pedestrian edges
+  UNIT_TEST(RussiaAssertHighwayClassOnPedestrianRouteInOSRM)
+  {
+    integration::CalculateRouteAndTestRouteLength(
+          integration::GetAllMaps(),
+          MercatorBounds::FromLatLon(55.77787, 37.70405), {0., 0.},
+          MercatorBounds::FromLatLon(55.77682, 37.70391), 3032.
+          );
+  }
+
   // Cross mwm tests.
   UNIT_TEST(RussiaMoscowLeningradskiy39GerPanfilovtsev22RouteTest)
   {