Changeset 11633 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2017-02-26T13:33:10+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #10638 - fix zoom problem when validating "Way connected to Area" with a lot of data sources (patch by GerdP)

File:

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

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

@@ -17 +17 @@
 import java.awt.event.ActionEvent;
 import java.awt.geom.Area;
+import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
@@ -412 +413 @@
             // over-grow it just to be sure
             b.grow(100, 100);
-            Area a = new Area(b);
-
-            // now successively subtract downloaded areas
+            Path2D p = new Path2D.Double();
+
+            // combine successively downloaded areas
             for (Bounds bounds : data.getDataSourceBounds()) {
                 if (bounds.isCollapsed()) {
                     continue;
                 }
-                a.subtract(mv.getState().getArea(bounds));
-            }
+                p.append(mv.getState().getArea(bounds), false);
+            }
+            // subtract combined areas
+            Area a = new Area(b);
+            a.subtract(new Area(p));
 
             // paint remainder