Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into WikivoyageExploreCards

Browse source
This commit is contained in:
Chumva 2018-04-27 12:29:56 +03:00
commit 3ec2ecbecd
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/download/DownloadResources.java
View file

@ -72,19 +72,16 @@ public class DownloadResources extends DownloadResourceGroup {
}
public IndexItem getWorldWikivoyageItem() {
DownloadResourceGroup travelGroup = getSubGroupById(DownloadResourceGroupType.TRAVEL_GROUP.getDefaultId());
if (travelGroup != null) {
DownloadResourceGroup wikivoyageMaps = travelGroup.getSubGroupById(DownloadResourceGroupType.WIKIVOYAGE_MAPS.getDefaultId());
if (wikivoyageMaps != null) {
DownloadResourceGroup wikivoyageHeader = wikivoyageMaps.getSubGroupById(DownloadResourceGroupType.WIKIVOYAGE_HEADER.getDefaultId());
if (wikivoyageHeader != null) {
List<IndexItem> items = wikivoyageHeader.getIndividualResources();
if (items != null) {
for (IndexItem ii : items) {
if (ii.getBasename().equalsIgnoreCase(DownloadResources.WORLD_WIKIVOYAGE_NAME)) {
return ii;
}
}
String groupId = DownloadResourceGroupType.TRAVEL_GROUP.getDefaultId() + "#" +
DownloadResourceGroupType.WIKIVOYAGE_MAPS.getDefaultId() + "#" +
DownloadResourceGroupType.WIKIVOYAGE_HEADER.getDefaultId();
DownloadResourceGroup wikivoyageHeader = getSubGroupById(groupId);
if (wikivoyageHeader != null) {
List<IndexItem> items = wikivoyageHeader.getIndividualResources();
if (items != null) {
for (IndexItem ii : items) {
if (ii.getBasename().equalsIgnoreCase(DownloadResources.WORLD_WIKIVOYAGE_NAME)) {
return ii;
}
}
}