Review fixes.

routing/osrm_router.cpp

@@ -183,8 +183,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(TCheckedPath const &
       points.pop_back();
       turnsDir.pop_back();
       times.pop_back();
-      if (streets.back().first >= points.size())
-        streets.pop_back();
+      // Streets might not point to the last point of the path.
     }
 
     // Get annotated route.
@@ -478,7 +477,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(
 
       // Street names. I put empty names too, to avoid freezing old street name while riding on
       // unnamed street.
-      streets.emplace_back(max(points.size(), (size_t)1) - 1, loadedSegment.m_name);
+      streets.emplace_back(max(points.size(), static_cast<size_t>(1)) - 1, loadedSegment.m_name);
 
       // Turns information.
       if (segmentIndex > 0 && !points.empty() && skipTurnSegments == 0)

routing/route.cpp

@@ -156,7 +156,8 @@ void Route::GetCurrentStreetName(string & name) const
   auto it = GetCurrentStreetNameIterAfter(m_poly.GetCurrentIter());
   if (it == m_streets.cend())
     name.clear();
-  name = it->second;
+  else
+    name = it->second;
 }
 
 void Route::GetStreetNameAfterIdx(uint32_t idx, string & name) const
@@ -191,7 +192,7 @@ Route::TStreets::const_iterator Route::GetCurrentStreetNameIterAfter(FollowedPol
   {
     ++prevIter;
     ++curIter;
-    if (curIter==m_streets.cend())
+    if (curIter == m_streets.cend())
       return curIter;
   }
   return curIter->first == iter.m_ind ? curIter : prevIter;

routing/routing_integration_tests/routing_integration_tests.pro

@@ -27,10 +27,10 @@ SOURCES += \
   cross_section_tests.cpp \
   online_cross_tests.cpp \
   osrm_route_test.cpp \
+  osrm_street_names_test.cpp \
   osrm_turn_test.cpp \
   pedestrian_route_test.cpp \
   routing_test_tools.cpp \
-  osrm_street_names_test.cpp \
 
 HEADERS += \
   routing_test_tools.hpp \