Refactoring of transit route processing.

6 files changed, 2 insertions, 13 deletions

diff --git a/drape_frontend/color_constants.cpp b/drape_frontend/color_constants.cpp
index d25a5ac851..1ce41f1c3c 100644
--- a/drape_frontend/color_constants.cpp
+++ b/drape_frontend/color_constants.cpp
@@ -32,10 +32,7 @@ public:
     auto const & colors = isDarkStyle ? m_nightColors : m_clearColors;
     auto const it = colors.find(name);
     if (it == colors.cend())
-    {
-      LOG(LWARNING, ("Requested transit color '" + name + "' is not found"));
       return dp::Color();
-    }
     return it->second;
   }
 
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index 53fab55799..3b755aac3f 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -241,7 +241,6 @@ void DrapeEngine::UpdateUserMarksGroup(MarkGroupID groupId, UserMarksProvider *
       renderInfo->m_pivot = mark->GetPivot();
       renderInfo->m_pixelOffset = mark->GetPixelOffset();
       renderInfo->m_titleDecl = mark->GetTitleDecl();
-      renderInfo->m_symbolSizes = mark->GetSymbolSizes();
       renderInfo->m_symbolNames = mark->GetSymbolNames();
       renderInfo->m_coloredSymbols = mark->GetColoredSymbols();
       renderInfo->m_hasSymbolPriority = mark->HasSymbolPriority();
diff --git a/drape_frontend/render_group.cpp b/drape_frontend/render_group.cpp
index 64e16d9931..5f807984c7 100755
--- a/drape_frontend/render_group.cpp
+++ b/drape_frontend/render_group.cpp
@@ -101,7 +101,7 @@ void RenderGroup::Render(ScreenBase const & screen)
   int const programIndex = m_state.GetProgramIndex();
   int const program3dIndex = m_state.GetProgram3dIndex();
 
-  if (IsOverlay() || GetDepthLayer(m_state) == RenderState::TransitMarkLayer)
+  if (IsOverlay())
   {
     if (programIndex == gpu::COLORED_SYMBOL_PROGRAM ||
         programIndex == gpu::COLORED_SYMBOL_BILLBOARD_PROGRAM)
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index 579cf5a348..d7b3d71d4c 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -201,11 +201,7 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
       buffer.emplace_back(pos, right + up + offset, glsl::ToVec2(texRect.RightBottom()), runAnim);
     }
 
-    if (renderInfo.m_symbolSizes != nullptr)
-    {
-      symbolSize = renderInfo.m_symbolSizes->at(static_cast<size_t>(tileKey.m_zoomLevel - 1)) * vs;
-    }
-    else if (!symbolName.empty())
+    if (!symbolName.empty())
     {
       textures->GetSymbolRegion(symbolName, region);
       symbolSize.x = max(region.GetPixelSize().x, symbolSize.x);
diff --git a/drape_frontend/user_mark_shapes.hpp b/drape_frontend/user_mark_shapes.hpp
index b325b6ae92..d00f38e930 100644
--- a/drape_frontend/user_mark_shapes.hpp
+++ b/drape_frontend/user_mark_shapes.hpp
@@ -20,7 +20,6 @@ struct UserMarkRenderParams
   m2::PointD m_pivot = m2::PointD(0.0, 0.0);
   m2::PointD m_pixelOffset = m2::PointD(0.0, 0.0);
   dp::Anchor m_anchor = dp::Center;
-  drape_ptr<UserPointMark::SymbolSizesZoomInfo> m_symbolSizes;
   drape_ptr<UserPointMark::ColoredSymbolZoomInfo> m_coloredSymbols;
   drape_ptr<UserPointMark::SymbolNameZoomInfo> m_symbolNames;
   drape_ptr<UserPointMark::TitlesInfo> m_titleDecl;
diff --git a/drape_frontend/user_marks_provider.hpp b/drape_frontend/user_marks_provider.hpp
index b9892aad2f..cc0374e92d 100644
--- a/drape_frontend/user_marks_provider.hpp
+++ b/drape_frontend/user_marks_provider.hpp
@@ -41,7 +41,6 @@ class UserPointMark
 public:
   using ColoredSymbolZoomInfo = std::map<int, df::ColoredSymbolViewParams>;
   using SymbolNameZoomInfo = std::map<int, std::string>;
-  using SymbolSizesZoomInfo = std::vector<m2::PointF>;
   using TitlesInfo = std::vector<dp::TitleDecl>;
 
   UserPointMark();
@@ -59,7 +58,6 @@ public:
   virtual RenderState::DepthLayer GetDepthLayer() const = 0;
   virtual bool IsVisible() const = 0;
   virtual drape_ptr<TitlesInfo> GetTitleDecl() const = 0;
-  virtual drape_ptr<SymbolSizesZoomInfo> GetSymbolSizes() const = 0;
   virtual drape_ptr<SymbolNameZoomInfo> GetSymbolNames() const = 0;
   virtual drape_ptr<ColoredSymbolZoomInfo> GetColoredSymbols() const = 0;
   virtual uint16_t GetPriority() const = 0;