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

Fix context menu

Browse source
This commit is contained in:
Alexey Kulish 2016-11-23 16:02:16 +03:00
parent 2227b9e963
commit 6fc0ce85e7
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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