AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[bookmarks] helper methods for compilations. review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-10-15 16:15:24 +03:00 • committed by Maria Velichko
parent aefa9bf26f
commit ecd03ce3a1
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -1264,8 +1264,8 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetChildrenCategor
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetChildrenCollections(JNIEnv *env,
jobject,
jlong parentId)
jobject,
jlong parentId)
{
auto const & bm = frm()->GetBookmarkManager();
auto const ids = bm.GetChildrenCollections(static_cast<kml::MarkGroupId>(parentId));
@ -1274,18 +1274,16 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetChildrenCollect
}
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsBookmarkCompilation(JNIEnv *env,
jobject,
jlong id)
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsCompilation(JNIEnv *env, jobject,
jlong id)
{
auto const & bm = frm()->GetBookmarkManager();
return static_cast<jboolean>(bm.IsBookmarkCompilation(static_cast<kml::MarkGroupId>(id)));
return static_cast<jboolean>(bm.IsCompilation(static_cast<kml::MarkGroupId>(id)));
}
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCompilationType(JNIEnv *env,
jobject,
jlong id)
jobject, jlong id)
{
auto const & bm = frm()->GetBookmarkManager();
return static_cast<jint>(bm.GetCompilationType(static_cast<kml::MarkGroupId>(id)));

2
android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
View file

@ -893,7 +893,7 @@ public enum BookmarkManager
@NonNull
native BookmarkCategory[] nativeGetChildrenCollections(long catId);
native boolean nativeIsBookmarkCompilation(long catId);
native boolean nativeIsCompilation(long catId);
native int nativeGetCompilationType(long catId);
@NonNull

2
map/bookmark_manager.cpp
View file

@ -1393,7 +1393,7 @@ kml::GroupIdCollection BookmarkManager::GetCompilationOfType(kml::MarkGroupId pa
return result;
}
bool BookmarkManager::IsBookmarkCompilation(kml::MarkGroupId id) const
bool BookmarkManager::IsCompilation(kml::MarkGroupId id) const
{
CHECK_THREAD_CHECKER(m_threadChecker, ());
return m_compilations.find(id) != m_compilations.cend();

2
map/bookmark_manager.hpp
View file

@ -508,7 +508,7 @@ public:
kml::GroupIdCollection GetChildrenCategories(kml::MarkGroupId parentCategoryId) const;
kml::GroupIdCollection GetChildrenCollections(kml::MarkGroupId parentCategoryId) const;
bool IsBookmarkCompilation(kml::MarkGroupId id) const;
bool IsCompilation(kml::MarkGroupId id) const;
kml::CompilationType GetCompilationType(kml::MarkGroupId id) const;
std::vector<std::string> GetAllPaidCategoriesIds() const;