diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-09-19 19:52:30 +0300 |
|---|---|---|
| committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-09-20 18:05:43 +0300 |
| commit | a9d9007eeebf04ac83d7c1f8e70e1b048d087450 (patch) | |
| tree | 4bc0a7bad8c34d96e5b8321b47f943acb39105b7 /routing_common | |
| parent | fba751f28286f9611256f6c7b2d2c017fba26e45 (diff) | |
Adding in city param to GetSpeed methods.
Diffstat (limited to 'routing_common')
| -rw-r--r-- | routing_common/vehicle_model.cpp | 2 | ||||
| -rw-r--r-- | routing_common/vehicle_model.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp index 2a0d80fef3..f8cf9ed8fa 100644 --- a/routing_common/vehicle_model.cpp +++ b/routing_common/vehicle_model.cpp @@ -89,7 +89,7 @@ void VehicleModel::SetAdditionalRoadTypes(Classificator const & c, } } -VehicleModel::SpeedKMpH VehicleModel::GetSpeed(FeatureType & f) const +VehicleModel::SpeedKMpH VehicleModel::GetSpeed(FeatureType & f, bool inCity) const { feature::TypesHolder const types(f); diff --git a/routing_common/vehicle_model.hpp b/routing_common/vehicle_model.hpp index 969d89d463..31d01a2b70 100644 --- a/routing_common/vehicle_model.hpp +++ b/routing_common/vehicle_model.hpp @@ -72,7 +72,7 @@ public: /// @return Allowed weight and ETA speed in KMpH. /// 0 means that it's forbidden to move on this feature or it's not a road at all. // @TODO(bykoianko) A param if feature in city or not should be added. - virtual SpeedKMpH GetSpeed(FeatureType & f) const = 0; + virtual SpeedKMpH GetSpeed(FeatureType & f, bool inCity) const = 0; virtual InOutCitySpeedKMpH GetMaxSpeed() const = 0; @@ -158,7 +158,7 @@ public: SurfaceInitList const & featureTypeSurface); /// VehicleModelInterface overrides: - SpeedKMpH GetSpeed(FeatureType & f) const override; + SpeedKMpH GetSpeed(FeatureType & f, bool inCity) const override; InOutCitySpeedKMpH GetMaxSpeed() const override { return m_maxSpeed; } bool IsOneWay(FeatureType & f) const override; bool IsRoad(FeatureType & f) const override; |