Changeset 14338 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-10-16T00:32:46+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #16755 - Cut overlapping GPX layers when merging (patch by Bjoeni, modified)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/layer/MergeGpxLayerDialog.java (added)
• layer/GpxLayer.java (modified) (1 diff)

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

@@ -307 +307 @@
         if (!(from instanceof GpxLayer))
             throw new IllegalArgumentException("not a GpxLayer: " + from);
-        data.mergeFrom(((GpxLayer) from).data);
+        mergeFrom((GpxLayer) from, false, false);
+    }
+
+    /**
+     * Merges the given GpxLayer into this layer and can remove timewise overlapping parts of the given track
+     * @param from The GpxLayer that gets merged into this one
+     * @param cutOverlapping whether overlapping parts of the given track should be removed
+     * @param connect whether the tracks should be connected on cuts
+     * @since 14338
+     */
+    public void mergeFrom(GpxLayer from, boolean cutOverlapping, boolean connect) {
+        data.mergeFrom(from.data, cutOverlapping, connect);
         invalidate();
     }