From 92d0419286463b1f85b9a13d52a654d7fcd4af3a Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Wed, 20 Mar 2019 19:06:22 +0300 Subject: [PATCH] Fix after rebase, warning fixes. --- map/framework.cpp | 8 ++++---- map/routing_mark.cpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index c16cdb7445..bbff55db6c 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1035,16 +1035,16 @@ void Framework::FillRoadTypeMarkInfo(RoadWarningMark const & roadTypeMark, place CHECK(roadTypeMark.GetFeatureID().IsValid(), ()); FeaturesLoaderGuard const guard(m_model.GetDataSource(), roadTypeMark.GetFeatureID().m_mwmId); - FeatureType ft; - if (!guard.GetFeatureByIndex(roadTypeMark.GetFeatureID().m_index, ft)) + auto ft = guard.GetFeatureByIndex(roadTypeMark.GetFeatureID().m_index); + if (!ft) { LOG(LERROR, ("Feature can't be loaded:", roadTypeMark.GetFeatureID())); return; } - FillInfoFromFeatureType(ft, info); + FillInfoFromFeatureType(*ft, info); - info.SetRoadType(ft, + info.SetRoadType(*ft, roadTypeMark.GetRoadWarningType(), RoadWarningMark::GetLocalizedRoadWarningType(roadTypeMark.GetRoadWarningType()), roadTypeMark.GetDistance()); diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp index c063e4f0e0..400d959be9 100644 --- a/map/routing_mark.cpp +++ b/map/routing_mark.cpp @@ -661,6 +661,7 @@ drape_ptr RoadWarningMark::GetSymbolNames case RoadWarningMarkType::Ferry: symbolName = "ferry"; break; case RoadWarningMarkType::Paid: symbolName = "paid_road"; break; case RoadWarningMarkType::Unpaved: symbolName = "unpaved_road"; break; + case RoadWarningMarkType::Count: CHECK(false, ()); break; } auto symbol = make_unique_dp(); symbol->insert(std::make_pair(1 /* zoomLevel */, symbolName)); @@ -682,7 +683,7 @@ std::string RoadWarningMark::GetLocalizedRoadWarningType(RoadWarningMarkType typ case RoadWarningMarkType::Ferry: return platform::GetLocalizedString("ferry_crossing"); case RoadWarningMarkType::Paid: return platform::GetLocalizedString("toll_road"); case RoadWarningMarkType::Unpaved: return platform::GetLocalizedString("unpaved_road"); + case RoadWarningMarkType::Count: CHECK(false, ()); break; } - UNREACHABLE(); return {}; }