[core] new route track design

graphics/depth_constants.hpp

@@ -18,11 +18,12 @@ namespace graphics
   static const int balloonBaseDepth = countryStatusDepth - (balloonContentInc + 10);
 
   static const int locationDepth = balloonBaseDepth - 10;
-  static const int poiDepth = locationDepth - 10;
-  static const int bookmarkDepth = poiDepth;
-  static const int routingFinishDepth = bookmarkDepth - balloonContentInc;
-  static const int routingSymbolsDepth = routingFinishDepth;
+  static const int locationFaultDepth = locationDepth - 10;
+
+  static const int routingFinishDepth = locationFaultDepth - balloonContentInc;
+  static const int activePinDepth = routingFinishDepth - balloonContentInc;
+  static const int routingSymbolsDepth = activePinDepth - balloonContentInc;
   static const int tracksDepth = routingSymbolsDepth - balloonContentInc;
   static const int tracksOutlineDepth = tracksDepth - 10;
-  static const int activePinDepth = tracksOutlineDepth - 10;
+  static const int bookmarkDepth = tracksOutlineDepth - balloonContentInc;
 }

map/bookmark_manager.cpp

@@ -278,9 +278,9 @@ void BookmarkManager::DrawItems(shared_ptr<PaintEvent> const & e) const
   pScreen->beginFrame();
 
   PaintOverlayEvent event(e->drawer(), screen);
-  m_selection.Draw(event, m_cache);
   for_each(m_userMarkLayers.begin(), m_userMarkLayers.end(), bind(&UserMarkContainer::Draw, _1, event, m_cache));
   for_each(m_categories.begin(), m_categories.end(), bind(&BookmarkManager::DrawCategory, this, _1, event));
+  m_selection.Draw(event, m_cache);
 
   pScreen->endFrame();
 }

map/framework.cpp

@@ -692,13 +692,12 @@ void Framework::DrawAdditionalInfo(shared_ptr<PaintEvent> const & e)
 #endif
 
   m_informationDisplay.doDraw(pDrawer);
-
   pScreen->endFrame();
 
   m_bmManager.DrawItems(e);
-
   m_guiController->UpdateElements();
   m_guiController->DrawFrame(pScreen);
+
 }
 
 /// Function for calling from platform dependent-paint function.
@@ -1880,13 +1879,20 @@ void Framework::InsertRoute(routing::Route const & route)
   else
     cat->ClearTracks();
 
+  float visScale = GetVisualScale();
+
   Track track(route.GetPoly());
   track.SetName(route.GetName());
-  track.SetColor(graphics::Color(0, 0xA3,0xFF, 0xFF));
-  track.SetWidth(4.0f * GetVisualScale());
-  track.SetIsMarked(true);
-  track.SetOutlineWidth(3.0f * GetVisualScale());
-  track.SetOutlineColor(graphics::Color::White());
+  track.SetColor(graphics::Color(0x73, 0xCC,0xFF, 0xFF));
+  track.SetWidth(6.0f * visScale);
+
+  Track::TrackOutline outlines[]
+  {
+    { 12.0f * visScale, graphics::Color(0x40, 0xB9, 0xFF, 0xFF) },
+    { 16.0f * visScale, graphics::Color::White() }
+  };
+
+  track.AddOutline(outlines, ARRAY_SIZE(outlines));
   track.AddClosingSymbol(true, "route_from", graphics::EPosCenter, graphics::routingSymbolsDepth);
   track.AddClosingSymbol(false, "route_to", graphics::EPosCenter, graphics::routingFinishDepth);
   cat->AddTrack(track);

map/location_state.cpp

@@ -5,6 +5,7 @@
 
 #include "../graphics/display_list.hpp"
 #include "../graphics/icon.hpp"
+#include "../graphics/depth_constants.hpp"
 
 #include "../anim/controller.hpp"
 #include "../anim/task.hpp"
@@ -474,13 +475,13 @@ void State::CacheLocationMark()
                           0, 2.0 * math::pi,
                           s_cacheRadius,
                           m_locationAreaColor,
-                          depth() - 3);
+                          graphics::locationFaultDepth);
 
   cacheScreen->setDisplayList(m_positionMarkDL.get());
   cacheScreen->drawSymbol(m2::PointD(0, 0),
                           "current-position",
                           graphics::EPosCenter,
-                          depth() - 1);
+                          graphics::locationDepth);
 
   cacheScreen->setDisplayList(0);
 
@@ -521,7 +522,7 @@ void State::CacheArrow(graphics::DisplayList * dl, const string & iconName)
   cacheScreen->addTexturedStripStrided(coords, sizeof(m2::PointD),
                                        &normal, 0,
                                        texCoords, sizeof(m2::PointF),
-                                       4, depth(), res->m_pipelineID);
+                                       4, graphics::locationDepth, res->m_pipelineID);
   cacheScreen->setDisplayList(0);
   cacheScreen->endFrame();
 }

map/track.cpp

@@ -36,6 +36,16 @@ void Track::DeleteDisplayList() const
   }
 }
 
+void Track::AddOutline(TrackOutline const * outline, int arraySize)
+{
+  m_outlines.reserve(arraySize);
+  for_each(outline, outline + arraySize, MakeBackInsertFunctor(m_outlines));
+  sort(m_outlines.begin(), m_outlines.end(), [](TrackOutline const & l, TrackOutline const & r)
+  {
+    return l.m_lineWidth > r.m_lineWidth;
+  });
+}
+
 void Track::AddClosingSymbol(bool isBeginSymbol, string const & symbolName, graphics::EPosition pos, double depth)
 {
   if (isBeginSymbol)
@@ -85,11 +95,13 @@ void Track::CreateDisplayList(graphics::Screen * dlScreen, MatrixT const & matri
   SimplifyDP(pts1.begin(), pts1.end(), math::sqr(m_width),
              m2::DistanceToLineSquare<m2::PointD>(), MakeBackInsertFunctor(pts2));
 
-  if (IsMarked())
+  double baseDepth = graphics::tracksOutlineDepth - 10 * m_outlines.size();
+  for (TrackOutline const & outline : m_outlines)
   {
-    graphics::Pen::Info const outlineInfo(m_outlineColor, m_width + 2 * m_outlineWidth);
+    graphics::Pen::Info const outlineInfo(outline.m_color, outline.m_lineWidth);
     uint32_t const outlineId = dlScreen->mapInfo(outlineInfo);
-    dlScreen->drawPath(pts2.data(), pts2.size(), 0, outlineId, graphics::tracksOutlineDepth);
+    dlScreen->drawPath(pts2.data(), pts2.size(), 0, outlineId, baseDepth);
+    baseDepth += 10;
   }
 
   dlScreen->drawPath(pts2.data(), pts2.size(), 0, resId, graphics::tracksDepth);
@@ -142,9 +154,7 @@ void Track::Swap(Track & rhs)
   swap(m_width, rhs.m_width);
   swap(m_color, rhs.m_color);
   swap(m_rect, rhs.m_rect);
-  swap(m_isMarked, rhs.m_isMarked);
-  swap(m_outlineColor, rhs.m_outlineColor);
-  swap(m_outlineWidth, rhs.m_outlineWidth);
+  swap(m_outlines, rhs.m_outlines);
   swap(m_beginSymbols, rhs.m_beginSymbols);
   swap(m_endSymbols, rhs.m_endSymbols);
 

map/track.hpp

@@ -8,7 +8,6 @@
 
 #include "../std/noncopyable.hpp"
 
-
 class Navigator;
 namespace graphics
 {
@@ -16,7 +15,6 @@ namespace graphics
   class DisplayList;
 }
 
-
 class Track : private noncopyable
 {
   typedef math::Matrix<double, 3, 3> MatrixT;
@@ -29,18 +27,12 @@ public:
   Track()
     : m_isVisible(true), m_width(5),
       m_color(graphics::Color::fromARGB(0xFFFF0000)),
-      m_isMarked(false),
-      m_outlineWidth(0),
-      m_outlineColor(graphics::Color::White()),
       m_dList(0)
   {}
 
   explicit Track(PolylineD const & polyline)
     : m_isVisible(true), m_width(5),
       m_color(graphics::Color::fromARGB(0xFFFF0000)),
-      m_isMarked(false),
-      m_outlineWidth(0),
-      m_outlineColor(graphics::Color::White()),
       m_polyline(polyline),
       m_dList(0)
   {
@@ -68,14 +60,13 @@ public:
   graphics::Color const & GetColor() const { return m_color; }
   void SetColor(graphics::Color const & color) { m_color = color; }
 
-  bool IsMarked() const { return m_isMarked; }
-  void SetIsMarked(bool isMarked) { m_isMarked = isMarked; }
+  struct TrackOutline
+  {
+    float m_lineWidth;
+    graphics::Color m_color;
+  };
 
-  float GetOutlineWidth() const { return m_outlineWidth; }
-  void SetOutlineWidth(float outlineWidth) { m_outlineWidth = outlineWidth; }
-
-  graphics::Color const & GetOutlineColor() { return m_outlineColor; }
-  void SetOutlineColor(graphics::Color const & outlineColor) { m_outlineColor = outlineColor; }
+  void AddOutline(TrackOutline const * outline, int arraySize);
 
   string const & GetName() const { return m_name; }
   void SetName(string const & name) { m_name = name; }
@@ -98,9 +89,7 @@ private:
   float m_width;
   graphics::Color m_color;
 
-  bool m_isMarked;
-  float m_outlineWidth;
-  graphics::Color m_outlineColor;
+  vector<TrackOutline> m_outlines;
 
   struct ClosingSymbol
   {