--- a/gnv-artifacts/ChangeLog	Fri Mar 19 12:40:55 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Mar 19 13:20:04 2010 +0000
@@ -1,3 +1,11 @@
+2010-03-19  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/products/horizontalprofile/conf_mesh_cross.xml: 
+	  Modified the Workflow for "Horizontales Schnittprofil" so that the Inputvalues 
+	  of the Mapviewer-Interface take effect. E.g. The Regionfilter will not be 
+	  displaied if an Polygon was send by the Mapviewer. Also the Input of an 
+	  LineString will be skipped if a LineString was send by the MapViewer.
+
 2010-03-19  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/resources/lang/artifactMessages_de*.properties: 
@@ -45,7 +53,7 @@
 
 	* doc/conf/products/horizontalcrosssection/conf_mesh.xml: 
 	  Modified the Workflow for Horizontalcrosssections so that the Inputvalues 
-	  of the Mapviewer-Interface take affect. E.g. The Regionfilter will not be 
+	  of the Mapviewer-Interface take effect. E.g. The Regionfilter will not be 
 	  displaied if an Polygon was send by the Mapviewer. Also the Input of an 
 	  Polygon will be skipped if a Polygon was send by the MapViewer.
 
@@ -53,7 +61,7 @@
 
 	* doc/conf/products/horizontalprofile/conf_mesh.xml: 
 	  Modified the Workflow for Horizontalprofiles so that the Inputvalues 
-	  of the Mapviewer-Interface take affect. E.g. The Regionfilter will not be 
+	  of the Mapviewer-Interface take effect. E.g. The Regionfilter will not be 
 	  displaied if an Polygon was send by the Mapviewer. Also the Input of an 
 	  Point will be skipped if a Point was send by the MapViewer.
 
@@ -61,7 +69,7 @@
 
 	* doc/conf/products/verticalcrosssection/conf_mesh.xml: 
 	  Modified the Workflow so that the Inputvalues of the Mapviewer-Interface 
-	  take affect. E.g. The Regionfilter will not be displaied if an Polygon
+	  take effect. E.g. The Regionfilter will not be displaied if an Polygon
 	  was send by the Mapviewer. Also the Input of an LineString will be skipped 
 	  if a LineString was send by the MapViewer.
 
@@ -77,7 +85,7 @@
 	* doc/conf/products/timeseries/conf_mesh.xml,
 	  doc/conf/products/verticalprofile/conf_mesh.xml: 
 	  Modified the Workflow for Verticalprofiles and Timeseries on Meshes in 
-	  that case that the Inputvalues of the Mapviewer-Interface take affect. 
+	  that case that the Inputvalues of the Mapviewer-Interface take effect. 
 	  E.g. The Regionfilter will not be displaied if an Polygon was send by 
 	  the Mapviewer.
 
@@ -117,7 +125,7 @@
 
 	* doc/conf/products/layer/conf.xml: 
 	  Modified the Workflow so that the Inputvalues of the Mapviewer-Interface 
-	  take affect. E.g. The Regionfilter will not be displaied if an Polygon
+	  take effect. E.g. The Regionfilter will not be displaied if an Polygon
 	  was send by the Mapviewer.
 
 2010-03-16  Tim Englich  <tim.englich@intevation.de>
@@ -129,7 +137,7 @@
 
 	* doc/conf/products/verticalprofile/conf_timeseriespoint.xml: 
 	  Modified the Workflow so that the Inputvalues of the Mapviewer-Interface 
-	  take affect. E.g. The Regionfilter will not be displaied if an Polygon
+	  take effect. E.g. The Regionfilter will not be displaied if an Polygon
 	  was send by the Mapviewer. 
 
 2010-03-15  Tim Englich  <tim.englich@intevation.de>
@@ -140,7 +148,7 @@
 
 	* doc/conf/products/timeseries/conf_timeseriespoint.xml: 
 	  Modified the Workflow so that the Inputvalues of the Mapviewer-Interface 
-	  take affect. E.g. The Regionfilter will not be displaied if an Polygon
+	  take effect. E.g. The Regionfilter will not be displaied if an Polygon
 	  was send by the Mapviewer. 
 
 2010-03-15  Ingo Weinzierl <ingo.weinzierl@intevation.de>
@@ -162,7 +170,7 @@
 
 	* doc/conf/products/verticalprofile/conf_timeseriespoint.xml: 
 	  Modified the Workflow so that the Inputvalues of the Mapviewer-Interface 
-	  take affect. E.g. The Regionfilter will not be displaied if an Polygon
+	  take effect. E.g. The Regionfilter will not be displaied if an Polygon
 	  was send by the Mapviewer. 
 
 2010-03-15  Tim Englich  <tim.englich@intevation.de>
@@ -173,7 +181,7 @@
 
 	* doc/conf/products/timeseries/conf_timeseriespoint.xml: 
 	  Modified the Workflow so that the Inputvalues of the Mapviewer-Interface 
-	  take affect. E.g. The Regionfilter will not be displaied if an Polygon
+	  take effect. E.g. The Regionfilter will not be displaied if an Polygon
 	  was send by the Mapviewer. 
 
 2010-03-15  Tim Englich  <tim.englich@intevation.de>
@@ -183,7 +191,7 @@
 
 	* doc/conf/products/timeseries/conf_mesh.xml: 
 	  Modified the Workflow so that the Inputvalues of the Mapviewer-interface 
-	  take affect. E.g. The regionfilter will not be displaied if an  Polygon
+	  take effect. E.g. The regionfilter will not be displaied if an  Polygon
 	  was send by the Mapviewer. Also the State for typing an Point will be 
 	  skipped an the Geometry of the Mapviewercall will be used.
 
@@ -193,7 +201,7 @@
 	  src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java: 
 	  Revoke Changes of r771. The Switch if the QueryId is null has several 
 	  Effects which causes NPEs in other Parts of this Module.
-	  So I removed the Changes of r771 and override the affected Methods in 
+	  So I removed the Changes of r771 and override the effected Methods in 
 	  DefaultAutoResumeState.
 
 2010-03-15  Tim Englich  <tim.englich@intevation.de>

--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml	Fri Mar 19 12:40:55 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml	Fri Mar 19 13:20:04 2010 +0000
@@ -1,6 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="horizontalProfileMeshCross">
   <states>
+        <state id="horizontalprofile_mesh_mapviewerswitch" description="horizontalprofile_mesh_area_one" state="de.intevation.gnv.state.DefaultAutoResumeState">
+            <!-- Empty State which will be used to integrate the switch for a 
+                 standalone and an mapviewer based call. -->
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+        </state>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalprofile_mesh_mapviewerswitch"/>
+            <to state="horizontalprofile_mesh_area"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalprofile_mesh_mapviewerswitch"/>
+            <to state="horizontalprofile_mesh_with_wkt"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
+        </transition>
+        
+        <state id="horizontalprofile_mesh_with_wkt" description="timeseries_mesh" state="de.intevation.gnv.state.PreSettingsTransferState">
+            <queryID>verticalprofile_mesh_with_wkt</queryID>
+            <dataname>meshid</dataname>
+            <data-multiselect>false</data-multiselect>
+            <presettings-transfer presetting="geometry" inputvalue="mesh_polygon"/>
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="mesh_polygon" type="Geometry" multiselect="false" usedinquery="1"/>
+                <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+        </state>
+        
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="horizontalprofile_mesh_with_wkt"/>
+            <to state="horizontalprofile_mesh_linestring"/>
+        </transition>
+        
         <state id="horizontalprofile_mesh_area" description="horizontalprofile_mesh_area_one" state="de.intevation.gnv.state.DefaultState">
                <queryID>area_filter</queryID>
                <dataname>areaid</dataname>
@@ -52,10 +91,17 @@
               </inputvalues>
          </state>
           
-         <transition transition="de.intevation.gnv.transition.DefaultTransition">
-             <from state="horizontalprofile_mesh_without_geom"/>
-             <to state="horizontalprofile_mesh_linestring"/>
-         </transition>
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalprofile_mesh_without_geom"/>
+            <to state="horizontalprofile_mesh_linestring"/>
+            <condition inputvalue="geometry" value="LINESTRING" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalprofile_mesh_without_geom"/>
+            <to state="horizontalprofile_meshpoint_parameter_presettings"/>
+            <condition inputvalue="geometry" value="LINESTRING" operator="equal"/>
+        </transition>
           
         <state id="horizontalprofile_mesh" description="horizontalprofile_mesh" state="de.intevation.gnv.state.DefaultState">
            <queryID>verticalprofile_mesh_with_area</queryID>
@@ -69,10 +115,17 @@
            </inputvalues>
        </state>
        
-       <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="horizontalprofile_mesh"/>
-           <to state="horizontalprofile_mesh_linestring"/>
-       </transition>
+       <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalprofile_mesh"/>
+            <to state="horizontalprofile_mesh_linestring"/>
+            <condition inputvalue="geometry" value="LINESTRING" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalprofile_mesh"/>
+            <to state="horizontalprofile_meshpoint_parameter_presettings"/>
+            <condition inputvalue="geometry" value="LINESTRING" operator="equal"/>
+        </transition>
        
        <state id="horizontalprofile_mesh_linestring" description="horizontalprofile_mesh_coordinate" state="de.intevation.gnv.state.SingleInputState">
            <dataname>mesh_linestring</dataname>
@@ -89,9 +142,6 @@
            <to state="horizontalprofile_meshpoint_parameter"/>
        </transition>
        
-       <!-- mesh_point -->
-       
-       
        <state id="horizontalprofile_meshpoint_parameter" description="horizontalprofile_meshpoint_parameter" state="de.intevation.gnv.state.DefaultState">
            <queryID>verticalprofile_mesh_parameter</queryID>
            <dataname>parameterid</dataname>
@@ -110,6 +160,25 @@
            <to state="horizontalprofile_meshpoint_depth"/>
        </transition>
        
+       <state id="horizontalprofile_meshpoint_parameter_presettings" description="horizontalprofile_meshpoint_parameter" state="de.intevation.gnv.state.PreSettingsTransferState">
+           <queryID>verticalprofile_mesh_parameter</queryID>
+           <dataname>parameterid</dataname>
+           <presettings-name>parameter</presettings-name>
+           <data-multiselect>true</data-multiselect>
+           <presettings-transfer presetting="geometry" inputvalue="mesh_linestring"/>
+           <inputvalues>
+                <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="parameterid" type="Integer" multiselect="true" useinquery="0"/>
+                <inputvalue name="mesh_linestring" type="String" multiselect="false" usedinquery="0"/>
+           </inputvalues>
+       </state>
+       
+       <transition transition="de.intevation.gnv.transition.DefaultTransition">
+           <from state="horizontalprofile_meshpoint_parameter_presettings"/>
+           <to state="horizontalprofile_meshpoint_depth"/>
+       </transition>
+       
         <state id="horizontalprofile_meshpoint_depth" description="horizontalprofile_meshpoint_depth" state="de.intevation.gnv.state.DefaultState">
            <queryID>horizontalprofile_meshpoint_depth</queryID>
            <dataname>depthid</dataname>