Mercurial > dive4elements > gnv-client
changeset 188:693f7b676ade
Adding two further fis which are based on Mesh to the System.
Fis in Median.Mesh will be choosen using the sourceid issue49
gnv-artifacts/trunk@232 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Tim Englich <tim.englich@intevation.de> |
---|---|
date | Fri, 16 Oct 2009 14:51:43 +0000 (2009-10-16) |
parents | 92a43d90a0b8 |
children | af354567b421 |
files | gnv-artifacts/ChangeLog gnv-artifacts/src/main/resources/lang/artifactMessages.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties gnv-artifacts/src/test/ressources/conf.xml gnv-artifacts/src/test/ressources/queries.properties |
diffstat | 7 files changed, 80 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Fri Oct 16 13:05:40 2009 +0000 +++ b/gnv-artifacts/ChangeLog Fri Oct 16 14:51:43 2009 +0000 @@ -1,5 +1,17 @@ 2009-10-16 Tim Englich <tim.englich@intevation.de> + * src/test/ressources/queries.properties: + There are different FIS in the Relation Median.Mesh so it is + nessessary to sepcify which FIS should be selected by using the sourceid + issue49 + * src/test/ressources/conf.xml: + Adding two further FIS to the Configuration which are based on Meshes. + Added the Sourceid to the ModelData issue49 + * src/main/resources/lang/artifactMessages*.properties: + Adding the Names of tne two new FIS to the Propertiesfiles issue49 + +2009-10-16 Tim Englich <tim.englich@intevation.de> + * src/main/java/de/intevation/gnv/chart/HorizontalProfileChartFactory.java (createXYSeries): Adding 5% bigger Valuearea to the Chart according to GT0030.011 2009-10-16 Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties Fri Oct 16 13:05:40 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties Fri Oct 16 14:51:43 2009 +0000 @@ -8,6 +8,8 @@ fis_gts = GTS fis_bsh_ctd = CTD fis_bsh_cbt = CBT +fis_eisklimatologie = Eisklimatologie +fis_sst = SST meshid= Mesh product= Product
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties Fri Oct 16 13:05:40 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties Fri Oct 16 14:51:43 2009 +0000 @@ -8,6 +8,8 @@ fis_gts = GTS fis_bsh_ctd = CTD fis_bsh_cbt = CBT +fis_eisklimatologie = Eisklimatologie +fis_sst = SST product= Produkt timeSeries= Zeitserie
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties Fri Oct 16 13:05:40 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties Fri Oct 16 14:51:43 2009 +0000 @@ -8,7 +8,8 @@ fis_gts = GTS fis_bsh_ctd = CTD fis_bsh_cbt = CBT - +fis_eisklimatologie = Eisklimatologie +fis_sst = SST product= Produkt timeSeries= Zeitserie
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties Fri Oct 16 13:05:40 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties Fri Oct 16 14:51:43 2009 +0000 @@ -8,6 +8,8 @@ fis_gts = GTS fis_bsh_ctd = CTD fis_bsh_cbt = CBT +fis_eisklimatologie = Iceclimatology +fis_sst = SST meshid= Mesh product= Product
--- a/gnv-artifacts/src/test/ressources/conf.xml Fri Oct 16 13:05:40 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/conf.xml Fri Oct 16 14:51:43 2009 +0000 @@ -10,6 +10,10 @@ ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> <artifact-factory name="fis_modeldata" 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_eisklimatologie" 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_sst" 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_delphin" 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_thermosalinograph" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" @@ -91,6 +95,7 @@ <artifact-factory name="timeSeriesMesh" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesMeshArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> <parameters> + <parameter name="sourceid" value="2"/> <parameter name="fisname" value="fis_modeldata"/> </parameters> </product> @@ -98,6 +103,7 @@ <artifact-factory name="verticalProfileMesh" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileMeshArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> <parameters> + <parameter name="sourceid" value="2"/> <parameter name="fisname" value="fis_modeldata"/> </parameters> </product> @@ -105,11 +111,58 @@ <artifact-factory name="horizontalProfilehorizontalProfileMesh" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileMeshArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> <parameters> + <parameter name="sourceid" value="2"/> <parameter name="fisname" value="fis_modeldata"/> </parameters> </product> </products> </artifact> + <artifact name="fis_eisklimatologie"> + <products> + <product name= "timeSeries"> + <artifact-factory name="timeSeriesMesh" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesMeshArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <parameters> + <parameter name="sourceid" value="38"/> + <parameter name="fisname" value="fis_eisklimatologie"/> + </parameters> + </product> + <product name= "horizontalProfile"> + <artifact-factory name="horizontalProfilehorizontalProfileMesh" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileMeshArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <parameters> + <parameter name="sourceid" value="38"/> + <parameter name="fisname" value="fis_eisklimatologie"/> + </parameters> + </product> + </products> + </artifact> + <artifact name="fis_sst"> + <products> + <product name= "timeSeries"> + <artifact-factory name="timeSeriesMesh" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesMeshArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <parameters> + <parameter name="sourceid" value="39"/> + <parameter name="sourceid" value="40"/> + <parameter name="sourceid" value="41"/> + <parameter name="sourceid" value="42"/> + <parameter name="fisname" value="fis_sst"/> + </parameters> + </product> + <product name= "horizontalProfile"> + <artifact-factory name="horizontalProfilehorizontalProfileMesh" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata" + ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileMeshArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <parameters> + <parameter name="sourceid" value="39"/> + <parameter name="sourceid" value="40"/> + <parameter name="sourceid" value="41"/> + <parameter name="sourceid" value="42"/> + <parameter name="fisname" value="fis_sst"/> + </parameters> + </product> + </products> + </artifact> <artifact name="fis_delphin"> <products> <product name= "horizontalProfile"> @@ -196,6 +249,7 @@ <transition>timeseries_mesh_coordinate</transition> </reachableTransitions> <inputvalues> + <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> </inputvalues> </transition> @@ -463,6 +517,7 @@ <transition>verticalprofile_mesh_coordinate</transition> </reachableTransitions> <inputvalues> + <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> </inputvalues> </transition> @@ -650,7 +705,7 @@ <data-multiselect>false</data-multiselect> <reachableTransitions> <transition>horizontalprofile_instantaneouspoint_surveyinfo</transition> - </reachableTransitions> + </reachableTransitions>Eisklimatologie <inputvalues> <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="1" /> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> @@ -737,6 +792,7 @@ <transition>horizontalprofile_mesh_coordinate</transition> </reachableTransitions> <inputvalues> + <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/> </inputvalues> </transition>
--- a/gnv-artifacts/src/test/ressources/queries.properties Fri Oct 16 13:05:40 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/queries.properties Fri Oct 16 14:51:43 2009 +0000 @@ -93,7 +93,8 @@ timeseries_mesh = SELECT OBJECTID KEY, \ m.NAME VALUE \ FROM MEDIAN.MESH m \ - order by m.NAME + WHERE SOURCEID IN (?) \ + ORDER BY m.NAME timeseries_meshpoint = SELECT FEATUREID, \ ST_ASTEXT(SHAPE) \ FROM MEDIAN.MESHPOINT \ @@ -229,6 +230,7 @@ verticalprofile_mesh = SELECT OBJECTID KEY, \ m.NAME VALUE \ FROM MEDIAN.MESH m \ + WHERE SOURCEID IN (?) \ order by m.NAME verticalprofile_mesh_point = SELECT FEATUREID, \