Changeset 14627 in josm for trunk/src

Timestamp:

2019-01-03T13:47:12+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17167 : Regression from #17119 clipped closed path was not closed

File:

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

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

@@ -47 +47 @@
             if (num > 0 && (type == PathIterator.SEG_CLOSE || type == PathIterator.SEG_MOVETO || pit.isDone())) {
                 // we have extracted a single segment, maybe unclosed
-                hasData |= addToResult(result, points, num,
+                boolean hasPath = addToResult(result, points, num,
                         new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY), clippingRect);
+                hasData |= hasPath;
+                if (hasPath && type == PathIterator.SEG_CLOSE) {
+                    result.closePath();
+                }
                 num = 0;
                 minX = minY = Double.POSITIVE_INFINITY;