Mercurial > dive4elements > gnv-client

changeset 224:2b7a40b5b535

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added the RegionFilters into the configuration of the Products for TimeSeriesPoints. gnv-artifacts/trunk@288 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Thu, 05 Nov 2009 16:02:36 +0000
parents 05663e307495
children 219e9666f590
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml gnv-artifacts/doc/conf/queries.properties
diffstat 4 files changed, 112 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Thu Nov 05 15:16:51 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Thu Nov 05 16:02:36 2009 +0000
@@ -1,9 +1,20 @@
 2009-11-05  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/queries.properties: 
+	  Query to select only those TimeSeriesPoints
+	  which are within an Region
+	* doc/conf/products/timeseries/conf_timeseriespoint.xml: 
+	* doc/conf/products/verticalprofile/conf_timeseriespoint.xml: 
+	  Added the RegionFilters into the configuration of the Products 
+	  for TimeSeriesPoints.
+	
+
+2009-11-05  Tim Englich  <tim.englich@intevation.de>
+	* doc/conf/queries.properties: 
 	  Added new Queries to fill the Lists for the
 	  Regionfilters and one Query to select only those Meshes
-	  which ar within an Region.
+	  which are within an Region.
+	
 	* doc/conf/products/verticalprofile/conf_mesh.xml, 
 	  doc/conf/products/verticalcrosssection/conf_mesh.xml, 
 	  doc/conf/products/timeseries/conf_mesh.xml, 
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml	Thu Nov 05 15:16:51 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/timeseries/conf_timeseriespoint.xml	Thu Nov 05 16:02:36 2009 +0000
@@ -1,16 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="timeSeries">
     <transitions>
+        <transition id="timeseries_area" description="timeseries_area_one" transition="de.intevation.gnv.transition.DefaultTransition">
+            <queryID>area_filter</queryID>
+            <dataname>areaid</dataname>
+            <data-multiselect>false</data-multiselect>
+             <data-noselect>true</data-noselect>
+            <reachableTransitions>
+                   <transition>timeseries_subarea</transition>
+            </reachableTransitions>
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+        </transition>
+        <transition id="timeseries_subarea" description="timeseries_subaera" transition="de.intevation.gnv.transition.DefaultTransition">
+            <queryID>subarea_filter</queryID>
+            <dataname>subareaid</dataname>
+            <data-multiselect>false</data-multiselect>
+            <reachableTransitions>
+                   <transition>timeseries_timeseriespoint</transition>
+            </reachableTransitions>
+            <alternativeTransition>
+                <transition id="timeseries_without_geom" description="timeseries_mesh_without_geom" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>timeseries_timeseriespoint</queryID>
+                    <dataname>featureid</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                           <transition>timeseries_parameter</transition>
+                    </reachableTransitions>
+                    <inputvalues>
+                        <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                    </inputvalues>
+                </transition>
+            </alternativeTransition>
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="areaid" type="Integer" multiselect="false" usedinquery="1"/>
+            </inputvalues>
+        </transition>
         <transition id="timeseries_timeseriespoint" description="timeseries_timeseriespoint" transition="de.intevation.gnv.transition.DefaultTransition">
-            <queryID>timeseries_timeseriespoint</queryID>
+            <queryID>timeseries_timeseriespoint_with_area</queryID>
             <dataname>featureid</dataname>
             <data-multiselect>false</data-multiselect>
             <reachableTransitions>
                 <transition>timeseries_parameter</transition>
             </reachableTransitions>
             <inputvalues>
-                <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="subareaid" type="Integer" multiselect="false" usedinquery="1"/>
             </inputvalues>
         </transition>
         
--- a/gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml	Thu Nov 05 15:16:51 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_timeseriespoint.xml	Thu Nov 05 16:02:36 2009 +0000
@@ -1,8 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="verticalProfile">
     <transitions>
+        <transition id="verticalprofile_area" description="verticalprofile_area_one" transition="de.intevation.gnv.transition.DefaultTransition">
+            <queryID>area_filter</queryID>
+            <dataname>areaid</dataname>
+            <data-multiselect>false</data-multiselect>
+             <data-noselect>true</data-noselect>
+            <reachableTransitions>
+                   <transition>verticalprofile_subarea</transition>
+            </reachableTransitions>
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+            </inputvalues>
+        </transition>
+        <transition id="verticalprofile_subarea" description="verticalprofile_subaera" transition="de.intevation.gnv.transition.DefaultTransition">
+            <queryID>subarea_filter</queryID>
+            <dataname>subareaid</dataname>
+            <data-multiselect>false</data-multiselect>
+            <reachableTransitions>
+                   <transition>verticalprofile_timeseriespoint</transition>
+            </reachableTransitions>
+            <alternativeTransition>
+                <transition id="verticalprofile_without_geom" description="verticalprofile_without_geom" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_point</queryID>
+                    <dataname>featureid</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                           <transition>verticalprofile_parameter</transition>
+                    </reachableTransitions>
+                    <inputvalues>
+                        <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
+                        <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                    </inputvalues>
+                </transition>
+            </alternativeTransition>
+            <inputvalues>
+                <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="0"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="areaid" type="Integer" multiselect="false" usedinquery="1"/>
+            </inputvalues>
+        </transition>
         <transition id="verticalprofile_timeseriespoint" description="timeseries_timeseriespoint" transition="de.intevation.gnv.transition.DefaultTransition">
-            <queryID>verticalprofile_point</queryID>
+            <queryID>timeseries_timeseriespoint_with_area</queryID>
             <dataname>featureid</dataname>
             <data-multiselect>false</data-multiselect>
             <reachableTransitions>
@@ -11,6 +51,7 @@
             <inputvalues>
                 <inputvalue name="sourceid" type="Integer" multiselect="false"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="subareaid" type="Integer" multiselect="false" usedinquery="1"/>
             </inputvalues>
         </transition>
         
--- a/gnv-artifacts/doc/conf/queries.properties	Thu Nov 05 15:16:51 2009 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Thu Nov 05 16:02:36 2009 +0000
@@ -13,6 +13,21 @@
           mmt.SOURCEID = ? \
     order by tsp.name
 
+timeseries_timeseriespoint_with_area=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, \
+                      (SELECT st_astext(SHAPE) \
+                       FROM MEDIAN.FEATUREAREA \
+                       WHERE (FEATURETYPE = 7 OR FEATURETYPE = 8) AND \
+                              FEATURECODE = ? )\
+                      )\
+    ORDER BY MEDIAN.TIMESERIESPOINT.NAME
+
 timeseries_parameter=SELECT DISTINCT \
         p.PARAMETERID KEY, \
         p.GERMANNAME VALUE \
http://dive4elements.wald.intevation.org