# HG changeset patch # User Tim Englich # Date 1256572296 0 # Node ID 310874d3573f3637bfc80065b0a7c1bcc46d33bf # Parent 7d1f9219d1637cf60137ddfc3fbb0ccf72f7fc6b Minimum and Maximum Depth should be entered by the User issue31 gnv-artifacts/trunk@267 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Fri Oct 23 14:29:50 2009 +0000 +++ b/gnv-artifacts/ChangeLog Mon Oct 26 15:51:36 2009 +0000 @@ -1,3 +1,27 @@ +2009-10-26 Tim Englich + + * src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_statistics.xml (renamed), + src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_csv.xml (renamed), + src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_chart.xml(renamed), + src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_feed.xml, + src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_advance.xml, + src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_advance.xml, + src/test/ressources/verticalprofile/verticalprofile_step_05_out_statistics.xml(renamed), + src/test/ressources/verticalprofile/verticalprofile_step_05_out_csv.xml(renamed), + src/test/ressources/verticalprofile/verticalprofile_step_05_out_chart.xml(renamed), + src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml, + src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml, + src/test/ressources/verticalprofile/verticalprofile_step_03_advance.xml, + src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java: + Edited the RestCases for VerticalProfiles according to the requirement that + the user should be able to enter the minimal and maximal Value of the deth that + should be show n in the charts. issue31 + * doc/conf/queries.properties, + doc/conf/products/verticalprofile/conf_timeseriespoint.xml, + doc/conf/products/verticalprofile/conf_instantaneouspoint.xml: + Adding required Configuration-Parts to get the possible to enter the minmum + and maximum depth value that should be shown in the charts. issue31 + 2009-10-23 Tim Englich * src/test/ressources/timeseries_mesh/timeseries_step_07_feed.xml: diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/doc/conf/products/verticalprofile/conf_instantaneouspoint.xml --- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_instantaneouspoint.xml Fri Oct 23 14:29:50 2009 +0000 +++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_instantaneouspoint.xml Mon Oct 26 15:51:36 2009 +0000 @@ -26,17 +26,31 @@ - + verticalprofile_instantaneouspoint_parameter parameterid true + verticalprofile_instantaneouspoint_minmaxdepth + + + + + + + + + verticalprofile_instantaneouspoint_minmaxdepth + depthrange + true + verticalprofile_instantaneouspoint_calculate_results - + + @@ -46,6 +60,8 @@ + + diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml --- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml Fri Oct 23 14:29:50 2009 +0000 +++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml Mon Oct 26 15:51:36 2009 +0000 @@ -32,12 +32,27 @@ dateid true + verticalprofile_minmaxdepth + + + + + + + + + + verticalprofile_minmaxdepth + depthrange + true + verticalprofile_calculate_results + @@ -48,6 +63,8 @@ + + diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/doc/conf/queries.properties --- a/gnv-artifacts/doc/conf/queries.properties Fri Oct 23 14:29:50 2009 +0000 +++ b/gnv-artifacts/doc/conf/queries.properties Mon Oct 26 15:51:36 2009 +0000 @@ -169,7 +169,17 @@ m.MEASUREMENTID = tsv.MEASUREMENTID and \ m.FEATUREID = ? \ ORDER BY p.GERMANNAME - + +verticalprofile_minmaxdepth= SELECT min(M.ZLOCATION) MIN, \ + max(M.ZLOCATION) MAX \ + FROM MEDIAN.MEASUREMENT M, \ + MEDIAN.TIMESERIES TS, \ + MEDIAN.TIMESERIESVALUE TSV \ + WHERE TS.TIMESERIESID = TSV.TIMESERIESID and \ + M.MEASUREMENTID = TSV.MEASUREMENTID and \ + M.FEATUREID = ? and \ + TS.PARAMETERID IN ( ? ) + verticalprofile_date=select distinct \ tsv.TIMEVALUE KEY, \ tsv.TIMEVALUE VALUE \ @@ -182,23 +192,25 @@ ts.PARAMETERID IN ( ? ) \ order by tsv.TIMEVALUE -verticalprofile_chart_data= SELECT m.ZLOCATION XORDINATE, \ - tsv.DATAVALUE YORDINATE, \ - ts.PARAMETERID GROUP1, \ - tsv.TIMEVALUE GROUP2, \ +verticalprofile_chart_data= SELECT M.ZLOCATION XORDINATE, \ + TSV.DATAVALUE YORDINATE, \ + TS.PARAMETERID GROUP1, \ + TSV.TIMEVALUE GROUP2, \ 1 GROUP3 \ - from MEDIAN.TIMESERIES ts, \ - MEDIAN.TIMESERIESVALUE tsv, \ - MEDIAN.MEASUREMENT m \ - where ts.TIMESERIESID = tsv.TIMESERIESID and \ - m.MEASUREMENTID = tsv.MEASUREMENTID and \ - m.FEATUREID = ? and \ - ts.PARAMETERID IN ( ? ) AND \ - tsv.TIMEVALUE IN (?) \ - ORDER BY tsv.TIMEVALUE , \ - tsv.TIMESERIESID , \ - ts.PARAMETERID , \ - tsv.TIMEVALUE + from MEDIAN.TIMESERIES TS, \ + MEDIAN.TIMESERIESVALUE TSV, \ + MEDIAN.MEASUREMENT M \ + where TS.TIMESERIESID = TSV.TIMESERIESID AND \ + M.MEASUREMENTID = TSV.MEASUREMENTID AND \ + M.FEATUREID = ? AND \ + TS.PARAMETERID IN ( ? ) AND \ + TSV.TIMEVALUE IN (?) AND \ + M.ZLOCATION >= ? AND \ + M.ZLOCATION <= ? \ + ORDER BY TSV.TIMEVALUE , \ + TSV.TIMESERIESID , \ + TS.PARAMETERID , \ + TSV.TIMEVALUE ############################################# ############################################# @@ -318,7 +330,17 @@ MSV.PARAMETERID = P.PARAMETERID AND \ IP.FEATUREID = ? \ ORDER BY P.GERMANNAME - + +verticalprofile_instantaneouspoint_minmaxdepth = SELECT min(M.ZLOCATION) MIN, \ + max(M.ZLOCATION) MAX \ + FROM MEDIAN.INSTANTANEOUSPOINT IP, \ + MEDIAN.MEASUREMENT M, \ + MEDIAN.MEASUREDSCALARVALUE MSV \ + WHERE IP.FEATUREID = M.FEATUREID AND \ + M.MEASUREMENTID = MSV.MEASUREMENTID AND \ + IP.FEATUREID = ? AND \ + MSV.PARAMETERID in (?) + verticalprofile_instantaneouspoint_chart_data = SELECT M.ZLOCATION XORDINATE, \ MSV.DATAVALUE YORDINATE, \ MSV.PARAMETERID GROUP1, \ @@ -330,7 +352,9 @@ WHERE IP.FEATUREID = M.FEATUREID AND \ M.MEASUREMENTID = MSV.MEASUREMENTID AND \ IP.FEATUREID = ? AND \ - MSV.PARAMETERID in (?) \ + MSV.PARAMETERID in (?) AND \ + M.ZLOCATION >= ? AND \ + M.ZLOCATION <= ? \ ORDER BY IP.TIMEVALUE, \ MSV.PARAMETERID, \ M.ZLOCATION diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java --- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Fri Oct 23 14:29:50 2009 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Mon Oct 26 15:51:36 2009 +0000 @@ -177,11 +177,11 @@ String feedDocument, String advanceDocument) throws Exception { Document outputData = artifact.describe(cc); - this.writeDocument2Log(outputData); +// this.writeDocument2Log(outputData); outputData = artifact.feed(this.readDocument(feedDocument), cc); this.check4ExceptionReport(outputData); outputData = artifact.advance(this.readDocument(advanceDocument), cc); - this.writeDocument2Log(outputData); +// this.writeDocument2Log(outputData); this.check4ExceptionReport(outputData); } @@ -343,6 +343,15 @@ cc, "src/test/ressources/verticalprofile/verticalprofile_step_03_feed.xml", "src/test/ressources/verticalprofile/verticalprofile_step_03_advance.xml"); + + // Vierter Schritt + this + .doNextStep( + artifact, + cc, + "src/test/ressources/verticalprofile/verticalprofile_step_04_feed.xml", + "src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml"); + // Vierter Schritt Document outputData = artifact.describe(cc); @@ -362,22 +371,22 @@ artifact .feed( this - .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_04_feed.xml"), + .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml"), cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_04_out_statistics.xml"), + .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_05_out_statistics.xml"), fos2, cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_04_out_chart.xml"), + .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_05_out_chart.xml"), fos, cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_04_out_csv.xml"), + .readDocument("src/test/ressources/verticalprofile/verticalprofile_step_05_out_csv.xml"), fos3, cc); } catch (Exception e) { log.error(e, e); @@ -549,6 +558,13 @@ cc, "src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_feed.xml", "src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_advance.xml"); + // Vierter Schritt + this + .doNextStep( + artifact, + cc, + "src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_feed.xml", + "src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_advance.xml"); // Vierter Schritt Document outputData = artifact.describe(cc); @@ -568,22 +584,22 @@ artifact .feed( this - .readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_feed.xml"), + .readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_feed.xml"), cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_statistics.xml"), + .readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_statistics.xml"), fos2, cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_chart.xml"), + .readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_chart.xml"), fos, cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_csv.xml"), + .readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_csv.xml"), fos3, cc); } catch (Exception e) { log.error(e, e); diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_03_advance.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_03_advance.xml Fri Oct 23 14:29:50 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_03_advance.xml Mon Oct 26 15:51:36 2009 +0000 @@ -3,5 +3,5 @@ - + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_advance.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_out_chart.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_out_chart.xml Fri Oct 23 14:29:50 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_out_csv.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_out_csv.xml Fri Oct 23 14:29:50 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - - diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_out_statistics.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_04_out_statistics.xml Fri Oct 23 14:29:50 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_feed.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_out_chart.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_out_chart.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_out_csv.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_out_csv.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_out_statistics.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile/verticalprofile_step_05_out_statistics.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_advance.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_advance.xml Fri Oct 23 14:29:50 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_advance.xml Mon Oct 26 15:51:36 2009 +0000 @@ -3,5 +3,5 @@ - + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_advance.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_advance.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_chart.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_chart.xml Fri Oct 23 14:29:50 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_csv.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_csv.xml Fri Oct 23 14:29:50 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_statistics.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_04_out_statistics.xml Fri Oct 23 14:29:50 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_feed.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_feed.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_chart.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_chart.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_csv.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_csv.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,2 @@ + + diff -r 7d1f9219d163 -r 310874d3573f gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_statistics.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_05_out_statistics.xml Mon Oct 26 15:51:36 2009 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file