Changeset 18233 in josm for trunk

Timestamp:

2021-09-27T21:45:27+02:00 (3 years ago)

Author:

Don-vip

Message:

see #21144 - fix #21330 - fix #21335 - proper handling of correlation support layers in "duplicate" and "gpx export" actions

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/layer/DuplicateAction.java (modified) (2 diffs)
• layer/OsmDataLayer.java (modified) (1 diff)
• layer/geoimage/CorrelationSupportLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java

@@ -8 +8 @@
 import javax.swing.AbstractAction;
 
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
@@ -54 +53 @@
         if (layer instanceof OsmDataLayer) {
             String newName = LayerListTransferHandler.suggestNewLayerName(layer.getName(), MainApplication.getLayerManager().getLayers());
-            OsmDataLayer oldLayer = (OsmDataLayer) layer;
-            MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(oldLayer.getDataSet()), newName, null));
+            MainApplication.getLayerManager().addLayer(((OsmDataLayer) layer).duplicate(newName));
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1355 +1355 @@
         return true;
     }
+
+    /**
+     * Duplicates this layer with a new name and a copy of this layer dataset.
+     * @param newName name of new layer
+     * @return A copy of this layer
+     * @since 18233
+     */
+    public OsmDataLayer duplicate(String newName) {
+        return new OsmDataLayer(new DataSet(getDataSet()), newName, null);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelationSupportLayer.java

@@ -41 +41 @@
         data.setUploadPolicy(UploadPolicy.BLOCKED);
         rebuildGpxData();
+    }
+
+    @Override
+    public GpxData toGpxData() {
+        GpxData gpxData = new GpxData();
+        fillGpxData(gpxData, data, getAssociatedFile(), CORRELATION_PREFIX);
+        return gpxData;
+    }
+
+    @Override
+    public CorrelationSupportLayer duplicate(String newName) {
+        return new CorrelationSupportLayer(gpxData, newName);
     }