Changeset 9063 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-11-25T09:54:02+01:00 (9 years ago)

Author:

bastiK

Message:

mapcss: partial fill - if partial fill would only leave a small gap in the center, fill area completely (see #12104)

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (1 diff)

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

@@ -951 +951 @@
         return false;
     }
+
+    /**
+     * Data class to hold two double values (area and perimeter of a polygon).
+     */
+    public static class AreaAndPerimeter {
+        private final double area;
+        private final double perimeter;
+
+        public AreaAndPerimeter(double area, double perimeter) {
+            this.area = area;
+            this.perimeter = perimeter;
+        }
+
+        public double getArea() {
+            return area;
+        }
+
+        public double getPerimeter() {
+            return perimeter;
+        }
+    }
+
+    /**
+     * Calculate area and perimeter length of a polygon.
+     * 
+     * Uses current projection; units are that of the projected coordinates.
+     * 
+     * @param nodes the list of nodes representing the polygon (must be
+     * closed, i.e. first node equals last node)
+     * @return area and perimeter
+     */
+    public static AreaAndPerimeter getAreaAndPerimeter(List<Node> nodes) {
+        if (nodes.get(0) != nodes.get(nodes.size() - 1)) {
+            throw new IllegalArgumentException();
+        }
+        double area = 0;
+        double perimeter = 0;
+        Node lastN = null;
+        for (Node n : nodes) {
+            if (lastN != null) {
+                EastNorth p1 = lastN.getEastNorth();
+                EastNorth p2 = n.getEastNorth();
+                area += p1.east() * p2.north() - p2.east() * p1.north();
+                perimeter += p1.distance(p2);
+            }
+            lastN = n;
+        }
+        return new AreaAndPerimeter(Math.abs(area) / 2, perimeter);
+    }
 }