From d6ee74ac9bb3a772ddce61c889445f8f2c17e2e4 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Sat, 7 Nov 2015 21:43:34 +0300 Subject: [PATCH 1/2] Fix road maps selection --- OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java index 9583928b3f..050f765b29 100644 --- a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java @@ -207,7 +207,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe private boolean checkIfObjectDownloaded(String downloadName) { final String regionName = Algorithms.capitalizeFirstLetterAndLowercase(downloadName) + IndexConstants.BINARY_MAP_INDEX_EXT; - final String roadsRegionName = Algorithms.capitalizeFirstLetterAndLowercase(downloadName) + "-roads" + final String roadsRegionName = Algorithms.capitalizeFirstLetterAndLowercase(downloadName) + ".road" + IndexConstants.BINARY_MAP_INDEX_EXT; return rm.getIndexFileNames().containsKey(regionName) || rm.getIndexFileNames().containsKey(roadsRegionName); } From 49cd2b0707d79ceb035e4ce361eb1bd0e3af84f5 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Sat, 7 Nov 2015 22:25:20 +0300 Subject: [PATCH 2/2] Disable map selection when context menu is opened --- .../plus/views/DownloadedRegionsLayer.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java index 050f765b29..ce0a3c7774 100644 --- a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java @@ -22,8 +22,11 @@ import net.osmand.map.OsmandRegions; import net.osmand.map.WorldRegion; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; +import net.osmand.plus.activities.MapActivity; import net.osmand.plus.download.DownloadActivityType; import net.osmand.plus.download.IndexItem; +import net.osmand.plus.mapcontextmenu.MapContextMenu; +import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu; import net.osmand.plus.resources.ResourceManager; import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider; import net.osmand.plus.views.ContextMenuLayer.IContextMenuProviderSelection; @@ -65,7 +68,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe private static int ZOOM_TO_SHOW_MAP_NAMES = 6; private static int ZOOM_AFTER_BASEMAP = 12; - private static int ZOOM_TO_SHOW_BORDERS_ST = 5; + private static int ZOOM_TO_SHOW_BORDERS_ST = 4; private static int ZOOM_TO_SHOW_BORDERS = 7; private static int ZOOM_TO_SHOW_SELECTION_ST = 3; private static int ZOOM_TO_SHOW_SELECTION = 10; @@ -404,7 +407,16 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe // IContextMenuProvider @Override public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List objects) { - getWorldRegionFromPoint(tileBox, point, objects); + boolean isMenuVisible = false; + if (view.getContext() instanceof MapActivity) { + MapActivity mapActivity = (MapActivity) view.getContext(); + MapContextMenu menu = mapActivity.getContextMenu(); + MapMultiSelectionMenu multiMenu = mapActivity.getMultiSelectionMenu(); + isMenuVisible = menu.isVisible() || multiMenu.isVisible(); + } + if (!isMenuVisible) { + getWorldRegionFromPoint(tileBox, point, objects); + } } @Override