diff options
| -rw-r--r-- | routing/osrm_router.cpp | 2 | ||||
| -rw-r--r-- | routing/pedestrian_model.cpp | 7 | ||||
| -rw-r--r-- | routing/road_graph_router.cpp | 2 | ||||
| -rw-r--r-- | routing/vehicle_model.hpp | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp index e3ef15d730..4eb18ee7ed 100644 --- a/routing/osrm_router.cpp +++ b/routing/osrm_router.cpp @@ -1,9 +1,9 @@ +#include "car_model.hpp" #include "cross_mwm_router.hpp" #include "online_cross_fetcher.hpp" #include "osrm2feature_map.hpp" #include "osrm_router.hpp" #include "turns_generator.hpp" -#include "car_model.hpp" #include "platform/country_file.hpp" #include "platform/platform.hpp" diff --git a/routing/pedestrian_model.cpp b/routing/pedestrian_model.cpp index a9950c25df..84163166b4 100644 --- a/routing/pedestrian_model.cpp +++ b/routing/pedestrian_model.cpp @@ -12,6 +12,11 @@ namespace // See model specifics in different countries here: // http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Access-Restrictions +// Document contains proposals for some countries, but we assume that some kinds of roads are ready for pedestrian routing, +// but not listed in tables in the document. For example, steps are not listed, paths, roads and services features also +// can be treated as ready for pedestrian routing. +// Kinds of roads which we assume footable are marked by // * below. + // See road types here: // http://wiki.openstreetmap.org/wiki/Key:highway @@ -606,7 +611,7 @@ PedestrianModelFactory::PedestrianModelFactory() m_models["Russia"] = make_shared<PedestrianModel>(s_pedestrianLimits_Russia); m_models["Slovakia"] = make_shared<PedestrianModel>(s_pedestrianLimits_Slovakia); m_models["Switzerland"] = make_shared<PedestrianModel>(s_pedestrianLimits_Switzerland); - m_models["Turkey"] = make_shared<PedestrianModel>(s_pedestrianLimits_Turkey ); + m_models["Turkey"] = make_shared<PedestrianModel>(s_pedestrianLimits_Turkey); m_models["Ukraine"] = make_shared<PedestrianModel>(s_pedestrianLimits_Ukraine); m_models["UK"] = make_shared<PedestrianModel>(s_pedestrianLimits_UK); m_models["USA"] = make_shared<PedestrianModel>(s_pedestrianLimits_USA); diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp index 8e3d9e17aa..23ff71071b 100644 --- a/routing/road_graph_router.cpp +++ b/routing/road_graph_router.cpp @@ -1,8 +1,8 @@ #include "routing/features_road_graph.hpp" #include "routing/nearest_edge_finder.hpp" +#include "routing/pedestrian_model.hpp" #include "routing/road_graph_router.hpp" #include "routing/route.hpp" -#include "routing/pedestrian_model.hpp" #include "indexer/feature.hpp" #include "indexer/ftypes_matcher.hpp" diff --git a/routing/vehicle_model.hpp b/routing/vehicle_model.hpp index fb57b560c4..17b7d91fe8 100644 --- a/routing/vehicle_model.hpp +++ b/routing/vehicle_model.hpp @@ -36,11 +36,11 @@ class IVehicleModelFactory public: virtual ~IVehicleModelFactory() {} - /// @returns Default vehicle model which corresponds for all countrines, + /// @return Default vehicle model which corresponds for all countrines, /// but it may be non optimal for some countries virtual shared_ptr<IVehicleModel> GetVehicleModel() const = 0; - /// @returns The most optimal vehicle model for specified country + /// @return The most optimal vehicle model for specified country virtual shared_ptr<IVehicleModel> GetVehicleModelForCountry(string const & country) const = 0; }; |