diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java @ 8647:5f60bd7c4b42

(issue1754) Simplify code to handle a>b cases.
author Andre Heinecke <andre.heinecke@intevation.de>
date Mon, 30 Mar 2015 19:28:41 +0200
parents 1f6b30310360
children 5e38e2924c07
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Mon Mar 30 19:27:11 2015 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Mon Mar 30 19:28:41 2015 +0200
@@ -37,23 +37,12 @@
 
         this.river     = access.getRiverName();
         this.heightIds = access.extractHeightIds(context);
-        double from    = access.getFrom();
-        double to      = access.getTo();
-        double start;
-        double end;
-
-        if ((!Double.isNaN(from) && !Double.isNaN(to)) && from > to) {
-            log.debug("Reordering range.");
-            start = to;
-            end = from;
-        } else {
-            start = from;
-            end = to;
-        }
+        double from    = access.getFrom(true);
+        double to      = access.getTo(true);
 
         BedDiffYearResult [] results = new BedDiffYearResult[heightIds.length];
         for (int i = 0; i < heightIds.length; i++) {
-            BedHeightData [] pair = getHeightPair(heightIds[i], start, end);
+            BedHeightData [] pair = getHeightPair(heightIds[i], from, to);
             if (pair[0].getYear() == null || pair[1].getYear() == null) {
                 addProblem("beddiff.missing.year");
             }

http://dive4elements.wald.intevation.org