Changeset 13486 in josm for trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

Timestamp:

2018-03-03T17:59:48+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #8039, see #10456 - fix bugs with non-downloadable layers

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -41 +41 @@
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.RelationSorter;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -160 +161 @@
 
         // download incomplete relation or incomplete members if necessary
-        if (multipolygonRelation != null) {
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
+        if (multipolygonRelation != null && editLayer != null && editLayer.isDownloadable()) {
             if (!multipolygonRelation.isNew() && multipolygonRelation.isIncomplete()) {
                 MainApplication.worker.submit(
-                        new DownloadRelationTask(Collections.singleton(multipolygonRelation), getLayerManager().getEditLayer()));
+                        new DownloadRelationTask(Collections.singleton(multipolygonRelation), editLayer));
             } else if (multipolygonRelation.hasIncompleteMembers()) {
                 MainApplication.worker.submit(new DownloadRelationMemberTask(multipolygonRelation,
                         DownloadSelectedIncompleteMembersAction.buildSetOfIncompleteMembers(Collections.singleton(multipolygonRelation)),
-                        getLayerManager().getEditLayer()));
+                        editLayer));
             }
         }