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

[new downloader][android] add: Show "Downloaded" at deeper levels too.

Browse source
This commit is contained in:
Alexander Marchuk 2016-03-10 20:06:14 +03:00 • committed by Sergey Yershov
parent 5c155b8d24
commit be6d47fd55
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -279,27 +279,18 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeListItems(JNIEnv * env, jcl
TCountryId const parentId = (parent ? jni::ToNativeString(env, parent) : storage.GetRootId());
static jfieldID const countryItemFieldParentId = env->GetFieldID(g_countryItemClass, "parentId", "Ljava/lang/String;");
if (parent)
if (hasLocation)
{
TCountriesVec children;
storage.GetChildren(parentId, children);
PutItemsToList(env, result, children, ItemCategory::AVAILABLE);
TCountriesVec near;
g_framework->NativeFramework()->CountryInfoGetter().GetRegionsCountryId(MercatorBounds::FromLatLon(lat, lon), near);
PutItemsToList(env, result, near, ItemCategory::NEAR_ME);
}
else
{
if (hasLocation)
{
TCountriesVec near;
g_framework->NativeFramework()->CountryInfoGetter().GetRegionsCountryId(MercatorBounds::FromLatLon(lat, lon), near);
PutItemsToList(env, result, near, ItemCategory::NEAR_ME);
}
TCountriesVec downloaded, available;
storage.GetChildrenInGroups(parentId, downloaded, available);
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);
PutItemsToList(env, result, available, ItemCategory::AVAILABLE);
}
// static void nativeUpdateItem(CountryItem item);