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

[new downloader][android] fix: Do not show downloaded maps in "Near me"section.

Browse source
This commit is contained in:
Alexander Marchuk 2016-03-14 14:56:01 +03:00 • committed by Sergey Yershov
parent d1d6c5e868
commit 200f98e66d
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/jni/com/mapswithme/maps/MapManager.cpp
View file

@ -248,7 +248,8 @@ static void UpdateItem(JNIEnv * env, jobject item, NodeAttrs const & attrs)
env->SetIntField(item, countryItemFieldProgress, static_cast<jint>(attrs.m_downloadingProgress.first));
}
static void PutItemsToList(JNIEnv * env, jobject const list, TCountriesVec const & children, int category)
static void PutItemsToList(JNIEnv * env, jobject const list, TCountriesVec const & children, int category,
function<bool (TCountryId const & countryId, NodeAttrs const & attrs)> const & predicate)
{
static jmethodID const countryItemCtor = jni::GetConstructorID(env, g_countryItemClass, "(Ljava/lang/String;)V");
static jfieldID const countryItemFieldCategory = env->GetFieldID(g_countryItemClass, "category", "I");
@ -258,6 +259,9 @@ static void PutItemsToList(JNIEnv * env, jobject const list, TCountriesVec const
{
GetStorage().GetNodeAttrs(child, attrs);
if (predicate && !predicate(child, attrs))
continue;
jni::TScopedLocalRef const id(env, jni::ToJavaString(env, child));
jni::TScopedLocalRef const item(env, env->NewObject(g_countryItemClass, countryItemCtor, id.get()));
env->SetIntField(item.get(), countryItemFieldCategory, category);
@ -283,14 +287,17 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeListItems(JNIEnv * env, jcl
{
TCountriesVec near;
g_framework->NativeFramework()->CountryInfoGetter().GetRegionsCountryId(MercatorBounds::FromLatLon(lat, lon), near);
PutItemsToList(env, result, near, ItemCategory::NEAR_ME);
PutItemsToList(env, result, near, ItemCategory::NEAR_ME, [](TCountryId const & countryId, NodeAttrs const & attrs) -> bool
{
return !attrs.m_present;
});
}
TCountriesVec downloaded, available;
storage.GetChildrenInGroups(parentId, downloaded, available);
PutItemsToList(env, result, downloaded, ItemCategory::DOWNLOADED);
PutItemsToList(env, result, available, ItemCategory::AVAILABLE);
PutItemsToList(env, result, downloaded, ItemCategory::DOWNLOADED, nullptr);
PutItemsToList(env, result, available, ItemCategory::AVAILABLE, nullptr);
}
// static void nativeUpdateItem(CountryItem item);