Mercurial > dive4elements > gnv-client

changeset 223:05663e307495

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 Meshes. gnv-artifacts/trunk@287 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Thu, 05 Nov 2009 15:16:51 +0000
parents 3e82b4f1c455
children 2b7a40b5b535
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml gnv-artifacts/doc/conf/queries.properties
diffstat 7 files changed, 256 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Thu Nov 05 14:45:54 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Thu Nov 05 15:16:51 2009 +0000
@@ -1,5 +1,18 @@
 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.
+	* doc/conf/products/verticalprofile/conf_mesh.xml, 
+	  doc/conf/products/verticalcrosssection/conf_mesh.xml, 
+	  doc/conf/products/timeseries/conf_mesh.xml, 
+	  doc/conf/products/horizontalprofile/conf_mesh.xml, 
+	  doc/conf/products/horizontalcrosssection/conf_mesh.xml:
+	  Added the RegionFilters into the configuration of the Products
+	  for Meshes.
+
+2009-11-05  Tim Englich  <tim.englich@intevation.de>
 	* src/test/ressources/*_describe.xml:
 	  Added the DescribeRequestBodies to each TestCaseData.
 	* src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java: 
--- a/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Thu Nov 05 14:45:54 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Thu Nov 05 15:16:51 2009 +0000
@@ -1,6 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="horizontalCrossSectionMesh">
     <transitions>
+        <transition id="horizontalcrosssection_area" description="horizontalcrosssection_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>horizontalcrosssection_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="horizontalcrosssection_subarea" description="horizontalcrosssection_area_one" transition="de.intevation.gnv.transition.DefaultTransition">
+            <queryID>subarea_filter</queryID>
+            <dataname>subareaid</dataname>
+            <data-multiselect>false</data-multiselect>
+            <reachableTransitions>
+                   <transition>horizontalcrosssection_mesh</transition>
+            </reachableTransitions>
+            <alternativeTransition>
+                   <transition id="horizontalcrosssection_mesh" description="horizontalcrosssection_mesh" transition="de.intevation.gnv.transition.DefaultTransition">
+                        <queryID>verticalprofile_mesh</queryID>
+                        <dataname>meshid</dataname>
+                        <data-multiselect>false</data-multiselect>
+                        <reachableTransitions>
+                               <transition>horizontalcrosssection_meshpoint_depth</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="horizontalcrosssection_mesh" description="horizontalcrosssection_mesh" transition="de.intevation.gnv.transition.DefaultTransition">
             <queryID>verticalprofile_mesh</queryID>
             <dataname>meshid</dataname>
@@ -9,6 +50,7 @@
                    <transition>horizontalcrosssection_meshpoint_depth</transition>
             </reachableTransitions>
             <inputvalues>
+                <inputvalue name="subareaid" type="Integer" multiselect="false" usedinquery="0"/>
                 <inputvalue name="sourceid" type="Integer" multiselect="false" usedinquery="1"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
             </inputvalues>
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml	Thu Nov 05 14:45:54 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml	Thu Nov 05 15:16:51 2009 +0000
@@ -1,8 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="horizontalProfileMesh">
   <transitions>
+        <transition id="horizontalprofile_mesh_area" description="horizontalprofile_mesh_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>horizontalprofile_mesh_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="horizontalprofile_mesh_subarea" description="horizontalprofile_mesh_subaera" transition="de.intevation.gnv.transition.DefaultTransition">
+               <queryID>subarea_filter</queryID>
+               <dataname>subareaid</dataname>
+               <data-multiselect>false</data-multiselect>
+               <reachableTransitions>
+                      <transition>horizontalprofile_mesh</transition>
+               </reachableTransitions>
+               <alternativeTransition>
+                   <transition id="horizontalprofile_mesh_without_geom" description="horizontalprofile_mesh_without_geom" transition="de.intevation.gnv.transition.DefaultTransition">
+                       <queryID>verticalprofile_mesh</queryID>
+                       <dataname>meshid</dataname>
+                       <data-multiselect>false</data-multiselect>
+                       <reachableTransitions>
+                              <transition>horizontalprofile_mesh_coordinate</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="horizontalprofile_mesh" description="horizontalprofile_mesh" transition="de.intevation.gnv.transition.DefaultTransition">
-           <queryID>verticalprofile_mesh</queryID>
+           <queryID>verticalprofile_mesh_with_area</queryID>
            <dataname>meshid</dataname>
            <data-multiselect>false</data-multiselect>
            <reachableTransitions>
@@ -11,6 +51,7 @@
            <inputvalues>
                <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/timeseries/conf_mesh.xml	Thu Nov 05 14:45:54 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml	Thu Nov 05 15:16:51 2009 +0000
@@ -1,8 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="timeSeriesMesh">
     <transitions>
+        <transition id="timeseries_mesh_area" description="timeseries_mesh_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_mesh_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_mesh_subarea" description="timeseries_mesh_subaera" transition="de.intevation.gnv.transition.DefaultTransition">
+            <queryID>subarea_filter</queryID>
+            <dataname>subareaid</dataname>
+            <data-multiselect>false</data-multiselect>
+            <reachableTransitions>
+                   <transition>timeseries_mesh</transition>
+            </reachableTransitions>
+            <alternativeTransition>
+                <transition id="timeseries_mesh_without_geom" description="timeseries_mesh_without_geom" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_mesh</queryID>
+                    <dataname>meshid</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                           <transition>timeseries_mesh_coordinate</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_mesh" description="timeseries_mesh" transition="de.intevation.gnv.transition.DefaultTransition">
-            <queryID>timeseries_mesh</queryID>
+            <queryID>verticalprofile_mesh_with_area</queryID>
             <dataname>meshid</dataname>
             <data-multiselect>false</data-multiselect>
             <reachableTransitions>
@@ -11,6 +51,7 @@
             <inputvalues>
                 <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/verticalcrosssection/conf_mesh.xml	Thu Nov 05 14:45:54 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Thu Nov 05 15:16:51 2009 +0000
@@ -1,8 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="verticalCrossSectionMesh">
      <transitions>
+        <transition id="verticalcrosssection_mesh_area" description="verticalcrosssection_mesh_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>verticalcrosssection_mesh_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="verticalcrosssection_mesh_subarea" description="verticalcrosssection_mesh_area_one" transition="de.intevation.gnv.transition.DefaultTransition">
+               <queryID>subarea_filter</queryID>
+               <dataname>subareaid</dataname>
+               <data-multiselect>false</data-multiselect>
+               <reachableTransitions>
+                      <transition>verticalcrosssection_mesh</transition>
+               </reachableTransitions>
+               <alternativeTransition>
+                      <transition id="verticalcrosssection_mesh_without_geom" description="verticalcrosssection_mesh" transition="de.intevation.gnv.transition.DefaultTransition">
+                           <queryID>verticalprofile_mesh</queryID>
+                           <dataname>meshid</dataname>
+                           <data-multiselect>false</data-multiselect>
+                           <reachableTransitions>
+                                  <transition>verticalcrosssection_mesh_coordinate</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="verticalcrosssection_mesh" description="verticalcrosssection_mesh" transition="de.intevation.gnv.transition.DefaultTransition">
-             <queryID>verticalprofile_mesh</queryID>
+             <queryID>verticalprofile_mesh_with_area</queryID>
              <dataname>meshid</dataname>
              <data-multiselect>false</data-multiselect>
              <reachableTransitions>
@@ -11,6 +51,7 @@
              <inputvalues>
                  <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_mesh.xml	Thu Nov 05 14:45:54 2009 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalprofile/conf_mesh.xml	Thu Nov 05 15:16:51 2009 +0000
@@ -1,8 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="verticalProfileMesh">
    <transitions>
+       <transition id="verticalprofile_mesh_area" description="verticalprofile_mesh_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_mesh_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_mesh_subarea" description="verticalprofile_mesh_subaera" transition="de.intevation.gnv.transition.DefaultTransition">
+           <queryID>subarea_filter</queryID>
+           <dataname>subareaid</dataname>
+           <data-multiselect>false</data-multiselect>
+           <reachableTransitions>
+                  <transition>verticalprofile_mesh</transition>
+           </reachableTransitions>
+           <alternativeTransition>
+               <transition id="verticalprofile_mesh_without_geom" description="timeseries_mesh_without_geom" transition="de.intevation.gnv.transition.DefaultTransition">
+                   <queryID>verticalprofile_mesh</queryID>
+                   <dataname>meshid</dataname>
+                   <data-multiselect>false</data-multiselect>
+                   <reachableTransitions>
+                          <transition>verticalprofile_mesh_coordinate</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_mesh" description="verticalprofile_mesh" transition="de.intevation.gnv.transition.DefaultTransition">
-           <queryID>verticalprofile_mesh</queryID>
+           <queryID>verticalprofile_mesh_with_area</queryID>
            <dataname>meshid</dataname>
            <data-multiselect>false</data-multiselect>
            <reachableTransitions>
@@ -11,6 +51,7 @@
            <inputvalues>
                <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/queries.properties	Thu Nov 05 14:45:54 2009 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Thu Nov 05 15:16:51 2009 +0000
@@ -226,6 +226,20 @@
     WHERE SOURCEID IN (?) \
     order by m.NAME
     
+verticalprofile_mesh_with_area = 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, \
+                      (SELECT st_astext(SHAPE) \
+                       FROM MEDIAN.FEATUREAREA \
+                       WHERE (FEATURETYPE = 7 OR FEATURETYPE = 8) AND \
+                              FEATURECODE = ? )\
+                      ) \
+     order by M.NAME
+    
 verticalprofile_mesh_point = SELECT FEATUREID, \
         ST_ASTEXT(SHAPE) \
     FROM MEDIAN.MESHPOINT \
@@ -639,4 +653,22 @@
           M.OBJECTID = ? AND \
           MEDIAN.MESHFACE.KPOSITION = ? \
     order by MEDIAN.MESHFACE.JPOSITION , \
-             MEDIAN.MESHFACE.IPOSITION
\ No newline at end of file
+             MEDIAN.MESHFACE.IPOSITION
+             
+             
+area_filter = SELECT DISTINCT \
+       FEATUREID KEY ,\
+       DESCRIPTION VALUE \
+    FROM MEDIAN.FEATUREAREA \
+    WHERE (FEATURETYPE = 7 OR FEATURETYPE = 8) AND \
+          FEATUREID > 0 \
+    ORDER BY FEATUREID
+    
+subarea_filter = SELECT \
+       FEATURECODE KEY, \
+       NAME VALUE \
+    FROM MEDIAN.FEATUREAREA \
+    WHERE (FEATURETYPE = 7 OR FEATURETYPE = 8) AND \
+          FEATUREID = ? \
+    ORDER BY NAME
+    
\ No newline at end of file
http://dive4elements.wald.intevation.org