diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-07-23 21:38:16 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-07-23 21:40:50 +0300 |
| commit | 979f48bfaf7322320801db215b1d0e3d231f8699 (patch) | |
| tree | 7109319338f48996f9f98ff361599a1687194225 /routing | |
| parent | 9879d1808a7da38006d9067089215dec75d7aa6c (diff) | |
Writing altitude section without intermediate files and using MemoryRegion for reading it.
Diffstat (limited to 'routing')
| -rw-r--r-- | routing/bicycle_model.cpp | 2 | ||||
| -rw-r--r-- | routing/bicycle_model.hpp | 2 | ||||
| -rw-r--r-- | routing/pedestrian_model.cpp | 2 | ||||
| -rw-r--r-- | routing/pedestrian_model.hpp | 2 | ||||
| -rw-r--r-- | routing/routing_helpers.hpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/routing/bicycle_model.cpp b/routing/bicycle_model.cpp index ac8a867d43..997bcb6543 100644 --- a/routing/bicycle_model.cpp +++ b/routing/bicycle_model.cpp @@ -639,7 +639,7 @@ bool BicycleModel::IsOneWay(FeatureType const & f) const } // static -BicycleModel const & BicycleModel::DefaultInstance() +BicycleModel const & BicycleModel::AllLimitsInstance() { static BicycleModel const instance; return instance; diff --git a/routing/bicycle_model.hpp b/routing/bicycle_model.hpp index 3765abb9f3..9293fcc1cd 100644 --- a/routing/bicycle_model.hpp +++ b/routing/bicycle_model.hpp @@ -17,7 +17,7 @@ public: /// VehicleModel overrides: bool IsOneWay(FeatureType const & f) const override; - static BicycleModel const & DefaultInstance(); + static BicycleModel const & AllLimitsInstance(); protected: RoadAvailability GetRoadAvailability(feature::TypesHolder const & types) const override; diff --git a/routing/pedestrian_model.cpp b/routing/pedestrian_model.cpp index 7947e0b999..285ed91d38 100644 --- a/routing/pedestrian_model.cpp +++ b/routing/pedestrian_model.cpp @@ -643,7 +643,7 @@ IVehicleModel::RoadAvailability PedestrianModel::GetRoadAvailability(feature::Ty } // static -PedestrianModel const & PedestrianModel::DefaultInstance() +PedestrianModel const & PedestrianModel::AllLimitsInstance() { static PedestrianModel const instance; return instance; diff --git a/routing/pedestrian_model.hpp b/routing/pedestrian_model.hpp index db0b392451..f28eba80e1 100644 --- a/routing/pedestrian_model.hpp +++ b/routing/pedestrian_model.hpp @@ -17,7 +17,7 @@ public: /// VehicleModel overrides: bool IsOneWay(FeatureType const &) const override { return false; } - static PedestrianModel const & DefaultInstance(); + static PedestrianModel const & AllLimitsInstance(); protected: RoadAvailability GetRoadAvailability(feature::TypesHolder const & types) const override; diff --git a/routing/routing_helpers.hpp b/routing/routing_helpers.hpp index 49acc0417a..98365f39c4 100644 --- a/routing/routing_helpers.hpp +++ b/routing/routing_helpers.hpp @@ -11,7 +11,7 @@ template <class TTypes> bool IsRoad(TTypes const & types) { return CarModel::Instance().HasRoadType(types) || - PedestrianModel::DefaultInstance().HasRoadType(types) || - BicycleModel::DefaultInstance().HasRoadType(types); + PedestrianModel::AllLimitsInstance().HasRoadType(types) || + BicycleModel::AllLimitsInstance().HasRoadType(types); } } // namespace rouing |