changeset 116:820238357bab

Added Horizontal-Profile-Support for Meshes. Modify the Workflow for Horizontal-Profile-InstantaneousPoint gnv-artifacts/trunk@169 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Fri, 02 Oct 2009 08:07:00 +0000
parents 158e89c2263b
children ef157bd2fa92
files gnv-artifacts/Changelog gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChartFactory.java gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshArtifact.java gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/horizontal/NorthSouthEastWestTransition.java gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java gnv-artifacts/src/test/ressources/conf.xml gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_00_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_00_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_01_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_01_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_02_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_03_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_04_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_06_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_01_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_01_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_02_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_02_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_05_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_05_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_06_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_06_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_07_advance.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_07_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_feed.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_chart.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_csv.xml gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_statistics.xml gnv-artifacts/src/test/ressources/queries.properties
diffstat 37 files changed, 679 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/Changelog	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/Changelog	Fri Oct 02 08:07:00 2009 +0000
@@ -1,3 +1,32 @@
+2009-10-02  Tim Englich  <tim.englich@intevation.de>
+
+    * src/test/ressources/conf.xml Edited:
+      Added the Configuration of the Horizontal-Profile.Mesh.
+      Also Edited the Workflowq for HorizontalProfile-Instantaneouspoint and
+      Put three n ew FIS into the Configuration which represents HorizontalProfile-Instantaneouspoint.
+    * src/test/ressources/horizontalProfile_instantaneouspoint/*.xml Edited, 
+      src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (testHorizontalProfileInstantaneousPointArtifact) Edited:
+      Edited the Workflowlogic given by new Specification of the BSH.
+    * src/test/ressources/horizontalProfile_mesh/*.xml Added:
+      The Request for do an Workflow for an HorizontalProfile-Mesh
+    * src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (testHorizontalProfileMeshPointArtifact) Edited:
+      Added TestCase for HorizontalProfiles of Type Mesh.
+    * src/test/java/de/intevation/gnv/artifacts/TestCallContext.java (getMeta) Edited:
+      Added new Method which is defined in the implemented Interface. 
+    * src/main/java/de/intevation/gnv/utils/InputValidator.java (isInputValid) Edited:
+      Added the Validation of InputValues from Type AttributeName which should represent
+      an QueryValue of Type String which must not put into "'".
+    * src/main/java/de/intevation/gnv/transition/profile/horizontal/NorthSouthEastWestTransition.java Added:
+      Transition to provide the possibility of choosing the axis of an Grid that should be used. 
+    * src/main/java/de/intevation/gnv/transition/TransitionBase.java (dataMultiSelect) Edited:
+      Changed from private to protected so that this mMeber could be accessed by within extending Classes. 
+    * src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshArtifact.java Added:
+      Class for the Representation of Horizontal Profiles for the Type Mesh.
+    * src/main/java/de/intevation/gnv/chart/HorizontalProfileChartFactory.java (HorizontalProfileChartFactory) Edited:
+      Changed PlotOrientation so that the Profile is displayed correctly. 
+    * src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java (advance) Edited:
+      Added Log-Message for better Workflowanalyzis. 
+      
 2009-10-01	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/gnv/artifacts/fis/FISArtifact.java,
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java	Fri Oct 02 08:07:00 2009 +0000
@@ -95,6 +95,7 @@
         try {
             if (this.current != null){
                 String transitionName = this.readTransitionName(target);
+                log.debug("Transitionsname: "+transitionName);
                 if (this.current.isTransitionReachable(transitionName)){
                     // 1. Prüfung ob Transition valide ist
                     if (this.current.validate()){
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChartFactory.java	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChartFactory.java	Fri Oct 02 08:07:00 2009 +0000
@@ -41,7 +41,7 @@
 
 	public HorizontalProfileChartFactory(){
 	    super();
-	    super.plotOrientation = PlotOrientation.HORIZONTAL;
+	    super.plotOrientation = PlotOrientation.VERTICAL;
 	}
 
 	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshArtifact.java	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,32 @@
+/**
+ *
+ */
+package de.intevation.gnv.profile.horizontal;
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author Tim Englich <tim.englich@intevation.de>
+ *
+ */
+public class HorizontalProfileMeshArtifact extends HorizontalProfileArtifact {
+    /**
+     * the logger, used to log exceptions and additonaly information
+     */
+    private static Logger log = Logger.getLogger(HorizontalProfileMeshArtifact.class);
+    
+    
+    /**
+     * The UID of this class
+     */
+    private static final long serialVersionUID = -8291547966693867205L;
+    
+    /**
+     * Constructor
+     */
+    public HorizontalProfileMeshArtifact(){
+        super();
+        log.debug("VerticalProfileMeshArtifact.Constructor");
+        super.name = super.name+ "Mesh";
+    }
+}
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java	Fri Oct 02 08:07:00 2009 +0000
@@ -59,7 +59,7 @@
     
     protected String dataName = null;
     
-    private boolean dataMultiSelect = false;
+    protected boolean dataMultiSelect = false;
 
     protected String queryID = null;
     
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/horizontal/NorthSouthEastWestTransition.java	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,61 @@
+/**
+ *
+ */
+package de.intevation.gnv.transition.profile.horizontal;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import de.intevation.gnv.geobackend.base.Result;
+import de.intevation.gnv.transition.TransitionBase;
+import de.intevation.gnv.transition.describedata.DefaultKeyValueDescribeData;
+import de.intevation.gnv.transition.describedata.KeyValueDescibeData;
+import de.intevation.gnv.transition.describedata.NamedArrayList;
+import de.intevation.gnv.transition.describedata.NamedCollection;
+import de.intevation.gnv.transition.exception.TransitionException;
+
+/**
+ * @author Tim Englich <tim.englich@intevation.de>
+ *
+ */
+public class NorthSouthEastWestTransition extends TransitionBase {
+
+    /**
+     * The UID of this Class
+     */
+    private static final long serialVersionUID = -7989531326553305293L;
+
+    /**
+     * Constructor
+     */
+    public NorthSouthEastWestTransition() {
+    }
+
+    /**
+     * @see de.intevation.gnv.transition.Transition#validate()
+     */
+    public boolean validate() {
+        return true;
+    }
+
+    
+    
+    
+    @Override
+    public void advance(String uuid) throws TransitionException {
+        this.purifyResult(null, uuid);
+    }
+
+    @Override
+    protected void purifyResult(Collection<Result> result, String uuid) {
+        if (this.descibeData == null){
+            this.descibeData = new ArrayList<Object>();
+        }
+        NamedCollection<KeyValueDescibeData> keyValueDescibeData = new NamedArrayList<KeyValueDescibeData>(this.dataName,2);
+        keyValueDescibeData.setMultiSelect(super.dataMultiSelect);
+        keyValueDescibeData.add(new DefaultKeyValueDescribeData("IPOSITION", "IPOSITION"));
+        keyValueDescibeData.add(new DefaultKeyValueDescribeData("JPOSITION", "JPOSITION"));
+        this.descibeData.add(keyValueDescibeData);
+    }
+
+}
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java	Fri Oct 02 08:07:00 2009 +0000
@@ -3,12 +3,11 @@
  */
 package de.intevation.gnv.utils;
 
+import org.apache.commons.validator.GenericValidator;
 import org.apache.log4j.Logger;
 
 import de.intevation.gnv.geobackend.util.DateUtils;
 
-import org.apache.commons.validator.GenericValidator;
-
 /**
  * @author Tim Englich <tim.englich@intevation.de>
  *
@@ -42,6 +41,8 @@
                 valid = GenericValidator.isDate(values[i].trim(), DateUtils.DATE_PATTERN, true);
             }else if ("Point".equalsIgnoreCase(type)){
                 valid = GenericValidator.matchRegexp(values[i], "[0-9]"); // TODO: FIXME: VALIDATE REGEXP
+            }else if ("AttributeName".equalsIgnoreCase(type)){
+                valid = org.apache.commons.validator.GenericValidator.matchRegexp(values[i], "[a-zA-Z0-9]"); // TODO: FIXME: VALIDATE REGEXP
             }else{
                 valid = false;
             }
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java	Fri Oct 02 08:07:00 2009 +0000
@@ -429,7 +429,7 @@
     public void testHorizontalProfileInstantaneousPointArtifact(){
         try {
             log.debug("GNVArtifactsTestCase.testHorizontalProfileInstantaneousPointArtifact");
-            String artefactName = "fis_instantaneouspoint"; 
+            String artefactName = "fis_delphin"; 
             ArtifactFactory artifactFactory = this.getArtifactFactory(artefactName);
             assertNotNull(artifactFactory);
             log.debug("VerticalProfile-ArtifactFactory is available");
@@ -442,6 +442,12 @@
             
             // Erster Schritt
             this.doNextStep(artifact, cc,
+                    "src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_00_feed.xml",
+                    "src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_00_advance.xml");
+         
+            
+            // Erster Schritt
+            this.doNextStep(artifact, cc,
                     "src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_01_feed.xml",
                     "src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_01_advance.xml");
             
@@ -496,6 +502,87 @@
         }
     }
     
+    public void testHorizontalProfileMeshPointArtifact(){
+        try {
+            log.debug("GNVArtifactsTestCase.testHorizontalProfileInstantaneousPointArtifact");
+            String artefactName = "fis_modeldata"; 
+            ArtifactFactory artifactFactory = this.getArtifactFactory(artefactName);
+            assertNotNull(artifactFactory);
+            log.debug("VerticalProfile-ArtifactFactory is available");
+            Artifact artifact = artifactFactory.createArtifact(""+System.currentTimeMillis(),bootstrap.getContext());
+            assertNotNull(artifact);
+            log.debug("VerticalProfile-Artifact is available");
+            
+            
+            CallContext cc = new TestCallContext(bootstrap.getContext());
+            
+             
+            
+            // Erster Schritt
+            this.doNextStep(artifact, cc,
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_01_feed.xml",
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_01_advance.xml");
+            
+            // Zweiter Schritt
+            this.doNextStep(artifact, cc,
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_02_feed.xml",
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_02_advance.xml");
+            // Dritter Schritt
+            this.doNextStep(artifact, cc,
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_feed.xml",
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_advance.xml");
+            // Vierter Schritt
+            this.doNextStep(artifact, cc,
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_feed.xml",
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_advance.xml");
+           // Fünfter Schritt
+            this.doNextStep(artifact, cc,
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_05_feed.xml",
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_05_advance.xml");
+            
+            // Sechster Schritt
+            this.doNextStep(artifact, cc,
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_06_feed.xml",
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_06_advance.xml");
+            
+            // Siebter Schritt
+            this.doNextStep(artifact, cc,
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_07_feed.xml",
+                    "src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_07_advance.xml");
+            
+            Document outputData = artifact.describe(null);
+            FileOutputStream fos = null;
+            FileOutputStream fos2 = null;
+            FileOutputStream fos3 = null;
+            try{
+                fos = new FileOutputStream("src/test/results/horizontalProfile_mesh"+System.currentTimeMillis()+".png");
+                fos2 = new FileOutputStream("src/test/results/horizontalProfile_mesh"+System.currentTimeMillis()+".xml");
+                fos3 = new FileOutputStream("src/test/results/horizontalProfile_mesh"+System.currentTimeMillis()+".csv");
+                artifact.feed(this.readDocument("src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_feed.xml"), cc);
+                artifact.out(this.readDocument("src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_statistics.xml"),fos2, cc);
+                artifact.out(this.readDocument("src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_chart.xml"),fos, cc);
+//                artifact.out(this.readDocument("src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_csv.xml"),fos3, cc);
+            } catch (Exception e){
+                log.error(e,e);
+                fail();
+            }finally{
+                try {
+                    fos.flush();
+                    fos.close();
+                    fos2.flush();
+                    fos2.close();
+                    fos3.flush();
+                    fos3.close();
+                } catch (Exception e) {
+                    log.error(e,e);
+                }
+            }
+        } catch (Exception e) {
+            log.error(e,e);
+            fail();
+        }
+    }
+    
     protected void createFile(byte[] content, String fileName){
         try {
             FileOutputStream fos = new FileOutputStream(new File(fileName));
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java	Fri Oct 02 08:07:00 2009 +0000
@@ -4,6 +4,7 @@
 package de.intevation.gnv.artifacts;
 
 import de.intevation.artifacts.CallContext;
+import de.intevation.artifacts.CallMeta;
 
 /**
  * @author Tim Englich <tim.englich@intevation.de>
@@ -38,4 +39,9 @@
         return this.globalContext;
     }
 
+    public CallMeta getMeta() {
+        
+        		return null;
+    }
+
 }
--- a/gnv-artifacts/src/test/ressources/conf.xml	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/conf.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -11,6 +11,12 @@
                               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_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"  
+                              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"  
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
         </artifact-factories>
@@ -82,9 +88,49 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileMeshArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters></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>
+                </product>
             </products>
         </artifact>
-        
+        <artifact name="fis_delphin">
+            <products>
+                <product name= "horizontalProfile">
+                    <artifact-factory name="horizontalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                             ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                    <parameters>
+                        <parameter name="sourceid" value="34"/>
+                    </parameters>
+                </product>
+                
+            </products>
+        </artifact>
+        <artifact name="fis_thermosalinograph">
+            <products>
+                <product name= "horizontalProfile">
+                    <artifact-factory name="horizontalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                             ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                    <parameters>
+                        <parameter name="sourceid" value="35"/>
+                    </parameters>
+                </product>
+                
+            </products>
+        </artifact>
+        <artifact name="fis_chemusurvey">
+            <products>
+                <product name= "horizontalProfile">
+                    <artifact-factory name="horizontalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                             ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                    <parameters>
+                        <parameter name="sourceid" value="37"/>
+                    </parameters>
+                </product>
+                
+            </products>
+        </artifact>
          <artifact name="fis_instantaneouspoint">
             <products>
                 <product name= "verticalProfile">
@@ -92,12 +138,6 @@
                              ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
                     <parameters></parameters>
                 </product>
-                <product name= "horizontalProfile">
-                    <artifact-factory name="horizontalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
-                             ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
-                    <parameters></parameters>
-                </product>
-                
             </products>
         </artifact>
         
@@ -486,6 +526,17 @@
            
            <artifact name="horizontalProfileInstantaneousPoint">
             <transitions>
+                <transition id="horizontalprofile_instantaneouspoint_vehicle" description="horizontalprofile_instantaneouspoint_vehicle" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>horizontalprofile_instantaneouspoint_vehicle</queryID>
+                    <dataname>vehicleid</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                        <transition>horizontalprofile_instantaneouspoint_cruise</transition>
+                    </reachableTransitions>
+                    <inputvalues>
+                        <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+                    </inputvalues>
+                </transition>
                 <transition id="horizontalprofile_instantaneouspoint_cruise" description="horizontalprofile_instantaneouspoint_cruise" transition="de.intevation.gnv.transition.DefaultTransition">
                     <queryID>horizontalprofile_instantaneouspoint_cruise</queryID>
                     <dataname>cruiseid</dataname>
@@ -494,6 +545,8 @@
                            <transition>horizontalprofile_instantaneouspoint_track</transition>
                     </reachableTransitions>
                     <inputvalues>
+                        <inputvalue name="vehicleid" type="Integer" multiselect="false"/>
+                        <inputvalue name="sourceid" type="Integer" multiselect="false"/>
                     </inputvalues>
                 </transition>
                 <transition id="horizontalprofile_instantaneouspoint_track" description="horizontalprofile_instantaneouspoint_track" transition="de.intevation.gnv.transition.DefaultTransition">
@@ -568,6 +621,128 @@
                 </transition>
             </transitions>
            </artifact>
+           
+           <artifact name="horizontalProfileMesh">
+            <transitions>
+             <transition id="horizontalprofile_mesh" description="horizontalprofile_mesh" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_mesh</queryID>
+                    <dataname>featureid</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                           <transition>horizontalprofile_mesh_coordinate</transition>
+                    </reachableTransitions>
+                    <inputvalues>
+                    </inputvalues>
+                </transition>
+                
+                <transition id="horizontalprofile_mesh_coordinate" description="horizontalprofile_mesh_coordinate" transition="de.intevation.gnv.transition.SingleInputTransition">
+                    <dataname>verticalprofile_mesh_coordinate</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                           <transition>horizontalprofile_mesh_point</transition>v
+                    </reachableTransitions>
+                    <inputvalues>
+                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
+                    </inputvalues>
+                </transition>
+                
+                <transition id="horizontalprofile_mesh_point" description="horizontalprofile_mesh_point" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_mesh_point</queryID>
+                    <dataname>mesh_point</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                        <transition>horizontalprofile_mesh_axis</transition>v
+                    </reachableTransitions>
+                    <inputvalues>
+                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
+                         <inputvalue name="mesh_coordinate" type="Integer" multiselect="false"/>
+                    </inputvalues>
+                </transition>
+                 <transition id="horizontalprofile_mesh_axis" description="horizontalprofile_mesh_point" transition="de.intevation.gnv.transition.profile.horizontal.NorthSouthEastWestTransition">
+                   <dataname>axisid</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                        <transition>horizontalprofile_meshpoint_parameter</transition>v
+                    </reachableTransitions>
+                    <inputvalues>
+                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
+                         <inputvalue name="mesh_point" type="Integer" multiselect="false"/>
+                    </inputvalues>
+                </transition>
+                <transition id="horizontalprofile_meshpoint_parameter" description="horizontalprofile_meshpoint_parameter" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_mesh_parameter</queryID>
+                    <dataname>parameterid</dataname>
+                    <data-multiselect>true</data-multiselect>
+                    <reachableTransitions>
+                        <transition>horizontalprofile_meshpoint_depth</transition>
+                    </reachableTransitions>
+                    <inputvalues>
+                         <inputvalue name="featureid" 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"/>
+                    </inputvalues>
+                </transition>
+                
+                
+                 <transition id="horizontalprofile_meshpoint_depth" description="horizontalprofile_meshpoint_depth" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>horizontalprofile_meshpoint_depth</queryID>
+                    <dataname>depthid</dataname>
+                    <data-multiselect>true</data-multiselect>
+                    <reachableTransitions>
+                        <transition>horizontalprofile_mesh_date</transition>v
+                    </reachableTransitions>
+                    <inputvalues>
+                         <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="1"/>
+                         <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"/>
+                    </inputvalues>
+                </transition>
+                
+                <transition id="horizontalprofile_mesh_date" description="horizontalprofile_mesh_date" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_mesh_date</queryID>
+                    <dataname>dateid</dataname>
+                    <data-multiselect>true</data-multiselect>
+                    <reachableTransitions>
+                         <transition>horizontalprofile_mesh_calculate_results</transition>
+                    </reachableTransitions>
+                    <inputvalues>
+                        <inputvalue name="featureid" 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="parameterid" type="Integer" multiselect="true"  usedinquery="0"/>
+                        <inputvalue name="depthid" type="Integer" multiselect="true"  usedinquery="0"/>
+                    </inputvalues>
+                </transition>
+                
+                <transition id="horizontalprofile_mesh_calculate_results" description="horizontalprofile_mesh_calculate_results" transition="de.intevation.gnv.transition.profile.horizontal.HorizontalProfileOutputTransition">
+                    <queryID>horizontalprofile_mesh_chart_data</queryID>
+                    <inputvalues>
+                        <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/>
+                        <inputvalue name="dateid" type="Date" multiselect="true" usedinquery="1"/>
+                        <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="2"/>
+                        <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"/> 
+                    </inputvalues>
+                    <outputsModes>
+                        <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png">
+                            <parameters>
+                                <inputvalue name="width" type="Integer" value="600"/>
+                                <inputvalue name="height" type="Integer" value="400"/>
+                            </parameters>
+                        </outputsMode>
+                        <outputsMode name="csv" description="CSV-Export der Daten" mime-type="test/plain"/>
+                        <outputsMode name="statistics" description="Statistik zu den Daten" mime-type="text/xml"/>
+                    </outputsModes>
+                </transition>
+            </transitions>
+         </artifact>
+           
+           
+           
+           
+           
     </artifacts>
     <ehcache>
         <configuration>src/test/ressources/ehcache.xml</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_00_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="3637e455-944f-46ef-997d-8cd61d9ad2d3" />
+	<art:hash value="5437874" />
+	<art:target name="horizontalProfile" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_00_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="3637e455-944f-46ef-997d-8cd61d9ad2d3" />
+	<art:hash value="5437874" />
+	<art:data>
+		<art:input name="product" value="horizontalProfile" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_01_advance.xml	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_01_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -3,5 +3,5 @@
 	<art:type name="advance" />
 	<art:uuid value="3637e455-944f-46ef-997d-8cd61d9ad2d3" />
 	<art:hash value="5437874" />
-	<art:target name="horizontalProfile" />
+	<art:target name="horizontalprofile_instantaneouspoint_track" />
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_01_feed.xml	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_01_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="3637e455-944f-46ef-997d-8cd61d9ad2d3" />
 	<art:hash value="5437874" />
 	<art:data>
-		<art:input name="product" value="horizontalProfile" />
+		<art:input name="vehicleid" value="8402" />
 	</art:data>
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_02_feed.xml	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_02_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="3637e455-944f-46ef-997d-8cd61d9ad2d3" />
 	<art:hash value="5437874" />
 	<art:data>
-		<art:input name="cruiseid" value="49" />
+		<art:input name="cruiseid" value="47" />
 	</art:data>
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_03_feed.xml	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_03_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="3637e455-944f-46ef-997d-8cd61d9ad2d3" />
 	<art:hash value="5437874" />
 	<art:data>
-		<art:input name="trackid" value="1948" />
+		<art:input name="trackid" value="1671" />
 	</art:data>
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_04_feed.xml	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_04_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="3637e455-944f-46ef-997d-8cd61d9ad2d3" />
 	<art:hash value="5437874" />
 	<art:data>
-		<art:input name="surveyid" value="2340" />
+		<art:input name="surveyid" value="2063" />
 	</art:data>
 </art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_06_feed.xml	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_step_06_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="3637e455-944f-46ef-997d-8cd61d9ad2d3" />
 	<art:hash value="5437874" />
 	<art:data>
-		<art:input name="measurementid" value="-4.0" />
+		<art:input name="measurementid" value="-5.943" />
 	</art:data>
 </art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_01_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:target name="horizontalProfile" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_01_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:data>
+		<art:input name="product" value="horizontalProfile" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_02_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="86a0e5c5-e98d-4c7d-93ff-76b099a2de4e" />
+	<art:hash value="7390092" />
+	<art:target name="horizontalprofile_mesh_point" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_02_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:data>
+		<art:input name="featureid" value="3" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="86a0e5c5-e98d-4c7d-93ff-76b099a2de4e" />
+	<art:hash value="7390092" />
+	<art:target name="horizontalprofile_mesh_axis" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:data />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:target name="horizontalprofile_meshpoint_parameter" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:data>
+		<art:input name="mesh_point" value="2003416" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_05_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:target name="horizontalprofile_meshpoint_depth" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_05_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:data>
+		<art:input name="axisid" value="JPOSITION" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_06_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:target name="horizontalprofile_mesh_date" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_06_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:data>
+		<art:input name="parameterid" value="2" />
+		<art:input name="parameterid" value="1" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_07_advance.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="advance" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:target name="horizontalprofile_mesh_calculate_results" />
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_07_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:data>
+		<art:input name="depthid" value="1" />
+		<art:input name="depthid" value="2" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_feed.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="feed" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:data>
+		<art:input name="dateid" value="2009.10.03 23:45:00" />
+		<art:input name="dateid" value="2009.10.04 00:00:00" />
+	</art:data>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_chart.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="out" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:out name="chart">
+		<art:out value="image/png" />
+		<art:params>
+			<art:input name="width" value="600" />
+			<art:input name="height" value="400" />
+		</art:params>
+	</art:out>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_csv.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="out" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:out name="csv">
+		<art:out value="test/plain" />
+		<art:params />
+	</art:out>
+</art:action>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_out_statistics.xml	Fri Oct 02 08:07:00 2009 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<art:action xmlns:art="http://www.intevation.de/2009/artifacts">
+	<art:type name="out" />
+	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
+	<art:hash value="29647319" />
+	<art:out name="statistics">
+		<art:out value="text/xml" />
+		<art:params />
+	</art:out>
+</art:action>
\ No newline at end of file
--- a/gnv-artifacts/src/test/ressources/queries.properties	Thu Oct 01 08:57:49 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/queries.properties	Fri Oct 02 08:07:00 2009 +0000
@@ -339,25 +339,54 @@
 #### Horizontalprofil InstantaneousPoint ####
 #############################################
 #############################################
-
-horizontalprofile_instantaneouspoint_cruise = SELECT \
-        CRUISEID KEY , \
-        NAME VALUE \
-    FROM MEDIAN.CRUISE \
-    WHERE NAME IS NOT NULL \
-    ORDER BY NAME
+horizontalprofile_instantaneouspoint_vehicle = SELECT DISTINCT \
+        V.VEHICLEID KEY, \
+        V.NAME VALUE \
+    FROM MEDIAN.VEHICLE V, \
+         MEDIAN.CRUISE C, \
+         MEDIAN.TRACK T, \
+         MEDIAN.SURVEYINFO S, \
+         MEDIAN.INSTANTANEOUSPOINT I, \
+         MEDIAN.MEASUREMENT M \
+    WHERE V.VEHICLEID = C.VEHICLEID AND \
+          C.CRUISEID = T.CRUISEID AND \
+          T.TRACKID = S.TRACKID AND \
+          S.SURVEYID  = I.SURVEYID AND \
+          I.FEATUREID =  M.FEATUREID AND \
+          M.SOURCEID = ? \
+    ORDER BY V.NAME
+horizontalprofile_instantaneouspoint_cruise = SELECT DISTINCT \
+        C.CRUISEID KEY , \
+        C.NAME VALUE \
+     FROM MEDIAN.CRUISE C, \
+         MEDIAN.TRACK T, \
+         MEDIAN.SURVEYINFO S, \
+         MEDIAN.INSTANTANEOUSPOINT I, \
+         MEDIAN.MEASUREMENT M \
+    WHERE C.CRUISEID = T.CRUISEID AND \
+          T.TRACKID = S.TRACKID AND \
+          S.SURVEYID  = I.SURVEYID AND \
+          I.FEATUREID =  M.FEATUREID AND \
+          C.VEHICLEID  = ? AND \
+          M.SOURCEID = ? AND \
+          C.NAME IS NOT NULL \
+    ORDER BY C.NAME
 horizontalprofile_instantaneouspoint_track= SELECT \
-        TRACKID KEY , \
-        NAME VALUE \
-    FROM MEDIAN.TRACK \
-    WHERE CRUISEID = ? \
-    ORDER BY NAME
+        T.TRACKID KEY , \
+        to_char(T.STARTDATE,'DD.MM.YYYY HH24:MI') || ' - '|| to_char(T.ENDDATE,'DD.MM.YYYY HH24:MI') || ' - '|| T.NAME VALUE \
+    FROM MEDIAN.TRACK T \
+    WHERE T.CRUISEID = ? \
+    ORDER BY T.STARTDATE, \
+             T.ENDDATE, \
+             T.NAME
 horizontalprofile_instantaneouspoint_surveyinfo = SELECT \
         SURVEYID KEY , \
-        DESCRIPTION VALUE \
+        to_char(STARTDATE,'DD.MM.YYYY HH24:MI') || ' - '|| to_char(ENDDATE,'DD.MM.YYYY HH24:MI') || ' - '|| DESCRIPTION VALUE \
     FROM MEDIAN.SURVEYINFO \
     WHERE TRACKID = ? \
-    ORDER BY DESCRIPTION
+    ORDER BY STARTDATE, \
+             ENDDATE, \
+             DESCRIPTION
 horizontalprofile_instantaneouspoint_parameter = SELECT DISTINCT \
         P.PARAMETERID KEY , \
         P.GERMANNAME VALUE \
@@ -395,3 +424,58 @@
     ORDER BY IP.TIMEVALUE, \
           MSV.PARAMETERID, \
           M.ZLOCATION
+          
+#############################################
+#############################################
+########### Horizontalprofil MESH ###########
+#############################################
+#############################################
+horizontalprofile_meshpoint_depth = SELECT DISTINCT \
+         mp.KPOSITION KEY, \
+        -ml.UPPERZLOCATION || ' - '|| -ml.LOWERZLOCATION VALUE \
+    from MEDIAN.MESHLAYER ml, \
+         MEDIAN.MESHPOINT mp \
+    where ml.KPOSITION = mp.KPOSITION and \
+          ml.MESHID = mp.MESHID and \
+          mp.FEATUREID in \
+    ( select FEATUREID \
+      from MEDIAN.MESHPOINT mp, \
+           MEDIAN.MESH m \
+      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 = ?)) \
+    order by mp.KPOSITION
+    
+horizontalprofile_mesh_chart_data = select mp.IPOSITION XORDINATE_XCOORD, mp.JPOSITION XORDINATE_YCOORD, \
+           msv.DATAVALUE YORDINATE, \
+           msv.PARAMETERID GROUP1, \
+           msv.TIMEVALUE GROUP2, \
+           mp.KPOSITION GROUP3 \
+    from MEDIAN.MESHLAYER ml, \
+         MEDIAN.MESHPOINT mp, \
+         MEDIAN.MESH m, \
+         MEDIAN.MESHSCALARVALUE msv \
+    where msv.FEATUREID = mp. FEATUREID AND \
+          ml.KPOSITION = mp.KPOSITION and \
+          ml.MESHID = mp.MESHID and \
+          m.MESHID = mp.MESHID AND \
+          m.PARTIDMIN <= msv.PARTID AND \
+          m.PARTIDMAX >= msv.PARTID AND \
+          msv.PARAMETERID in (?) AND \
+          msv.TIMEVALUE in (?) AND \
+          m.OBJECTID = ? AND \
+          mp.FEATUREID in \
+            ( select FEATUREID \
+              from MEDIAN.MESHPOINT mp, \
+                   MEDIAN.MESH m \
+              where m.OBJECTID = ? AND \
+                    mp.MESHID = m.MESHID  AND \
+                    KPOSITION in ( ? ) and \
+                    ? = (select ? from MEDIAN.MESHPOINT where FEATUREID = ?)) \
+   order by mp.KPOSITION, \
+            msv.TIMEVALUE, \
+            msv.PARAMETERID, \
+            mp.JPOSITION , \
+            mp.IPOSITION
+            
\ No newline at end of file

http://dive4elements.wald.intevation.org