Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

Timestamp:

2018-02-18T05:02:23+01:00 (6 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - support read-only data layers

File:

• trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -48 +48 @@
 import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
 import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
@@ -53 +54 @@
 import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -237 +237 @@
         Graphics2D g2d = (Graphics2D) g;
 
-        // draw shaded area for non-downloaded region of current "edit layer", but only if there *is* a current "edit layer",
+        // draw shaded area for non-downloaded region of current data set, but only if there *is* a current data set,
         // and it has defined bounds. Routine is analogous to that in OsmDataLayer's paint routine (but just different
         // enough to make sharing code impractical)
-        final OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-        if (editLayer != null && this.showDownloadAreaButtonModel.isSelected() && !editLayer.data.getDataSources().isEmpty()) {
+        final DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+        if (ds != null && this.showDownloadAreaButtonModel.isSelected() && !ds.getDataSources().isEmpty()) {
             // initialize area with current viewport
             Rectangle b = this.getBounds();
@@ -249 +249 @@
 
             // combine successively downloaded areas after converting to screen-space
-            for (Bounds bounds : editLayer.data.getDataSourceBounds()) {
+            for (Bounds bounds : ds.getDataSourceBounds()) {
                 if (bounds.isCollapsed()) {
                     continue;