[routing] Fix warnings from static analyzer

2 files changed, 8 insertions, 10 deletions

diff --git a/routing_common/maxspeed_conversion.cpp b/routing_common/maxspeed_conversion.cpp
index 4089b1f692..e887aa37cc 100644
--- a/routing_common/maxspeed_conversion.cpp
+++ b/routing_common/maxspeed_conversion.cpp
@@ -46,26 +46,29 @@ uint16_t Maxspeed::GetSpeedInUnits(bool forward) const
 
 uint16_t Maxspeed::GetSpeedKmPH(bool forward) const
 {
-  uint16_t constexpr kNoneSpeedLimitKmPH = 130;
-  uint16_t constexpr kWalkSpeedLimitKmPH = 6;
-
   auto speedInUnits = GetSpeedInUnits(forward);
   if (speedInUnits == kInvalidSpeed)
     return kInvalidSpeed; // That means IsValid() returns false.
 
   if (IsNumeric(speedInUnits))
-    return ToSpeedKmPH(speedInUnits, m_units);
+    return static_cast<uint16_t>(ToSpeedKmPH(speedInUnits, m_units));
 
   // A feature is marked as a feature without any speed limits. (maxspeed=="none").
   if (kNoneMaxSpeed)
+  {
+    uint16_t constexpr kNoneSpeedLimitKmPH = 130;
     return kNoneSpeedLimitKmPH;
+  }
 
   // If a feature is marked with the maxspeed=="walk" tag (speed == kWalkMaxSpeed) a driver
   // should drive with a speed of a walking person.
   if (kWalkMaxSpeed)
+  {
+    uint16_t constexpr kWalkSpeedLimitKmPH = 6;
     return kWalkSpeedLimitKmPH;
+  }
 
-  CHECK(false, ("Method IsNumeric() returns something wrong."));
+  UNREACHABLE();
 }
 
 // FeatureMaxspeed ---------------------------------------------------------------------------------
diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp
index f4ea9d6539..88d45fc722 100644
--- a/routing_common/vehicle_model.cpp
+++ b/routing_common/vehicle_model.cpp
@@ -296,11 +296,6 @@ string VehicleModelFactory::GetParent(string const & country) const
   return m_countryParentNameGetterFn(country);
 }
 
-double GetMaxWeight(VehicleModel::InOutCitySpeedKMpH const & speed)
-{
-  return max(speed.m_inCity.m_weight, speed.m_outCity.m_weight);
-}
-
 string DebugPrint(VehicleModelInterface::RoadAvailability const l)
 {
   switch (l)