dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java comparison

(issue1754) Check if start > end and handle this

author	Andre Heinecke <andre.heinecke@intevation.de>
date	Tue, 24 Mar 2015 10:52:23 +0100
parents	fa57a2cb1dfa
children	5f60bd7c4b42

comparison

equal deleted inserted replaced

-:2010da0904b7
+:0f6f702742b4
 WINFOArtifact winfo = (WINFOArtifact) artifact;
 String id = getID();
 RangeAccess rangeAccess = new RangeAccess(artifact);
 double from = rangeAccess.getFrom();
 double to = rangeAccess.getTo();
+double start;
+double end;
 // Load the Artifacts/facets that we want to subtract and display.
 // Expected format is:
 // [42537f1e-3522-42ef-8968-635b03d8e9c6;longitudinal_section.w;0]#[1231f2-....]
 String diffids = winfo.getDataAsString("diffids");
 log.debug("WDifferencesState has: " + diffids);
 String datas[] = diffids.split("#");
+log.debug("Difference from: " + from + " to: " + to);
+/* Check if we need to obtain the data in a different order */
+if ((!Double.isNaN(from) && !Double.isNaN(to)) && from > to) {
+log.debug("Reordering range.");
+start = to;
+end = from;
+} else {
+start = from;
+end = to;
+}
 // Validate the Data-Strings.
 for (String s: datas) {
 if (!WaterlevelSelectState.isValueValid(s)) {
 // TODO: escalate.
 }
 for(int i = 0; i < datas.length; i+=2) {
 // e.g.:
 // 42537f1e-3522-42ef-8968-635b03d8e9c6;longitudinal_section.w;1
 WKms minuendWKms = getWKms(StringUtil.unbracket(datas[i+0]),
-context, from, to);
+context, start, end);
 WKms subtrahendWKms = getWKms(StringUtil.unbracket(datas[i+1]),
-context, from, to);
+context, start, end);
 String facetName = "diff ()";
 String minName = "min";
 String subName = "sub";

Mercurial > dive4elements > river