Mercurial > dive4elements > gnv-client

changeset 750:3cbf26125829

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified the Workflow of Verticalcrosssections on Meshes that the Data that was sent by the Mapviewer-Interface take effect. gnv-artifacts/trunk@791 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Tue, 16 Mar 2010 14:22:18 +0000
parents 686eecfafbbf
children 2998a9ea0c0c
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml
diffstat 2 files changed, 74 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Tue Mar 16 13:10:44 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Mar 16 14:22:18 2010 +0000
@@ -1,3 +1,11 @@
+2010-03-16  Tim Englich  <tim.englich@intevation.de>
+
+	* 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
+	  was send by the Mapviewer. Also the Input of an LineString will be skipped 
+	  if a LineString was send by the MapViewer.
+
 2010-03-16  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/queries.properties: 
--- a/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Tue Mar 16 13:10:44 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Tue Mar 16 14:22:18 2010 +0000
@@ -1,6 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="verticalCrossSectionMesh">
      <states>
+     
+        <state id="verticalcrosssection_mesh_mapviewerswitch" description="verticalcrosssection_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="verticalcrosssection_mesh_mapviewerswitch"/>
+            <to state="verticalcrosssection_mesh_area"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalcrosssection_mesh_mapviewerswitch"/>
+            <to state="verticalcrosssection_mesh_with_wkt"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
+        </transition>
+        
+        <state id="verticalcrosssection_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="verticalcrosssection_mesh_with_wkt"/>
+            <to state="verticalcrosssection_mesh_linestring"/>
+        </transition>
+        
         <state id="verticalcrosssection_mesh_area" description="verticalcrosssection_mesh_area_one" state="de.intevation.gnv.state.DefaultState">
                <queryID>area_filter</queryID>
                <dataname>areaid</dataname>
@@ -52,10 +92,18 @@
               </inputvalues>
           </state>
           
-          <transition transition="de.intevation.gnv.transition.DefaultTransition">
-              <from state="verticalcrosssection_mesh_without_geom"/>
-              <to state="verticalcrosssection_mesh_linestring"/>
-          </transition>
+         <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalcrosssection_mesh_without_geom"/>
+            <to state="verticalcrosssection_mesh_linestring"/>
+            <condition inputvalue="geometry" value="LINESTRING" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalcrosssection_mesh_without_geom"/>
+            <to state="verticalcrosssection_mesh_parameter"/>
+            <condition inputvalue="geometry" value="LINESTRING" operator="equal"/>
+        </transition>
+          
          
          <state id="verticalcrosssection_mesh" description="verticalcrosssection_mesh" state="de.intevation.gnv.state.DefaultState">
              <queryID>verticalprofile_mesh_with_area</queryID>
@@ -68,11 +116,18 @@
                  <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="0"/>
              </inputvalues>
          </state>
-         
-         <transition transition="de.intevation.gnv.transition.DefaultTransition">
-              <from state="verticalcrosssection_mesh"/>
-              <to state="verticalcrosssection_mesh_linestring"/>
-          </transition>
+          
+         <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalcrosssection_mesh"/>
+            <to state="verticalcrosssection_mesh_linestring"/>
+            <condition inputvalue="geometry" value="LINESTRING" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="verticalcrosssection_mesh"/>
+            <to state="verticalcrosssection_mesh_parameter"/>
+            <condition inputvalue="geometry" value="LINESTRING" operator="equal"/>
+        </transition>
          
         <state id="verticalcrosssection_mesh_linestring" description="verticalcrosssection_mesh_linestring" state="de.intevation.gnv.state.SingleInputState">
            <dataname>mesh_linestring</dataname>
@@ -89,11 +144,12 @@
               <to state="verticalcrosssection_mesh_parameter"/>
          </transition>
          
-         <state id="verticalcrosssection_mesh_parameter" description="verticalcrosssection_mesh_parameter" state="de.intevation.gnv.state.DefaultState">
+         <state id="verticalcrosssection_mesh_parameter" description="verticalcrosssection_mesh_parameter" state="de.intevation.gnv.state.PreSettingsTransferState">
              <queryID>verticalprofile_mesh_parameter</queryID>
              <dataname>parameterid</dataname>
              <presettings-name>parameter</presettings-name>
              <data-multiselect>false</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"/>
http://dive4elements.wald.intevation.org