# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1330942586 0
# Node ID 4514b0158b10c91ff571c04aa2ab167fe32881cc
# Parent  0611ae467e4a392ccabb72a60b9e5e623f87d88c
Fixed column order.

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

diff -r 0611ae467e4a -r 4514b0158b10 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Mar 05 10:00:06 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon Mar 05 10:16:26 2012 +0000
@@ -1,3 +1,8 @@
+2012-03-05	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java:
+	  Fixed column order.
+
 2012-03-05	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java:
diff -r 0611ae467e4a -r 4514b0158b10 flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java	Mon Mar 05 10:00:06 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java	Mon Mar 05 10:16:26 2012 +0000
@@ -235,18 +235,23 @@
         for (int i = 0; i < size; i ++) {
             stepWriter.addNexts(kmf.format(ww.getStartKm()),
                 startLocationDescription);
+            stepWriter.addNext(wf.format(ww.getW1(i)));
             if (startAtGauge) {
                 stepWriter.addNext(wf.format(ww.getRelHeight1Cm(i)));
             }
-            stepWriter.addNext(wf.format(ww.getW1(i)));
             stepWriter.addNexts(
                 qf.format(ww.getQ1(i)), // "Q"
                 kmf.format(ww.getEndKm()),
                 endLocationDescription);
+            stepWriter.addNext(wf.format(ww.getW2(i)));
             if (endAtGauge) {
-                stepWriter.addNext(wf.format(ww.getRelHeight2Cm(i)));
+                if (ww.endAtGauge()) {
+                    stepWriter.addNext(wf.format(ww.getRelHeight2Cm(i)));
+                }
+                else {
+                    stepWriter.addNext("-");
+                }
             }
-            stepWriter.addNext(wf.format(ww.getW2(i)));
             stepWriter.addNext(qf.format(ww.getQ2(i)) // "Q"
                 );
             stepWriter.flush();