diff options
46 files changed, 445 insertions, 457 deletions
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 599bd3a66f..13a90db444 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -372,12 +372,12 @@ void Framework::RemoveLocalMaps() m_work.DeregisterAllMaps(); } -void Framework::ReplaceBookmark(df::MarkID markId, kml::BookmarkData & bm) +void Framework::ReplaceBookmark(kml::MarkId markId, kml::BookmarkData & bm) { m_work.GetBookmarkManager().GetEditSession().UpdateBookmark(markId, bm); } -void Framework::MoveBookmark(df::MarkID markId, df::MarkGroupID curCat, df::MarkGroupID newCat) +void Framework::MoveBookmark(kml::MarkId markId, kml::MarkGroupId curCat, kml::MarkGroupId newCat) { m_work.GetBookmarkManager().GetEditSession().MoveBookmark(markId, curCat, newCat); } @@ -414,7 +414,7 @@ string Framework::GetOutdatedCountriesString() return res; } -void Framework::ShowTrack(df::LineID track) +void Framework::ShowTrack(kml::TrackId track) { Track const * nTrack = NativeFramework()->GetBookmarkManager().GetTrack(track); NativeFramework()->ShowTrack(*nTrack); @@ -903,7 +903,7 @@ Java_com_mapswithme_maps_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclas JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativeShowTrackRect(JNIEnv * env, jclass, jlong track) { - g_framework->ShowTrack(static_cast<df::LineID>(track)); + g_framework->ShowTrack(static_cast<kml::TrackId>(track)); } JNIEXPORT jstring JNICALL @@ -1411,9 +1411,9 @@ Java_com_mapswithme_maps_Framework_nativeOnBookmarkCategoryChanged(JNIEnv * env, place_page::Info & info = g_framework->GetPlacePageInfo(); ASSERT_GREATER_OR_EQUAL(bmk, 0, ()); ASSERT_GREATER_OR_EQUAL(cat, 0, ()); - info.SetBookmarkCategoryId(static_cast<df::MarkGroupID>(cat)); - info.SetBookmarkId(static_cast<df::MarkID>(bmk)); - info.SetBookmarkCategoryName(frm()->GetBookmarkManager().GetCategoryName(static_cast<df::MarkGroupID>(cat))); + info.SetBookmarkCategoryId(static_cast<kml::MarkGroupId>(cat)); + info.SetBookmarkId(static_cast<kml::MarkId>(bmk)); + info.SetBookmarkCategoryName(frm()->GetBookmarkManager().GetCategoryName(static_cast<kml::MarkGroupId>(cat))); } JNIEXPORT void JNICALL diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index 64058af703..6422ee4349 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -138,8 +138,8 @@ namespace android void Scale(::Framework::EScaleMode mode); void Scale(m2::PointD const & centerPt, int targetZoom, bool animate); - void ReplaceBookmark(df::MarkID markId, kml::BookmarkData & bm); - void MoveBookmark(df::MarkID markId, df::MarkGroupID curCat, df::MarkGroupID newCat); + void ReplaceBookmark(kml::MarkId markId, kml::BookmarkData & bm); + void MoveBookmark(kml::MarkId markId, kml::MarkGroupId curCat, kml::MarkGroupId newCat); ::Framework * NativeFramework(); @@ -151,7 +151,7 @@ namespace android std::string GetOutdatedCountriesString(); - void ShowTrack(df::LineID track); + void ShowTrack(kml::TrackId track); void SetMyPositionModeListener(location::TMyPositionModeChanged const & fn); location::EMyPositionMode GetMyPositionMode(); diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/Bookmark.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/Bookmark.cpp index 672b5594fe..f40119781f 100644 --- a/android/jni/com/mapswithme/maps/bookmarks/data/Bookmark.cpp +++ b/android/jni/com/mapswithme/maps/bookmarks/data/Bookmark.cpp @@ -9,7 +9,7 @@ namespace Bookmark const * getBookmark(jlong bokmarkId) { - Bookmark const * pBmk = frm()->GetBookmarkManager().GetBookmark(static_cast<df::MarkID>(bokmarkId)); + Bookmark const * pBmk = frm()->GetBookmarkManager().GetBookmark(static_cast<kml::MarkId>(bokmarkId)); ASSERT(pBmk, ("Bookmark not found, id", bokmarkId)); return pBmk; } @@ -54,15 +54,15 @@ Java_com_mapswithme_maps_bookmarks_data_Bookmark_nativeSetBookmarkParams( kml::SetDefaultStr(bmData.m_description, jni::ToNativeString(env, descr)); bmData.m_color.m_predefinedColor = static_cast<kml::PredefinedColor>(color); - g_framework->ReplaceBookmark(static_cast<df::MarkID>(bmk), bmData); + g_framework->ReplaceBookmark(static_cast<kml::MarkId>(bmk), bmData); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_bookmarks_data_Bookmark_nativeChangeCategory( JNIEnv * env, jobject thiz, jlong oldCat, jlong newCat, jlong bmk) { - g_framework->MoveBookmark(static_cast<df::MarkID>(bmk), static_cast<df::MarkGroupID>(oldCat), - static_cast<df::MarkGroupID>(newCat)); + g_framework->MoveBookmark(static_cast<kml::MarkId>(bmk), static_cast<kml::MarkGroupId>(oldCat), + static_cast<kml::MarkGroupId>(newCat)); } JNIEXPORT jobject JNICALL diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp index 47c29a770b..054a692b9c 100644 --- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp +++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp @@ -186,7 +186,7 @@ JNIEXPORT void JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap( JNIEnv * env, jobject thiz, jlong bmkId) { - frm()->ShowBookmark(static_cast<df::MarkID>(bmkId)); + frm()->ShowBookmark(static_cast<kml::MarkId>(bmkId)); } JNIEXPORT void JNICALL @@ -231,7 +231,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCategoryIdByPos JNIEnv * env, jobject thiz, jint position) { auto & ids = frm()->GetBookmarkManager().GetBmGroupsIdList(); - return static_cast<jlong>(position < ids.size() ? ids[position] : df::kInvalidMarkGroupId); + return static_cast<jlong>(position < ids.size() ? ids[position] : kml::kInvalidMarkGroupId); } JNIEXPORT jlong JNICALL @@ -247,21 +247,21 @@ JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeDeleteCategory( JNIEnv * env, jobject thiz, jlong catId) { - auto const categoryId = static_cast<df::MarkGroupID>(catId); + auto const categoryId = static_cast<kml::MarkGroupId>(catId); return static_cast<jboolean>(frm()->GetBookmarkManager().GetEditSession().DeleteBmCategory(categoryId)); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeDeleteBookmark(JNIEnv *, jobject, jlong bmkId) { - frm()->GetBookmarkManager().GetEditSession().DeleteBookmark(static_cast<df::MarkID>(bmkId)); + frm()->GetBookmarkManager().GetEditSession().DeleteBookmark(static_cast<kml::MarkId>(bmkId)); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeDeleteTrack( JNIEnv * env, jobject thiz, jlong trkId) { - frm()->GetBookmarkManager().GetEditSession().DeleteTrack(static_cast<df::LineID>(trkId)); + frm()->GetBookmarkManager().GetEditSession().DeleteTrack(static_cast<kml::TrackId>(trkId)); } JNIEXPORT jobject JNICALL @@ -321,21 +321,21 @@ JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsVisible( JNIEnv * env, jobject thiz, jlong catId) { - return static_cast<jboolean>(frm()->GetBookmarkManager().IsVisible(static_cast<df::MarkGroupID>(catId))); + return static_cast<jboolean>(frm()->GetBookmarkManager().IsVisible(static_cast<kml::MarkGroupId>(catId))); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetVisibility( JNIEnv * env, jobject thiz, jlong catId, jboolean isVisible) { - frm()->GetBookmarkManager().GetEditSession().SetIsVisible(static_cast<df::MarkGroupID>(catId), isVisible); + frm()->GetBookmarkManager().GetEditSession().SetIsVisible(static_cast<kml::MarkGroupId>(catId), isVisible); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryName( JNIEnv * env, jobject thiz, jlong catId, jstring name) { - frm()->GetBookmarkManager().GetEditSession().SetCategoryName(static_cast<df::MarkGroupID>(catId), + frm()->GetBookmarkManager().GetEditSession().SetCategoryName(static_cast<kml::MarkGroupId>(catId), jni::ToNativeString(env, name)); } @@ -343,21 +343,21 @@ JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCategoryName( JNIEnv * env, jobject thiz, jlong catId) { - return ToJavaString(env, frm()->GetBookmarkManager().GetCategoryName(static_cast<df::MarkGroupID>(catId))); + return ToJavaString(env, frm()->GetBookmarkManager().GetCategoryName(static_cast<kml::MarkGroupId>(catId))); } JNIEXPORT jint JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarksCount( JNIEnv * env, jobject thiz, jlong catId) { - return frm()->GetBookmarkManager().GetUserMarkIds(static_cast<df::MarkGroupID>(catId)).size(); + return frm()->GetBookmarkManager().GetUserMarkIds(static_cast<kml::MarkGroupId>(catId)).size(); } JNIEXPORT jint JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTracksCount( JNIEnv * env, jobject thiz, jlong catId) { - return frm()->GetBookmarkManager().GetTrackIds(static_cast<df::MarkGroupID>(catId)).size(); + return frm()->GetBookmarkManager().GetTrackIds(static_cast<kml::MarkGroupId>(catId)).size(); } // TODO(AlexZ): Get rid of UserMarks completely in UI code. @@ -368,7 +368,7 @@ JNIEXPORT jobject JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmark( JNIEnv * env, jobject thiz, jlong bmkId) { - auto const * mark = frm()->GetBookmarkManager().GetBookmark(static_cast<df::MarkID>(bmkId)); + auto const * mark = frm()->GetBookmarkManager().GetBookmark(static_cast<kml::MarkId>(bmkId)); place_page::Info info; frm()->FillBookmarkInfo(*mark, info); return usermark_helper::CreateMapObject(env, info); @@ -378,9 +378,9 @@ JNIEXPORT jlong JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPosition( JNIEnv * env, jobject thiz, jlong catId, jint positionInCategory) { - auto & ids = frm()->GetBookmarkManager().GetUserMarkIds(static_cast<df::MarkGroupID>(catId)); + auto & ids = frm()->GetBookmarkManager().GetUserMarkIds(static_cast<kml::MarkGroupId>(catId)); if (positionInCategory >= ids.size()) - return static_cast<jlong>(df::kInvalidMarkId); + return static_cast<jlong>(kml::kInvalidMarkId); auto it = ids.begin(); std::advance(it, positionInCategory); return static_cast<jlong>(*it); @@ -395,7 +395,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTrack( // Track(long trackId, long categoryId, String name, String lengthString, int color) static jmethodID const cId = jni::GetConstructorID(env, trackClazz, "(JJLjava/lang/String;Ljava/lang/String;I)V"); - auto const * nTrack = frm()->GetBookmarkManager().GetTrack(static_cast<df::LineID>(trackId)); + auto const * nTrack = frm()->GetBookmarkManager().GetTrack(static_cast<kml::TrackId>(trackId)); ASSERT(nTrack, ("Track must not be null with id:)", trackId)); @@ -418,9 +418,9 @@ JNIEXPORT jlong JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition( JNIEnv * env, jobject thiz, jlong catId, jint positionInCategory) { - auto & ids = frm()->GetBookmarkManager().GetTrackIds(static_cast<df::MarkGroupID>(catId)); + auto & ids = frm()->GetBookmarkManager().GetTrackIds(static_cast<kml::MarkGroupId>(catId)); if (positionInCategory >= ids.size()) - return static_cast<jlong>(df::kInvalidLineId); + return static_cast<jlong>(kml::kInvalidTrackId); auto it = ids.begin(); std::advance(it, positionInCategory); return static_cast<jlong>(*it); @@ -497,7 +497,7 @@ JNIEXPORT void JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativePrepareFileForSharing( JNIEnv * env, jobject thiz, jlong catId) { - frm()->GetBookmarkManager().PrepareFileForSharing(static_cast<df::MarkGroupID>(catId), + frm()->GetBookmarkManager().PrepareFileForSharing(static_cast<kml::MarkGroupId>(catId), [env](BookmarkManager::SharingResult const & result) { OnPreparedFileForSharing(env, result); @@ -509,7 +509,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty( JNIEnv * env, jobject thiz, jlong catId) { return static_cast<jboolean>(frm()->GetBookmarkManager().IsCategoryEmpty( - static_cast<df::MarkGroupID>(catId))); + static_cast<kml::MarkGroupId>(catId))); } JNIEXPORT void JNICALL 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 diff --git a/iphone/Maps/Bookmarks/AddSetVC.h b/iphone/Maps/Bookmarks/AddSetVC.h index 10ac731933..f4ea9a251f 100644 --- a/iphone/Maps/Bookmarks/AddSetVC.h +++ b/iphone/Maps/Bookmarks/AddSetVC.h @@ -1,11 +1,11 @@ #import "MWMTableViewController.h" -#include "drape_frontend/user_marks_global.hpp" +#include "kml/type_utils.hpp" @class AddSetVC; @protocol AddSetVCDelegate <NSObject> -- (void)addSetVC:(AddSetVC *)vc didAddSetWithCategoryId:(df::MarkGroupID)categoryId; +- (void)addSetVC:(AddSetVC *)vc didAddSetWithCategoryId:(kml::MarkGroupId)categoryId; @end diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index f21bc18d95..6277d65577 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -44,7 +44,7 @@ return self; } -- (df::MarkID)getBookmarkIdByRow:(NSInteger)row +- (kml::MarkId)getBookmarkIdByRow:(NSInteger)row { auto const & bmManager = GetFramework().GetBookmarkManager(); auto const & bookmarkIds = bmManager.GetUserMarkIds(m_categoryId); @@ -54,7 +54,7 @@ return *it; } -- (df::LineID)getTrackIdByRow:(NSInteger)row +- (kml::TrackId)getTrackIdByRow:(NSInteger)row { auto const & bmManager = GetFramework().GetBookmarkManager(); auto const & trackIds = bmManager.GetTrackIds(m_categoryId); @@ -146,7 +146,7 @@ cell = [tableView dequeueReusableCellWithIdentifier:@"TrackCell"]; if (!cell) cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"TrackCell"]; - df::LineID const trackId = [self getTrackIdByRow:indexPath.row]; + kml::TrackId const trackId = [self getTrackIdByRow:indexPath.row]; Track const * tr = bmManager.GetTrack(trackId); cell.textLabel.text = @(tr->GetName().c_str()); string dist; @@ -165,7 +165,7 @@ UITableViewCell * bmCell = (UITableViewCell *)[tableView dequeueReusableCellWithIdentifier:@"BookmarksVCBookmarkItemCell"]; if (!bmCell) bmCell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"BookmarksVCBookmarkItemCell"]; - df::MarkID const bmId = [self getBookmarkIdByRow:indexPath.row]; + kml::MarkId const bmId = [self getBookmarkIdByRow:indexPath.row]; Bookmark const * bm = bmManager.GetBookmark(bmId); if (bm) { @@ -229,7 +229,7 @@ { if (categoryExists) { - df::LineID const trackId = [self getTrackIdByRow:indexPath.row]; + kml::TrackId const trackId = [self getTrackIdByRow:indexPath.row]; Track const * tr = bmManager.GetTrack(trackId); ASSERT(tr, ("NULL track")); if (tr) @@ -243,7 +243,7 @@ { if (categoryExists) { - df::MarkID const bmId = [self getBookmarkIdByRow:indexPath.row]; + kml::MarkId const bmId = [self getBookmarkIdByRow:indexPath.row]; Bookmark const * bm = bmManager.GetBookmark(bmId); ASSERT(bm, ("NULL bookmark")); if (bm) @@ -304,12 +304,12 @@ { if (indexPath.section == m_trackSection) { - df::LineID const trackId = [self getTrackIdByRow:indexPath.row]; + kml::TrackId const trackId = [self getTrackIdByRow:indexPath.row]; bmManager.GetEditSession().DeleteTrack(trackId); } else { - df::MarkID const bmId = [self getBookmarkIdByRow:indexPath.row]; + kml::MarkId const bmId = [self getBookmarkIdByRow:indexPath.row]; [MWMBookmarksManager deleteBookmark:bmId]; } } @@ -343,7 +343,7 @@ NSIndexPath * indexPath = [table indexPathForCell:cell]; if (indexPath.section == self->m_bookmarkSection) { - df::MarkID const bmId = [self getBookmarkIdByRow:indexPath.row]; + kml::MarkId const bmId = [self getBookmarkIdByRow:indexPath.row]; Bookmark const * bm = bmManager.GetBookmark(bmId); if (bm) { diff --git a/iphone/Maps/Bookmarks/SelectSetVC.h b/iphone/Maps/Bookmarks/SelectSetVC.h index ba4f64c4ca..13b6924787 100644 --- a/iphone/Maps/Bookmarks/SelectSetVC.h +++ b/iphone/Maps/Bookmarks/SelectSetVC.h @@ -1,17 +1,17 @@ #import "MWMTableViewController.h" -#include "drape_frontend/user_marks_global.hpp" +#include "kml/type_utils.hpp" @protocol MWMSelectSetDelegate <NSObject> -- (void)didSelectCategory:(NSString *)category withCategoryId:(df::MarkGroupID)categoryId; +- (void)didSelectCategory:(NSString *)category withCategoryId:(kml::MarkGroupId)categoryId; @end @interface SelectSetVC : MWMTableViewController - (instancetype)initWithCategory:(NSString *)category - categoryId:(df::MarkGroupID)categoryId + categoryId:(kml::MarkGroupId)categoryId delegate:(id<MWMSelectSetDelegate>)delegate; @end diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm index 05c8043406..ff2f7bdd14 100644 --- a/iphone/Maps/Bookmarks/SelectSetVC.mm +++ b/iphone/Maps/Bookmarks/SelectSetVC.mm @@ -7,7 +7,7 @@ @interface SelectSetVC () <AddSetVCDelegate> { - df::MarkGroupID m_categoryId; + kml::MarkGroupId m_categoryId; } @property (copy, nonatomic) NSString * category; @@ -18,7 +18,7 @@ @implementation SelectSetVC - (instancetype)initWithCategory:(NSString *)category - categoryId:(df::MarkGroupID)categoryId + categoryId:(kml::MarkGroupId)categoryId delegate:(id<MWMSelectSetDelegate>)delegate { self = [super initWithStyle:UITableViewStyleGrouped]; @@ -77,12 +77,12 @@ return cell; } -- (void)addSetVC:(AddSetVC *)vc didAddSetWithCategoryId:(df::MarkGroupID)categoryId +- (void)addSetVC:(AddSetVC *)vc didAddSetWithCategoryId:(kml::MarkGroupId)categoryId { [self moveBookmarkToSetWithCategoryId:categoryId]; } -- (void)moveBookmarkToSetWithCategoryId:(df::MarkGroupID)categoryId +- (void)moveBookmarkToSetWithCategoryId:(kml::MarkGroupId)categoryId { m_categoryId = categoryId; self.category = @(GetFramework().GetBookmarkManager().GetCategoryName(categoryId).c_str()); diff --git a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm index a29627f8fa..4f39494756 100644 --- a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm @@ -33,8 +33,8 @@ enum RowInMetaInfo @interface MWMEditBookmarkController () <MWMButtonCellDelegate, MWMNoteCelLDelegate, MWMBookmarkColorDelegate, MWMSelectSetDelegate, MWMBookmarkTitleDelegate> { - df::MarkID m_cachedBookmarkId; - df::MarkGroupID m_cachedBookmarkCatId; + kml::MarkId m_cachedBookmarkId; + kml::MarkGroupId m_cachedBookmarkCatId; } @property (nonatomic) MWMNoteCell * cachedNote; @@ -42,7 +42,7 @@ enum RowInMetaInfo @property (copy, nonatomic) NSString * cachedTitle; @property (nonatomic) kml::PredefinedColor cachedColor; @property (copy, nonatomic) NSString * cachedCategory; -@property(nonatomic) df::MarkGroupID cachedNewBookmarkCatId; +@property(nonatomic) kml::MarkGroupId cachedNewBookmarkCatId; @end @@ -51,7 +51,7 @@ enum RowInMetaInfo - (void)viewDidLoad { [super viewDidLoad]; - self.cachedNewBookmarkCatId = df::kInvalidMarkGroupId; + self.cachedNewBookmarkCatId = kml::kInvalidMarkGroupId; auto data = self.data; NSAssert(data, @"Data can't be nil!"); self.cachedDescription = data.bookmarkDescription; @@ -94,7 +94,7 @@ enum RowInMetaInfo auto & f = GetFramework(); BookmarkManager & bmManager = f.GetBookmarkManager(); auto editSession = bmManager.GetEditSession(); - if (self.cachedNewBookmarkCatId != df::kInvalidMarkGroupId) + if (self.cachedNewBookmarkCatId != kml::kInvalidMarkGroupId) { editSession.MoveBookmark(m_cachedBookmarkId, m_cachedBookmarkCatId, self.cachedNewBookmarkCatId); m_cachedBookmarkCatId = self.cachedNewBookmarkCatId; @@ -232,8 +232,8 @@ enum RowInMetaInfo } case Category: { - df::MarkGroupID categoryId = self.cachedNewBookmarkCatId; - if (categoryId == df::kInvalidMarkGroupId) + kml::MarkGroupId categoryId = self.cachedNewBookmarkCatId; + if (categoryId == kml::kInvalidMarkGroupId) categoryId = m_cachedBookmarkCatId; SelectSetVC * svc = [[SelectSetVC alloc] initWithCategory:self.cachedCategory categoryId:categoryId @@ -282,7 +282,7 @@ enum RowInMetaInfo #pragma mark - MWMSelectSetDelegate -- (void)didSelectCategory:(NSString *)category withCategoryId:(df::MarkGroupID)categoryId +- (void)didSelectCategory:(NSString *)category withCategoryId:(kml::MarkGroupId)categoryId { self.cachedCategory = category; self.cachedNewBookmarkCatId = categoryId; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h index 1fa679fd77..2e1357b51b 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h @@ -221,8 +221,8 @@ using NewSectionsAreReady = void (^)(NSRange const & range, MWMPlacePageData * d - (kml::PredefinedColor)bookmarkColor; - (NSString *)bookmarkDescription; - (NSString *)bookmarkCategory; -- (df::MarkID)bookmarkId; -- (df::MarkGroupID)bookmarkCategoryId; +- (kml::MarkId)bookmarkId; +- (kml::MarkGroupId)bookmarkCategoryId; // Local Ads - (NSString *)localAdsURL; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index face8f7df8..dad0515085 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -711,12 +711,12 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS"; return m_info.IsBookmark() ? @(m_info.GetBookmarkCategoryName().c_str()) : nil; } -- (df::MarkID)bookmarkId +- (kml::MarkId)bookmarkId { return m_info.GetBookmarkId(); } -- (df::MarkGroupID)bookmarkCategoryId +- (kml::MarkGroupId)bookmarkCategoryId { return m_info.GetBookmarkCategoryId(); } diff --git a/kml/type_utils.hpp b/kml/type_utils.hpp index 87afae88a5..0e8249a363 100644 --- a/kml/type_utils.hpp +++ b/kml/type_utils.hpp @@ -6,6 +6,7 @@ #include <chrono> #include <limits> #include <map> +#include <set> #include <sstream> #include <vector> #include <unordered_map> @@ -17,13 +18,23 @@ using LocalizableString = std::unordered_map<int8_t, std::string>; using LocalizableStringSubIndex = std::map<int8_t, uint32_t>; using LocalizableStringIndex = std::vector<LocalizableStringSubIndex>; using Properties = std::map<std::string, std::string>; -using CategoryId = uint64_t; -using BookmarkId = uint64_t; + +using MarkGroupId = uint64_t; +using MarkId = uint64_t; using TrackId = uint64_t; using LocalId = uint8_t; -CategoryId constexpr kInvalidCategoryId = std::numeric_limits<CategoryId>::max(); -BookmarkId constexpr kInvalidBookmarkId = std::numeric_limits<BookmarkId>::max(); +using MarkIdCollection = std::vector<MarkId>; +using TrackIdCollection = std::vector<TrackId>; + +using MarkIdSet = std::set<MarkId, std::greater<MarkId>>; +using TrackIdSet = std::set<TrackId>; + +using GroupIdCollection = std::vector<MarkGroupId>; +using GroupIdSet = std::set<MarkGroupId>; + +MarkGroupId constexpr kInvalidMarkGroupId = std::numeric_limits<MarkGroupId>::max(); +MarkId constexpr kInvalidMarkId = std::numeric_limits<MarkId>::max(); TrackId constexpr kInvalidTrackId = std::numeric_limits<TrackId>::max(); inline uint64_t ToSecondsSinceEpoch(Timestamp const & time) diff --git a/kml/types.hpp b/kml/types.hpp index 2389b08c3c..187bb9964f 100644 --- a/kml/types.hpp +++ b/kml/types.hpp @@ -131,7 +131,7 @@ struct BookmarkData bool operator!=(BookmarkData const & data) const { return !operator==(data); } // Unique id. - BookmarkId m_id = kInvalidBookmarkId; + MarkId m_id = kInvalidMarkId; // Bookmark's name. LocalizableString m_name; // Bookmark's description. @@ -250,7 +250,7 @@ struct CategoryData bool operator!=(CategoryData const & data) const { return !operator==(data); } // Unique id. - CategoryId m_id = kInvalidCategoryId; + MarkGroupId m_id = kInvalidMarkGroupId; // Category's name. LocalizableString m_name; // Image URL. diff --git a/map/bookmark.cpp b/map/bookmark.cpp index b680aaa724..db2ff11c84 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -32,7 +32,7 @@ Bookmark::Bookmark(m2::PointD const & ptOrg) : Base(ptOrg, UserMark::BOOKMARK) - , m_groupId(df::kInvalidMarkGroupId) + , m_groupId(kml::kInvalidMarkGroupId) { m_data.m_point = ptOrg; m_data.m_id = GetId(); @@ -41,7 +41,7 @@ Bookmark::Bookmark(m2::PointD const & ptOrg) Bookmark::Bookmark(kml::BookmarkData const & data) : Base(data.m_id, data.m_point, UserMark::BOOKMARK) , m_data(data) - , m_groupId(df::kInvalidMarkGroupId) + , m_groupId(kml::kInvalidMarkGroupId) { m_data.m_id = GetId(); } @@ -163,23 +163,23 @@ void Bookmark::SetScale(uint8_t scale) m_data.m_viewportScale = scale; } -df::MarkGroupID Bookmark::GetGroupId() const +kml::MarkGroupId Bookmark::GetGroupId() const { return m_groupId; } -void Bookmark::Attach(df::MarkGroupID groupId) +void Bookmark::Attach(kml::MarkGroupId groupId) { - ASSERT(m_groupId == df::kInvalidMarkGroupId, ()); + ASSERT(m_groupId == kml::kInvalidMarkGroupId, ()); m_groupId = groupId; } void Bookmark::Detach() { - m_groupId = df::kInvalidMarkGroupId; + m_groupId = kml::kInvalidMarkGroupId; } -BookmarkCategory::BookmarkCategory(std::string const & name, df::MarkGroupID groupId, bool autoSave) +BookmarkCategory::BookmarkCategory(std::string const & name, kml::MarkGroupId groupId, bool autoSave) : Base(UserMark::Type::BOOKMARK) , m_groupId(groupId) , m_autoSave(autoSave) @@ -188,7 +188,7 @@ BookmarkCategory::BookmarkCategory(std::string const & name, df::MarkGroupID gro SetName(name); } -BookmarkCategory::BookmarkCategory(kml::CategoryData const & data, df::MarkGroupID groupId, bool autoSave) +BookmarkCategory::BookmarkCategory(kml::CategoryData const & data, kml::MarkGroupId groupId, bool autoSave) : Base(UserMark::Type::BOOKMARK) , m_groupId(groupId) , m_autoSave(autoSave) diff --git a/map/bookmark.hpp b/map/bookmark.hpp index 96d200b8c0..a1637378c3 100644 --- a/map/bookmark.hpp +++ b/map/bookmark.hpp @@ -62,14 +62,14 @@ public: df::ColorConstant GetColorConstant() const override; - df::MarkGroupID GetGroupId() const override; + kml::MarkGroupId GetGroupId() const override; - void Attach(df::MarkGroupID groupId); + void Attach(kml::MarkGroupId groupId); void Detach(); private: kml::BookmarkData m_data; - df::MarkGroupID m_groupId; + kml::MarkGroupId m_groupId; }; class BookmarkCategory : public UserMarkLayer @@ -77,13 +77,13 @@ class BookmarkCategory : public UserMarkLayer using Base = UserMarkLayer; public: - BookmarkCategory(std::string const & name, df::MarkGroupID groupId, bool autoSave); - BookmarkCategory(kml::CategoryData const & data, df::MarkGroupID groupId, bool autoSave); + BookmarkCategory(std::string const & name, kml::MarkGroupId groupId, bool autoSave); + BookmarkCategory(kml::CategoryData const & data, kml::MarkGroupId groupId, bool autoSave); ~BookmarkCategory() override; static kml::PredefinedColor GetDefaultColor(); - df::MarkGroupID GetID() const { return m_groupId; } + kml::MarkGroupId GetID() const { return m_groupId; } void SetIsVisible(bool isVisible) override; void SetName(std::string const & name); @@ -97,7 +97,7 @@ public: kml::CategoryData const & GetCategoryData() const { return m_data; } private: - df::MarkGroupID const m_groupId; + kml::MarkGroupId const m_groupId; // Stores file name from which bookmarks were loaded. std::string m_file; bool m_autoSave = true; diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index ba26de5365..7453bb2120 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -135,7 +135,7 @@ public: m2::PointD m_globalCenter; }; -BookmarkManager::SharingResult GetFileForSharing(df::MarkGroupID categoryId, std::string const & filePath) +BookmarkManager::SharingResult GetFileForSharing(kml::MarkGroupId categoryId, std::string const & filePath) { if (!GetPlatform().IsFileExistsByFullPath(filePath)) { @@ -453,7 +453,7 @@ BookmarkManager::EditSession BookmarkManager::GetEditSession() return EditSession(*this); } -UserMark const * BookmarkManager::GetMark(df::MarkID markId) const +UserMark const * BookmarkManager::GetMark(kml::MarkId markId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); if (IsBookmark(markId)) @@ -461,14 +461,14 @@ UserMark const * BookmarkManager::GetMark(df::MarkID markId) const return GetUserMark(markId); } -UserMark const * BookmarkManager::GetUserMark(df::MarkID markId) const +UserMark const * BookmarkManager::GetUserMark(kml::MarkId markId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto it = m_userMarks.find(markId); return (it != m_userMarks.end()) ? it->second.get() : nullptr; } -UserMark * BookmarkManager::GetUserMarkForEdit(df::MarkID markId) +UserMark * BookmarkManager::GetUserMarkForEdit(kml::MarkId markId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto it = m_userMarks.find(markId); @@ -480,7 +480,7 @@ UserMark * BookmarkManager::GetUserMarkForEdit(df::MarkID markId) return nullptr; } -void BookmarkManager::DeleteUserMark(df::MarkID markId) +void BookmarkManager::DeleteUserMark(kml::MarkId markId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); ASSERT(!IsBookmark(markId), ()); @@ -497,7 +497,7 @@ Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData const & bmData) return AddBookmark(std::make_unique<Bookmark>(bmData)); } -Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData & bm, df::MarkGroupID groupId) +Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData & bm, kml::MarkGroupId groupId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); GetPlatform().GetMarketingService().SendMarketingEvent(marketing::kBookmarksBookmarkAction, @@ -518,14 +518,14 @@ Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData & bm, df::MarkGroup return bookmark; } -Bookmark const * BookmarkManager::GetBookmark(df::MarkID markId) const +Bookmark const * BookmarkManager::GetBookmark(kml::MarkId markId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto it = m_bookmarks.find(markId); return (it != m_bookmarks.end()) ? it->second.get() : nullptr; } -Bookmark * BookmarkManager::GetBookmarkForEdit(df::MarkID markId) +Bookmark * BookmarkManager::GetBookmarkForEdit(kml::MarkId markId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto it = m_bookmarks.find(markId); @@ -533,27 +533,27 @@ Bookmark * BookmarkManager::GetBookmarkForEdit(df::MarkID markId) return nullptr; auto const groupId = it->second->GetGroupId(); - if (groupId != df::kInvalidMarkGroupId) + if (groupId != kml::kInvalidMarkGroupId) m_changesTracker.OnUpdateMark(markId); return it->second.get(); } -void BookmarkManager::AttachBookmark(df::MarkID bmId, df::MarkGroupID catID) +void BookmarkManager::AttachBookmark(kml::MarkId bmId, kml::MarkGroupId catID) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); GetBookmarkForEdit(bmId)->Attach(catID); GetGroup(catID)->AttachUserMark(bmId); } -void BookmarkManager::DetachBookmark(df::MarkID bmId, df::MarkGroupID catID) +void BookmarkManager::DetachBookmark(kml::MarkId bmId, kml::MarkGroupId catID) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); GetBookmarkForEdit(bmId)->Detach(); GetGroup(catID)->DetachUserMark(bmId); } -void BookmarkManager::DeleteBookmark(df::MarkID bmId) +void BookmarkManager::DeleteBookmark(kml::MarkId bmId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); ASSERT(IsBookmark(bmId), ()); @@ -571,14 +571,14 @@ Track * BookmarkManager::CreateTrack(kml::TrackData const & trackData) return AddTrack(std::make_unique<Track>(trackData)); } -Track const * BookmarkManager::GetTrack(df::LineID trackId) const +Track const * BookmarkManager::GetTrack(kml::TrackId trackId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto it = m_tracks.find(trackId); return (it != m_tracks.end()) ? it->second.get() : nullptr; } -void BookmarkManager::AttachTrack(df::LineID trackId, df::MarkGroupID groupId) +void BookmarkManager::AttachTrack(kml::TrackId trackId, kml::MarkGroupId groupId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto it = m_tracks.find(trackId); @@ -586,31 +586,31 @@ void BookmarkManager::AttachTrack(df::LineID trackId, df::MarkGroupID groupId) GetBmCategory(groupId)->AttachTrack(trackId); } -void BookmarkManager::DetachTrack(df::LineID trackId, df::MarkGroupID groupId) +void BookmarkManager::DetachTrack(kml::TrackId trackId, kml::MarkGroupId groupId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); GetBmCategory(groupId)->DetachTrack(trackId); } -void BookmarkManager::DeleteTrack(df::LineID trackId) +void BookmarkManager::DeleteTrack(kml::TrackId trackId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto it = m_tracks.find(trackId); auto const groupId = it->second->GetGroupId(); - if (groupId != df::kInvalidMarkGroupId) + if (groupId != kml::kInvalidMarkGroupId) GetBmCategory(groupId)->DetachTrack(trackId); m_changesTracker.OnDeleteLine(trackId); m_tracks.erase(it); } -void BookmarkManager::CollectDirtyGroups(df::GroupIDSet & dirtyGroups) +void BookmarkManager::CollectDirtyGroups(kml::GroupIdSet & dirtyGroups) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); for (auto const & group : m_userMarkLayers) { if (!group->IsDirty()) continue; - auto const groupId = static_cast<df::MarkGroupID>(group->GetType()); + auto const groupId = static_cast<kml::MarkGroupId>(group->GetType()); dirtyGroups.insert(groupId); } for (auto const & group : m_categories) @@ -640,7 +640,7 @@ void BookmarkManager::NotifyChanges() return; bool hasBookmarks = false; - df::GroupIDCollection categoriesToSave; + kml::GroupIdCollection categoriesToSave; for (auto groupId : m_changesTracker.GetDirtyGroupIds()) { if (IsBookmarkCategory(groupId)) @@ -687,19 +687,19 @@ void BookmarkManager::NotifyChanges() m_changesTracker.ResetChanges(); } -df::MarkIDSet const & BookmarkManager::GetUserMarkIds(df::MarkGroupID groupId) const +kml::MarkIdSet const & BookmarkManager::GetUserMarkIds(kml::MarkGroupId groupId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); return GetGroup(groupId)->GetUserMarks(); } -df::LineIDSet const & BookmarkManager::GetTrackIds(df::MarkGroupID groupId) const +kml::TrackIdSet const & BookmarkManager::GetTrackIds(kml::MarkGroupId groupId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); return GetGroup(groupId)->GetUserLines(); } -void BookmarkManager::ClearGroup(df::MarkGroupID groupId) +void BookmarkManager::ClearGroup(kml::MarkGroupId groupId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto * group = GetGroup(groupId); @@ -719,25 +719,25 @@ void BookmarkManager::ClearGroup(df::MarkGroupID groupId) group->Clear(); } -std::string BookmarkManager::GetCategoryName(df::MarkGroupID categoryId) const +std::string BookmarkManager::GetCategoryName(kml::MarkGroupId categoryId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); return GetBmCategory(categoryId)->GetName(); } -void BookmarkManager::SetCategoryName(df::MarkGroupID categoryId, std::string const & name) +void BookmarkManager::SetCategoryName(kml::MarkGroupId categoryId, std::string const & name) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); GetBmCategory(categoryId)->SetName(name); } -std::string BookmarkManager::GetCategoryFileName(df::MarkGroupID categoryId) const +std::string BookmarkManager::GetCategoryFileName(kml::MarkGroupId categoryId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); return GetBmCategory(categoryId)->GetFileName(); } -UserMark const * BookmarkManager::FindMarkInRect(df::MarkGroupID groupId, m2::AnyRectD const & rect, double & d) const +UserMark const * BookmarkManager::FindMarkInRect(kml::MarkGroupId groupId, m2::AnyRectD const & rect, double & d) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto const * group = GetGroup(groupId); @@ -756,13 +756,13 @@ UserMark const * BookmarkManager::FindMarkInRect(df::MarkGroupID groupId, m2::An return resMark; } -void BookmarkManager::SetIsVisible(df::MarkGroupID groupId, bool visible) +void BookmarkManager::SetIsVisible(kml::MarkGroupId groupId, bool visible) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); GetGroup(groupId)->SetIsVisible(visible); } -bool BookmarkManager::IsVisible(df::MarkGroupID groupId) const +bool BookmarkManager::IsVisible(kml::MarkGroupId groupId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); return GetGroup(groupId)->IsVisible(); @@ -1138,7 +1138,7 @@ boost::optional<std::string> BookmarkManager::GetKMLPath(std::string const & fil return fileSavePath; } -void BookmarkManager::MoveBookmark(df::MarkID bmID, df::MarkGroupID curGroupID, df::MarkGroupID newGroupID) +void BookmarkManager::MoveBookmark(kml::MarkId bmID, kml::MarkGroupId curGroupID, kml::MarkGroupId newGroupID) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); DetachBookmark(bmID, curGroupID); @@ -1147,20 +1147,20 @@ void BookmarkManager::MoveBookmark(df::MarkID bmID, df::MarkGroupID curGroupID, SetLastEditedBmCategory(newGroupID); } -void BookmarkManager::UpdateBookmark(df::MarkID bmID, kml::BookmarkData const & bm) +void BookmarkManager::UpdateBookmark(kml::MarkId bmID, kml::BookmarkData const & bm) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto * bookmark = GetBookmarkForEdit(bmID); auto const prevColor = bookmark->GetColor(); bookmark->SetData(bm); - ASSERT(bookmark->GetGroupId() != df::kInvalidMarkGroupId, ()); + ASSERT(bookmark->GetGroupId() != kml::kInvalidMarkGroupId, ()); if (prevColor != bookmark->GetColor()) SetLastEditedBmColor(bookmark->GetColor()); } -df::MarkGroupID BookmarkManager::LastEditedBMCategory() +kml::MarkGroupId BookmarkManager::LastEditedBMCategory() { ASSERT_THREAD_CHECKER(m_threadChecker, ()); @@ -1185,7 +1185,7 @@ kml::PredefinedColor BookmarkManager::LastEditedBMColor() const return (m_lastColor != kml::PredefinedColor::None ? m_lastColor : BookmarkCategory::GetDefaultColor()); } -void BookmarkManager::SetLastEditedBmCategory(df::MarkGroupID groupId) +void BookmarkManager::SetLastEditedBmCategory(kml::MarkGroupId groupId) { m_lastEditedGroupId = groupId; m_lastCategoryUrl = GetBmCategory(groupId)->GetFileName(); @@ -1198,7 +1198,7 @@ void BookmarkManager::SetLastEditedBmColor(kml::PredefinedColor color) SaveState(); } -BookmarkCategory const * BookmarkManager::GetBmCategory(df::MarkGroupID categoryId) const +BookmarkCategory const * BookmarkManager::GetBmCategory(kml::MarkGroupId categoryId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); ASSERT(IsBookmarkCategory(categoryId), ()); @@ -1206,7 +1206,7 @@ BookmarkCategory const * BookmarkManager::GetBmCategory(df::MarkGroupID category return (it != m_categories.end() ? it->second.get() : nullptr); } -BookmarkCategory * BookmarkManager::GetBmCategory(df::MarkGroupID categoryId) +BookmarkCategory * BookmarkManager::GetBmCategory(kml::MarkGroupId categoryId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); ASSERT(IsBookmarkCategory(categoryId), ()); @@ -1218,19 +1218,19 @@ void BookmarkManager::SendBookmarksChanges() { if (m_callbacks.m_createdBookmarksCallback != nullptr) { - std::vector<std::pair<df::MarkID, kml::BookmarkData>> marksInfo; + std::vector<std::pair<kml::MarkId, kml::BookmarkData>> marksInfo; GetBookmarksData(m_changesTracker.GetCreatedMarkIds(), marksInfo); m_callbacks.m_createdBookmarksCallback(marksInfo); } if (m_callbacks.m_updatedBookmarksCallback != nullptr) { - std::vector<std::pair<df::MarkID, kml::BookmarkData>> marksInfo; + std::vector<std::pair<kml::MarkId, kml::BookmarkData>> marksInfo; GetBookmarksData(m_changesTracker.GetUpdatedMarkIds(), marksInfo); m_callbacks.m_updatedBookmarksCallback(marksInfo); } if (m_callbacks.m_deletedBookmarksCallback != nullptr) { - df::MarkIDCollection idCollection; + kml::MarkIdCollection idCollection; auto const & removedIds = m_changesTracker.GetRemovedMarkIds(); idCollection.reserve(removedIds.size()); for (auto markId : removedIds) @@ -1242,8 +1242,8 @@ void BookmarkManager::SendBookmarksChanges() } } -void BookmarkManager::GetBookmarksData(df::MarkIDSet const & markIds, - std::vector<std::pair<df::MarkID, kml::BookmarkData>> & data) const +void BookmarkManager::GetBookmarksData(kml::MarkIdSet const & markIds, + std::vector<std::pair<kml::MarkId, kml::BookmarkData>> & data) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); data.clear(); @@ -1256,17 +1256,17 @@ void BookmarkManager::GetBookmarksData(df::MarkIDSet const & markIds, } } -bool BookmarkManager::HasBmCategory(df::MarkGroupID groupId) const +bool BookmarkManager::HasBmCategory(kml::MarkGroupId groupId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); return m_categories.find(groupId) != m_categories.end(); } -df::MarkGroupID BookmarkManager::CreateBookmarkCategory(kml::CategoryData const & data, bool autoSave) +kml::MarkGroupId BookmarkManager::CreateBookmarkCategory(kml::CategoryData const & data, bool autoSave) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto groupId = data.m_id; - if (groupId == kml::kInvalidCategoryId) + if (groupId == kml::kInvalidMarkGroupId) { groupId = ++m_lastGroupID; SaveLastBmCategoryId(m_lastGroupID); @@ -1279,7 +1279,7 @@ df::MarkGroupID BookmarkManager::CreateBookmarkCategory(kml::CategoryData const return groupId; } -df::MarkGroupID BookmarkManager::CreateBookmarkCategory(std::string const & name, bool autoSave) +kml::MarkGroupId BookmarkManager::CreateBookmarkCategory(std::string const & name, bool autoSave) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto const groupId = ++m_lastGroupID; @@ -1308,7 +1308,7 @@ void BookmarkManager::CheckAndResetLastIds() Track::ResetLastId(); } -bool BookmarkManager::DeleteBmCategory(df::MarkGroupID groupId) +bool BookmarkManager::DeleteBmCategory(kml::MarkGroupId groupId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto it = m_categories.find(groupId); @@ -1338,7 +1338,7 @@ public: , m_manager(manager) {} - void operator()(df::MarkGroupID groupId) + void operator()(kml::MarkGroupId groupId) { m2::AnyRectD const & rect = m_rectHolder(BookmarkManager::GetGroupType(groupId)); if (UserMark const * p = m_manager->FindMarkInRect(groupId, rect, m_d)) @@ -1378,7 +1378,7 @@ UserMark const * BookmarkManager::FindNearestUserMark(TTouchRectHolder const & h return finder.GetFoundMark(); } -UserMarkLayer const * BookmarkManager::GetGroup(df::MarkGroupID groupId) const +UserMarkLayer const * BookmarkManager::GetGroup(kml::MarkGroupId groupId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); if (groupId < UserMark::Type::COUNT) @@ -1388,7 +1388,7 @@ UserMarkLayer const * BookmarkManager::GetGroup(df::MarkGroupID groupId) const return m_categories.at(groupId).get(); } -UserMarkLayer * BookmarkManager::GetGroup(df::MarkGroupID groupId) +UserMarkLayer * BookmarkManager::GetGroup(kml::MarkGroupId groupId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); if (groupId < UserMark::Type::COUNT) @@ -1401,16 +1401,16 @@ UserMarkLayer * BookmarkManager::GetGroup(df::MarkGroupID groupId) void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool autoSave) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); - df::GroupIDSet loadedGroups; + kml::GroupIdSet loadedGroups; - std::vector<std::pair<df::MarkGroupID, BookmarkCategory *>> categoriesForMerge; + std::vector<std::pair<kml::MarkGroupId, BookmarkCategory *>> categoriesForMerge; categoriesForMerge.reserve(m_categories.size()); for (auto const & c : m_categories) categoriesForMerge.emplace_back(c.first, c.second.get()); for (auto const & data : dataCollection) { - df::MarkGroupID groupId; + kml::MarkGroupId groupId; BookmarkCategory * group = nullptr; auto const & fileName = data.first; @@ -1430,7 +1430,7 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool } else { - bool const saveAfterCreation = categoryData.m_id == df::kInvalidMarkGroupId; + bool const saveAfterCreation = categoryData.m_id == kml::kInvalidMarkGroupId; groupId = CreateBookmarkCategory(categoryData, saveAfterCreation); loadedGroups.insert(groupId); group = GetBmCategory(groupId); @@ -1488,7 +1488,7 @@ std::unique_ptr<kml::FileData> BookmarkManager::CollectBmGroupKMLData(BookmarkCa return kmlData; } -bool BookmarkManager::SaveBookmarkCategory(df::MarkGroupID groupId) +bool BookmarkManager::SaveBookmarkCategory(kml::MarkGroupId groupId) { auto collection = PrepareToSaveBookmarks({groupId}); if (!collection || collection->empty()) @@ -1498,7 +1498,7 @@ bool BookmarkManager::SaveBookmarkCategory(df::MarkGroupID groupId) return SaveKMLData(file, kmlData, migration::IsMigrationCompleted()); } -void BookmarkManager::SaveToFile(df::MarkGroupID groupId, Writer & writer, bool useBinary) const +void BookmarkManager::SaveToFile(kml::MarkGroupId groupId, Writer & writer, bool useBinary) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto * group = GetBmCategory(groupId); @@ -1521,7 +1521,7 @@ void BookmarkManager::SaveToFile(kml::FileData & kmlData, Writer & writer, bool } std::shared_ptr<BookmarkManager::KMLDataCollection> BookmarkManager::PrepareToSaveBookmarks( - df::GroupIDCollection const & groupIdCollection) + kml::GroupIdCollection const & groupIdCollection) { bool migrated = migration::IsMigrationCompleted(); @@ -1579,7 +1579,7 @@ bool BookmarkManager::SaveKMLData(std::string const & file, kml::FileData & kmlD return false; } -void BookmarkManager::SaveBookmarks(df::GroupIDCollection const & groupIdCollection) +void BookmarkManager::SaveBookmarks(kml::GroupIdCollection const & groupIdCollection) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); @@ -1620,7 +1620,7 @@ void BookmarkManager::SetInvalidTokenHandler(Cloud::InvalidTokenHandler && onInv m_bookmarkCloud.SetInvalidTokenHandler(std::move(onInvalidToken)); } -void BookmarkManager::PrepareFileForSharing(df::MarkGroupID categoryId, SharingHandler && handler) +void BookmarkManager::PrepareFileForSharing(kml::MarkGroupId categoryId, SharingHandler && handler) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); ASSERT(handler, ()); @@ -1637,7 +1637,7 @@ void BookmarkManager::PrepareFileForSharing(df::MarkGroupID categoryId, SharingH }); } -bool BookmarkManager::IsCategoryEmpty(df::MarkGroupID categoryId) const +bool BookmarkManager::IsCategoryEmpty(kml::MarkGroupId categoryId) const { ASSERT_THREAD_CHECKER(m_threadChecker, ()); return GetBmCategory(categoryId)->IsEmpty(); @@ -1851,51 +1851,51 @@ void BookmarkManager::CancelCloudRestoring() m_bookmarkCloud.CancelRestoring(); } -df::GroupIDSet BookmarkManager::MarksChangesTracker::GetAllGroupIds() const +kml::GroupIdSet BookmarkManager::MarksChangesTracker::GetAllGroupIds() const { auto const & groupIds = m_bmManager.GetBmGroupsIdList(); - df::GroupIDSet resultingSet(groupIds.begin(), groupIds.end()); + kml::GroupIdSet resultingSet(groupIds.begin(), groupIds.end()); for (uint32_t i = 1; i < UserMark::COUNT; ++i) - resultingSet.insert(static_cast<df::MarkGroupID>(i)); + resultingSet.insert(static_cast<kml::MarkGroupId>(i)); return resultingSet; } -bool BookmarkManager::MarksChangesTracker::IsGroupVisible(df::MarkGroupID groupId) const +bool BookmarkManager::MarksChangesTracker::IsGroupVisible(kml::MarkGroupId groupId) const { return m_bmManager.IsVisible(groupId); } -bool BookmarkManager::MarksChangesTracker::IsGroupVisibilityChanged(df::MarkGroupID groupId) const +bool BookmarkManager::MarksChangesTracker::IsGroupVisibilityChanged(kml::MarkGroupId groupId) const { return m_bmManager.GetGroup(groupId)->IsVisibilityChanged(); } -df::MarkIDSet const & BookmarkManager::MarksChangesTracker::GetGroupPointIds(df::MarkGroupID groupId) const +kml::MarkIdSet const & BookmarkManager::MarksChangesTracker::GetGroupPointIds(kml::MarkGroupId groupId) const { return m_bmManager.GetUserMarkIds(groupId); } -df::LineIDSet const & BookmarkManager::MarksChangesTracker::GetGroupLineIds(df::MarkGroupID groupId) const +kml::TrackIdSet const & BookmarkManager::MarksChangesTracker::GetGroupLineIds(kml::MarkGroupId groupId) const { return m_bmManager.GetTrackIds(groupId); } -df::UserPointMark const * BookmarkManager::MarksChangesTracker::GetUserPointMark(df::MarkID markId) const +df::UserPointMark const * BookmarkManager::MarksChangesTracker::GetUserPointMark(kml::MarkId markId) const { return m_bmManager.GetMark(markId); } -df::UserLineMark const * BookmarkManager::MarksChangesTracker::GetUserLineMark(df::LineID lineId) const +df::UserLineMark const * BookmarkManager::MarksChangesTracker::GetUserLineMark(kml::TrackId lineId) const { return m_bmManager.GetTrack(lineId); } -void BookmarkManager::MarksChangesTracker::OnAddMark(df::MarkID markId) +void BookmarkManager::MarksChangesTracker::OnAddMark(kml::MarkId markId) { m_createdMarks.insert(markId); } -void BookmarkManager::MarksChangesTracker::OnDeleteMark(df::MarkID markId) +void BookmarkManager::MarksChangesTracker::OnDeleteMark(kml::MarkId markId) { auto const it = m_createdMarks.find(markId); if (it != m_createdMarks.end()) @@ -1909,18 +1909,18 @@ void BookmarkManager::MarksChangesTracker::OnDeleteMark(df::MarkID markId) } } -void BookmarkManager::MarksChangesTracker::OnUpdateMark(df::MarkID markId) +void BookmarkManager::MarksChangesTracker::OnUpdateMark(kml::MarkId markId) { if (m_createdMarks.find(markId) == m_createdMarks.end()) m_updatedMarks.insert(markId); } -void BookmarkManager::MarksChangesTracker::OnAddLine(df::LineID lineId) +void BookmarkManager::MarksChangesTracker::OnAddLine(kml::TrackId lineId) { m_createdLines.insert(lineId); } -void BookmarkManager::MarksChangesTracker::OnDeleteLine(df::LineID lineId) +void BookmarkManager::MarksChangesTracker::OnDeleteLine(kml::TrackId lineId) { auto const it = m_createdLines.find(lineId); if (it != m_createdLines.end()) @@ -1929,12 +1929,12 @@ void BookmarkManager::MarksChangesTracker::OnDeleteLine(df::LineID lineId) m_removedLines.insert(lineId); } -void BookmarkManager::MarksChangesTracker::OnAddGroup(df::MarkGroupID groupId) +void BookmarkManager::MarksChangesTracker::OnAddGroup(kml::MarkGroupId groupId) { m_createdGroups.insert(groupId); } -void BookmarkManager::MarksChangesTracker::OnDeleteGroup(df::MarkGroupID groupId) +void BookmarkManager::MarksChangesTracker::OnDeleteGroup(kml::MarkGroupId groupId) { auto const it = m_createdGroups.find(groupId); if (it != m_createdGroups.end()) @@ -2035,7 +2035,7 @@ Bookmark * BookmarkManager::EditSession::CreateBookmark(kml::BookmarkData const return m_bmManager.CreateBookmark(bm); } -Bookmark * BookmarkManager::EditSession::CreateBookmark(kml::BookmarkData & bm, df::MarkGroupID groupId) +Bookmark * BookmarkManager::EditSession::CreateBookmark(kml::BookmarkData & bm, kml::MarkGroupId groupId) { return m_bmManager.CreateBookmark(bm, groupId); } @@ -2045,73 +2045,73 @@ Track * BookmarkManager::EditSession::CreateTrack(kml::TrackData const & trackDa return m_bmManager.CreateTrack(trackData); } -Bookmark * BookmarkManager::EditSession::GetBookmarkForEdit(df::MarkID markId) +Bookmark * BookmarkManager::EditSession::GetBookmarkForEdit(kml::MarkId markId) { return m_bmManager.GetBookmarkForEdit(markId); } -void BookmarkManager::EditSession::DeleteUserMark(df::MarkID markId) +void BookmarkManager::EditSession::DeleteUserMark(kml::MarkId markId) { m_bmManager.DeleteUserMark(markId); } -void BookmarkManager::EditSession::DeleteBookmark(df::MarkID bmId) +void BookmarkManager::EditSession::DeleteBookmark(kml::MarkId bmId) { m_bmManager.DeleteBookmark(bmId); } -void BookmarkManager::EditSession::DeleteTrack(df::LineID trackId) +void BookmarkManager::EditSession::DeleteTrack(kml::TrackId trackId) { m_bmManager.DeleteTrack(trackId); } -void BookmarkManager::EditSession::ClearGroup(df::MarkGroupID groupId) +void BookmarkManager::EditSession::ClearGroup(kml::MarkGroupId groupId) { m_bmManager.ClearGroup(groupId); } -void BookmarkManager::EditSession::SetIsVisible(df::MarkGroupID groupId, bool visible) +void BookmarkManager::EditSession::SetIsVisible(kml::MarkGroupId groupId, bool visible) { m_bmManager.SetIsVisible(groupId, visible); } void BookmarkManager::EditSession::MoveBookmark( - df::MarkID bmID, df::MarkGroupID curGroupID, df::MarkGroupID newGroupID) + kml::MarkId bmID, kml::MarkGroupId curGroupID, kml::MarkGroupId newGroupID) { m_bmManager.MoveBookmark(bmID, curGroupID, newGroupID); } -void BookmarkManager::EditSession::UpdateBookmark(df::MarkID bmId, kml::BookmarkData const & bm) +void BookmarkManager::EditSession::UpdateBookmark(kml::MarkId bmId, kml::BookmarkData const & bm) { return m_bmManager.UpdateBookmark(bmId, bm); } -void BookmarkManager::EditSession::AttachBookmark(df::MarkID bmId, df::MarkGroupID groupId) +void BookmarkManager::EditSession::AttachBookmark(kml::MarkId bmId, kml::MarkGroupId groupId) { m_bmManager.AttachBookmark(bmId, groupId); } -void BookmarkManager::EditSession::DetachBookmark(df::MarkID bmId, df::MarkGroupID groupId) +void BookmarkManager::EditSession::DetachBookmark(kml::MarkId bmId, kml::MarkGroupId groupId) { m_bmManager.DetachBookmark(bmId, groupId); } -void BookmarkManager::EditSession::AttachTrack(df::LineID trackId, df::MarkGroupID groupId) +void BookmarkManager::EditSession::AttachTrack(kml::TrackId trackId, kml::MarkGroupId groupId) { m_bmManager.AttachTrack(trackId, groupId); } -void BookmarkManager::EditSession::DetachTrack(df::LineID trackId, df::MarkGroupID groupId) +void BookmarkManager::EditSession::DetachTrack(kml::TrackId trackId, kml::MarkGroupId groupId) { m_bmManager.DetachTrack(trackId, groupId); } -void BookmarkManager::EditSession::SetCategoryName(df::MarkGroupID categoryId, std::string const & name) +void BookmarkManager::EditSession::SetCategoryName(kml::MarkGroupId categoryId, std::string const & name) { m_bmManager.SetCategoryName(categoryId, name); } -bool BookmarkManager::EditSession::DeleteBmCategory(df::MarkGroupID groupId) +bool BookmarkManager::EditSession::DeleteBmCategory(kml::MarkGroupId groupId) { return m_bmManager.DeleteBmCategory(groupId); } diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp index 81fa836fe6..1e8404354e 100644 --- a/map/bookmark_manager.hpp +++ b/map/bookmark_manager.hpp @@ -30,11 +30,11 @@ class BookmarkManager final { using UserMarkLayers = std::vector<std::unique_ptr<UserMarkLayer>>; - using CategoriesCollection = std::map<df::MarkGroupID, std::unique_ptr<BookmarkCategory>>; + using CategoriesCollection = std::map<kml::MarkGroupId, std::unique_ptr<BookmarkCategory>>; - using MarksCollection = std::map<df::MarkID, std::unique_ptr<UserMark>>; - using BookmarksCollection = std::map<df::MarkID, std::unique_ptr<Bookmark>>; - using TracksCollection = std::map<df::LineID, std::unique_ptr<Track>>; + using MarksCollection = std::map<kml::MarkId, std::unique_ptr<UserMark>>; + using BookmarksCollection = std::map<kml::MarkId, std::unique_ptr<Bookmark>>; + using TracksCollection = std::map<kml::TrackId, std::unique_ptr<Track>>; public: using KMLDataCollection = std::vector<std::pair<std::string, std::unique_ptr<kml::FileData>>>; @@ -54,9 +54,9 @@ public: struct Callbacks { using GetStringsBundleFn = std::function<StringsBundle const &()>; - using CreatedBookmarksCallback = std::function<void(std::vector<std::pair<df::MarkID, kml::BookmarkData>> const &)>; - using UpdatedBookmarksCallback = std::function<void(std::vector<std::pair<df::MarkID, kml::BookmarkData>> const &)>; - using DeletedBookmarksCallback = std::function<void(std::vector<df::MarkID> const &)>; + using CreatedBookmarksCallback = std::function<void(std::vector<std::pair<kml::MarkId, kml::BookmarkData>> const &)>; + using UpdatedBookmarksCallback = std::function<void(std::vector<std::pair<kml::MarkId, kml::BookmarkData>> const &)>; + using DeletedBookmarksCallback = std::function<void(std::vector<kml::MarkId> const &)>; template <typename StringsBundleGetter, typename CreateListener, typename UpdateListener, typename DeleteListener> Callbacks(StringsBundleGetter && stringsBundleGetter, CreateListener && createListener, @@ -86,16 +86,16 @@ public: } Bookmark * CreateBookmark(kml::BookmarkData const & bm); - Bookmark * CreateBookmark(kml::BookmarkData & bm, df::MarkGroupID groupId); + Bookmark * CreateBookmark(kml::BookmarkData & bm, kml::MarkGroupId groupId); Track * CreateTrack(kml::TrackData const & trackData); template <typename UserMarkT> - UserMarkT * GetMarkForEdit(df::MarkID markId) + UserMarkT * GetMarkForEdit(kml::MarkId markId) { return m_bmManager.GetMarkForEdit<UserMarkT>(markId); } - Bookmark * GetBookmarkForEdit(df::MarkID markId); + Bookmark * GetBookmarkForEdit(kml::MarkId markId); template <typename UserMarkT, typename F> void DeleteUserMarks(UserMark::Type type, F && deletePredicate) @@ -103,25 +103,25 @@ public: return m_bmManager.DeleteUserMarks<UserMarkT>(type, std::move(deletePredicate)); }; - void DeleteUserMark(df::MarkID markId); - void DeleteBookmark(df::MarkID bmId); - void DeleteTrack(df::LineID trackId); + void DeleteUserMark(kml::MarkId markId); + void DeleteBookmark(kml::MarkId bmId); + void DeleteTrack(kml::TrackId trackId); - void ClearGroup(df::MarkGroupID groupId); + void ClearGroup(kml::MarkGroupId groupId); - void SetIsVisible(df::MarkGroupID groupId, bool visible); + void SetIsVisible(kml::MarkGroupId groupId, bool visible); - void MoveBookmark(df::MarkID bmID, df::MarkGroupID curGroupID, df::MarkGroupID newGroupID); - void UpdateBookmark(df::MarkID bmId, kml::BookmarkData const & bm); + void MoveBookmark(kml::MarkId bmID, kml::MarkGroupId curGroupID, kml::MarkGroupId newGroupID); + void UpdateBookmark(kml::MarkId bmId, kml::BookmarkData const & bm); - void AttachBookmark(df::MarkID bmId, df::MarkGroupID groupId); - void DetachBookmark(df::MarkID bmId, df::MarkGroupID groupId); + void AttachBookmark(kml::MarkId bmId, kml::MarkGroupId groupId); + void DetachBookmark(kml::MarkId bmId, kml::MarkGroupId groupId); - void AttachTrack(df::LineID trackId, df::MarkGroupID groupId); - void DetachTrack(df::LineID trackId, df::MarkGroupID groupId); + void AttachTrack(kml::TrackId trackId, kml::MarkGroupId groupId); + void DetachTrack(kml::TrackId trackId, kml::MarkGroupId groupId); - void SetCategoryName(df::MarkGroupID categoryId, std::string const & name); - bool DeleteBmCategory(df::MarkGroupID groupId); + void SetCategoryName(kml::MarkGroupId categoryId, std::string const & name); + bool DeleteBmCategory(kml::MarkGroupId groupId); void NotifyChanges(); @@ -141,48 +141,48 @@ public: void UpdateViewport(ScreenBase const & screen); void Teardown(); - static UserMark::Type GetGroupType(df::MarkGroupID groupId) + static UserMark::Type GetGroupType(kml::MarkGroupId groupId) { return groupId >= UserMark::COUNT ? UserMark::BOOKMARK : static_cast<UserMark::Type>(groupId); } - static bool IsBookmarkCategory(df::MarkGroupID groupId) { return groupId >= UserMark::COUNT; } - static bool IsBookmark(df::MarkID markId) { return UserMark::GetMarkType(markId) == UserMark::BOOKMARK; } + static bool IsBookmarkCategory(kml::MarkGroupId groupId) { return groupId >= UserMark::COUNT; } + static bool IsBookmark(kml::MarkId markId) { return UserMark::GetMarkType(markId) == UserMark::BOOKMARK; } template <typename UserMarkT> - UserMarkT const * GetMark(df::MarkID markId) const + UserMarkT const * GetMark(kml::MarkId markId) const { auto * mark = GetUserMark(markId); ASSERT(dynamic_cast<UserMarkT const *>(mark) != nullptr, ()); return static_cast<UserMarkT const *>(mark); } - UserMark const * GetUserMark(df::MarkID markId) const; - Bookmark const * GetBookmark(df::MarkID markId) const; - Track const * GetTrack(df::LineID trackId) const; + UserMark const * GetUserMark(kml::MarkId markId) const; + Bookmark const * GetBookmark(kml::MarkId markId) const; + Track const * GetTrack(kml::TrackId trackId) const; - df::MarkIDSet const & GetUserMarkIds(df::MarkGroupID groupId) const; - df::LineIDSet const & GetTrackIds(df::MarkGroupID groupId) const; + kml::MarkIdSet const & GetUserMarkIds(kml::MarkGroupId groupId) const; + kml::TrackIdSet const & GetTrackIds(kml::MarkGroupId groupId) const; - bool IsVisible(df::MarkGroupID groupId) const; + bool IsVisible(kml::MarkGroupId groupId) const; - df::MarkGroupID CreateBookmarkCategory(kml::CategoryData const & data, bool autoSave = true); - df::MarkGroupID CreateBookmarkCategory(std::string const & name, bool autoSave = true); + kml::MarkGroupId CreateBookmarkCategory(kml::CategoryData const & data, bool autoSave = true); + kml::MarkGroupId CreateBookmarkCategory(std::string const & name, bool autoSave = true); - std::string GetCategoryName(df::MarkGroupID categoryId) const; - std::string GetCategoryFileName(df::MarkGroupID categoryId) const; + std::string GetCategoryName(kml::MarkGroupId categoryId) const; + std::string GetCategoryFileName(kml::MarkGroupId categoryId) const; - df::GroupIDCollection const & GetBmGroupsIdList() const { return m_bmGroupsIdList; } - bool HasBmCategory(df::MarkGroupID groupId) const; - df::MarkGroupID LastEditedBMCategory(); + kml::GroupIdCollection const & GetBmGroupsIdList() const { return m_bmGroupsIdList; } + bool HasBmCategory(kml::MarkGroupId groupId) const; + kml::MarkGroupId LastEditedBMCategory(); kml::PredefinedColor LastEditedBMColor() const; - void SetLastEditedBmCategory(df::MarkGroupID groupId); + void SetLastEditedBmCategory(kml::MarkGroupId groupId); void SetLastEditedBmColor(kml::PredefinedColor color); using TTouchRectHolder = function<m2::AnyRectD(UserMark::Type)>; UserMark const * FindNearestUserMark(TTouchRectHolder const & holder) const; UserMark const * FindNearestUserMark(m2::AnyRectD const & rect) const; - UserMark const * FindMarkInRect(df::MarkGroupID groupId, m2::AnyRectD const & rect, double & d) const; + UserMark const * FindMarkInRect(kml::MarkGroupId groupId, m2::AnyRectD const & rect, double & d) const; /// Scans and loads all kml files with bookmarks in WritableDir. std::shared_ptr<KMLDataCollection> LoadBookmarksKML(std::vector<std::string> & filePaths); @@ -192,7 +192,7 @@ public: /// Uses the same file name from which was loaded, or /// creates unique file name on first save and uses it every time. - void SaveBookmarks(df::GroupIDCollection const & groupIdCollection); + void SaveBookmarks(kml::GroupIdCollection const & groupIdCollection); StaticMarkPoint & SelectionMark() { return *m_selectionMark; } StaticMarkPoint const & SelectionMark() const { return *m_selectionMark; } @@ -215,23 +215,23 @@ public: ArchiveError, FileError }; - df::MarkGroupID m_categoryId; + kml::MarkGroupId m_categoryId; Code m_code; std::string m_sharingPath; std::string m_errorString; - SharingResult(df::MarkGroupID categoryId, std::string const & sharingPath) + SharingResult(kml::MarkGroupId categoryId, std::string const & sharingPath) : m_categoryId(categoryId) , m_code(Code::Success) , m_sharingPath(sharingPath) {} - SharingResult(df::MarkGroupID categoryId, Code code) + SharingResult(kml::MarkGroupId categoryId, Code code) : m_categoryId(categoryId) , m_code(code) {} - SharingResult(df::MarkGroupID categoryId, Code code, std::string const & errorString) + SharingResult(kml::MarkGroupId categoryId, Code code, std::string const & errorString) : m_categoryId(categoryId) , m_code(code) , m_errorString(errorString) @@ -239,9 +239,9 @@ public: }; using SharingHandler = platform::SafeCallback<void(SharingResult const & result)>; - void PrepareFileForSharing(df::MarkGroupID categoryId, SharingHandler && handler); + void PrepareFileForSharing(kml::MarkGroupId categoryId, SharingHandler && handler); - bool IsCategoryEmpty(df::MarkGroupID categoryId) const; + bool IsCategoryEmpty(kml::MarkGroupId categoryId) const; bool IsUsedCategoryName(std::string const & name) const; bool AreAllCategoriesVisible() const; @@ -266,8 +266,8 @@ public: void CancelCloudRestoring(); /// These functions are public for unit tests only. You shouldn't call them from client code. - bool SaveBookmarkCategory(df::MarkGroupID groupId); - void SaveToFile(df::MarkGroupID groupId, Writer & writer, bool useBinary) const; + bool SaveBookmarkCategory(kml::MarkGroupId groupId); + void SaveToFile(kml::MarkGroupId groupId, Writer & writer, bool useBinary) const; void CreateCategories(KMLDataCollection && dataCollection, bool autoSave = true); static std::string RemoveInvalidSymbols(std::string const & name); static std::string GenerateUniqueFileName(std::string const & path, std::string name, std::string const & fileExt); @@ -281,47 +281,47 @@ private: public: explicit MarksChangesTracker(BookmarkManager & bmManager) : m_bmManager(bmManager) {} - void OnAddMark(df::MarkID markId); - void OnDeleteMark(df::MarkID markId); - void OnUpdateMark(df::MarkID markId); + void OnAddMark(kml::MarkId markId); + void OnDeleteMark(kml::MarkId markId); + void OnUpdateMark(kml::MarkId markId); - void OnAddLine(df::LineID lineId); - void OnDeleteLine(df::LineID lineId); + void OnAddLine(kml::TrackId lineId); + void OnDeleteLine(kml::TrackId lineId); - void OnAddGroup(df::MarkGroupID groupId); - void OnDeleteGroup(df::MarkGroupID groupId); + void OnAddGroup(kml::MarkGroupId groupId); + void OnDeleteGroup(kml::MarkGroupId groupId); bool CheckChanges(); void ResetChanges(); // UserMarksProvider - df::GroupIDSet GetAllGroupIds() const override; - df::GroupIDSet const & GetDirtyGroupIds() const override { return m_dirtyGroups; } - df::GroupIDSet const & GetRemovedGroupIds() const override { return m_removedGroups; } - df::MarkIDSet const & GetCreatedMarkIds() const override { return m_createdMarks; } - df::MarkIDSet const & GetRemovedMarkIds() const override { return m_removedMarks; } - df::MarkIDSet const & GetUpdatedMarkIds() const override { return m_updatedMarks; } - df::LineIDSet const & GetRemovedLineIds() const override { return m_removedLines; } - bool IsGroupVisible(df::MarkGroupID groupId) const override; - bool IsGroupVisibilityChanged(df::MarkGroupID groupId) const override; - df::MarkIDSet const & GetGroupPointIds(df::MarkGroupID groupId) const override; - df::LineIDSet const & GetGroupLineIds(df::MarkGroupID groupId) const override; - df::UserPointMark const * GetUserPointMark(df::MarkID markId) const override; - df::UserLineMark const * GetUserLineMark(df::LineID lineId) const override; + kml::GroupIdSet GetAllGroupIds() const override; + kml::GroupIdSet const & GetDirtyGroupIds() const override { return m_dirtyGroups; } + kml::GroupIdSet const & GetRemovedGroupIds() const override { return m_removedGroups; } + kml::MarkIdSet const & GetCreatedMarkIds() const override { return m_createdMarks; } + kml::MarkIdSet const & GetRemovedMarkIds() const override { return m_removedMarks; } + kml::MarkIdSet const & GetUpdatedMarkIds() const override { return m_updatedMarks; } + kml::TrackIdSet const & GetRemovedLineIds() const override { return m_removedLines; } + bool IsGroupVisible(kml::MarkGroupId groupId) const override; + bool IsGroupVisibilityChanged(kml::MarkGroupId groupId) const override; + kml::MarkIdSet const & GetGroupPointIds(kml::MarkGroupId groupId) const override; + kml::TrackIdSet const & GetGroupLineIds(kml::MarkGroupId groupId) const override; + df::UserPointMark const * GetUserPointMark(kml::MarkId markId) const override; + df::UserLineMark const * GetUserLineMark(kml::TrackId lineId) const override; private: BookmarkManager & m_bmManager; - df::MarkIDSet m_createdMarks; - df::MarkIDSet m_removedMarks; - df::MarkIDSet m_updatedMarks; + kml::MarkIdSet m_createdMarks; + kml::MarkIdSet m_removedMarks; + kml::MarkIdSet m_updatedMarks; - df::LineIDSet m_createdLines; - df::LineIDSet m_removedLines; + kml::TrackIdSet m_createdLines; + kml::TrackIdSet m_removedLines; - df::GroupIDSet m_dirtyGroups; - df::GroupIDSet m_createdGroups; - df::GroupIDSet m_removedGroups; + kml::GroupIdSet m_dirtyGroups; + kml::GroupIdSet m_createdGroups; + kml::GroupIdSet m_removedGroups; }; template <typename UserMarkT> @@ -331,7 +331,7 @@ private: auto mark = std::make_unique<UserMarkT>(ptOrg); auto * m = mark.get(); auto const markId = m->GetId(); - auto const groupId = static_cast<df::MarkGroupID>(m->GetMarkType()); + auto const groupId = static_cast<kml::MarkGroupId>(m->GetMarkType()); ASSERT_EQUAL(m_userMarks.count(markId), 0, ()); ASSERT_LESS(groupId, m_userMarkLayers.size(), ()); m_userMarks.emplace(markId, std::move(mark)); @@ -341,7 +341,7 @@ private: } template <typename UserMarkT> - UserMarkT * GetMarkForEdit(df::MarkID markId) + UserMarkT * GetMarkForEdit(kml::MarkId markId) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); auto * mark = GetUserMarkForEdit(markId); @@ -353,7 +353,7 @@ private: void DeleteUserMarks(UserMark::Type type, F && deletePredicate) { ASSERT_THREAD_CHECKER(m_threadChecker, ()); - std::list<df::MarkID> marksToDelete; + std::list<kml::MarkId> marksToDelete; for (auto markId : GetUserMarkIds(type)) { if (deletePredicate(GetMark<UserMarkT>(markId))) @@ -364,39 +364,39 @@ private: DeleteUserMark(markId); }; - UserMark * GetUserMarkForEdit(df::MarkID markId); - void DeleteUserMark(df::MarkID markId); + UserMark * GetUserMarkForEdit(kml::MarkId markId); + void DeleteUserMark(kml::MarkId markId); Bookmark * CreateBookmark(kml::BookmarkData const & bm); - Bookmark * CreateBookmark(kml::BookmarkData & bm, df::MarkGroupID groupId); + Bookmark * CreateBookmark(kml::BookmarkData & bm, kml::MarkGroupId groupId); - Bookmark * GetBookmarkForEdit(df::MarkID markId); - void AttachBookmark(df::MarkID bmId, df::MarkGroupID groupId); - void DetachBookmark(df::MarkID bmId, df::MarkGroupID groupId); - void DeleteBookmark(df::MarkID bmId); + Bookmark * GetBookmarkForEdit(kml::MarkId markId); + void AttachBookmark(kml::MarkId bmId, kml::MarkGroupId groupId); + void DetachBookmark(kml::MarkId bmId, kml::MarkGroupId groupId); + void DeleteBookmark(kml::MarkId bmId); Track * CreateTrack(kml::TrackData const & trackData); - void AttachTrack(df::LineID trackId, df::MarkGroupID groupId); - void DetachTrack(df::LineID trackId, df::MarkGroupID groupId); - void DeleteTrack(df::LineID trackId); + void AttachTrack(kml::TrackId trackId, kml::MarkGroupId groupId); + void DetachTrack(kml::TrackId trackId, kml::MarkGroupId groupId); + void DeleteTrack(kml::TrackId trackId); - void ClearGroup(df::MarkGroupID groupId); - void SetIsVisible(df::MarkGroupID groupId, bool visible); + void ClearGroup(kml::MarkGroupId groupId); + void SetIsVisible(kml::MarkGroupId groupId, bool visible); - void SetCategoryName(df::MarkGroupID categoryId, std::string const & name); - bool DeleteBmCategory(df::MarkGroupID groupId); + void SetCategoryName(kml::MarkGroupId categoryId, std::string const & name); + bool DeleteBmCategory(kml::MarkGroupId groupId); void ClearCategories(); - void MoveBookmark(df::MarkID bmID, df::MarkGroupID curGroupID, df::MarkGroupID newGroupID); - void UpdateBookmark(df::MarkID bmId, kml::BookmarkData const & bm); + void MoveBookmark(kml::MarkId bmID, kml::MarkGroupId curGroupID, kml::MarkGroupId newGroupID); + void UpdateBookmark(kml::MarkId bmId, kml::BookmarkData const & bm); - UserMark const * GetMark(df::MarkID markId) const; + UserMark const * GetMark(kml::MarkId markId) const; - UserMarkLayer const * GetGroup(df::MarkGroupID groupId) const; - UserMarkLayer * GetGroup(df::MarkGroupID groupId); - BookmarkCategory const * GetBmCategory(df::MarkGroupID categoryId) const; - BookmarkCategory * GetBmCategory(df::MarkGroupID categoryId); + UserMarkLayer const * GetGroup(kml::MarkGroupId groupId) const; + UserMarkLayer * GetGroup(kml::MarkGroupId groupId); + BookmarkCategory const * GetBmCategory(kml::MarkGroupId categoryId) const; + BookmarkCategory * GetBmCategory(kml::MarkGroupId categoryId); Bookmark * AddBookmark(std::unique_ptr<Bookmark> && bookmark); Track * AddTrack(std::unique_ptr<Track> && track); @@ -413,17 +413,17 @@ private: void NotifyAboutFile(bool success, std::string const & filePath, bool isTemporaryFile); void LoadBookmarkRoutine(std::string const & filePath, bool isTemporaryFile); - void CollectDirtyGroups(df::GroupIDSet & dirtyGroups); + void CollectDirtyGroups(kml::GroupIdSet & dirtyGroups); void SendBookmarksChanges(); - void GetBookmarksData(df::MarkIDSet const & markIds, - std::vector<std::pair<df::MarkID, kml::BookmarkData>> & data) const; + void GetBookmarksData(kml::MarkIdSet const & markIds, + std::vector<std::pair<kml::MarkId, kml::BookmarkData>> & data) const; void CheckAndCreateDefaultCategory(); void CheckAndResetLastIds(); std::unique_ptr<kml::FileData> CollectBmGroupKMLData(BookmarkCategory const * group) const; void SaveToFile(kml::FileData & kmlData, Writer & writer, bool useBinary) const; - std::shared_ptr<KMLDataCollection> PrepareToSaveBookmarks(df::GroupIDCollection const & groupIdCollection); + std::shared_ptr<KMLDataCollection> PrepareToSaveBookmarks(kml::GroupIdCollection const & groupIdCollection); bool SaveKMLData(std::string const & file, kml::FileData & kmlData, bool useBinary); void OnSynchronizationStarted(Cloud::SynchronizationType type); @@ -439,7 +439,7 @@ private: df::DrapeEngineSafePtr m_drapeEngine; AsyncLoadingCallbacks m_asyncLoadingCallbacks; std::atomic<bool> m_needTeardown; - df::MarkGroupID m_lastGroupID; + kml::MarkGroupId m_lastGroupID; size_t m_openedEditSessionsCount = 0; bool m_loadBookmarksFinished = false; bool m_firstDrapeNotification = false; @@ -447,10 +447,10 @@ private: ScreenBase m_viewport; CategoriesCollection m_categories; - df::GroupIDCollection m_bmGroupsIdList; + kml::GroupIdCollection m_bmGroupsIdList; std::string m_lastCategoryUrl; - df::MarkGroupID m_lastEditedGroupId = df::kInvalidMarkGroupId; + kml::MarkGroupId m_lastEditedGroupId = kml::kInvalidMarkGroupId; kml::PredefinedColor m_lastColor = kml::PredefinedColor::Red; UserMarkLayers m_userMarkLayers; diff --git a/map/bookmarks_search_params.hpp b/map/bookmarks_search_params.hpp index 87964055ed..95b392976a 100644 --- a/map/bookmarks_search_params.hpp +++ b/map/bookmarks_search_params.hpp @@ -1,6 +1,6 @@ #pragma once -#include "drape_frontend/user_marks_global.hpp" +#include "kml/type_utils.hpp" #include "base/assert.hpp" @@ -12,7 +12,7 @@ namespace search { struct BookmarksSearchParams { - using Results = std::vector<df::MarkID>; + using Results = std::vector<kml::MarkId>; enum class Status { diff --git a/map/framework.cpp b/map/framework.cpp index a525b3df20..351535b25a 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -418,13 +418,13 @@ Framework::Framework(FrameworkParams const & params) m_bmManager = make_unique<BookmarkManager>(BookmarkManager::Callbacks( [this]() -> StringsBundle const & { return m_stringsBundle; }, - [this](vector<pair<df::MarkID, kml::BookmarkData>> const & marks) { + [this](vector<pair<kml::MarkId, kml::BookmarkData>> const & marks) { GetSearchAPI().OnBookmarksCreated(marks); }, - [this](vector<pair<df::MarkID, kml::BookmarkData>> const & marks) { + [this](vector<pair<kml::MarkId, kml::BookmarkData>> const & marks) { GetSearchAPI().OnBookmarksUpdated(marks); }, - [this](vector<df::MarkID> const & marks) { GetSearchAPI().OnBookmarksDeleted(marks); })); + [this](vector<kml::MarkId> const & marks) { GetSearchAPI().OnBookmarksDeleted(marks); })); m_ParsedMapApi.SetBookmarkManager(m_bmManager.get()); m_routingManager.SetBookmarkManager(m_bmManager.get()); @@ -705,7 +705,7 @@ void Framework::LoadBookmarks() GetBookmarkManager().LoadBookmarks(); } -df::MarkGroupID Framework::AddCategory(string const & categoryName) +kml::MarkGroupId Framework::AddCategory(string const & categoryName) { return GetBookmarkManager().CreateBookmarkCategory(categoryName); } @@ -723,8 +723,8 @@ void Framework::ResetBookmarkInfo(Bookmark const & bmk, place_page::Info & info) { info.SetBookmarkCategoryName(""); info.SetBookmarkData({}); - info.SetBookmarkId(df::kInvalidMarkId); - info.SetBookmarkCategoryId(df::kInvalidMarkGroupId); + info.SetBookmarkId(kml::kInvalidMarkId); + info.SetBookmarkCategoryId(kml::kInvalidMarkGroupId); FillPointInfo(bmk.GetPivot(), {} /* customTitle */, info); } @@ -942,7 +942,7 @@ void Framework::FillRouteMarkInfo(RouteMarkPoint const & rmp, place_page::Info & info.SetIntermediateIndex(rmp.GetIntermediateIndex()); } -void Framework::ShowBookmark(df::MarkID id) +void Framework::ShowBookmark(kml::MarkId id) { auto const * mark = m_bmManager->GetBookmark(id); ShowBookmark(mark); diff --git a/map/framework.hpp b/map/framework.hpp index 0eb562d1ca..15bcf15fc5 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -22,10 +22,11 @@ #include "drape_frontend/drape_api.hpp" #include "drape_frontend/drape_engine.hpp" #include "drape_frontend/user_event_stream.hpp" -#include "drape_frontend/user_marks_global.hpp" #include "drape/oglcontextfactory.hpp" +#include "kml/type_utils.hpp" + #include "ugc/api.hpp" #include "indexer/data_header.hpp" @@ -316,12 +317,12 @@ public: void LoadBookmarks(); /// @return Created bookmark category id. - df::MarkGroupID AddCategory(string const & categoryName); + kml::MarkGroupId AddCategory(string const & categoryName); - df::MarkGroupID LastEditedBMCategory() { return GetBookmarkManager().LastEditedBMCategory(); } + kml::MarkGroupId LastEditedBMCategory() { return GetBookmarkManager().LastEditedBMCategory(); } kml::PredefinedColor LastEditedBMColor() const { return GetBookmarkManager().LastEditedBMColor(); } - void ShowBookmark(df::MarkID id); + void ShowBookmark(kml::MarkId id); void ShowBookmark(Bookmark const * bookmark); void ShowTrack(Track const & track); void ShowFeatureByMercator(m2::PointD const & pt); diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp index 80492a40b0..862ff6a879 100644 --- a/map/map_tests/bookmarks_test.cpp +++ b/map/map_tests/bookmarks_test.cpp @@ -137,7 +137,7 @@ BookmarkManager::Callbacks const bmCallbacks( static_cast<BookmarkManager::Callbacks::UpdatedBookmarksCallback>(nullptr), static_cast<BookmarkManager::Callbacks::DeletedBookmarksCallback>(nullptr)); -void CheckBookmarks(BookmarkManager const & bmManager, df::MarkGroupID groupId) +void CheckBookmarks(BookmarkManager const & bmManager, kml::MarkGroupId groupId) { auto const & markIds = bmManager.GetUserMarkIds(groupId); TEST_EQUAL(markIds.size(), 4, ()); @@ -742,12 +742,12 @@ UNIT_CLASS_TEST(Runner, TrackParsingTest_2) UNIT_CLASS_TEST(Runner, Bookmarks_Listeners) { - set<df::MarkID> createdMarksResult; - set<df::MarkID> updatedMarksResult; - set<df::MarkID> deletedMarksResult; - set<df::MarkID> createdMarks; - set<df::MarkID> updatedMarks; - set<df::MarkID> deletedMarks; + set<kml::MarkId> createdMarksResult; + set<kml::MarkId> updatedMarksResult; + set<kml::MarkId> deletedMarksResult; + set<kml::MarkId> createdMarks; + set<kml::MarkId> updatedMarks; + set<kml::MarkId> deletedMarks; auto const checkNotifications = [&]() { @@ -763,17 +763,17 @@ UNIT_CLASS_TEST(Runner, Bookmarks_Listeners) deletedMarks.clear(); }; - auto const onCreate = [&createdMarksResult](std::vector<std::pair<df::MarkID, kml::BookmarkData>> const &marks) + auto const onCreate = [&createdMarksResult](std::vector<std::pair<kml::MarkId, kml::BookmarkData>> const &marks) { for (auto const & markPair : marks) createdMarksResult.insert(markPair.first); }; - auto const onUpdate = [&updatedMarksResult](std::vector<std::pair<df::MarkID, kml::BookmarkData>> const &marks) + auto const onUpdate = [&updatedMarksResult](std::vector<std::pair<kml::MarkId, kml::BookmarkData>> const &marks) { for (auto const & markPair : marks) updatedMarksResult.insert(markPair.first); }; - auto const onDelete = [&deletedMarksResult](std::vector<df::MarkID> const &marks) + auto const onDelete = [&deletedMarksResult](std::vector<kml::MarkId> const &marks) { deletedMarksResult.insert(marks.begin(), marks.end()); }; @@ -836,7 +836,7 @@ UNIT_CLASS_TEST(Runner, Bookmarks_AutoSave) { BookmarkManager bmManager((BookmarkManager::Callbacks(bmCallbacks))); kml::BookmarkData data; - df::MarkID bmId0; + kml::MarkId bmId0; auto const catId = bmManager.CreateBookmarkCategory("test"); data.m_point = m2::PointD(0.0, 0.0); { diff --git a/map/map_tests/search_api_tests.cpp b/map/map_tests/search_api_tests.cpp index 489642ca0a..24717ef9a1 100644 --- a/map/map_tests/search_api_tests.cpp +++ b/map/map_tests/search_api_tests.cpp @@ -133,7 +133,7 @@ UNIT_CLASS_TEST(SearchAPITest, MultipleViewportsRequests) UNIT_CLASS_TEST(SearchAPITest, BookmarksSearch) { - vector<pair<df::MarkID, kml::BookmarkData>> marks; + vector<pair<kml::MarkId, kml::BookmarkData>> marks; kml::BookmarkData data; kml::SetDefaultStr(data.m_name, "R&R dinner"); @@ -147,12 +147,12 @@ UNIT_CLASS_TEST(SearchAPITest, BookmarksSearch) marks.emplace_back(2, data); m_api.OnBookmarksCreated(marks); - promise<vector<df::MarkID>> promise; + promise<vector<kml::MarkId>> promise; auto future = promise.get_future(); BookmarksSearchParams params; params.m_query = "gread silver hotel"; - params.m_onResults = [&](vector<df::MarkID> const & results, + params.m_onResults = [&](vector<kml::MarkId> const & results, BookmarksSearchParams::Status status) { if (status != BookmarksSearchParams::Status::Completed) return; @@ -163,6 +163,6 @@ UNIT_CLASS_TEST(SearchAPITest, BookmarksSearch) m_api.SearchInBookmarks(params); auto const ids = future.get(); - TEST_EQUAL(ids, vector<df::MarkID>({2, 1}), ()); + TEST_EQUAL(ids, vector<kml::MarkId>({2, 1}), ()); } } // namespace diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index 0270157cff..94884ddee7 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -180,7 +180,7 @@ void Info::SetCustomNameWithCoordinates(m2::PointD const & mercator, std::string m_customName = name; } -void Info::SetBookmarkId(df::MarkID markId) +void Info::SetBookmarkId(kml::MarkId markId) { m_markId = markId; m_uiSubtitle = FormatSubtitle(IsFeature() /* withType */); diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp index 6062b70d84..5fdf187ca5 100644 --- a/map/place_page_info.hpp +++ b/map/place_page_info.hpp @@ -72,7 +72,7 @@ public: /// Place traits bool IsFeature() const { return m_featureID.IsValid(); } - bool IsBookmark() const { return m_markGroupId != df::kInvalidMarkGroupId && m_markId != df::kInvalidMarkId; } + bool IsBookmark() const { return m_markGroupId != kml::kInvalidMarkGroupId && m_markId != kml::kInvalidMarkId; } bool IsMyPosition() const { return m_isMyPosition; } bool IsRoutePoint() const { return m_isRoutePoint; } @@ -120,10 +120,10 @@ public: void SetLocalizedWifiString(std::string const & str) { m_localizedWifiString = str; } /// Bookmark - void SetBookmarkId(df::MarkID markId); - df::MarkID GetBookmarkId() const { return m_markId; } - void SetBookmarkCategoryId(df::MarkGroupID markGroupId) { m_markGroupId = markGroupId; } - df::MarkGroupID GetBookmarkCategoryId() const { return m_markGroupId; } + void SetBookmarkId(kml::MarkId markId); + kml::MarkId GetBookmarkId() const { return m_markId; } + void SetBookmarkCategoryId(kml::MarkGroupId markGroupId) { m_markGroupId = markGroupId; } + kml::MarkGroupId GetBookmarkCategoryId() const { return m_markGroupId; } std::string const & GetBookmarkCategoryName() const { return m_bookmarkCategoryName; } void SetBookmarkCategoryName(std::string const & name) { m_bookmarkCategoryName = name; } void SetBookmarkData(kml::BookmarkData const & data) { m_bookmarkData = data; } @@ -243,8 +243,8 @@ private: /// Bookmarks /// If not invalid, bookmark is bound to this place page. - df::MarkID m_markId = df::kInvalidMarkId; - df::MarkGroupID m_markGroupId = df::kInvalidMarkGroupId;; + kml::MarkId m_markId = kml::kInvalidMarkId; + kml::MarkGroupId m_markGroupId = kml::kInvalidMarkGroupId;; /// Bookmark category name. Empty, if it's not bookmark; std::string m_bookmarkCategoryName; kml::BookmarkData m_bookmarkData; diff --git a/map/search_api.cpp b/map/search_api.cpp index 2d7e3afbf9..ad31474b7a 100644 --- a/map/search_api.cpp +++ b/map/search_api.cpp @@ -40,22 +40,22 @@ void CancelQuery(weak_ptr<ProcessorHandle> & handle) handle.reset(); } -bookmarks::Id MarkIDToBookmarkId(df::MarkID id) +bookmarks::Id MarkIDToBookmarkId(kml::MarkId id) { - static_assert(is_integral<df::MarkID>::value, ""); + static_assert(is_integral<kml::MarkId>::value, ""); static_assert(is_integral<bookmarks::Id>::value, ""); - static_assert(is_unsigned<df::MarkID>::value, ""); + static_assert(is_unsigned<kml::MarkId>::value, ""); static_assert(is_unsigned<bookmarks::Id>::value, ""); - static_assert(sizeof(bookmarks::Id) >= sizeof(df::MarkID), ""); + static_assert(sizeof(bookmarks::Id) >= sizeof(kml::MarkId), ""); return static_cast<bookmarks::Id>(id); } -df::MarkID BookmarkIdToMarkID(bookmarks::Id id) { return static_cast<df::MarkID>(id); } +kml::MarkId BookmarkIdToMarkID(bookmarks::Id id) { return static_cast<kml::MarkId>(id); } -void AppendBookmarkIdDocs(vector<pair<df::MarkID, kml::BookmarkData>> const & marks, +void AppendBookmarkIdDocs(vector<pair<kml::MarkId, kml::BookmarkData>> const & marks, vector<BookmarkIdDoc> & result) { result.reserve(result.size() + marks.size()); @@ -68,7 +68,7 @@ void AppendBookmarkIdDocs(vector<pair<df::MarkID, kml::BookmarkData>> const & ma } } -void AppendBookmarkIds(vector<df::MarkID> const & marks, vector<bookmarks::Id> & result) +void AppendBookmarkIds(vector<kml::MarkId> const & marks, vector<bookmarks::Id> & result) { result.reserve(result.size() + marks.size()); transform(marks.begin(), marks.end(), back_inserter(result), MarkIDToBookmarkId); @@ -368,21 +368,21 @@ ProductInfo SearchAPI::GetProductInfo(Result const & result) const return m_delegate.GetProductInfo(result); } -void SearchAPI::OnBookmarksCreated(vector<pair<df::MarkID, kml::BookmarkData>> const & marks) +void SearchAPI::OnBookmarksCreated(vector<pair<kml::MarkId, kml::BookmarkData>> const & marks) { vector<BookmarkIdDoc> data; AppendBookmarkIdDocs(marks, data); m_engine.OnBookmarksCreated(data); } -void SearchAPI::OnBookmarksUpdated(vector<pair<df::MarkID, kml::BookmarkData>> const & marks) +void SearchAPI::OnBookmarksUpdated(vector<pair<kml::MarkId, kml::BookmarkData>> const & marks) { vector<BookmarkIdDoc> data; AppendBookmarkIdDocs(marks, data); m_engine.OnBookmarksUpdated(data); } -void SearchAPI::OnBookmarksDeleted(vector<df::MarkID> const & marks) +void SearchAPI::OnBookmarksDeleted(vector<kml::MarkId> const & marks) { vector<bookmarks::Id> data; AppendBookmarkIds(marks, data); diff --git a/map/search_api.hpp b/map/search_api.hpp index 9cbe9ab345..7fa06dbf37 100644 --- a/map/search_api.hpp +++ b/map/search_api.hpp @@ -10,7 +10,7 @@ #include "search/search_params.hpp" #include "search/viewport_search_callback.hpp" -#include "drape_frontend/user_marks_global.hpp" +#include "kml/type_utils.hpp" #include "geometry/point2d.hpp" #include "geometry/rect2d.hpp" @@ -141,9 +141,9 @@ public: search::Results::ConstIter end) override; search::ProductInfo GetProductInfo(search::Result const & result) const override; - void OnBookmarksCreated(std::vector<std::pair<df::MarkID, kml::BookmarkData>> const & marks); - void OnBookmarksUpdated(std::vector<std::pair<df::MarkID, kml::BookmarkData>> const & marks); - void OnBookmarksDeleted(std::vector<df::MarkID> const & marks); + void OnBookmarksCreated(std::vector<std::pair<kml::MarkId, kml::BookmarkData>> const & marks); + void OnBookmarksUpdated(std::vector<std::pair<kml::MarkId, kml::BookmarkData>> const & marks); + void OnBookmarksDeleted(std::vector<kml::MarkId> const & marks); private: struct SearchIntent diff --git a/map/track.cpp b/map/track.cpp index caa653edaf..bcc3a5d7ac 100644 --- a/map/track.cpp +++ b/map/track.cpp @@ -28,7 +28,7 @@ void SaveLastLineId(uint64_t lastId) GetPlatform().GetSecureStorage().Save(kLastLineId, strings::to_string(lastId)); } -df::LineID GetNextUserLineId(bool reset = false) +kml::TrackId GetNextUserLineId(bool reset = false) { static std::atomic<uint64_t> lastLineId(LoadLastLineId()); @@ -36,10 +36,10 @@ df::LineID GetNextUserLineId(bool reset = false) { SaveLastLineId(0); lastLineId = 0; - return df::kInvalidLineId; + return kml::kInvalidTrackId; } - auto const id = static_cast<df::LineID>(++lastLineId); + auto const id = static_cast<kml::TrackId>(++lastLineId); SaveLastLineId(lastLineId); return id; } @@ -47,7 +47,7 @@ df::LineID GetNextUserLineId(bool reset = false) } // namespace Track::Track(kml::TrackData const & data) - : df::UserLineMark(data.m_id == df::kInvalidLineId ? GetNextUserLineId() : data.m_id) + : df::UserLineMark(data.m_id == kml::kInvalidTrackId ? GetNextUserLineId() : data.m_id) , m_data(data) , m_groupID(0) { @@ -123,7 +123,7 @@ std::vector<m2::PointD> const & Track::GetPoints() const return m_data.m_points; } -void Track::Attach(df::MarkGroupID groupId) +void Track::Attach(kml::MarkGroupId groupId) { ASSERT(!m_groupID, ()); m_groupID = groupId; diff --git a/map/track.hpp b/map/track.hpp index be5fb128a4..7f7efa8393 100644 --- a/map/track.hpp +++ b/map/track.hpp @@ -41,13 +41,13 @@ public: float GetDepth(size_t layerIndex) const override; std::vector<m2::PointD> const & GetPoints() const override; - df::MarkGroupID GetGroupId() const { return m_groupID; } - void Attach(df::MarkGroupID groupId); + kml::MarkGroupId GetGroupId() const { return m_groupID; } + void Attach(kml::MarkGroupId groupId); void Detach(); private: kml::TrackData m_data; - df::MarkGroupID m_groupID; + kml::MarkGroupId m_groupID; mutable bool m_isDirty = true; }; diff --git a/map/user_mark.cpp b/map/user_mark.cpp index ab0fde2ed7..f32f5a1ebc 100644 --- a/map/user_mark.cpp +++ b/map/user_mark.cpp @@ -30,7 +30,7 @@ void SaveLastBookmarkId(uint64_t lastId) GetPlatform().GetSecureStorage().Save(kLastBookmarkId, strings::to_string(lastId)); } -df::MarkID GetNextUserMarkId(UserMark::Type type, bool reset = false) +kml::MarkId GetNextUserMarkId(UserMark::Type type, bool reset = false) { static std::atomic<uint64_t> lastBookmarkId(LoadLastBookmarkId()); static std::atomic<uint64_t> lastUserMarkId(0); @@ -42,27 +42,27 @@ df::MarkID GetNextUserMarkId(UserMark::Type type, bool reset = false) SaveLastBookmarkId(0); lastBookmarkId = 0; } - return df::kInvalidMarkId; + return kml::kInvalidMarkId; } static_assert(UserMark::Type::COUNT <= (1 << kMarkIdTypeBitsCount), "Not enough bits for user mark type."); - auto const typeBits = static_cast<uint64_t>(type) << (sizeof(df::MarkID) * 8 - kMarkIdTypeBitsCount); + auto const typeBits = static_cast<uint64_t>(type) << (sizeof(kml::MarkId) * 8 - kMarkIdTypeBitsCount); if (type == UserMark::Type::BOOKMARK) { - auto const id = static_cast<df::MarkID>((++lastBookmarkId) | typeBits); + auto const id = static_cast<kml::MarkId>((++lastBookmarkId) | typeBits); SaveLastBookmarkId(lastBookmarkId); return id; } else { - return static_cast<df::MarkID>((++lastUserMarkId) | typeBits); + return static_cast<kml::MarkId>((++lastUserMarkId) | typeBits); } } } // namespace -UserMark::UserMark(df::MarkID id, m2::PointD const & ptOrg, UserMark::Type type) - : df::UserPointMark(id == df::kInvalidMarkId ? GetNextUserMarkId(type) : id) +UserMark::UserMark(kml::MarkId id, m2::PointD const & ptOrg, UserMark::Type type) + : df::UserPointMark(id == kml::kInvalidMarkId ? GetNextUserMarkId(type) : id) , m_ptOrg(ptOrg) { ASSERT_EQUAL(GetMarkType(), type, ()); @@ -74,7 +74,7 @@ UserMark::UserMark(m2::PointD const & ptOrg, UserMark::Type type) {} // static -UserMark::Type UserMark::GetMarkType(df::MarkID id) +UserMark::Type UserMark::GetMarkType(kml::MarkId id) { return static_cast<Type>(id >> (sizeof(id) * 8 - kMarkIdTypeBitsCount)); } diff --git a/map/user_mark.hpp b/map/user_mark.hpp index 9459e61454..b07d29ab42 100644 --- a/map/user_mark.hpp +++ b/map/user_mark.hpp @@ -43,14 +43,14 @@ public: COUNT, }; - UserMark(df::MarkID id, m2::PointD const & ptOrg, UserMark::Type type); + UserMark(kml::MarkId id, m2::PointD const & ptOrg, UserMark::Type type); UserMark(m2::PointD const & ptOrg, UserMark::Type type); - static Type GetMarkType(df::MarkID id); + static Type GetMarkType(kml::MarkId id); static void ResetLastId(UserMark::Type type); Type GetMarkType() const { return GetMarkType(GetId()); } - df::MarkGroupID GetGroupId() const override { return GetMarkType(); } + kml::MarkGroupId GetGroupId() const override { return GetMarkType(); } // df::UserPointMark overrides. bool IsDirty() const override { return m_isDirty; } diff --git a/map/user_mark_layer.cpp b/map/user_mark_layer.cpp index 24a92891af..adf1e6cc39 100644 --- a/map/user_mark_layer.cpp +++ b/map/user_mark_layer.cpp @@ -63,25 +63,25 @@ void UserMarkLayer::ResetChanges() m_wasVisible = m_isVisible; } -void UserMarkLayer::AttachUserMark(df::MarkID markId) +void UserMarkLayer::AttachUserMark(kml::MarkId markId) { SetDirty(); m_userMarks.insert(markId); } -void UserMarkLayer::DetachUserMark(df::MarkID markId) +void UserMarkLayer::DetachUserMark(kml::MarkId markId) { SetDirty(); m_userMarks.erase(markId); } -void UserMarkLayer::AttachTrack(df::LineID trackId) +void UserMarkLayer::AttachTrack(kml::TrackId trackId) { SetDirty(); m_tracks.insert(trackId); } -void UserMarkLayer::DetachTrack(df::LineID trackId) +void UserMarkLayer::DetachTrack(kml::TrackId trackId) { SetDirty(); m_tracks.erase(trackId); diff --git a/map/user_mark_layer.hpp b/map/user_mark_layer.hpp index 4f5f481b7d..81f09b2126 100644 --- a/map/user_mark_layer.hpp +++ b/map/user_mark_layer.hpp @@ -27,14 +27,14 @@ public: bool IsVisibilityChanged() const; UserMark::Type GetType() const; - df::MarkIDSet const & GetUserMarks() const { return m_userMarks; } - df::LineIDSet const & GetUserLines() const { return m_tracks; } + kml::MarkIdSet const & GetUserMarks() const { return m_userMarks; } + kml::TrackIdSet const & GetUserLines() const { return m_tracks; } - void AttachUserMark(df::MarkID markId); - void DetachUserMark(df::MarkID markId); + void AttachUserMark(kml::MarkId markId); + void DetachUserMark(kml::MarkId markId); - void AttachTrack(df::LineID trackId); - void DetachTrack(df::LineID trackId); + void AttachTrack(kml::TrackId trackId); + void DetachTrack(kml::TrackId trackId); void Clear(); bool IsEmpty() const; @@ -46,8 +46,8 @@ protected: UserMark::Type m_type; - df::MarkIDSet m_userMarks; - df::LineIDSet m_tracks; + kml::MarkIdSet m_userMarks; + kml::TrackIdSet m_tracks; bool m_isDirty = true; bool m_isVisible = true; diff --git a/qt/qt_common/map_widget.hpp b/qt/qt_common/map_widget.hpp index 846bb4e9f2..27c78266c0 100644 --- a/qt/qt_common/map_widget.hpp +++ b/qt/qt_common/map_widget.hpp @@ -3,7 +3,9 @@ #include "drape/pointers.hpp" #include "drape_frontend/gui/skin.hpp" #include "drape_frontend/user_event_stream.hpp" -#include <drape_frontend/user_marks_global.hpp> + +#include "kml/type_utils.hpp" + #include "qt/qt_common/qtoglcontextfactory.hpp" #include <QtCore/QTimer> @@ -87,7 +89,7 @@ protected: bool m_apiOpenGLES3; ScaleSlider * m_slider; SliderState m_sliderState; - df::MarkGroupID m_bookmarksCategoryId = 0; + kml::MarkGroupId m_bookmarksCategoryId = 0; qreal m_ratio; drape_ptr<QtOGLContextFactory> m_contextFactory; diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 2c0a86832f..26c328d724 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -186,7 +186,6 @@ 67E91C7E1BDFC85E005CEE88 /* visual_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709478F1BDF9BE1005014C0 /* visual_params.cpp */; }; BB035F6F1E3A2AAE00519962 /* drape_measurer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB035F6D1E3A2AAE00519962 /* drape_measurer.cpp */; }; BB035F701E3A2AAE00519962 /* drape_measurer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BB035F6E1E3A2AAE00519962 /* drape_measurer.hpp */; }; - BB68AD42201248AF009DE501 /* user_marks_global.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BB68AD41201248AE009DE501 /* user_marks_global.hpp */; }; BB7D67D21F34A62C002FD122 /* custom_features_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BB7D67CF1F34A62C002FD122 /* custom_features_context.hpp */; }; BB7D67D31F34A62C002FD122 /* path_text_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7D67D01F34A62C002FD122 /* path_text_handle.cpp */; }; BB7D67D41F34A62C002FD122 /* path_text_handle.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BB7D67D11F34A62C002FD122 /* path_text_handle.hpp */; }; @@ -452,7 +451,6 @@ 677A2DE41C0DD55D00635A00 /* requested_tiles.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = requested_tiles.hpp; sourceTree = "<group>"; }; BB035F6D1E3A2AAE00519962 /* drape_measurer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drape_measurer.cpp; sourceTree = "<group>"; }; BB035F6E1E3A2AAE00519962 /* drape_measurer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drape_measurer.hpp; sourceTree = "<group>"; }; - BB68AD41201248AE009DE501 /* user_marks_global.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_marks_global.hpp; sourceTree = "<group>"; }; BB7D67CF1F34A62C002FD122 /* custom_features_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = custom_features_context.hpp; sourceTree = "<group>"; }; BB7D67D01F34A62C002FD122 /* path_text_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = path_text_handle.cpp; sourceTree = "<group>"; }; BB7D67D11F34A62C002FD122 /* path_text_handle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = path_text_handle.hpp; sourceTree = "<group>"; }; @@ -573,7 +571,6 @@ 670947411BDF9B99005014C0 /* drape_frontend */ = { isa = PBXGroup; children = ( - BB68AD41201248AE009DE501 /* user_marks_global.hpp */, 454B9A391F4591AC003FAE7A /* drape_engine_safe_ptr.hpp */, 453FEDAA1F34C257005C1BB4 /* render_state.cpp */, 453FEDAB1F34C257005C1BB4 /* render_state.hpp */, @@ -883,7 +880,6 @@ 452C9EE51CEDCF3200A55E57 /* sequence_animation.hpp in Headers */, 670947A11BDF9BE1005014C0 /* message_subclasses.hpp in Headers */, BBD9E2D41F009D9E00DF189A /* user_mark_generator.hpp in Headers */, - BB68AD42201248AF009DE501 /* user_marks_global.hpp in Headers */, 670947C51BDF9BE1005014C0 /* text_handle.hpp in Headers */, 670947D71BDF9BE1005014C0 /* user_event_stream.hpp in Headers */, 6709479E1BDF9BE1005014C0 /* message_acceptor.hpp in Headers */, |