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-09 08:30:07 +01:00
commit cafd332d5b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,6 @@ import android.widget.LinearLayout;
import net.osmand.IndexConstants;
import net.osmand.NativeLibrary.RenderedObject;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
import net.osmand.binary.RouteDataObject;
import net.osmand.data.Amenity;
@ -612,7 +611,14 @@ public abstract class MenuController extends BaseMenuController {
+ IndexConstants.BINARY_MAP_INDEX_EXT;
final String roadsRegionName = Algorithms.capitalizeFirstLetterAndLowercase(downloadName) + ".road"
+ IndexConstants.BINARY_MAP_INDEX_EXT;
return rm.getIndexFileNames().containsKey(regionName) || rm.getIndexFileNames().containsKey(roadsRegionName);
boolean downloaded = rm.getIndexFileNames().containsKey(regionName) || rm.getIndexFileNames().containsKey(roadsRegionName);
if (!downloaded) {
WorldRegion region = rm.getOsmandRegions().getRegionDataByDownloadName(downloadName);
if (region != null && region.getSuperregion() != null && region.getSuperregion().isRegionMapDownload()) {
return checkIfObjectDownloaded(rm, region.getSuperregion().getRegionDownloadName());
}
}
return downloaded;
}
public static class ContextMenuToolbarController extends TopToolbarController {