From 8ee91875f60f8b2180b2356c4c0be86bd0de48e4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 30 Sep 2018 22:51:22 +0100 Subject: [PATCH v1 3/4] SlippyMapBBoxChooser: also gather TileSources from current imagery layers this should catch imagery sources that were added through means other than the imagery menu (e.g. remotecontrol) --- .../josm/gui/bbox/SlippyMapBBoxChooser.java | 34 ++++++++++++++++++---- .../josm/gui/dialogs/MinimapDialogTest.java | 34 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java index 4b322854d..821065de6 100644 --- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java +++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java @@ -54,6 +54,7 @@ import org.openstreetmap.josm.data.preferences.BooleanProperty; import org.openstreetmap.josm.data.preferences.StringProperty; import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer; +import org.openstreetmap.josm.gui.layer.ImageryLayer; import org.openstreetmap.josm.gui.layer.MainLayerManager; import org.openstreetmap.josm.gui.layer.TMSLayer; import org.openstreetmap.josm.spi.preferences.Config; @@ -76,16 +77,14 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha List getTileSources(); } - /** - * TMS TileSource provider for the slippymap chooser - */ - public static class TMSTileSourceProvider implements TileSourceProvider { + public abstract static class AbstractImageryInfoBasedTileSourceProvider implements TileSourceProvider { + public abstract List getImageryInfos(); @Override public List getTileSources() { if (!TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get()) return Collections.emptyList(); List sources = new ArrayList<>(); - for (ImageryInfo info : ImageryLayerInfo.instance.getLayers()) { + for (ImageryInfo info : this.getImageryInfos()) { try { TileSource source = TMSLayer.getTileSourceStatic(info); if (source != null) { @@ -105,6 +104,30 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha } /** + * TileSource provider for the slippymap chooser - providing sources from imagery sources menu + */ + public static class TMSTileSourceProvider extends AbstractImageryInfoBasedTileSourceProvider { + @Override + public List getImageryInfos() { + return ImageryLayerInfo.instance.getLayers(); + } + } + + /** + * TileSource provider for the slippymap chooser - providing sources from current layers + */ + public static class CurrentLayersTileSourceProvider extends AbstractImageryInfoBasedTileSourceProvider { + @Override + public List getImageryInfos() { + return MainApplication.getLayerManager().getLayers().stream().filter( + layer -> layer instanceof ImageryLayer + ).map( + layer -> ((ImageryLayer) layer).getInfo() + ).collect(Collectors.toList()); + } + } + + /** * Plugins that wish to add custom tile sources to slippy map choose should call this method * @param tileSourceProvider new tile source provider */ @@ -116,6 +139,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha static { addTileSourceProvider(() -> Arrays.asList(new OsmTileSource.Mapnik())); addTileSourceProvider(new TMSTileSourceProvider()); + addTileSourceProvider(new CurrentLayersTileSourceProvider()); } private static final StringProperty PROP_MAPSTYLE = new StringProperty("slippy_map_chooser.mapstyle", "Mapnik"); diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java index 9d9fa63e3..8d33d3f2a 100644 --- a/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java +++ b/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java @@ -30,6 +30,7 @@ import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.DataSource; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.imagery.ImageryInfo; import org.openstreetmap.josm.data.imagery.ImageryLayerInfo; import org.openstreetmap.josm.data.projection.ProjectionRegistry; import org.openstreetmap.josm.data.projection.Projections; @@ -37,6 +38,7 @@ import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser; import org.openstreetmap.josm.gui.bbox.SourceButton; +import org.openstreetmap.josm.gui.layer.ImageryLayer; import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.util.GuiHelper; @@ -292,6 +294,38 @@ public class MinimapDialogTest { } /** + * Tests the tile source list includes sources only present in the LayerManager + * @throws Exception if any error occurs + */ + @Test + public void testTileSourcesFromCurrentLayers() throws Exception { + // relevant prefs starting out empty, should choose the first (ImageryLayerInfo) source and have shown download area enabled + // (not that there's a data layer for it to use) + + // first we will remove "Green Tiles" from ImageryLayerInfo + final ImageryInfo greenTilesInfo = ImageryLayerInfo.instance.getLayers().stream().filter( + i -> i.getName().equals("Green Tiles") + ).findAny().get(); + ImageryLayerInfo.instance.remove(greenTilesInfo); + + GuiHelper.runInEDT(() -> MainApplication.getLayerManager().addLayer(ImageryLayer.create(greenTilesInfo))); + + this.setUpMiniMap(); + + this.clickSourceMenuItemByLabel("Green Tiles"); + this.assertSingleSelectedSourceLabel("Green Tiles"); + + // call paint to trigger new tile fetch + this.paintSlippyMap(); + + Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished); + + this.paintSlippyMap(); + + assertEquals(0xff00ff00, paintedSlippyMap.getRGB(0, 0)); + } + + /** * Tests minimap obeys a saved "mapstyle" preference on startup. * @throws Exception if any error occurs */ -- 2.11.0