From 6e81cdf59b2417264983399f49d3b4ad566ed2c5 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Wed, 23 Nov 2016 16:18:28 +0300 Subject: [PATCH] Check mwm on left-hand traffic. --- drape_frontend/rule_drawer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp index 3ada0a3f72..69c21481de 100644 --- a/drape_frontend/rule_drawer.cpp +++ b/drape_frontend/rule_drawer.cpp @@ -47,6 +47,8 @@ void ExtractTrafficGeometry(FeatureType const & f, df::RoadClass const & roadCla if (polyline.GetSize() < 2) return; + bool const isLeftHandTraffic = f.GetID().m_mwmId.GetInfo()->GetRegionData().Get(feature::RegionData::RD_DRIVING) == "l"; + static vector directions = {traffic::TrafficInfo::RoadSegmentId::kForwardDirection, traffic::TrafficInfo::RoadSegmentId::kReverseDirection}; auto & segments = geometry[f.GetID().m_mwmId]; @@ -56,7 +58,10 @@ void ExtractTrafficGeometry(FeatureType const & f, df::RoadClass const & roadCla for (size_t dirIndex = 0; dirIndex < directions.size(); ++dirIndex) { auto const sid = traffic::TrafficInfo::RoadSegmentId(f.GetID().m_index, segmentIndex, directions[dirIndex]); - bool const isReversed = (directions[dirIndex] == traffic::TrafficInfo::RoadSegmentId::kReverseDirection); + bool isReversed = (directions[dirIndex] == traffic::TrafficInfo::RoadSegmentId::kReverseDirection); + if (isLeftHandTraffic) + isReversed = !isReversed; + segments.emplace_back(sid, df::TrafficSegmentGeometry(polyline.ExtractSegment(segmentIndex, isReversed), roadClass)); } }