Mercurial > dive4elements > gnv-client
changeset 119:4841808819d9
Added the new FIS
FIS GTS
FIS CTD
FIS XBT
to the Configuration.
This three FIS uses Data from InstantaneousPoint
Some CodeCleanup done
gnv-artifacts/trunk@182 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/gnv-artifacts/Changelog Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/Changelog Mon Oct 05 10:15:15 2009 +0000 @@ -1,3 +1,26 @@ +2009-10-05 Tim Englich <tim.englich@intevation.de> + + * src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages*.properties Edited: + Added further Ressourec Values. + * src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (testVerticalProfileInstantaneousPointArtifact) Edited: + Changed ArtifactName to real FIS. + * src/test/ressources/timeseries_mesh/timeseries_step_01_feed.xml Edited: + Changed Product-Name from timeSeriesMesh to timeSeries to provide a General-Naming-Structure + * src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java (setup) Edited, + src/main/java/de/intevation/gnv/transition/profile/horizontal/HorizontalProfileOutputTransition.java Edited, + src/main/java/de/intevation/gnv/transition/profile/vertical/VerticalProfileOutputTransition.java Edited: + Added Configurationsupport for the Labeling Data. Now it is possible do define the + value-names in the Configurationfile. + * src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_feed.xml Edited, + src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_02_feed.xml Edited, + src/test/ressources/queries.properties Edited: + Changed the Queries for the VerticalProfileInstantaneusPoint to the FIS-Query Mode. + This Mode was send by Mr. Schulz-Ohlberg. + * src/test/ressources/conf.xml: + Changed the Workflow for the VerticalProfileInstantaneusPoint to the FIS-Query Mode. + This Mode was send by Mr. Schulz-Ohlberg. + Also Added the support for value-names to the Configuration of VerticalProfileInstantaneusPoint. + 2009-10-05 Tim Englich <tim.englich@intevation.de> * src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages_en.properties Renamed:
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages.properties Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages.properties Mon Oct 05 10:15:15 2009 +0000 @@ -21,6 +21,7 @@ vehicleid = Ship cruiseid = Cruise trackid = Track +seriesid = Series surveyid = Survey Info axisid = Axis depthid = Depth \ No newline at end of file
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages_de.properties Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages_de.properties Mon Oct 05 10:15:15 2009 +0000 @@ -22,6 +22,7 @@ vehicleid = Schiff cruiseid = Reise trackid = Track +seriesid = Serie surveyid = Messinformation axisid = Achse depthid = Tiefe \ No newline at end of file
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages_de_DE.properties Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages_de_DE.properties Mon Oct 05 10:15:15 2009 +0000 @@ -22,6 +22,7 @@ vehicleid = Schiff cruiseid = Reise trackid = Track +seriesid = Serie surveyid = Messinformation axisid = Achse depthid = Tiefe \ No newline at end of file
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages_en.properties Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/artifactMessages_en.properties Mon Oct 05 10:15:15 2009 +0000 @@ -21,6 +21,7 @@ vehicleid = Ship cruiseid = Cruise trackid = Track +seriesid = Series surveyid = Survey Info axisid = Axis depthid = Depth \ No newline at end of file
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/horizontal/HorizontalProfileOutputTransition.java Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/horizontal/HorizontalProfileOutputTransition.java Mon Oct 05 10:15:15 2009 +0000 @@ -35,15 +35,6 @@ } /** - * @see de.intevation.gnv.transition.timeseries.TimeSeriesOutputTransition#getMeasurements() - */ - @Override - protected Collection<KeyValueDescibeData> getMeasurements() { - String collectionName = "dateid"; - return this.getCollection(collectionName); - } - - /** * @see de.intevation.gnv.transition.timeseries.TimeSeriesOutputTransition#createChart(java.io.OutputStream, java.util.Collection, java.util.Collection, java.lang.String, de.intevation.gnv.chart.ChartStyle, de.intevation.gnv.chart.ChartLabels) */ @Override
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/vertical/VerticalProfileOutputTransition.java Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/vertical/VerticalProfileOutputTransition.java Mon Oct 05 10:15:15 2009 +0000 @@ -34,14 +34,6 @@ super.domainLable = "Tiefe"; } - /** - * @see de.intevation.gnv.transition.timeseries.TimeSeriesOutputTransition#getMeasurements() - */ - @Override - protected Collection<KeyValueDescibeData> getMeasurements() { - String collectionName = "dateid"; - return this.getCollection(collectionName); - } /** * @see de.intevation.gnv.transition.timeseries.TimeSeriesOutputTransition#createChart(java.io.OutputStream, java.util.Collection, java.util.Collection, java.lang.String, de.intevation.gnv.chart.ChartStyle, de.intevation.gnv.chart.ChartLabels)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java Mon Oct 05 10:15:15 2009 +0000 @@ -25,6 +25,7 @@ import org.w3c.dom.Node; import au.com.bytecode.opencsv.CSVWriter; +import de.intevation.artifactdatabase.Config; import de.intevation.artifactdatabase.XMLUtils; import de.intevation.artifacts.CallMeta; import de.intevation.gnv.chart.ChartFactory; @@ -61,6 +62,10 @@ .getLogger(TimeSeriesOutputTransition.class); protected String domainLable = "Zeit [UTC]"; + + protected String featureValuesName = "featureid"; + protected String parameterValuesName = "parameterid"; + protected String measuremenValueName = "measurementid"; /** * Constructor @@ -215,9 +220,8 @@ } protected String getSelectedFeatureName() { - String collectionName = "featureid"; // TODO: Konfigurierbar machen Collection<KeyValueDescibeData> values = this - .getCollection(collectionName); + .getCollection(featureValuesName); if (values != null) { Iterator<KeyValueDescibeData> it = values.iterator(); while (it.hasNext()) { @@ -262,13 +266,28 @@ } protected Collection<KeyValueDescibeData> getParameters() { - String collectionName = "parameterid"; // TODO: Konfigurierbar machen - return this.getCollection(collectionName); + return this.getCollection(parameterValuesName); } protected Collection<KeyValueDescibeData> getMeasurements() { - String collectionName = "measurementid"; // TODO: Konfigurierbar machen - return this.getCollection(collectionName); + return this.getCollection(measuremenValueName); + } + + @Override + public void setup(Node configuration) { + super.setup(configuration); + String featureNameValue = Config.getStringXPath(configuration, "value-names/value-name[@name='feature']/@value"); + if (featureNameValue != null){ + this.featureValuesName = featureNameValue; + } + String parameterNameValue = Config.getStringXPath(configuration, "value-names/value-name[@name='parameter']/@value"); + if (parameterNameValue != null){ + this.parameterValuesName = parameterNameValue; + } + String measurementNameValue = Config.getStringXPath(configuration, "value-names/value-name[@name='measurement']/@value"); + if (measurementNameValue != null){ + this.measuremenValueName = measurementNameValue; + } } /**
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java Mon Oct 05 10:15:15 2009 +0000 @@ -380,7 +380,7 @@ public void testVerticalProfileInstantaneousPointArtifact(){ try { log.debug("GNVArtifactsTestCase.testVerticalProfileArtifact"); - String artefactName = "fis_instantaneouspoint"; + String artefactName = "fis_bsh_ctd"; ArtifactFactory artifactFactory = this.getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("VerticalProfile-ArtifactFactory is available");
--- a/gnv-artifacts/src/test/ressources/conf.xml Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/conf.xml Mon Oct 05 10:15:15 2009 +0000 @@ -17,7 +17,11 @@ ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> <artifact-factory name="fis_chemusurvey" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> - <artifact-factory name="fis_instantaneouspoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + <artifact-factory name="fis_gts" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <artifact-factory name="fis_bsh_ctd" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <artifact-factory name="fis_bsh_cbt" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> </artifact-factories> </factories> @@ -131,16 +135,39 @@ </products> </artifact> - <artifact name="fis_instantaneouspoint"> + <artifact name="fis_gts"> <products> <product name= "verticalProfile"> <artifact-factory name="verticalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> - <parameters></parameters> + <parameters> + <parameter name="sourceid" value="5"/> + </parameters> </product> </products> </artifact> - + <artifact name="fis_bsh_ctd"> + <products> + <product name= "verticalProfile"> + <artifact-factory name="verticalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <parameters> + <parameter name="sourceid" value="32"/> + </parameters> + </product> + </products> + </artifact> + <artifact name="fis_bsh_cbt"> + <products> + <product name= "verticalProfile"> + <artifact-factory name="verticalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <parameters> + <parameter name="sourceid" value="36"/> + </parameters> + </product> + </products> + </artifact> <artifact name="timeSeriesMesh"> <transitions> @@ -231,6 +258,11 @@ <inputvalue name="minvalue" type="Date" multiselect="false" usedinquery="1"/> <inputvalue name="maxvalue" type="Date" multiselect="false" usedinquery="1"/> </inputvalues> + <value-names> + <value-name name="feature" value="meshid"></value-name> + <value-name name="parameter" value="parameterid"></value-name> + <value-name name="measurement" value="measurementid"></value-name> + </value-names> <outputsModes> <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png"> <parameters> @@ -368,6 +400,11 @@ <inputvalue name="parameterid" type="Integer" multiselect="true"/> <inputvalue name="dateid" type="Date" multiselect="true"/> </inputvalues> + <value-names> + <value-name name="feature" value="featureid"></value-name> + <value-name name="parameter" value="parameterid"></value-name> + <value-name name="measurement" value="dateid"></value-name> + </value-names> <outputsModes> <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png"> <parameters> @@ -454,6 +491,11 @@ <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="2"/> <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="2"/> </inputvalues> + <value-names> + <value-name name="feature" value="meshid"></value-name> + <value-name name="parameter" value="parameterid"></value-name> + <value-name name="measurement" value="dateid"></value-name> + </value-names> <outputsModes> <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png"> <parameters> @@ -472,12 +514,13 @@ <transitions> <transition id="verticalprofile_instantaneouspoint_series" description="verticalprofile_instantaneouspoint_series" transition="de.intevation.gnv.transition.DefaultTransition"> <queryID>verticalprofile_instantaneouspoint_series</queryID> - <dataname>featureid</dataname> + <dataname>seriesid</dataname> <data-multiselect>false</data-multiselect> <reachableTransitions> - <transition>verticalprofile_instantaneouspoint_point</transition> + <transition>verticalprofile_instantaneouspoint_point</transition> </reachableTransitions> <inputvalues> + <inputvalue name="sourceid" type="Integer" multiselect="false"/> </inputvalues> </transition> <transition id="verticalprofile_instantaneouspoint_point" description="verticalprofile_instantaneouspoint_point" transition="de.intevation.gnv.transition.DefaultTransition"> @@ -488,7 +531,8 @@ <transition>verticalprofile_instantaneouspoint_parameter</transition>v </reachableTransitions> <inputvalues> - <inputvalue name="featureid" type="Integer" multiselect="false"/> + <inputvalue name="seriesid" type="Integer" multiselect="false"/> + <inputvalue name="sourceid" type="Integer" multiselect="false"/> </inputvalues> </transition> <transition id="verticalprofile_instantaneouspoint_parameter" description="verticalprofile_instantaneouspoint_parameter" transition="de.intevation.gnv.transition.DefaultTransition"> @@ -499,17 +543,22 @@ <transition>verticalprofile_instantaneouspoint_calculate_results</transition> </reachableTransitions> <inputvalues> - <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="0" /> + <inputvalue name="seriesid" type="Integer" multiselect="false" usedinquery="0" /> <inputvalue name="instantaneouspoint_point" type="Integer" multiselect="false" usedinquery="1"/> </inputvalues> </transition> <transition id="verticalprofile_instantaneouspoint_calculate_results" description="verticalprofile_mesh_calculate_results" transition="de.intevation.gnv.transition.profile.vertical.VerticalProfileOutputTransition"> <queryID>verticalprofile_instantaneouspoint_chart_data</queryID> <inputvalues> - <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="0" /> + <inputvalue name="seriesid" type="Integer" multiselect="false" usedinquery="0" /> <inputvalue name="instantaneouspoint_point" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/> </inputvalues> + <value-names> + <value-name name="feature" value="seriesid"></value-name> + <value-name name="parameter" value="parameterid"></value-name> + <value-name name="measurement" value="dateid"></value-name> + </value-names> <outputsModes> <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png"> <parameters> @@ -608,6 +657,11 @@ <inputvalue name="measurementid" type="Double" multiselect="true" usedinquery="1" /> <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1" /> </inputvalues> + <value-names> + <value-name name="feature" value="cruiseid"></value-name> + <value-name name="parameter" value="parameterid"></value-name> + <value-name name="measurement" value="measurementid"></value-name> + </value-names> <outputsModes> <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png"> <parameters> @@ -725,6 +779,11 @@ <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="2"/> <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="1"/> </inputvalues> + <value-names> + <value-name name="feature" value="meshid"></value-name> + <value-name name="parameter" value="parameterid"></value-name> + <value-name name="measurement" value="depthid"></value-name> + </value-names> <outputsModes> <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png"> <parameters>
--- a/gnv-artifacts/src/test/ressources/queries.properties Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/queries.properties Mon Oct 05 10:15:15 2009 +0000 @@ -295,15 +295,29 @@ ############################################# ############################################# -verticalprofile_instantaneouspoint_series = SELECT S.SERIESID KEY, \ +verticalprofile_instantaneouspoint_series = SELECT DISTINCT \ + S.SERIESID KEY , \ S.DESCRIPTION VALUE \ - FROM MEDIAN.SERIES S - -verticalprofile_instantaneouspoint_point = SELECT IP.FEATUREID KEY, \ - IP.SHAPE VALUE \ - FROM MEDIAN.INSTANTANEOUSPOINT IP \ - WHERE IP.POINTSPEC = 4 AND \ - IP.SERIESID = ? + FROM MEDIAN.SERIES S, \ + MEDIAN.INSTANTANEOUSPOINT I, \ + MEDIAN.MEASUREMENT M \ + WHERE S.SERIESID = I.SERIESID AND \ + I.POINTSPEC = 4 AND \ + I.FEATUREID = M.FEATUREID AND \ + M.SOURCEID= ? \ + ORDER BY S.DESCRIPTION + +verticalprofile_instantaneouspoint_point = SELECT DISTINCT \ + I.FEATUREID KEY, \ + to_char(I.TIMEVALUE,'DD.MM.YYYY HH24:MI') || ' - '|| I.SHAPE VALUE, \ + I.TIMEVALUE \ + FROM MEDIAN.INSTANTANEOUSPOINT I, \ + MEDIAN.MEASUREMENT M \ + WHERE I.SERIESID = ? AND \ + I.POINTSPEC = 4 AND \ + I.FEATUREID = M.FEATUREID AND \ + M.SOURCEID = ? \ + ORDER BY I.TIMEVALUE verticalprofile_instantaneouspoint_parameter = SELECT DISTINCT \ P.PARAMETERID KEY , \ @@ -412,7 +426,7 @@ MSV.DATAVALUE YORDINATE , \ MSV.PARAMETERID GROUP1 , \ IP.TIMEVALUE GROUP2 , \ - 1 GROUP3 \ + ZLOCATION GROUP3 \ FROM MEDIAN.INSTANTANEOUSPOINT IP, \ MEDIAN.MEASUREMENT M, \ MEDIAN.MEASUREDSCALARVALUE MSV \ @@ -421,9 +435,9 @@ IP.SURVEYID = ? AND \ M.ZLOCATION IN (?) AND \ MSV.PARAMETERID in (?) \ - ORDER BY IP.TIMEVALUE, \ + ORDER BY M.ZLOCATION, \ MSV.PARAMETERID, \ - M.ZLOCATION + IP.TIMEVALUE ############################################# ############################################# @@ -478,4 +492,5 @@ msv.PARAMETERID, \ mp.JPOSITION , \ mp.IPOSITION - \ No newline at end of file + + \ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/timeseries_mesh/timeseries_step_01_feed.xml Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/timeseries_mesh/timeseries_step_01_feed.xml Mon Oct 05 10:15:15 2009 +0000 @@ -4,6 +4,6 @@ <art:uuid value="1e9f6583-9073-4409-aac1-432ad06d7ce1" /> <art:hash value="29913235" /> <art:data> - <art:input name="product" value="timeSeriesMesh" /> + <art:input name="product" value="timeSeries" /> </art:data> </art:action> \ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_02_feed.xml Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_02_feed.xml Mon Oct 05 10:15:15 2009 +0000 @@ -4,6 +4,6 @@ <art:uuid value="793c935e-a3f3-44ce-a8f1-3d05459ca3d3" /> <art:hash value="9390720" /> <art:data> - <art:input name="featureid" value="186" /> + <art:input name="seriesid" value="184" /> </art:data> </art:action> \ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_feed.xml Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_step_03_feed.xml Mon Oct 05 10:15:15 2009 +0000 @@ -4,6 +4,6 @@ <art:uuid value="793c935e-a3f3-44ce-a8f1-3d05459ca3d3" /> <art:hash value="9390720" /> <art:data> - <art:input name="instantaneouspoint_point" value="4371970" /> + <art:input name="instantaneouspoint_point" value="4371899" /> </art:data> </art:action> \ No newline at end of file