Use base types from kml library.

12 files changed, 64 insertions, 86 deletions

diff --git a/drape_frontend/CMakeLists.txt b/drape_frontend/CMakeLists.txt
index ca06c792ad..33fad5d37a 100644
--- a/drape_frontend/CMakeLists.txt
+++ b/drape_frontend/CMakeLists.txt
@@ -212,7 +212,6 @@ set(
   user_mark_generator.hpp
   user_mark_shapes.cpp
   user_mark_shapes.hpp
-  user_marks_global.hpp
   user_marks_provider.cpp
   user_marks_provider.hpp
   visual_params.cpp
diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index 181e2a6242..cb2275c757 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -281,7 +281,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
   case Message::UpdateUserMarkGroup:
     {
       ref_ptr<UpdateUserMarkGroupMessage> msg = message;
-      MarkGroupID const groupId = msg->GetGroupId();
+      kml::MarkGroupId const groupId = msg->GetGroupId();
       m_userMarkGenerator->SetGroup(groupId, msg->AcceptIds());
       break;
     }
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index d233af41e8..3282678dc3 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -201,14 +201,14 @@ void DrapeEngine::SetModelViewAnyRect(m2::AnyRectD const & rect, bool isAnim)
   PostUserEvent(make_unique_dp<SetAnyRectEvent>(rect, isAnim));
 }
 
-void DrapeEngine::ClearUserMarksGroup(MarkGroupID groupId)
+void DrapeEngine::ClearUserMarksGroup(kml::MarkGroupId groupId)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
                                   make_unique_dp<ClearUserMarkGroupMessage>(groupId),
                                   MessagePriority::Normal);
 }
 
-void DrapeEngine::ChangeVisibilityUserMarksGroup(MarkGroupID groupId, bool isVisible)
+void DrapeEngine::ChangeVisibilityUserMarksGroup(kml::MarkGroupId groupId, bool isVisible)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
                                   make_unique_dp<ChangeUserMarkGroupVisibilityMessage>(groupId, isVisible),
@@ -235,14 +235,14 @@ void DrapeEngine::UpdateUserMarks(UserMarksProvider * provider, bool firstTime)
 
   if (!firstTime)
   {
-    df::MarkGroupID lastGroupId = *dirtyGroupIds.begin();
+    kml::MarkGroupId lastGroupId = *dirtyGroupIds.begin();
     bool visibilityChanged = provider->IsGroupVisibilityChanged(lastGroupId);
     bool groupIsVisible = provider->IsGroupVisible(lastGroupId);
 
     auto const handleMark = [&](
-      df::MarkID markId,
+      kml::MarkId markId,
       UserMarksRenderCollection & renderCollection,
-      MarkIDCollection *idCollection)
+      kml::MarkIdCollection *idCollection)
     {
       auto const *mark = provider->GetUserPointMark(markId);
       if (!mark->IsDirty())
@@ -277,7 +277,7 @@ void DrapeEngine::UpdateUserMarks(UserMarksProvider * provider, bool firstTime)
     removedIdCollection->m_lineIds.assign(removedLineIds.begin(), removedLineIds.end());
   }
 
-  std::map<df::MarkGroupID, drape_ptr<IDCollections>> dirtyMarkIds;
+  std::map<kml::MarkGroupId, drape_ptr<IDCollections>> dirtyMarkIds;
   for (auto groupId : dirtyGroupIds)
   {
     auto & idCollection = *(dirtyMarkIds.emplace(groupId, make_unique_dp<IDCollections>()).first->second);
diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp
index ba9e34b1e3..9abaf1af51 100644
--- a/drape_frontend/drape_engine.hpp
+++ b/drape_frontend/drape_engine.hpp
@@ -129,8 +129,8 @@ public:
   using TModelViewListenerFn = FrontendRenderer::TModelViewChanged;
   void SetModelViewListener(TModelViewListenerFn && fn);
 
-  void ClearUserMarksGroup(MarkGroupID groupId);
-  void ChangeVisibilityUserMarksGroup(MarkGroupID groupId, bool isVisible);
+  void ClearUserMarksGroup(kml::MarkGroupId groupId);
+  void ChangeVisibilityUserMarksGroup(kml::MarkGroupId groupId, bool isVisible);
   void UpdateUserMarks(UserMarksProvider * provider, bool firstTime);
   void InvalidateUserMarks();
 
diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp
index b811a4c407..06e7f55182 100644
--- a/drape_frontend/message_subclasses.hpp
+++ b/drape_frontend/message_subclasses.hpp
@@ -207,32 +207,32 @@ private:
 class ClearUserMarkGroupMessage : public Message
 {
 public:
-  ClearUserMarkGroupMessage(MarkGroupID groupId)
+  ClearUserMarkGroupMessage(kml::MarkGroupId groupId)
     : m_groupId(groupId)
   {}
 
   Type GetType() const override { return Message::ClearUserMarkGroup; }
 
-  MarkGroupID GetGroupId() const { return m_groupId; }
+  kml::MarkGroupId GetGroupId() const { return m_groupId; }
 
 private:
-  MarkGroupID m_groupId;
+  kml::MarkGroupId m_groupId;
 };
 
 class ChangeUserMarkGroupVisibilityMessage : public Message
 {
 public:
-  ChangeUserMarkGroupVisibilityMessage(MarkGroupID groupId, bool isVisible)
+  ChangeUserMarkGroupVisibilityMessage(kml::MarkGroupId groupId, bool isVisible)
     : m_groupId(groupId)
     , m_isVisible(isVisible) {}
 
   Type GetType() const override { return Message::ChangeUserMarkGroupVisibility; }
 
-  MarkGroupID GetGroupId() const { return m_groupId; }
+  kml::MarkGroupId GetGroupId() const { return m_groupId; }
   bool IsVisible() const { return m_isVisible; }
 
 private:
-  MarkGroupID m_groupId;
+  kml::MarkGroupId m_groupId;
   bool m_isVisible;
 };
 
@@ -266,7 +266,7 @@ private:
 class UpdateUserMarkGroupMessage : public Message
 {
 public:
-  UpdateUserMarkGroupMessage(MarkGroupID groupId,
+  UpdateUserMarkGroupMessage(kml::MarkGroupId groupId,
                              drape_ptr<IDCollections> && ids)
     : m_groupId(groupId)
     , m_ids(std::move(ids))
@@ -274,11 +274,11 @@ public:
 
   Type GetType() const override { return Message::UpdateUserMarkGroup; }
 
-  MarkGroupID GetGroupId() const { return m_groupId; }
+  kml::MarkGroupId GetGroupId() const { return m_groupId; }
   drape_ptr<IDCollections> AcceptIds() { return std::move(m_ids); }
 
 private:
-  MarkGroupID m_groupId;
+  kml::MarkGroupId m_groupId;
   drape_ptr<IDCollections> m_ids;
 };
 
diff --git a/drape_frontend/user_mark_generator.cpp b/drape_frontend/user_mark_generator.cpp
index fa5392dcd4..c84bf19ebd 100644
--- a/drape_frontend/user_mark_generator.cpp
+++ b/drape_frontend/user_mark_generator.cpp
@@ -20,14 +20,14 @@ UserMarkGenerator::UserMarkGenerator(TFlushFn const & flushFn)
   ASSERT(m_flushFn, ());
 }
 
-void UserMarkGenerator::RemoveGroup(MarkGroupID groupId)
+void UserMarkGenerator::RemoveGroup(kml::MarkGroupId groupId)
 {
   m_groupsVisibility.erase(groupId);
   m_groups.erase(groupId);
   UpdateIndex(groupId);
 }
 
-void UserMarkGenerator::SetGroup(MarkGroupID groupId, drape_ptr<IDCollections> && ids)
+void UserMarkGenerator::SetGroup(kml::MarkGroupId groupId, drape_ptr<IDCollections> && ids)
 {
   m_groups[groupId] = std::move(ids);
   UpdateIndex(groupId);
@@ -75,7 +75,7 @@ void UserMarkGenerator::SetUserLines(drape_ptr<UserLinesRenderCollection> && lin
   }
 }
 
-void UserMarkGenerator::UpdateIndex(MarkGroupID groupId)
+void UserMarkGenerator::UpdateIndex(kml::MarkGroupId groupId)
 {
   for (auto & tileGroups : m_index)
   {
@@ -134,7 +134,7 @@ void UserMarkGenerator::UpdateIndex(MarkGroupID groupId)
   CleanIndex();
 }
 
-ref_ptr<IDCollections> UserMarkGenerator::GetIdCollection(TileKey const & tileKey, MarkGroupID groupId)
+ref_ptr<IDCollections> UserMarkGenerator::GetIdCollection(TileKey const & tileKey, kml::MarkGroupId groupId)
 {
   ref_ptr<MarksIDGroups> tileGroups;
   auto itTileGroups = m_index.find(tileKey);
@@ -187,7 +187,7 @@ void UserMarkGenerator::CleanIndex()
   }
 }
 
-void UserMarkGenerator::SetGroupVisibility(MarkGroupID groupId, bool isVisible)
+void UserMarkGenerator::SetGroupVisibility(kml::MarkGroupId groupId, bool isVisible)
 {
   if (isVisible)
     m_groupsVisibility.insert(groupId);
@@ -249,7 +249,7 @@ void UserMarkGenerator::CacheUserLines(TileKey const & tileKey, MarksIDGroups co
 {
   for (auto & groupPair : indexesGroups)
   {
-    MarkGroupID groupId = groupPair.first;
+    kml::MarkGroupId groupId = groupPair.first;
     if (m_groupsVisibility.find(groupId) == m_groupsVisibility.end())
       continue;
 
@@ -262,7 +262,7 @@ void UserMarkGenerator::CacheUserMarks(TileKey const & tileKey, MarksIDGroups co
 {
   for (auto & groupPair : indexesGroups)
   {
-    MarkGroupID groupId = groupPair.first;
+    kml::MarkGroupId groupId = groupPair.first;
     if (m_groupsVisibility.find(groupId) == m_groupsVisibility.end())
       continue;
     df::CacheUserMarks(tileKey, textures, groupPair.second->m_markIds, m_marks, batcher);
diff --git a/drape_frontend/user_mark_generator.hpp b/drape_frontend/user_mark_generator.hpp
index 32dea25e24..95ced4da21 100644
--- a/drape_frontend/user_mark_generator.hpp
+++ b/drape_frontend/user_mark_generator.hpp
@@ -13,7 +13,7 @@
 
 namespace df
 {
-using MarksIDGroups = std::map<MarkGroupID, drape_ptr<IDCollections>>;
+using MarksIDGroups = std::map<kml::MarkGroupId, drape_ptr<IDCollections>>;
 using MarksIndex = std::map<TileKey, drape_ptr<MarksIDGroups>>;
 
 class UserMarkGenerator
@@ -28,16 +28,16 @@ public:
   void SetRemovedUserMarks(drape_ptr<IDCollections> && ids);
   void SetCreatedUserMarks(drape_ptr<IDCollections> && ids);
 
-  void SetGroup(MarkGroupID groupId, drape_ptr<IDCollections> && ids);
-  void RemoveGroup(MarkGroupID groupId);
-  void SetGroupVisibility(MarkGroupID groupId, bool isVisible);
+  void SetGroup(kml::MarkGroupId groupId, drape_ptr<IDCollections> && ids);
+  void RemoveGroup(kml::MarkGroupId groupId);
+  void SetGroupVisibility(kml::MarkGroupId groupId, bool isVisible);
 
   void GenerateUserMarksGeometry(TileKey const & tileKey, ref_ptr<dp::TextureManager> textures);
 
 private:
-  void UpdateIndex(MarkGroupID groupId);
+  void UpdateIndex(kml::MarkGroupId groupId);
 
-  ref_ptr<IDCollections> GetIdCollection(TileKey const & tileKey, MarkGroupID groupId);
+  ref_ptr<IDCollections> GetIdCollection(TileKey const & tileKey, kml::MarkGroupId groupId);
   void CleanIndex();
 
   int GetNearestLineIndexZoom(int zoom) const;
@@ -50,7 +50,7 @@ private:
   void CacheUserLines(TileKey const & tileKey, MarksIDGroups const & indexesGroups,
                       ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher);
 
-  std::unordered_set<MarkGroupID> m_groupsVisibility;
+  std::unordered_set<kml::MarkGroupId> m_groupsVisibility;
   MarksIDGroups m_groups;
 
   UserMarksRenderCollection m_marks;
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index 3a3a0d48ab..9b5abc04c4 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -287,7 +287,7 @@ std::string GetBackgroundForSymbol(std::string const & symbolName,
 }  // namespace
 
 void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> textures,
-                    MarkIDCollection const & marksId, UserMarksRenderCollection & renderParams,
+                    kml::MarkIdCollection const & marksId, UserMarksRenderCollection & renderParams,
                     dp::Batcher & batcher)
 {
   using UPV = UserPointVertex;
@@ -437,7 +437,7 @@ void ProcessSplineSegmentRects(m2::SharedSpline const & spline, double maxSegmen
 }
 
 void CacheUserLines(TileKey const & tileKey, ref_ptr<dp::TextureManager> textures,
-                    LineIDCollection const & linesId, UserLinesRenderCollection & renderParams,
+                    kml::TrackIdCollection const & linesId, UserLinesRenderCollection & renderParams,
                     dp::Batcher & batcher)
 {
   ASSERT_GREATER(tileKey.m_zoomLevel, 0, ());
diff --git a/drape_frontend/user_mark_shapes.hpp b/drape_frontend/user_mark_shapes.hpp
index 41e66c85c8..f881c59f01 100644
--- a/drape_frontend/user_mark_shapes.hpp
+++ b/drape_frontend/user_mark_shapes.hpp
@@ -60,8 +60,8 @@ struct UserLineRenderParams
   m2::SharedSpline m_spline;
 };
 
-using UserMarksRenderCollection = std::unordered_map<MarkID, drape_ptr<UserMarkRenderParams>>;
-using UserLinesRenderCollection = std::unordered_map<MarkID, drape_ptr<UserLineRenderParams>>;
+using UserMarksRenderCollection = std::unordered_map<kml::MarkId, drape_ptr<UserMarkRenderParams>>;
+using UserLinesRenderCollection = std::unordered_map<kml::MarkId, drape_ptr<UserLineRenderParams>>;
 
 struct UserMarkRenderData
 {
@@ -82,10 +82,10 @@ void ProcessSplineSegmentRects(m2::SharedSpline const & spline, double maxSegmen
                                std::function<bool(m2::RectD const & segmentRect)> const & func);
 
 void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> textures,
-                    MarkIDCollection const & marksId, UserMarksRenderCollection & renderParams,
+                    kml::MarkIdCollection const & marksId, UserMarksRenderCollection & renderParams,
                     dp::Batcher & batcher);
 
 void CacheUserLines(TileKey const & tileKey, ref_ptr<dp::TextureManager> textures,
-                    LineIDCollection const & linesId, UserLinesRenderCollection & renderParams,
+                    kml::TrackIdCollection const & linesId, UserLinesRenderCollection & renderParams,
                     dp::Batcher & batcher);
 }  // namespace df
diff --git a/drape_frontend/user_marks_global.hpp b/drape_frontend/user_marks_global.hpp
deleted file mode 100644
index 9d0d31eda8..0000000000
--- a/drape_frontend/user_marks_global.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <limits>
-#include <set>
-#include <vector>
-
-namespace df
-{
-using MarkID = uint64_t;
-using LineID = uint64_t;
-using MarkGroupID = uint64_t;
-using MarkIDCollection = std::vector<MarkID>;
-using LineIDCollection = std::vector<LineID>;
-using MarkIDSet = std::set<MarkID, std::greater<MarkID>>;
-using LineIDSet = std::set<LineID>;
-using GroupIDCollection = std::vector<MarkGroupID>;
-using GroupIDSet = std::set<MarkGroupID>;
-
-MarkID const kInvalidMarkId = std::numeric_limits<MarkID>::max();
-LineID const kInvalidLineId = std::numeric_limits<LineID>::max();
-MarkGroupID const kInvalidMarkGroupId = std::numeric_limits<MarkGroupID>::max();
-}  // namespace df
diff --git a/drape_frontend/user_marks_provider.cpp b/drape_frontend/user_marks_provider.cpp
index 0a406070d0..eb83835878 100644
--- a/drape_frontend/user_marks_provider.cpp
+++ b/drape_frontend/user_marks_provider.cpp
@@ -2,13 +2,13 @@
 
 namespace df
 {
-UserPointMark::UserPointMark(df::MarkID id)
+UserPointMark::UserPointMark(kml::MarkId id)
   : m_id(id)
 {
 }
 
 
-UserLineMark::UserLineMark(df::LineID id)
+UserLineMark::UserLineMark(kml::TrackId id)
   : m_id(id)
 {
 }
diff --git a/drape_frontend/user_marks_provider.hpp b/drape_frontend/user_marks_provider.hpp
index 6e11140ffe..a6018cede6 100644
--- a/drape_frontend/user_marks_provider.hpp
+++ b/drape_frontend/user_marks_provider.hpp
@@ -3,11 +3,12 @@
 #include "drape_frontend/color_constants.hpp"
 #include "drape_frontend/render_state.hpp"
 #include "drape_frontend/shape_view_params.hpp"
-#include "drape_frontend/user_marks_global.hpp"
 
 #include "drape/drape_global.hpp"
 #include "drape/pointers.hpp"
 
+#include "kml/type_utils.hpp"
+
 #include "indexer/feature_decl.hpp"
 
 #include "geometry/polyline2d.hpp"
@@ -18,8 +19,8 @@ namespace df
 {
 struct IDCollections
 {
-  MarkIDCollection m_markIds;
-  LineIDCollection m_lineIds;
+  kml::MarkIdCollection m_markIds;
+  kml::TrackIdCollection m_lineIds;
 
   bool IsEmpty()
   {
@@ -42,14 +43,14 @@ public:
   using SymbolSizes = std::vector<m2::PointF>;
   using SymbolOffsets = std::vector<m2::PointF>;
 
-  explicit UserPointMark(df::MarkID id);
+  explicit UserPointMark(kml::MarkId id);
   virtual ~UserPointMark() = default;
 
   virtual bool IsDirty() const = 0;
   virtual void ResetChanges() const = 0;
 
-  MarkID GetId() const { return m_id; }
-  virtual df::MarkGroupID GetGroupId() const = 0;
+  kml::MarkId GetId() const { return m_id; }
+  virtual kml::MarkGroupId GetGroupId() const = 0;
 
   virtual m2::PointD const & GetPivot() const = 0;
   virtual m2::PointD GetPixelOffset() const = 0;
@@ -73,19 +74,19 @@ public:
   virtual df::ColorConstant GetColorConstant() const = 0;
 
 private:
-  MarkID m_id;
+  kml::MarkId m_id;
 };
 
 class UserLineMark
 {
 public:
-  explicit UserLineMark(df::LineID id);
+  explicit UserLineMark(kml::TrackId id);
   virtual ~UserLineMark() = default;
 
   virtual bool IsDirty() const = 0;
   virtual void ResetChanges() const = 0;
 
-  virtual LineID GetId() const { return m_id; }
+  virtual kml::TrackId GetId() const { return m_id; }
 
   virtual int GetMinZoom() const = 0;
   virtual RenderState::DepthLayer GetDepthLayer() const = 0;
@@ -96,27 +97,27 @@ public:
   virtual std::vector<m2::PointD> const & GetPoints() const = 0;
 
 private:
-  LineID m_id;
+  kml::TrackId m_id;
 };
 
 class UserMarksProvider
 {
 public:
   virtual ~UserMarksProvider() = default;
-  virtual GroupIDSet const & GetDirtyGroupIds() const = 0;
-  virtual GroupIDSet const & GetRemovedGroupIds() const = 0;
-  virtual GroupIDSet GetAllGroupIds() const = 0;
-  virtual bool IsGroupVisible(MarkGroupID groupId) const = 0;
-  virtual bool IsGroupVisibilityChanged(MarkGroupID groupId) const = 0;
-  virtual MarkIDSet const & GetGroupPointIds(MarkGroupID groupId) const = 0;
-  virtual LineIDSet const & GetGroupLineIds(MarkGroupID groupId) const = 0;
-  virtual MarkIDSet const & GetCreatedMarkIds() const = 0;
-  virtual MarkIDSet const & GetRemovedMarkIds() const = 0;
-  virtual MarkIDSet const & GetUpdatedMarkIds() const = 0;
-  virtual LineIDSet const & GetRemovedLineIds() const = 0;
+  virtual kml::GroupIdSet const & GetDirtyGroupIds() const = 0;
+  virtual kml::GroupIdSet const & GetRemovedGroupIds() const = 0;
+  virtual kml::GroupIdSet GetAllGroupIds() const = 0;
+  virtual bool IsGroupVisible(kml::MarkGroupId groupId) const = 0;
+  virtual bool IsGroupVisibilityChanged(kml::MarkGroupId groupId) const = 0;
+  virtual kml::MarkIdSet const & GetGroupPointIds(kml::MarkGroupId groupId) const = 0;
+  virtual kml::TrackIdSet const & GetGroupLineIds(kml::MarkGroupId groupId) const = 0;
+  virtual kml::MarkIdSet const & GetCreatedMarkIds() const = 0;
+  virtual kml::MarkIdSet const & GetRemovedMarkIds() const = 0;
+  virtual kml::MarkIdSet const & GetUpdatedMarkIds() const = 0;
+  virtual kml::TrackIdSet const & GetRemovedLineIds() const = 0;
   /// Never store UserPointMark reference.
-  virtual UserPointMark const * GetUserPointMark(MarkID markId) const = 0;
+  virtual UserPointMark const * GetUserPointMark(kml::MarkId markId) const = 0;
   /// Never store UserLineMark reference.
-  virtual UserLineMark const * GetUserLineMark(LineID lineId) const = 0;
+  virtual UserLineMark const * GetUserLineMark(kml::TrackId lineId) const = 0;
 };
 }  // namespace df