kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fix after rebase, warning fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2019-03-20 19:06:22 +03:00 • committed by Roman Kuznetsov
parent c1788f19e6
commit 92d0419286
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
map/framework.cpp
View file

@ -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());

3
map/routing_mark.cpp
View file

@ -661,6 +661,7 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> 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<SymbolNameZoomInfo>();
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 {};
}