Improved getArea method, now also works on (already) closed paths

opensourceBIM · Jul 17, 2019 · 49ac16c · 49ac16c
1 parent 90f1c7f
commit 49ac16c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/PluginBase/src/org/bimserver/utils/IfcTools2D.java b/PluginBase/src/org/bimserver/utils/IfcTools2D.java
@@ -464,7 +464,7 @@ public static Area findSmallest(Area area) {
 		return null;
 	}
 
-	public static float getArea(Area area) {
+	public static float getArea(Area area) {
 		float sum = 0;
 		PathIterator pathIterator = area.getPathIterator(null);
 		float[] coords = new float[6];
@@ -473,23 +473,26 @@ public static float getArea(Area area) {
 		while (!pathIterator.isDone()) {
 			int currentSegment = pathIterator.currentSegment(coords);
 			if (currentSegment == PathIterator.SEG_CLOSE) {
-
-			} else if (currentSegment == PathIterator.SEG_MOVETO) {
+				if (last != null) {
+					sum = sum + Math.abs(last[0] * coords[1] - last[1] * coords[0]);
+				}
+				last = new float[]{coords[0], coords[1]};
+			} else if (currentSegment == PathIterator.SEG_MOVETO) {
 				last = new float[]{coords[0], coords[1]};
 				if (first == null) {
 					first = new float[]{coords[0], coords[1]};
 				}
 			} else if (currentSegment == PathIterator.SEG_LINETO) {
 				if (last != null) {
-					sum = sum + last[0] * coords[1] - last[1] * coords[0];
+					sum = sum + Math.abs(last[0] * coords[1] - last[1] * coords[0]);
 				}
 
 				last = new float[]{coords[0], coords[1]};
 			}
 			pathIterator.next();
 		}
 		if (last != null && first != null) {
-			sum = sum + last[0] * first[1] - last[1] * first[0];
+			sum += Math.abs(last[0] * first[1] - last[1] * first[0]);
 		}
 		return sum / 2f;
 	}