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

Timestamp:

2015-12-11T17:36:59+01:00 (8 years ago)

Author:

bastiK

Message:

mapcss partial fill: move threshold parameter ([9063]) into the mapcss style
(new property fill-extent-threshold)

• add support for this parameter when area is unclosed
• smaller extent for unclosed areas

(see #12104)

File:

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

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

@@ -978 +978 @@
      * 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)
+     * @param nodes the list of nodes representing the polygon
      * @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();
+        if (!nodes.isEmpty()) {
+            boolean closed = nodes.get(0) == nodes.get(nodes.size() - 1);
+            int numSegments = closed ? nodes.size() - 1 : nodes.size();
+            EastNorth p1 = nodes.get(0).getEastNorth();
+            for (int i=1; i<=numSegments; i++) {
+                EastNorth p2 = nodes.get(i == numSegments ? 0 : i).getEastNorth();
                 area += p1.east() * p2.north() - p2.east() * p1.north();
                 perimeter += p1.distance(p2);
-            }
-            lastN = n;
+                p1 = p2;
+            }
         }
         return new AreaAndPerimeter(Math.abs(area) / 2, perimeter);