Changeset 1558 in josm for trunk/src/org

Timestamp:

2009-04-27T01:04:01+02:00 (16 years ago)

Author:

framm

Message:

• only add new data sources to layer upon merge if new sources are not already part of the layer's area. Closes #2404.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import java.awt.event.ActionEvent;
 import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -234 +235 @@
 //        System.out.println("");
 
-        // copy the merged layer's data source info
-        for (DataSource src : ((OsmDataLayer)from).data.dataSources)
-            data.dataSources.add(src);
+        Area a = data.getDataSourceArea();
+        
+        // copy the merged layer's data source info; 
+        // only add source rectangles if they are not contained in the
+        // layer already.
+        for (DataSource src : ((OsmDataLayer)from).data.dataSources) {
+            if (a == null || !a.contains(src.bounds.asRect()))
+                data.dataSources.add(src);
+        }
         
         // copy the merged layer's API version, downgrade if required