Mercurial > dive4elements > gnv-client

changeset 178:9bcf315f57e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added Name of FIS to the Title of Charts gnv-artifacts/trunk@222 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Thu, 15 Oct 2009 14:19:40 +0000
parents 08b8b79b30ff
children f2c76f35da5a
files gnv-artifacts/ChangeLog gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java 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
diffstat 7 files changed, 103 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Thu Oct 15 12:43:46 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Thu Oct 15 14:19:40 2009 +0000
@@ -1,5 +1,13 @@
 2009-10-15  Tim Englich  <tim.englich@intevation.de>
 
+	* src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java (getFisName): 
+	  Added Method for lookup FIS Names
+	* src/main/resources/lang/artifactMessages*.properties: 
+	  Added further Key-Value-Pairs for FIS
+	* src/test/ressources/conf.xml: 
+	  Changed Configuratioon to get the ID of an FIS to the Chartgeneration
+	  
+2009-10-15  Tim Englich  <tim.englich@intevation.de>
 	* src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (testHorizontalProfileMeshPointArtifact): 
 	  Activate Tests for CSV and Statistics on HorizontalProfiles
 	* src/main/java/de/intevation/gnv/transition/profile/horizontal/HorizontalProfileOutputTransition.java (createCSV): 
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java	Thu Oct 15 12:43:46 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java	Thu Oct 15 14:19:40 2009 +0000
@@ -29,6 +29,8 @@
 import de.intevation.artifactdatabase.Config;
 import de.intevation.artifactdatabase.XMLUtils;
 import de.intevation.artifacts.CallMeta;
+import de.intevation.artifacts.PreferredLocale;
+import de.intevation.gnv.artifacts.ressource.RessourceFactory;
 import de.intevation.gnv.chart.ChartFactory;
 import de.intevation.gnv.chart.ChartLabels;
 import de.intevation.gnv.chart.ChartStyle;
@@ -122,7 +124,7 @@
                         .getMeasurements();
                 ChartStyle chartStyle = this
                         .creatStyle(chartWidth, chartHeight);
-                ChartLabels chartLables = new ChartLabels(this
+                ChartLabels chartLables = new ChartLabels(this.getFisName(callMeta.getLanguages())+" "+this
                         .getSelectedFeatureName(), this.domainLable);
                 this.createChart(outputStream, parameters, measurements,
                         chartStyle, chartLables, uuid);
@@ -278,6 +280,18 @@
         return new ChartStyle(Color.white, new Color(230, 230, 230),
                 Color.white, Color.white, true, true, lInsets, lChartSize);
     }
+    
+    protected String getFisName(PreferredLocale[] preferredLocales){
+        String returnValue = "";
+        InputData inputData = this.inputData.get("fisname");
+        if (inputData != null){
+            returnValue = RessourceFactory.getInstance()
+                                          .getRessource(preferredLocales, 
+                                                        inputData.getValue(), 
+                                                        inputData.getValue());
+        }
+        return returnValue;
+    }
 
     protected Collection<KeyValueDescibeData> getParameters() {
         return this.getCollection(parameterValuesName);
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Thu Oct 15 12:43:46 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Thu Oct 15 14:19:40 2009 +0000
@@ -5,6 +5,10 @@
 fis_delphin = Delphin
 fis_thermosalinograph = Thermosalinograph
 fis_chemusurvey = Chemusurvey
+fis_gts = GTS
+fis_bsh_ctd = CTD
+fis_bsh_cbt = CBT
+
 meshid= Mesh
 product= Product
 timeSeries= Timeseries
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Thu Oct 15 12:43:46 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Thu Oct 15 14:19:40 2009 +0000
@@ -5,6 +5,9 @@
 fis_delphin = Delphin
 fis_thermosalinograph = Thermosalinograph
 fis_chemusurvey = Chemusurvey
+fis_gts = GTS
+fis_bsh_ctd = CTD
+fis_bsh_cbt = CBT
 
 product= Produkt
 timeSeries= Zeitserie
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Thu Oct 15 12:43:46 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Thu Oct 15 14:19:40 2009 +0000
@@ -5,6 +5,10 @@
 fis_delphin = Delphin
 fis_thermosalinograph = Thermosalinograph
 fis_chemusurvey = Chemusurvey
+fis_gts = GTS
+fis_bsh_ctd = CTD
+fis_bsh_cbt = CBT
+
 
 product= Produkt
 timeSeries= Zeitserie
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Thu Oct 15 12:43:46 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Thu Oct 15 14:19:40 2009 +0000
@@ -5,6 +5,10 @@
 fis_delphin = Delphin
 fis_thermosalinograph = Thermosalinograph
 fis_chemusurvey = Chemusurvey
+fis_gts = GTS
+fis_bsh_ctd = CTD
+fis_bsh_cbt = CBT
+
 meshid= Mesh
 product= Product
 timeSeries= Timeseries
--- a/gnv-artifacts/src/test/ressources/conf.xml	Thu Oct 15 12:43:46 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/conf.xml	Thu Oct 15 14:19:40 2009 +0000
@@ -32,6 +32,7 @@
                              ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="4"/>
+                        <parameter name="fisname" value="fis_marnet"/>
                     </parameters>
                 </product>
                  <product name= "verticalProfile">
@@ -39,6 +40,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="4"/>
+                        <parameter name="fisname" value="fis_marnet"/>
                     </parameters>
                 </product>
             </products>
@@ -50,6 +52,7 @@
                               ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="18"/>
+                        <parameter name="fisname" value="fis_imis"/>
                     </parameters>
                 </product>
                 <product name= "verticalProfile">
@@ -57,6 +60,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="18"/>
+                        <parameter name="fisname" value="fis_imis"/>
                     </parameters>
                 </product>
             </products>
@@ -68,6 +72,7 @@
                               ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="17"/>
+                        <parameter name="fisname" value="fis_staun"/>
                     </parameters>
                 </product>
                 <product name= "verticalProfile">
@@ -75,6 +80,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="17"/>
+                        <parameter name="fisname" value="fis_staun"/>
                     </parameters>
                 </product>
             </products>
@@ -84,17 +90,23 @@
                 <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></parameters>
+                    <parameters>
+                         <parameter name="fisname" value="fis_modeldata"/>
+                    </parameters>
                 </product>
                 <product name= "verticalProfile">
                     <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></parameters>
+                    <parameters>
+                        <parameter name="fisname" value="fis_modeldata"/>
+                    </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></parameters>
+                    <parameters>
+                        <parameter name="fisname" value="fis_modeldata"/>
+                    </parameters>
                 </product>
             </products>
         </artifact>
@@ -105,6 +117,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="34"/>
+                        <parameter name="fisname" value="fis_delphin"/>
                     </parameters>
                 </product>
                 
@@ -117,6 +130,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="35"/>
+                        <parameter name="fisname" value="fis_thermosalinograph"/>
                     </parameters>
                 </product>
                 
@@ -129,6 +143,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="37"/>
+                        <parameter name="fisname" value="fis_chemusurvey"/>
                     </parameters>
                 </product>
                 
@@ -141,6 +156,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="5"/>
+                        <parameter name="fisname" value="fis_gts"/>
                     </parameters>
                 </product>
             </products>
@@ -152,6 +168,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="32"/>
+                        <parameter name="fisname" value="fis_bsh_ctd"/>
                     </parameters>
                 </product>
             </products>
@@ -163,6 +180,7 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters>
                         <parameter name="sourceid" value="36"/>
+                        <parameter name="fisname" value="fis_bsh_cbt"/>
                     </parameters>
                 </product>
             </products>
@@ -178,6 +196,7 @@
                            <transition>timeseries_mesh_coordinate</transition>
                     </reachableTransitions>
                     <inputvalues>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -189,6 +208,7 @@
                     </reachableTransitions>
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -202,6 +222,7 @@
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
                          <inputvalue name="mesh_coordinate" type="Coordinate" multiselect="false" usedinquery="1"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -215,6 +236,7 @@
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="2"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
 
@@ -229,6 +251,7 @@
                          <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
                          <inputvalue name="measurementid" type="Integer" multiselect="false" usedinquery="0"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -244,6 +267,7 @@
                          <inputvalue name="measurementid" type="Integer" multiselect="false" usedinquery="0"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
                          <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -256,6 +280,7 @@
                          <inputvalue name="measurementid" type="Integer" multiselect="false" usedinquery="1"/>
                          <inputvalue name="minvalue" type="Date" multiselect="false" usedinquery="1"/>
                          <inputvalue name="maxvalue" type="Date" multiselect="false" usedinquery="1"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                       <value-names>
                         <value-name name="feature" value="meshid"></value-name>
@@ -289,6 +314,7 @@
                     </reachableTransitions>
                     <inputvalues>
                         <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -301,6 +327,7 @@
                     </reachableTransitions>
                     <inputvalues>
                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>           
            
@@ -317,6 +344,7 @@
                     <inputvalues>
                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
                         <inputvalue name="parameterid" type="Integer" multiselect="true"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -330,6 +358,7 @@
                     <inputvalues>
                         <inputvalue name="parameterid" type="Integer" multiselect="true"/>
                         <inputvalue name="measurementid" type="Integer" multiselect="true"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -340,6 +369,7 @@
                         <inputvalue name="measurementid" type="Integer" multiselect="true"/>
                         <inputvalue name="minvalue" type="Date" multiselect="false"/>
                         <inputvalue name="maxvalue" type="Date" multiselect="false"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                     <outputsModes>
                         <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png">
@@ -367,6 +397,7 @@
                     </reachableTransitions>
                     <inputvalues>
                         <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -379,6 +410,7 @@
                     </reachableTransitions>
                     <inputvalues>
                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -392,6 +424,7 @@
                     <inputvalues>
                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
                         <inputvalue name="parameterid" type="Integer" multiselect="true"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -400,7 +433,8 @@
                     <inputvalues>
                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
                         <inputvalue name="parameterid" type="Integer" multiselect="true"/>
-                        <inputvalue name="dateid" type="Date" multiselect="true"/>
+                        <inputvalue name="dateid" type="Date" multiselect="true" />
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                     <value-names>
                         <value-name name="feature" value="featureid"></value-name>
@@ -431,6 +465,7 @@
                            <transition>verticalprofile_mesh_coordinate</transition>
                     </reachableTransitions>
                     <inputvalues>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -442,6 +477,7 @@
                     </reachableTransitions>
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -455,6 +491,7 @@
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
                          <inputvalue name="mesh_coordinate" type="Coordinate" multiselect="false"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -468,6 +505,7 @@
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -482,6 +520,7 @@
                         <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
                         <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
                         <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1" />
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -492,9 +531,10 @@
                         <inputvalue name="dateid" type="Date" multiselect="true" usedinquery="1"/>
                         <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="2"/>
                         <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="2"/> 
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                     <value-names>
-                        <value-name name="feature" value="meshid"></value-name>
+                        <value-name name="feature" value="mesh_point"></value-name>
                         <value-name name="parameter" value="parameterid"></value-name>
                         <value-name name="measurement" value="dateid"></value-name>
                     </value-names>
@@ -523,6 +563,7 @@
                     </reachableTransitions>
                     <inputvalues>
                         <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="verticalprofile_instantaneouspoint_point" description="verticalprofile_instantaneouspoint_point" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -535,6 +576,7 @@
                     <inputvalues>
                          <inputvalue name="seriesid" type="Integer" multiselect="false"/>
                           <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+                           <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                  <transition id="verticalprofile_instantaneouspoint_parameter" description="verticalprofile_instantaneouspoint_parameter" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -547,6 +589,7 @@
                     <inputvalues>
                          <inputvalue name="seriesid" type="Integer" multiselect="false" usedinquery="0" />
                          <inputvalue name="instantaneouspoint_point" type="Integer" multiselect="false" usedinquery="1"/>
+                          <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="verticalprofile_instantaneouspoint_calculate_results" description="verticalprofile_mesh_calculate_results" transition="de.intevation.gnv.transition.profile.vertical.VerticalProfileOutputTransition">
@@ -555,9 +598,10 @@
                         <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"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                     <value-names>
-                        <value-name name="feature" value="seriesid"></value-name>
+                        <value-name name="feature" value="instantaneouspoint_point"></value-name>
                         <value-name name="parameter" value="parameterid"></value-name>
                         <value-name name="measurement" value="dateid"></value-name>
                     </value-names>
@@ -586,6 +630,7 @@
                     </reachableTransitions>
                     <inputvalues>
                         <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="horizontalprofile_instantaneouspoint_cruise" description="horizontalprofile_instantaneouspoint_cruise" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -598,6 +643,7 @@
                     <inputvalues>
                         <inputvalue name="vehicleid" type="Integer" multiselect="false"/>
                         <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="horizontalprofile_instantaneouspoint_track" description="horizontalprofile_instantaneouspoint_track" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -609,6 +655,7 @@
                     </reachableTransitions>
                     <inputvalues>
                         <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="1" />
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="horizontalprofile_instantaneouspoint_surveyinfo" description="horizontalprofile_instantaneouspoint_surveyinfo" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -621,6 +668,7 @@
                     <inputvalues>
                         <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="0" />
                         <inputvalue name="trackid" type="Integer" multiselect="false" usedinquery="1" />
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="horizontalprofile_instantaneouspoint_parameter" description="horizontalprofile_instantaneouspoint_parameter" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -634,6 +682,7 @@
                         <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="0" />
                         <inputvalue name="trackid" type="Integer" multiselect="false" usedinquery="0" />
                         <inputvalue name="surveyid" type="Integer" multiselect="false" usedinquery="1" />
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="horizontalprofile_instantaneouspoint_depth" description="horizontalprofile_instantaneouspoint_depth" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -648,6 +697,7 @@
                         <inputvalue name="trackid" type="Integer" multiselect="false" usedinquery="0" />
                         <inputvalue name="surveyid" type="Integer" multiselect="false" usedinquery="1" />
                         <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="0" />
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="horizontalprofile_instantaneouspoint_calculate_results" description="horizontalprofile_instantaneouspoint_calculate_results" transition="de.intevation.gnv.transition.profile.horizontal.HorizontalProfileOutputTransition">
@@ -658,6 +708,7 @@
                         <inputvalue name="surveyid" type="Integer" multiselect="false" usedinquery="1" />
                         <inputvalue name="measurementid" type="Double" multiselect="true" usedinquery="1" />
                         <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1" />
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                     <value-names>
                         <value-name name="feature" value="cruiseid"></value-name>
@@ -688,6 +739,7 @@
                            <transition>horizontalprofile_mesh_coordinate</transition>
                     </reachableTransitions>
                     <inputvalues>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -699,6 +751,7 @@
                     </reachableTransitions>
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -712,6 +765,7 @@
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
                          <inputvalue name="mesh_coordinate" type="Coordinate" multiselect="false"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                  <transition id="horizontalprofile_mesh_axis" description="horizontalprofile_mesh_point" transition="de.intevation.gnv.transition.profile.horizontal.NorthSouthEastWestTransition">
@@ -723,6 +777,7 @@
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 <transition id="horizontalprofile_meshpoint_parameter" description="horizontalprofile_meshpoint_parameter" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -736,6 +791,7 @@
                          <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
                          <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="0"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -752,6 +808,7 @@
                          <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="2"/>
                          <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="0"/>
                          <inputvalue name="parameterid" type="Integer" multiselect="true" useinquery="0"/>
+                         <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -768,6 +825,7 @@
                         <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="0"/>
                         <inputvalue name="parameterid" type="Integer" multiselect="true"  usedinquery="1"/>
                         <inputvalue name="depthid" type="Integer" multiselect="true"  usedinquery="0"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                 </transition>
                 
@@ -780,6 +838,7 @@
                         <inputvalue name="depthid" type="Integer" multiselect="true"  usedinquery="1"/>
                         <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="2"/>
                         <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="1"/> 
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                     </inputvalues>
                     <value-names>
                         <value-name name="feature" value="meshid"></value-name>
http://dive4elements.wald.intevation.org