Mercurial > dive4elements > gnv-client

changeset 85:dbd141c6bb97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added Support for VerticalProfiles for InstantaneousPoints gnv-artifacts/trunk@115 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Wed, 23 Sep 2009 14:32:55 +0000
parents c8d1f7b9e5a8
children 5d4f5d26bb7a
files gnv-artifacts/Changelog gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java gnv-artifacts/src/test/ressources/conf.xml gnv-artifacts/src/test/ressources/queries.properties
diffstat 4 files changed, 149 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/Changelog	Wed Sep 23 12:39:48 2009 +0000
+++ b/gnv-artifacts/Changelog	Wed Sep 23 14:32:55 2009 +0000
@@ -1,3 +1,12 @@
+2009-09-23  Tim Englich  <tim.englich@intevation.de>
+
+    * src/test/ressources/queries.properties Edited:
+      Statements for InstantaneousPoint Vertical Profiles added 
+    * src/test/ressources/conf.xml Edited:
+      Configuration for Vertikal Profiles for InstantaneousPoints added
+    * src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java (VerticalProfileInstantaneousPointArtifact) Added:
+     New Artifact-Class Reperesenting Artifacts for InstantaneousPoints Creating VerticalProfiles added. 
+    
 2009-09-23  Tim Englich  <tim.englich@intevation.de>
 
     * src/main/java/de/intevation/gnv/transition/TransitionBase.java (prepareInputData4DateDBQuery) Edited:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java	Wed Sep 23 14:32:55 2009 +0000
@@ -0,0 +1,32 @@
+/**
+ *
+ */
+package de.intevation.gnv.profile.vertical;
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author Tim Englich <tim.englich@intevation.de>
+ *
+ */
+public class VerticalProfileInstantaneousPointArtifact extends VerticalProfileArtifact {
+    /**
+     * the logger, used to log exceptions and additonaly information
+     */
+    private static Logger log = Logger.getLogger(VerticalProfileInstantaneousPointArtifact.class);
+    
+    
+    /**
+     * The UID of this class
+     */
+    private static final long serialVersionUID = -8291547966693867205L;
+    
+    /**
+     * Constructor
+     */
+    public VerticalProfileInstantaneousPointArtifact(){
+        super();
+        log.debug("VerticalProfileInstantaneousPointArtifact.Constructor");
+        super.name = super.name+ "InstantaneousPoint";
+    }
+}
--- a/gnv-artifacts/src/test/ressources/conf.xml	Wed Sep 23 12:39:48 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/conf.xml	Wed Sep 23 14:32:55 2009 +0000
@@ -11,6 +11,8 @@
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="fis_modeldata" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                               ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+            <artifact-factory name="fis_instantaneouspoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                              ttl="300000" artifact="de.intevation.gnv.artifacts.fis.FISArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
         </artifact-factories>
     </factories>
     <artifacts>
@@ -83,6 +85,16 @@
             </products>
         </artifact>
         
+         <artifact name="fis_instantaneouspoint">
+            <products>
+                <product name= "verticalProfile">
+                    <artifact-factory name="verticalProfileInstantaneousPoint" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                             ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                    <parameters></parameters>
+                </product>
+            </products>
+        </artifact>
+        
         <artifact name="timeSeriesMesh">
             <transitions>
                 
@@ -389,6 +401,58 @@
                 </transition>
             </transitions>
          </artifact>
+         
+          <artifact name="verticalProfileInstantaneousPoint">
+            <transitions>
+                <transition id="verticalprofile_instantaneouspoint_series" description="verticalprofile_instantaneouspoint_series" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_instantaneouspoint_series</queryID>
+                    <dataname>featureid</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                           <transition>verticalprofile_instantaneouspoint_point</transition>
+                    </reachableTransitions>
+                    <inputvalues>
+                    </inputvalues>
+                </transition>
+                <transition id="verticalprofile_instantaneouspoint_point" description="verticalprofile_instantaneouspoint_point" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_instantaneouspoint_point</queryID>
+                    <dataname>instantaneouspoint_point</dataname>
+                    <data-multiselect>false</data-multiselect>
+                    <reachableTransitions>
+                        <transition>verticalprofile_instantaneouspoint_parameter</transition>v
+                    </reachableTransitions>
+                    <inputvalues>
+                         <inputvalue name="featureid" type="Integer" multiselect="false"/>
+                    </inputvalues>
+                </transition>
+                 <transition id="verticalprofile_instantaneouspoint_parameter" description="verticalprofile_instantaneouspoint_parameter" transition="de.intevation.gnv.transition.DefaultTransition">
+                    <queryID>verticalprofile_instantaneouspoint_parameter</queryID>
+                    <dataname>parameterid</dataname>
+                    <data-multiselect>true</data-multiselect>
+                    <reachableTransitions>
+                        <transition>verticalprofile_instantaneouspoint_calculate_results</transition>
+                    </reachableTransitions>
+                    <inputvalues>
+                         <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="0" />
+                         <inputvalue name="instantaneouspoint_point" type="Integer" multiselect="false" usedinquery="1"/>
+                    </inputvalues>
+                </transition>
+                 <transition id="verticalprofile_instantaneouspoint_calculate_results" description="verticalprofile_mesh_calculate_results" transition="de.intevation.gnv.transition.profile.vertical.VerticalProfileOutputTransition">
+                    <queryID>verticalprofile_instantaneouspoint_chart_data</queryID>
+                    <inputvalues>
+                        <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="0" />
+                        <inputvalue name="instantaneouspoint_point" type="Integer" multiselect="false" usedinquery="1"/>
+                        <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/>
+                    </inputvalues>
+                    <outputsModes>
+                        <outputsMode name="chart" description="Chartrepresentation of the Values" mime-type="image/png"/>
+                        <outputsMode name="csv" description="CSV-Export der Daten" mime-type="test/plain"/>
+                        <outputsMode name="statistics" description="Statistik zu den Daten" mime-type="test/plain"/>
+                    </outputsModes>
+                </transition>
+            </transitions>
+           </artifact>
+         
     </artifacts>
     <geo-backend>
         <backend-configuration>../geo-backend/src/test/ressources/ArcSDEConnectionPoolTestCase.properties</backend-configuration>
--- a/gnv-artifacts/src/test/ressources/queries.properties	Wed Sep 23 12:39:48 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/queries.properties	Wed Sep 23 14:32:55 2009 +0000
@@ -166,4 +166,47 @@
             msv.TIMEVALUE, \
             ml.UPPERZLOCATION
             
-  
\ No newline at end of file
+#############################################
+#############################################
+##### Vertikalprofil InstantaneousPoint #####
+#############################################
+#############################################
+
+verticalprofile_instantaneouspoint_series = SELECT S.SERIESID KEY, \
+        S.DESCRIPTION VALUE \
+    FROM MEDIAN.SERIES S
+
+verticalprofile_instantaneouspoint_point = SELECT IP.FEATUREID KEY, \
+        IP.SHAPE VALUE \
+    FROM MEDIAN.INSTANTANEOUSPOINT IP \
+    WHERE IP.POINTSPEC = 4 AND \
+          IP.SERIESID = ?
+
+verticalprofile_instantaneouspoint_parameter = SELECT DISTINCT \
+        P.PARAMETERID KEY , \
+        P.GERMANNAME VALUE \
+    FROM MEDIAN.PARAMETER P, \
+         MEDIAN.INSTANTANEOUSPOINT IP, \
+         MEDIAN.MEASUREMENT M, \
+         MEDIAN.MEASUREDSCALARVALUE MSV \
+    WHERE IP.FEATUREID = M.FEATUREID AND \
+          M.MEASUREMENTID = MSV.MEASUREMENTID AND \
+          MSV.PARAMETERID = P.PARAMETERID AND \
+          IP.FEATUREID = ? \
+    ORDER BY P.GERMANNAME
+
+verticalprofile_instantaneouspoint_chart_data = SELECT M.ZLOCATION XORDINATE, \
+        MSV.DATAVALUE  YORDINATE, \
+        MSV.PARAMETERID GROUP1, \
+        IP.TIMEVALUE GROUP2, \
+        1 GROUP3 \
+    FROM MEDIAN.INSTANTANEOUSPOINT IP, \
+         MEDIAN.MEASUREMENT M, \
+         MEDIAN.MEASUREDSCALARVALUE MSV \
+    WHERE IP.FEATUREID = M.FEATUREID AND \
+          M.MEASUREMENTID = MSV.MEASUREMENTID AND \
+          IP.FEATUREID = ? AND \
+          MSV.PARAMETERID in (?) \
+    ORDER BY IP.TIMEVALUE, \
+          MSV.PARAMETERID, \
+          M.ZLOCATION
\ No newline at end of file
http://dive4elements.wald.intevation.org