--- 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>