# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1268660990 0
# Node ID 3f8f71e88587726700b72881b14c03a1aa8400da
# Parent  b8c7105f2b947255f09212b3320d1aef047c627c
Modified the Workflow of TimeSeries on Meshes that the Data that was sent by the Mapviewer-Interface

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

diff -r b8c7105f2b94 -r 3f8f71e88587 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Mon Mar 15 13:40:14 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Mon Mar 15 13:49:50 2010 +0000
@@ -1,3 +1,14 @@
+2010-03-15  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/queries.properties:
+	  Integrated and modified Queries for Timeseries on Meshes.
+
+	* 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
+	  was send by the Mapviewer. Also the State for typing an Point will be 
+	  skipped an the Geometry of the Mapviewercall will be used.
+
 2010-03-15  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/java/de/intevation/gnv/state/StateBase.java,
diff -r b8c7105f2b94 -r 3f8f71e88587 gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml	Mon Mar 15 13:40:14 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml	Mon Mar 15 13:49:50 2010 +0000
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="timeSeriesMesh">
     <states>
+        <state id="timeseries_mesh_mapviewerswitch" description="timeseries_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="timeseries_mesh_mapviewerswitch"/>
+            <to state="timeseries_mesh_area"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="timeseries_mesh_mapviewerswitch"/>
+            <to state="timeseries_mesh_with_wkt"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
+        </transition>
+        
         <state id="timeseries_mesh_area" description="timeseries_mesh_area_one" state="de.intevation.gnv.state.DefaultState">
             <queryID>area_filter</queryID>
             <dataname>areaid</dataname>
@@ -52,6 +73,25 @@
              </inputvalues>
          </state>
          
+         
+         <state id="timeseries_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="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"/>
@@ -104,7 +144,7 @@
             <presettings-transfer presetting="geometry" inputvalue="mesh_coordinate"/>
             <inputvalues>
                  <inputvalue name="meshid" type="Integer" multiselect="false"/>
-                 <inputvalue name="mesh_coordinate" type="Coordinate" multiselect="false" usedinquery="1"/>
+                 <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>
diff -r b8c7105f2b94 -r 3f8f71e88587 gnv-artifacts/doc/conf/queries.properties
--- a/gnv-artifacts/doc/conf/queries.properties	Mon Mar 15 13:40:14 2010 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Mon Mar 15 13:49:50 2010 +0000
@@ -154,8 +154,9 @@
     from MEDIAN.PARAMETER p, \
          MEDIAN.MESHSCALARVALUE msc, \
          MEDIAN.MESH m \
-    where m.OBJECTID = ? AND \
-          msc.PARTID = m.PARTIDMIN AND \
+   where m.OBJECTID = ? AND \ 
+          msc.PARTID >= m.PARTIDMIN AND \
+          msc.PARTID <= m.PARTIDMAX AND \
           msc.PARAMETERID = p.PARAMETERID \
     order by p.GERMANNAME
 timeseries_mesh_interval=select /*+ parallel(TIMEVALUE,5) */ \
@@ -364,6 +365,15 @@
                               FEATURECODE = ? )\
                       ) \
      order by M.NAME
+     
+verticalprofile_mesh_with_wkt = SELECT M.OBJECTID KEY, \
+         M.NAME VALUE \
+     FROM MEDIAN.MESHPOINT, \
+          MEDIAN.MESH M \
+     WHERE M.SOURCEID IN (?) AND \
+           M.MESHID = MEDIAN.MESHPOINT.MESHID AND \
+           INTERSECTS(SHAPE, "?") \
+     order by M.NAME
     
 verticalprofile_mesh_point = SELECT FEATUREID, \
         ST_ASTEXT(SHAPE) \