Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaria Volvenkova <d.volvenkova@corp.mail.ru>2016-12-12 15:23:12 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2016-12-12 15:39:50 +0300
commitf86703267bab22bd0e271ce9c730d5bd7b509031 (patch)
tree96e78c8226e54eb477341564fda2b0eba9a9bbc5 /drape_frontend
parentf9fa7bbf6cb9ebf1142226aa1fdf82cb9e15cb00 (diff)
Unknown segments removing.
Diffstat (limited to 'drape_frontend')
-rw-r--r--drape_frontend/drape_engine.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index 4a89d0c7fc..c9a0485e8c 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -11,6 +11,7 @@
#include "platform/settings.hpp"
#include "std/bind.hpp"
+#include "std/utility.hpp"
namespace
{
@@ -547,13 +548,13 @@ void DrapeEngine::UpdateTraffic(traffic::TrafficInfo const & info)
if (info.GetColoring().empty())
return;
- df::TrafficSegmentsColoring segmentsColoring;
- auto & mwmColoring = segmentsColoring[info.GetMwmId()];
+#ifdef DEBUG
for (auto const & segmentPair : info.GetColoring())
- {
- if (segmentPair.second != traffic::SpeedGroup::Unknown)
- mwmColoring.insert(segmentPair);
- }
+ ASSERT_NOT_EQUAL(segmentPair.second, traffic::SpeedGroup::Unknown, ());
+#endif
+
+ df::TrafficSegmentsColoring segmentsColoring;
+ segmentsColoring.insert(make_pair(info.GetMwmId(), info.GetColoring()));
m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
make_unique_dp<UpdateTrafficMessage>(move(segmentsColoring), false),