Mercurial > dive4elements > gnv-client

changeset 738:40c9a48f51ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified the Workflow of TimeSeries on TimeSeriespoints that the Data that was sent by the Mapviewer-Interface take effect. gnv-artifacts/trunk@777 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Mon, 15 Mar 2010 15:15:56 +0000
parents 3f8f71e88587
children a40a6de70459
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml gnv-artifacts/doc/conf/queries.properties
diffstat 3 files changed, 61 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Mon Mar 15 13:49:50 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Mon Mar 15 15:15:56 2010 +0000
@@ -1,3 +1,14 @@
+2010-03-15  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/queries.properties: 
+	  Added Query for fetching the TimeSeriespoint using an WKT as the 
+	  Geometryvalue to define the Region of Interest.
+
+	* 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
+	  was send by the Mapviewer. 
+
 2010-03-15  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/queries.properties:
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml	Mon Mar 15 13:49:50 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml	Mon Mar 15 15:15:56 2010 +0000
@@ -24,7 +24,46 @@
               * description: A short description which should describe the state
               * state: The Class which must be load to handle the required logic,
                             This class will be load using reflection. -->
-              
+        
+        <state id="timeseries_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_mapviewerswitch"/>
+            <to state="timeseries_area"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="timeseries_mapviewerswitch"/>
+            <to state="timeseries_with_wkt"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
+        </transition>
+        
+        <state id="timeseries_with_wkt" description="timeseries_timeseriespoint" state="de.intevation.gnv.state.PreSettingsTransferState">
+            <queryID>timeseries_timeseriespoint_with_wkt</queryID>
+            <dataname>featureid</dataname>
+            <data-multiselect>false</data-multiselect>
+            <presettings-transfer presetting="geometry" inputvalue="wktid"/>
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="wktid" type="Geometry" multiselect="false" usedinquery="1"/>
+                <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+        </state>
+        
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="timeseries_with_wkt"/>
+            <to state="timeseries_parameter"/>
+        </transition>
+        
         <state id="timeseries_area" description="timeseries_area_one" state="de.intevation.gnv.state.DefaultState">
             
             <!-- The QueryID which identifies the Query which is configured in 
--- a/gnv-artifacts/doc/conf/queries.properties	Mon Mar 15 13:49:50 2010 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Mon Mar 15 15:15:56 2010 +0000
@@ -28,6 +28,16 @@
                       )\
     ORDER BY MEDIAN.TIMESERIESPOINT.NAME
 
+timeseries_timeseriespoint_with_wkt=SELECT \
+        MEDIAN.TIMESERIESPOINT.FEATUREID KEY, \
+        MEDIAN.TIMESERIESPOINT.NAME VALUE \
+    FROM MEDIAN.TIMESERIESPOINT, \
+         MEDIAN.MEASUREMENT MMT \
+    WHERE MEDIAN.TIMESERIESPOINT.FEATUREID =  MMT.FEATUREID AND \
+          MMT.SOURCEID = ? AND \
+          INTERSECTS(SHAPE,"?")\
+    ORDER BY MEDIAN.TIMESERIESPOINT.NAME
+
 timeseries_parameter=SELECT DISTINCT \
         p.PARAMETERID KEY, \
         p.GERMANNAME || '  ['|| p.UNIT ||']' VALUE, \
http://dive4elements.wald.intevation.org