Mercurial > dive4elements > gnv-client
changeset 247:af474a541f74
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
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Tue, 10 Nov 2009 15:31:39 +0000 |
| parents | b7f69809239c |
| children | bcb0b676f94d |
| files | gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/queries.properties gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java |
| diffstat | 3 files changed, 19 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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 \
--- 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" }; /**