Review fixes.beta-938beta-937beta-936

7 files changed, 5 insertions, 24 deletions

diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index a63012d6a0..7a9aea58db 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -243,7 +243,7 @@ void DrapeEngine::UpdateUserMarksGroup(MarkGroupID groupId, UserMarksProvider *
       renderInfo->m_hasTitlePriority = mark->HasTitlePriority();
       renderInfo->m_priority = mark->GetPriority();
       renderInfo->m_featureId = mark->GetFeatureID();
-      renderInfo->m_runCreationAnim = mark->RunCreationAnim();
+      renderInfo->m_hasCreationAnimation = mark->HasCreationAnimation();
 
       marksRenderCollection->emplace(mark->GetId(), std::move(renderInfo));
       mark->AcceptChanges();
diff --git a/drape_frontend/message.hpp b/drape_frontend/message.hpp
index 0f7ae1b0fe..49253626db 100644
--- a/drape_frontend/message.hpp
+++ b/drape_frontend/message.hpp
@@ -24,7 +24,6 @@ public:
     ClearUserMarkGroup,
     ChangeUserMarkGroupVisibility,
     UpdateUserMarks,
-    SetCreatedUserMarks,
     InvalidateUserMarks,
     FlushUserMarks,
     GuiLayerRecached,
diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp
index af3a5ddd47..d1d8bbcd3d 100644
--- a/drape_frontend/message_subclasses.hpp
+++ b/drape_frontend/message_subclasses.hpp
@@ -231,21 +231,6 @@ private:
   bool m_isVisible;
 };
 
-class AnimateUserMarksMessage : public Message
-{
-public:
-  AnimateUserMarksMessage(drape_ptr<MarkIDCollection> && ids)
-    : m_ids(std::move(ids))
-  {}
-
-  Type GetType() const override { return Message::SetCreatedUserMarks; }
-
-  drape_ptr<MarkIDCollection> && AcceptIds() { return std::move(m_ids); }
-
-private:
-  drape_ptr<MarkIDCollection> m_ids;
-};
-
 class UpdateUserMarksMessage : public Message
 {
 public:
diff --git a/drape_frontend/user_mark_generator.cpp b/drape_frontend/user_mark_generator.cpp
index d18855c351..be7438ae53 100644
--- a/drape_frontend/user_mark_generator.cpp
+++ b/drape_frontend/user_mark_generator.cpp
@@ -46,10 +46,7 @@ void UserMarkGenerator::SetCreatedUserMarks(drape_ptr<MarkIDCollection> && ids)
   if (ids == nullptr)
     return;
   for (auto const & id : ids->m_marksID)
-  {
-    UserMarkRenderParams & params = *m_marks[id].get();
-    params.m_justCreated = true;
-  }
+    m_marks[id].get()->m_justCreated = true;
 }
 
 void UserMarkGenerator::SetUserMarks(drape_ptr<UserMarksRenderCollection> && marks)
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index 07d6292a31..504c0e0c8c 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -132,7 +132,7 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
       m2::PointD const pt = MapShape::ConvertToLocal(renderInfo.m_pivot, tileCenter,
                                                      kShapeCoordScalar);
       glsl::vec3 const pos = glsl::vec3(glsl::ToVec2(pt), renderInfo.m_depth);
-      bool const runAnim = renderInfo.m_runCreationAnim && renderInfo.m_justCreated;
+      bool const runAnim = renderInfo.m_hasCreationAnimation && renderInfo.m_justCreated;
       isAnimated |= runAnim;
 
       glsl::vec2 left, right, up, down;
diff --git a/drape_frontend/user_mark_shapes.hpp b/drape_frontend/user_mark_shapes.hpp
index 54803b0ca5..106df084f8 100644
--- a/drape_frontend/user_mark_shapes.hpp
+++ b/drape_frontend/user_mark_shapes.hpp
@@ -26,7 +26,7 @@ struct UserMarkRenderParams
   uint16_t m_priority = 0;
   float m_depth = 0.0;
   dp::GLState::DepthLayer m_depthLayer = dp::GLState::UserMarkLayer;
-  bool m_runCreationAnim = false;
+  bool m_hasCreationAnimation = false;
   bool m_justCreated = false;
   bool m_isVisible = true;
   FeatureID m_featureId;
diff --git a/drape_frontend/user_marks_provider.hpp b/drape_frontend/user_marks_provider.hpp
index 34cf91c66f..b0fd837710 100644
--- a/drape_frontend/user_marks_provider.hpp
+++ b/drape_frontend/user_marks_provider.hpp
@@ -61,7 +61,7 @@ public:
   virtual bool HasTitlePriority() const = 0;
   virtual int GetMinZoom() const = 0;
   virtual FeatureID GetFeatureID() const = 0;
-  virtual bool RunCreationAnim() const = 0;
+  virtual bool HasCreationAnimation() const = 0;
 
 private:
   MarkID m_id;