# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1336721052 0
# Node ID dc67ddd4a34c72711a6ad56a91e80e0c516d1f4f
# Parent  6fda6ec9e426f3cff62512e589ba2e621331bea4
Progressed area calculation while line computation a bit.

flys-artifacts/trunk@4388 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 6fda6ec9e426 -r dc67ddd4a34c flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri May 11 07:11:01 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri May 11 07:24:12 2012 +0000
@@ -1,3 +1,11 @@
+2012-05-11  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	Somewhat improve area calculation during line computation.
+	Still faulty.
+
+	* src/main/java/de/intevation/flys/artifacts/geom/Lines.java
+	 (fillWater): Piecewise calculate area in more cases.
+
 2012-05-11  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	Tackle water-through-mountain issue that exists since r4099.
diff -r 6fda6ec9e426 -r dc67ddd4a34c flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/Lines.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/Lines.java	Fri May 11 07:11:01 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/Lines.java	Fri May 11 07:24:12 2012 +0000
@@ -242,6 +242,9 @@
                             startX = p1.getX();
                             mode = Mode.WET;
                         }
+                        area += area(p1, p2,
+                            new Point2D.Double(p2.getX(), waterLevel),
+                            new Point2D.Double(p2.getX(), waterLevel));
                     }
                 }
                 else { // p2 == waterlevel
@@ -259,6 +262,9 @@
                                 p2.getX(), waterLevel));
                         }
                         mode = Mode.DRY;
+                        area += area(p1, p2,
+                            new Point2D.Double(p1.getX(), waterLevel),
+                            new Point2D.Double(p1.getX(), waterLevel));
                     }
                 }
                 if (debug) {
@@ -280,6 +286,20 @@
                 log.debug("intersection at x: " + x);
             }
 
+            // Add area of that part of intersection that is 'wet'.
+            if (p1.getY() > waterLevel) {
+                area += area(new Point2D.Double(x, waterLevel),
+                             p2,
+                             new Point2D.Double(p2.getX(), waterLevel),
+                             new Point2D.Double(x, waterLevel));
+            }
+            else {
+                area += area(new Point2D.Double(x, waterLevel),
+                             p1,
+                             new Point2D.Double(p1.getX(), waterLevel),
+                             new Point2D.Double(x, waterLevel));
+            }
+
             switch (mode) {
                 case WET:
                     log.debug("intersect/wet");