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

[catalog] Added max tags count retrieving

Browse source
This commit is contained in:
r.kuznetsov 2019-01-31 14:39:35 +03:00 • committed by Aleksandr Zatsepin
parent e8f225900a
commit c1582291ea
5 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,7 @@ void PrepareClassRefs(JNIEnv * env)
jni::GetMethodID(env, bookmarkManagerInstance, "onImportFinished", "(Ljava/lang/String;JZ)V");
g_onTagsReceivedMethod =
jni::GetMethodID(env, bookmarkManagerInstance, "onTagsReceived",
"(Z[Lcom/mapswithme/maps/bookmarks/data/CatalogTagsGroup;)V");
"(Z[Lcom/mapswithme/maps/bookmarks/data/CatalogTagsGroup;I)V");
g_onCustomPropertiesReceivedMethod =
jni::GetMethodID(env, bookmarkManagerInstance, "onCustomPropertiesReceived",
"(Z[Lcom/mapswithme/maps/bookmarks/data/CatalogCustomProperty;)V");
@ -282,7 +282,8 @@ void OnImportFinished(JNIEnv * env, std::string const & serverId, kml::MarkGroup
jni::HandleJavaException(env);
}
void OnTagsReceived(JNIEnv * env, bool successful, BookmarkCatalog::TagGroups const & groups)
void OnTagsReceived(JNIEnv * env, bool successful, BookmarkCatalog::TagGroups const & groups,
uint32_t maxTagsCount)
{
ASSERT(g_bookmarkManagerClass, ());
ASSERT(g_catalogTagClass, ());
@ -309,7 +310,7 @@ void OnTagsReceived(JNIEnv * env, bool successful, BookmarkCatalog::TagGroups co
static_cast<jfloat>(tag.m_color[1]),
static_cast<jfloat>(tag.m_color[2]));
}));
}));
}), static_cast<jint>(maxTagsCount));
jni::HandleJavaException(env);
}
@ -889,9 +890,9 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeRequestCatalogTags
{
auto & bm = frm()->GetBookmarkManager();
bm.GetCatalog().RequestTagGroups(languages::GetCurrentNorm(),
[env](bool successful, BookmarkCatalog::TagGroups const & groups)
[env](bool successful, BookmarkCatalog::TagGroups const & groups, uint32_t maxTagsCount)
{
OnTagsReceived(env, successful, groups);
OnTagsReceived(env, successful, groups, maxTagsCount);
});
}

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

@ -270,8 +270,10 @@ public enum BookmarkManager
// Called from JNI.
@SuppressWarnings("unused")
@MainThread
public void onTagsReceived(boolean successful, @NonNull CatalogTagsGroup[] tagsGroups)
public void onTagsReceived(boolean successful, @NonNull CatalogTagsGroup[] tagsGroups,
int maxTagsCount)
{
//TODO(@yoksnod): Implement maxTagsCount usage.
List<CatalogTagsGroup> unmodifiableData = Collections.unmodifiableList(Arrays.asList(tagsGroups));
for (BookmarksCatalogListener listener : mCatalogListeners)
{

3
iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
View file

@ -624,8 +624,9 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
}
- (void)loadTags:(LoadTagsCompletionBlock)completionBlock {
auto onTagsCompletion = [completionBlock](bool success, BookmarkCatalog::TagGroups const & tagGroups)
auto onTagsCompletion = [completionBlock](bool success, BookmarkCatalog::TagGroups const & tagGroups, uint32_t maxTagsCount)
{
//TODO(@beloal): Implement maxTagsCount usage.
if (success)
{
NSMutableArray * groups = [NSMutableArray new];

24
map/bookmark_catalog.cpp
View file

@ -39,7 +39,7 @@ std::string BuildTagsUrl(std::string const & language)
{
if (kCatalogEditorServer.empty())
return {};
return kCatalogEditorServer + "editor/tags/?lang=" + language;
return kCatalogEditorServer + "editor/v2/tags/?lang=" + language;
}
std::string BuildCustomPropertiesUrl(std::string const & language)
@ -88,11 +88,20 @@ struct TagData
visitor(m_subtags, "subtags"))
};
struct TagsMeta
{
uint32_t m_maxTags;
DECLARE_VISITOR(visitor(m_maxTags, "max_for_bundle"))
};
struct TagsResponseData
{
std::vector<TagData> m_tags;
TagsMeta m_meta;
DECLARE_VISITOR(visitor(m_tags))
DECLARE_VISITOR(visitor(m_tags, "data"),
visitor(m_meta, "meta"))
};
BookmarkCatalog::Tag::Color ExtractColor(std::string const & c)
@ -293,7 +302,7 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
if (tagsUrl.empty())
{
if (callback)
callback(false /* success */, {});
callback(false /* success */, {}, 0 /* maxTagsCount */);
return;
}
@ -305,6 +314,7 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
if (request.RunHttpRequest())
{
auto const resultCode = request.ErrorCode();
uint32_t maxTagsCount = 0;
if (resultCode >= 200 && resultCode < 300) // Ok.
{
TagsResponseData tagsResponseData;
@ -317,7 +327,7 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
{
LOG(LWARNING, ("Tags request deserialization error:", ex.Msg()));
if (callback)
callback(false /* success */, {});
callback(false /* success */, {}, 0 /* maxTagsCount */);
return;
}
@ -337,9 +347,11 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
group.m_tags.push_back(std::move(tag));
}
result.push_back(std::move(group));
maxTagsCount = tagsResponseData.m_meta.m_maxTags;
}
if (callback)
callback(true /* success */, result);
callback(true /* success */, result, maxTagsCount);
return;
}
else
@ -348,7 +360,7 @@ void BookmarkCatalog::RequestTagGroups(std::string const & language,
}
}
if (callback)
callback(false /* success */, {});
callback(false /* success */, {}, 0 /* maxTagsCount */);
});
}

4
map/bookmark_catalog.hpp
View file

@ -46,8 +46,8 @@ public:
};
using TagGroups = std::vector<TagGroup>;
using TagGroupsCallback = platform::SafeCallback<void(bool success, TagGroups const &)>;
using TagGroupsCallback = platform::SafeCallback<void(bool success, TagGroups const &,
uint32_t maxTagsCount)>;
using CustomProperties = std::vector<CustomProperty>;
using CustomPropertiesCallback = platform::SafeCallback<void(bool success, CustomProperties const &)>;