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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-11-11 13:57:28 +01:00
commit 475b1d96c3
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/map/OsmandRegions.java
View file

@ -384,7 +384,11 @@ public class OsmandRegions {
}
public WorldRegion getRegionDataByDownloadName(String downloadName) {
return getRegionData(downloadNamesToFullNames.get(downloadName.toLowerCase()));
if (downloadName == null) {
return null;
} else {
return getRegionData(downloadNamesToFullNames.get(downloadName.toLowerCase()));
}
}
public String getDownloadName(BinaryMapDataObject o) {

33
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
View file

@ -538,21 +538,24 @@ public abstract class MenuController extends BaseMenuController {
String selectedFullName = "";
double smallestArea = -1;
for (BinaryMapDataObject o : mapDataObjects) {
boolean downloaded = checkIfObjectDownloaded(rm, osmandRegions.getDownloadName(o));
if (downloaded) {
downloadMapDataObject = null;
break;
} else {
String fullName = osmandRegions.getFullName(o);
double area = OsmandRegions.getArea(o);
if (smallestArea == -1) {
smallestArea = area;
selectedFullName = fullName;
downloadMapDataObject = o;
} else if (area < smallestArea) {
smallestArea = area;
selectedFullName = fullName;
downloadMapDataObject = o;
String downloadName = osmandRegions.getDownloadName(o);
if (!Algorithms.isEmpty(downloadName)) {
boolean downloaded = checkIfObjectDownloaded(rm, downloadName);
if (downloaded) {
downloadMapDataObject = null;
break;
} else {
String fullName = osmandRegions.getFullName(o);
double area = OsmandRegions.getArea(o);
if (smallestArea == -1) {
smallestArea = area;
selectedFullName = fullName;
downloadMapDataObject = o;
} else if (area < smallestArea) {
smallestArea = area;
selectedFullName = fullName;
downloadMapDataObject = o;
}
}
}
}