From c2d69e8e201023f24111e939fdf331c55c86e0a9 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Thu, 15 Dec 2016 17:59:48 +0300
Subject: [PATCH] Tuned traffic color

---
 drape_frontend/color_constants.cpp | 10 +++++-----
 drape_frontend/route_shape.cpp     |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drape_frontend/color_constants.cpp b/drape_frontend/color_constants.cpp
index 6dbbb0d264..923d5192d7 100644
--- a/drape_frontend/color_constants.cpp
+++ b/drape_frontend/color_constants.cpp
@@ -29,8 +29,8 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
       { TrafficG1, dp::Color(230, 60, 55, 255) },
       { TrafficG2, dp::Color(230, 60, 55, 255) },
       { TrafficG3, dp::Color(250, 190, 45, 127) },
-      { TrafficG4, dp::Color(250, 190, 45, 127) },
-      { TrafficG5, dp::Color(55, 165, 55, 255) },
+      { TrafficG4, dp::Color(155, 175, 50, 255) },
+      { TrafficG5, dp::Color(50, 155, 75, 255) },
       { TrafficTempBlock, dp::Color(75, 75, 75, 255) },
       { TrafficUnknown, dp::Color(0, 0, 0, 0) },
       { TrafficArrowLight, dp::Color(255, 255, 255, 255) },
@@ -56,9 +56,9 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
       { TrafficG0, dp::Color(70, 15, 0, 255) },
       { TrafficG1, dp::Color(105, 20, 0, 255) },
       { TrafficG2, dp::Color(105, 20, 0, 255) },
-      { TrafficG3, dp::Color(115, 80, 0, 127) },
-      { TrafficG4, dp::Color(115, 80, 0, 127) },
-      { TrafficG5, dp::Color(25, 75, 25, 255) },
+      { TrafficG3, dp::Color(115, 90, 0, 127) },
+      { TrafficG4, dp::Color(70, 75, 20, 255) },
+      { TrafficG5, dp::Color(25, 75, 20, 255) },
       { TrafficTempBlock, dp::Color(40, 40, 40, 255) },
       { TrafficUnknown, dp::Color(0, 0, 0, 0) },
       { TrafficArrowLight, dp::Color(170, 170, 170, 255) },
diff --git a/drape_frontend/route_shape.cpp b/drape_frontend/route_shape.cpp
index 6a3f4464e4..2c53c9c971 100644
--- a/drape_frontend/route_shape.cpp
+++ b/drape_frontend/route_shape.cpp
@@ -412,7 +412,8 @@ void RouteShape::CacheRoute(ref_ptr<dp::TextureManager> textures, RouteData & ro
   for (auto const & speedGroup : routeData.m_traffic)
   {
     dp::Color const color = df::GetColorConstant(style, TrafficGenerator::GetColorBySpeedGroup(speedGroup));
-    float const alpha = (speedGroup == traffic::SpeedGroup::G5 ||
+    float const alpha = (speedGroup == traffic::SpeedGroup::G4 ||
+                         speedGroup == traffic::SpeedGroup::G5 ||
                          speedGroup == traffic::SpeedGroup::Unknown) ? 0.0f : 1.0f;
     segmentsColors.push_back(glsl::vec4(color.GetRedF(), color.GetGreenF(), color.GetBlueF(), alpha));
   }