Changeset 15127 in josm

Timestamp:

2019-05-28T01:43:47+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #17724 - Allow DataSet merges without merging the Bounds (patch by taylor.smock)

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -406 +406 @@
      */
     public void merge(ProgressMonitor progressMonitor) {
+        merge(progressMonitor, true);
+    }
+
+    /**
+     * Runs the merge operation. Successfully merged {@link OsmPrimitive}s are in
+     * {@link #getTargetDataSet()}.
+     *
+     * See {@link #getConflicts()} for a map of conflicts after the merge operation.
+     * @param progressMonitor The progress monitor
+     * @param mergeBounds Whether or not to merge the bounds of the new DataSet to
+     * the existing DataSet
+     * @since 15127
+     */
+    public void merge(ProgressMonitor progressMonitor, boolean mergeBounds) {
         if (sourceDataSet == null)
             return;
@@ -443 +457 @@
             // copy the merged layer's data source info.
             // only add source rectangles if they are not contained in the layer already.
-            for (DataSource src : sourceDataSet.getDataSources()) {
-                if (a == null || !a.contains(src.bounds.asRect())) {
-                    targetDataSet.addDataSource(src);
+            if (mergeBounds) {
+                for (DataSource src : sourceDataSet.getDataSources()) {
+                    if (a == null || !a.contains(src.bounds.asRect())) {
+                        targetDataSet.addDataSource(src);
+                    }
                 }
             }