# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1268744813 0
# Node ID 5b9945798f86d1d6389d39c25e3a142fca77b887
# Parent  a5e860f17a52490bd5b8d98cef231d81fcd082d1
Modified the Workflow for Verticalprofiles and Timeseries on Meshes in that case that the Inputvalues of the Mapviewer-Interface take affect.

gnv-artifacts/trunk@788 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r a5e860f17a52 -r 5b9945798f86 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Tue Mar 16 13:02:56 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Mar 16 13:06:53 2010 +0000
@@ -1,3 +1,12 @@
+2010-03-16  Tim Englich  <tim.englich@intevation.de>
+
+	* 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. 
+	  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>
 
 	* src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java: 
diff -r a5e860f17a52 -r 5b9945798f86 gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml	Tue Mar 16 13:02:56 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml	Tue Mar 16 13:06:53 2010 +0000
@@ -73,6 +73,18 @@
              </inputvalues>
          </state>
          
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="timeseries_mesh_without_geom"/>
+            <to state="timeseries_mesh_coordinate"/>
+            <condition inputvalue="geometry" value="POINT" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="timeseries_mesh_without_geom"/>
+            <to state="timeseries_meshpoint_presettings"/>
+            <condition inputvalue="geometry" value="POINT" operator="equal"/>
+        </transition>
+         
          
          <state id="timeseries_mesh_with_wkt" description="timeseries_mesh" state="de.intevation.gnv.state.PreSettingsTransferState">
             <queryID>verticalprofile_mesh_with_wkt</queryID>
@@ -91,12 +103,7 @@
             <from state="timeseries_mesh_with_wkt"/>
             <to state="timeseries_meshpoint_presettings"/>
          </transition>
-         
-         <transition transition="de.intevation.gnv.transition.DefaultTransition">
-            <from state="timeseries_mesh_without_geom"/>
-            <to state="timeseries_mesh_coordinate"/>
-         </transition>
-                
+        
         <state id="timeseries_mesh" description="timeseries_mesh" state="de.intevation.gnv.state.DefaultState">
             <queryID>verticalprofile_mesh_with_area</queryID>
             <dataname>meshid</dataname>
@@ -137,7 +144,7 @@
             <to state="timeseries_meshpoint"/>
          </transition>
          
-         <state id="timeseries_meshpoint_presettings" description="timeseries_meshpoint" state="de.intevation.gnv.state.CoordinateSelectionState">
+         <state id="timeseries_meshpoint_presettings" description="timeseries_meshpoint" state="de.intevation.gnv.state.PreSettingsTransferCoordinateSelectionState">
             <queryID>timeseries_meshpoint</queryID>
             <dataname>mesh_point</dataname>
             <data-multiselect>false</data-multiselect>
diff -r a5e860f17a52 -r 5b9945798f86 gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml
--- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml	Tue Mar 16 13:02:56 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml	Tue Mar 16 13:06:53 2010 +0000
@@ -1,6 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="verticalProfileMesh">
    <states>
+       <state id="verticalprofile_mesh_mapviewerswitch" description="verticalprofile_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="verticalprofile_mesh_mapviewerswitch"/>
+           <to state="verticalprofile_mesh_area"/>
+           <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+       </transition>
+       
+       <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+           <from state="verticalprofile_mesh_mapviewerswitch"/>
+           <to state="verticalprofile_mesh_with_wkt"/>
+           <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
+       </transition>
+       
+       <state id="verticalprofile_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_coordinate"/>
+           <inputvalues>
+               <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
+               <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="mesh_coordinate" 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="verticalprofile_mesh_with_wkt"/>
+           <to state="verticalprofile_mesh_point_presettings"/>
+       </transition>
+       
+        <state id="verticalprofile_mesh_point_presettings" description="verticalprofile_meshpoint" state="de.intevation.gnv.state.PreSettingsTransferCoordinateSelectionState">
+            <queryID>verticalprofile_mesh_point</queryID>
+            <dataname>mesh_point</dataname>
+            <data-multiselect>false</data-multiselect>
+            <presettings-transfer presetting="geometry" inputvalue="mesh_coordinate"/>
+            <inputvalues>
+                 <inputvalue name="meshid" type="Integer" multiselect="false"/>
+                 <inputvalue name="mesh_coordinate" type="Geometry" multiselect="false" usedinquery="1"/>
+                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+            <mesh-width xlink:href="${artifacts.config.dir}/meshwidth.xml"/>
+        </state>
+        
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="verticalprofile_mesh_point_presettings"/>
+            <to state="verticalprofile_mesh_mindepth"/>
+        </transition>
+       
        <state id="verticalprofile_mesh_area" description="verticalprofile_mesh_area_one" state="de.intevation.gnv.state.DefaultState">
            <queryID>area_filter</queryID>
            <dataname>areaid</dataname>
@@ -41,7 +99,7 @@
            <to state="verticalprofile_mesh"/>
        </transition>
        
-        <state id="verticalprofile_mesh_without_geom" description="timeseries_mesh_without_geom" state="de.intevation.gnv.state.DefaultState">
+        <state id="verticalprofile_mesh_without_geom" description="verticalprofile_mesh_without_geom" state="de.intevation.gnv.state.DefaultState">
             <queryID>verticalprofile_mesh</queryID>
             <dataname>meshid</dataname>
             <data-multiselect>false</data-multiselect>
@@ -52,10 +110,17 @@
             </inputvalues>
         </state>
        
-       <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="verticalprofile_mesh_without_geom"/>
-           <to state="verticalprofile_mesh_coordinate"/>
-       </transition>
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalprofile_mesh_without_geom"/>
+            <to state="verticalprofile_mesh_coordinate"/>
+            <condition inputvalue="geometry" value="POINT" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalprofile_mesh_without_geom"/>
+            <to state="verticalprofile_mesh_point_presettings"/>
+            <condition inputvalue="geometry" value="POINT" operator="equal"/>
+        </transition>
        
        <state id="verticalprofile_mesh" description="verticalprofile_mesh" state="de.intevation.gnv.state.DefaultState">
            <queryID>verticalprofile_mesh_with_area</queryID>
@@ -69,10 +134,17 @@
            </inputvalues>
        </state>
        
-       <transition transition="de.intevation.gnv.transition.DefaultTransition">
-           <from state="verticalprofile_mesh"/>
-           <to state="verticalprofile_mesh_coordinate"/>
-       </transition>
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalprofile_mesh"/>
+            <to state="verticalprofile_mesh_coordinate"/>
+            <condition inputvalue="geometry" value="POINT" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalprofile_mesh"/>
+            <to state="verticalprofile_mesh_point_presettings"/>
+            <condition inputvalue="geometry" value="POINT" operator="equal"/>
+        </transition>
        
        <state id="verticalprofile_mesh_coordinate" description="verticalprofile_mesh_coordinate" state="de.intevation.gnv.state.SingleInputState">
            <dataname>mesh_coordinate</dataname>