[guides on map] Disabled icons displacement.

3 files changed, 8 insertions, 8 deletions

diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index a41c3fd603..df368d6533 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -1490,8 +1490,8 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView, bool activeFram
       RenderUserMarksLayer(modelView, DepthLayer::RoutingBottomMarkLayer);
       RenderUserMarksLayer(modelView, DepthLayer::RoutingMarkLayer);
       RenderUserMarksLayer(modelView, DepthLayer::GuidesBottomMarkLayer);
-      RenderUserMarksLayer(modelView, DepthLayer::GuidesMarkLayer);
-      RenderSearchMarksLayer(modelView);
+      RenderSearchMarksLayer(modelView, DepthLayer::GuidesMarkLayer);
+      RenderSearchMarksLayer(modelView, DepthLayer::SearchMarkLayer);
     }
 
     if (!HasRouteData())
@@ -1686,16 +1686,16 @@ void FrontendRenderer::RenderUserMarksLayer(ScreenBase const & modelView, DepthL
     RenderSingleGroup(m_context, modelView, make_ref(group));
 }
 
-void FrontendRenderer::RenderSearchMarksLayer(ScreenBase const & modelView)
+void FrontendRenderer::RenderSearchMarksLayer(ScreenBase const & modelView, DepthLayer layerId)
 {
-  auto & layer = m_layers[static_cast<size_t>(DepthLayer::SearchMarkLayer)];
+  auto & layer = m_layers[static_cast<size_t>(layerId)];
   layer.Sort(nullptr);
   for (drape_ptr<RenderGroup> & group : layer.m_renderGroups)
   {
     group->SetOverlayVisibility(true);
     group->Update(modelView);
   }
-  RenderUserMarksLayer(modelView, DepthLayer::SearchMarkLayer);
+  RenderUserMarksLayer(modelView, layerId);
 }
 
 void FrontendRenderer::RenderEmptyFrame()
@@ -1860,8 +1860,7 @@ void FrontendRenderer::BuildOverlayTree(ScreenBase const & modelView)
                                            DepthLayer::NavigationLayer,
                                            DepthLayer::RoutingBottomMarkLayer,
                                            DepthLayer::RoutingMarkLayer,
-                                           DepthLayer::GuidesBottomMarkLayer,
-                                           DepthLayer::GuidesMarkLayer};
+                                           DepthLayer::GuidesBottomMarkLayer};
   BeginUpdateOverlayTree(modelView);
   for (auto const & layerId : layers)
   {
diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp
index 8a844f457a..3d2f6464c2 100755
--- a/drape_frontend/frontend_renderer.hpp
+++ b/drape_frontend/frontend_renderer.hpp
@@ -186,7 +186,7 @@ private:
   void RenderTransitSchemeLayer(ScreenBase const & modelView);
   void RenderTrafficLayer(ScreenBase const & modelView);
   void RenderRouteLayer(ScreenBase const & modelView);
-  void RenderSearchMarksLayer(ScreenBase const & modelView);
+  void RenderSearchMarksLayer(ScreenBase const & modelView, DepthLayer layerId);
   void RenderTransitBackground();
   void RenderEmptyFrame();
 
diff --git a/drape_frontend/message.cpp b/drape_frontend/message.cpp
index 5cc8792a8b..607221ac83 100644
--- a/drape_frontend/message.cpp
+++ b/drape_frontend/message.cpp
@@ -102,6 +102,7 @@ std::string DebugPrint(Message::Type msgType)
   case Message::Type::NotifyRenderThread: return "NotifyRenderThread";
   case Message::Type::NotifyGraphicsReady: return "NotifyGraphicsReady";
   case Message::Type::EnableIsolines: return "EnableIsolines";
+  case Message::Type::EnableGuides: return "EnableGuides";
   }
   ASSERT(false, ("Unknown message type."));
   return "Unknown type";