# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1257867099 0
# Node ID af474a541f741ed194542ec5ed49b0e8fc0b8581
# Parent  b7f69809239cb863b34c1e38f6185de7f3821afa
Sort Columns to the given order of the ODV-Specification
and added the Columns DATAVALUE and PARAMETER to the output
according to issue68

gnv-artifacts/trunk@316 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r b7f69809239c -r af474a541f74 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Tue Nov 10 14:37:42 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Nov 10 15:31:39 2009 +0000
@@ -1,3 +1,13 @@
+2009-11-10  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java (TIMESERIES_ODV_PROFILE_NAMES): 
+	  Sort Columns to the given order of the ODV-Specification
+	  and added the Columns DATAVALUE and PARAMETER to the output 
+	  according to issue68
+	* doc/conf/queries.properties: 
+	  Changed Columnalias in Query for HorizontalProfile ODV-Exports in Meshes 
+	  from PARAMETERID to PARAMETER to be able to use in only on ODV-Export-Profile
+
 2009-11-10  Tim Englich  <tim.englich@intevation.de>
 
 	* src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (testVerticalCrossSectionMeshArtifact): 
diff -r b7f69809239c -r af474a541f74 gnv-artifacts/doc/conf/queries.properties
--- a/gnv-artifacts/doc/conf/queries.properties	Tue Nov 10 14:37:42 2009 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Tue Nov 10 15:31:39 2009 +0000
@@ -760,7 +760,7 @@
           0 BOTDEPTH, \
           (((ML.UPPERZLOCATION + ML.LOWERZLOCATION) / 2)*-1) DEPTH, \
           msv.DATAVALUE , \
-          msv.PARAMETERID PARAMETERID, \
+          msv.PARAMETERID PARAMETER, \
           msv.TIMEVALUE, \
           MEDIAN.MESHPOINT.JPOSITION , \
           MEDIAN.MESHPOINT.IPOSITION \
diff -r b7f69809239c -r af474a541f74 gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java	Tue Nov 10 14:37:42 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java	Tue Nov 10 15:31:39 2009 +0000
@@ -98,15 +98,13 @@
     public static final String [] TIMESERIES_ODV_PROFILE_NAMES = {
           "CRUISE",
           "STATION",
-          "TIMEVALUE",
           "TYPE",
           "SHAPE",
           "BOTDEPTH",
-          "DEPTH"
-          //"DATAVALUE",
-          //"PARAMETER",
-          //"MEASUREMENTID",
-          //"TIMESERIESID"
+          "DEPTH",
+          "TIMEVALUE",
+          "DATAVALUE",
+          "PARAMETER"
     };
 
 
@@ -114,11 +112,13 @@
         "Cruise",
         "Station",
         "Type",
-        "Date/Time",
         "Longitude [deegrees_east]",
         "Latitude [deegrees_north]",
         "Bot. Depth [m]",
-        "Depth [m]"
+        "Depth [m]",
+        "Date/Time",
+        "Value",
+        "Parameterid"
     };
 
     /**