Changeset 11361 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-12-04T21:05:07+01:00 (7 years ago)

Author:

bastiK

Message:

see #10387 - use path winding rule instead of Area.subtract

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• DefaultGeoProperty.java (modified) (2 diffs)
• Geometry.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/DefaultGeoProperty.java

@@ -3 +3 @@
 
 import java.awt.geom.Area;
+import java.awt.geom.Path2D;
 import java.util.Collection;
 
@@ -23 +24 @@
      */
     public DefaultGeoProperty(Collection<Way> ways) {
-        Area area = null;
+        Path2D path = new Path2D.Double();
+        path.setWindingRule(Path2D.WIND_EVEN_ODD);
         for (Way w : ways) {
-            Area wayArea = Geometry.getAreaLatLon(w.getNodes());
-            if (area == null) {
-                area = wayArea;
-            } else {
-                area.add(wayArea);
-            }
+            Geometry.buildPath2DLatLon(w.getNodes(), path);
         }
-        this.area = area;
+        this.area = new Area(path);
     }
 

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -505 +505 @@
 
     /**
-     * Returns the Area of a polygon, from its list of nodes.
-     * @param polygon List of nodes forming polygon
-     * @return Area for the given list of nodes (LatLon coordinates)
-     * @since 6841
-     */
-    public static Area getAreaLatLon(List<Node> polygon) {
-        Path2D path = new Path2D.Double();
-
+     * Builds a path from a list of nodes
+     * @param polygon Nodes, forming a closed polygon
+     * @param path path to add to; can be null, then a new path is created
+     * @return the path (LatLon coordinates)
+     */
+    public static Path2D buildPath2DLatLon(List<Node> polygon, Path2D path) {
+        if (path == null) {
+            path = new Path2D.Double();
+        }
         boolean begin = true;
         for (Node n : polygon) {
@@ -525 +526 @@
             path.closePath();
         }
-
-        return new Area(path);
+        return path;
     }
 
@@ -538 +538 @@
                 ? new Multipolygon(multipolygon)
                 : MultipolygonCache.getInstance().get(Main.map.mapView, multipolygon);
-        Area result = null;
+        Path2D path = new Path2D.Double();
+        path.setWindingRule(Path2D.WIND_EVEN_ODD);
         for (Multipolygon.PolyData pd : mp.getCombinedPolygons()) {
-            Area area = getAreaLatLon(pd.getNodes());
+            buildPath2DLatLon(pd.getNodes(), path);
             for (Multipolygon.PolyData pdInner : pd.getInners()) {
-                Area areaInner = getAreaLatLon(pdInner.getNodes());
-                area.subtract(areaInner);
-            }
-            if (result == null) {
-                result = area;
-            } else {
-                result.add(area);
-            }
-        }
-        return result;
+                buildPath2DLatLon(pdInner.getNodes(), path);
+            }
+        }
+        return new Area(path);
     }