# HG changeset patch # User Tim Englich # Date 1256645012 0 # Node ID c0a798299efc076e3940e7794398c9f3e19d84e6 # Parent 3dac84194db45fdf3475d7a2ad51d0c0b730cda1 Integration of the selection of the min and max Layer used in Verticalprofiles of Meshes. issue61 gnv-artifacts/trunk@269 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/ChangeLog Tue Oct 27 12:03:32 2009 +0000 @@ -1,3 +1,18 @@ +2009-10-27 Tim Englich + + * src/main/resources/lang/artifactMessages*.properties: + Added Ressources for the minimal and maximal Layer to use in VerticalProfiles of Meshes issue61 + * doc/conf/products/verticalprofile/conf_mesh.xml: + Added two new Transitions for selecting the min and max-Layer to use. issue61 + * doc/conf/queries.properties: + Added Queries for Selecting the Depth for selecting the minimum and the maximum Layer to use + Drawing the Chart. issue61 + * src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (testVerticalProfileMeshArtifact): + Integrated two further Transitions-Steps according to changes in Workflow of + VerticalProfiles in Meshes. issue61 + * src/test/ressources/verticalprofile_mesh/verticalprofile_step_*.xml: + New Testdata generated according to changes in Workflow of VerticalProfiles in Meshes. issue61 + 2009-10-26 Tim Englich * src/main/resources/lang/artifactMessages_de_DE.properties: diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml --- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml Tue Oct 27 12:03:32 2009 +0000 @@ -31,7 +31,7 @@ mesh_point false - verticalprofile_meshpoint_parameterv + verticalprofile_mesh_mindepthv @@ -40,6 +40,34 @@ + + verticalprofile_mesh_mindepth + mindepthid + false + + verticalprofile_mesh_maxdepthv + + + + + + + + + + verticalprofile_mesh_maxdepth + maxdepthid + false + + verticalprofile_meshpoint_parameterv + + + + + + + + verticalprofile_mesh_parameter parameterid @@ -51,6 +79,8 @@ + + @@ -66,6 +96,8 @@ + + @@ -77,6 +109,8 @@ + + diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/doc/conf/queries.properties --- a/gnv-artifacts/doc/conf/queries.properties Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/doc/conf/queries.properties Tue Oct 27 12:03:32 2009 +0000 @@ -234,6 +234,33 @@ KPOSITION = 1 AND \ INTERSECTS(SHAPE,"?") +verticalprofile_mesh_mindepth = SELECT MP.KPOSITION KEY, \ + 'Layer ' || ML.KPOSITION || ': ' || -ML.UPPERZLOCATION || ' - '|| -ML.LOWERZLOCATION VALUE \ + from MEDIAN.MESHLAYER ML, \ + MEDIAN.MESHPOINT MP, \ + MEDIAN.MESH M \ + WHERE ML.KPOSITION = MP.KPOSITION AND \ + ML.MESHID = MP.MESHID AND \ + M.OBJECTID = ? AND \ + MP.MESHID = M.MESHID AND \ + IPOSITION = (select IPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?) AND \ + JPOSITION = (select JPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?) \ + ORDER BY ML.UPPERZLOCATION DESC + +verticalprofile_mesh_maxdepth = SELECT MP.KPOSITION KEY, \ + 'Layer ' || ML.KPOSITION || ': ' || -ML.UPPERZLOCATION || ' - '|| -ML.LOWERZLOCATION VALUE \ + from MEDIAN.MESHLAYER ML, \ + MEDIAN.MESHPOINT MP, \ + MEDIAN.MESH M \ + WHERE ML.KPOSITION = MP.KPOSITION AND \ + ML.MESHID = MP.MESHID AND \ + M.OBJECTID = ? AND \ + MP.MESHID = M.MESHID AND \ + IPOSITION = (select IPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?) AND \ + JPOSITION = (select JPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?) AND \ + MP.KPOSITION < ? \ + ORDER BY ML.UPPERZLOCATION DESC + verticalprofile_mesh_parameter=SELECT distinct \ p.PARAMETERID KEY , \ p.GERMANNAME VALUE \ @@ -281,7 +308,9 @@ where m.OBJECTID = ? AND \ mp.MESHID = m.MESHID AND \ IPOSITION = (select IPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?) and \ - JPOSITION = (select JPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?)) \ + JPOSITION = (select JPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?)) AND \ + mp.KPOSITION <= ? AND \ + mp.KPOSITION >= ? \ order by msv.PARAMETERID, \ msv.TIMEVALUE, \ ml.UPPERZLOCATION @@ -559,7 +588,4 @@ msv.PARAMETERID, \ MEDIAN.MESHPOINT.JPOSITION , \ MEDIAN.MESHPOINT.IPOSITION, \ - MEDIAN.MESHPOINT.KPOSITION - - - select mp.FEATUREID KEY, 'Layer ' || ml.KPOSITION || ': ' || -ml.UPPERZLOCATION || ' - '|| -ml.LOWERZLOCATION as VALUE from MEDIAN.MESHLAYER ml, MEDIAN.MESHPOINT mp, MEDIAN.MESH M where ml.KPOSITION = mp.KPOSITION and ml.MESHID = mp.MESHID and m.OBJECTID = 3 AND mp.MESHID = m.MESHID AND IPOSITION = (select IPOSITION from MEDIAN.MESHPOINT where FEATUREID = 2003771) and JPOSITION = (select JPOSITION from MEDIAN.MESHPOINT where FEATUREID = 2003771) order by ml.UPPERZLOCATION desc \ No newline at end of file + MEDIAN.MESHPOINT.KPOSITION \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/main/resources/lang/artifactMessages.properties --- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties Tue Oct 27 12:03:32 2009 +0000 @@ -21,6 +21,8 @@ mesh_point = Mesh Point measurementid = Measurement depth/height [m] depthrange = Measurementarea depth/height [m] +mindepthid = Deepest Layer +maxdepthid = Highest Layer parameterid = Parameter timeinterval = Time period minvalue = from diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties --- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties Tue Oct 27 12:03:32 2009 +0000 @@ -21,6 +21,8 @@ mesh_point = Messpunkt measurementid = Messung Tiefe/Höhe [m] depthrange = Messbereich Tiefe/Höhe [m] +mindepthid = Tiefster Messbereich +maxdepthid = Flachester Messbereich parameterid = Parameter timeinterval = Zeitfenster minvalue = von diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties --- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties Tue Oct 27 12:03:32 2009 +0000 @@ -21,6 +21,8 @@ mesh_point = Messpunkt measurementid = Messung Tiefe/Höhe [m] depthrange = Messbereich Tiefe/Höhe [m] +mindepthid = Tiefster Messbereich +maxdepthid = Flachester Messbereich parameterid = Parameter timeinterval = Zeitfenster minvalue = von diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties --- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties Tue Oct 27 12:03:32 2009 +0000 @@ -21,6 +21,8 @@ mesh_point = Mesh Point measurementid = Measurement depth/height [m] depthrange = Measurementarea depth/height [m] +mindepthid = Deepest Layer +maxdepthid = Highest Layer parameterid = Parameter timeinterval = Time period minvalue = from diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java --- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Tue Oct 27 12:03:32 2009 +0000 @@ -463,8 +463,24 @@ cc, "src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_feed.xml", "src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_advance.xml"); + + // Sechster Schritt + this + .doNextStep( + artifact, + cc, + "src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml", + "src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_advance.xml"); + + // Siebter Schritt + this + .doNextStep( + artifact, + cc, + "src/test/ressources/verticalprofile_mesh/verticalprofile_step_07_feed.xml", + "src/test/ressources/verticalprofile_mesh/verticalprofile_step_07_advance.xml"); - // Sechster Schritt + // Achter Schritt Document outputData = artifact.describe(cc); FileOutputStream fos = null; FileOutputStream fos2 = null; @@ -482,22 +498,22 @@ artifact .feed( this - .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml"), + .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_feed.xml"), cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_statistics.xml"), + .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_statistics.xml"), fos2, cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_chart.xml"), + .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_chart.xml"), fos, cc); artifact .out( this - .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_csv.xml"), + .readDocument("src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_csv.xml"), fos3, cc); } catch (Exception e) { log.error(e, e); diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_01_advance.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_01_advance.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_01_advance.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_01_feed.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_01_feed.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_01_feed.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,8 +1,8 @@ - - + + diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_advance.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_advance.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_advance.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_feed.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_feed.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_feed.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,8 +1,8 @@ - - + + diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_advance.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_advance.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_advance.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_feed.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_feed.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_feed.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,9 +1,9 @@ - - - - - + + + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_advance.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_advance.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_advance.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_feed.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_feed.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_feed.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,9 +1,9 @@ - - + + - - + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_advance.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_advance.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_advance.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_feed.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_feed.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_05_feed.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,10 +1,9 @@ - - + + - - + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_advance.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_advance.xml Tue Oct 27 12:03:32 2009 +0000 @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml Mon Oct 26 15:56:47 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml Tue Oct 27 12:03:32 2009 +0000 @@ -1,9 +1,9 @@ - - + + - + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_chart.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_chart.xml Mon Oct 26 15:56:47 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_csv.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_csv.xml Mon Oct 26 15:56:47 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - - diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_statistics.xml --- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_out_statistics.xml Mon Oct 26 15:56:47 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_07_advance.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_07_advance.xml Tue Oct 27 12:03:32 2009 +0000 @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_07_feed.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_07_feed.xml Tue Oct 27 12:03:32 2009 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_feed.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_feed.xml Tue Oct 27 12:03:32 2009 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_chart.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_chart.xml Tue Oct 27 12:03:32 2009 +0000 @@ -0,0 +1,13 @@ + + + + + /> + + + + + + + + \ No newline at end of file diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_csv.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_csv.xml Tue Oct 27 12:03:32 2009 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -r 3dac84194db4 -r c0a798299efc gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_statistics.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_08_out_statistics.xml Tue Oct 27 12:03:32 2009 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file