[bicycle routing] Using attr bicycle=yes or no and oneway:bicycle for bicycle routing.

1 files changed, 17 insertions, 3 deletions

diff --git a/routing/pedestrian_model.cpp b/routing/pedestrian_model.cpp
index af22fa59f3..e2a305a147 100644
--- a/routing/pedestrian_model.cpp
+++ b/routing/pedestrian_model.cpp
@@ -621,11 +621,14 @@ PedestrianModel::PedestrianModel(VehicleModel::InitListT const & speedLimits)
 
 void PedestrianModel::Init()
 {
+  initializer_list<char const *> hwtagYesfoot = { "hwtag", "yesfoot" };
+
   m_noFootType = classif().GetTypeByPath({ "hwtag", "nofoot" });
-  m_yesFootType = classif().GetTypeByPath({ "hwtag", "yesfoot" });
+  m_yesFootType = classif().GetTypeByPath(hwtagYesfoot);
 
   initializer_list<char const *> arr[] =
   {
+    hwtagYesfoot,
     { "route", "ferry" },
     { "man_made", "pier" },
   };
@@ -649,12 +652,23 @@ double PedestrianModel::GetSpeed(FeatureType const & f) const
 
   if (IsYesFoot(types))
     return VehicleModel::GetMaxSpeed();
-  if (!IsNoFoot(types) && IsRoad(types))
-    return VehicleModel::GetSpeed(types);
+  if (!IsNoFoot(types) && HasRoadType(types))
+    return VehicleModel::GetMinTypeSpeed(types);
 
   return 0.0;
 }
 
+bool PedestrianModel::IsRoad(FeatureType const & f) const
+{
+  if (f.GetFeatureType() != feature::GEOM_LINE)
+    return false;
+
+  feature::TypesHolder types(f);
+
+  if (IsNoFoot(types))
+    return false;
+  return VehicleModel::HasRoadType(types);
+}
 
 PedestrianModelFactory::PedestrianModelFactory()
 {