# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1268672502 0
# Node ID 2dc0666db49a480686898fdcba67843c9d51a6dc
# Parent  0563389138bbae47c30863db1aefb16961264adb
Modified the Workflow of Horizontalprofiles on Instantaneouspoints that the Data that was sent by the Mapviewer-Interface take effect.

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

diff -r 0563389138bb -r 2dc0666db49a gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Mon Mar 15 15:39:59 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Mon Mar 15 17:01:42 2010 +0000
@@ -1,3 +1,21 @@
+2010-03-15  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/products/verticalprofile/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: 
+	  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  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	  Issue120
diff -r 0563389138bb -r 2dc0666db49a gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml	Mon Mar 15 15:39:59 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_instantaneouspoint.xml	Mon Mar 15 17:01:42 2010 +0000
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="horizontalProfileInstantaneousPoint">
    <states>
+        <state id="horizontalprofile_instantaneouspoint_mapviewerswitch" description="horizontalprofile_instantaneouspoint_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="horizontalprofile_instantaneouspoint_mapviewerswitch"/>
+            <to state="horizontalprofile_instantaneouspoint_area"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="notequal"/>
+        </transition>
+        
+        <transition transition="de.intevation.gnv.transition.PresettingsValueCompareTransition">
+            <from state="horizontalprofile_instantaneouspoint_mapviewerswitch"/>
+            <to state="horizontalprofile_instantaneouspoint_vehicle_with_wkt"/>
+            <condition inputvalue="geometry" value="POLYGON" operator="equal"/>
+        </transition>
         <state id="horizontalprofile_instantaneouspoint_area" description="horizontalprofile_instantaneouspoint_area" state="de.intevation.gnv.state.DefaultState">
             <queryID>area_filter</queryID>
             <dataname>areaid</dataname>
@@ -41,6 +61,61 @@
            <to state="horizontalprofile_instantaneouspoint_vehicle"/>
        </transition>
         
+       <!-- Anfang Sonderfall Ablaufsteuerung mit Anwendung der Geometrie aus der Mapviewer-Schnittstelle -->
+       <state id="horizontalprofile_instantaneouspoint_vehicle_with_wkt" description="horizontalprofile_instantaneouspoint_vehicle_with_wkt" state="de.intevation.gnv.state.PreSettingsTransferState">
+           <queryID>horizontalprofile_instantaneouspoint_vehicle_with_wkt</queryID>
+           <dataname>vehicleid</dataname>
+           <data-multiselect>false</data-multiselect>
+           <presettings-transfer presetting="geometry" inputvalue="wktid"/>
+           <inputvalues>
+               <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+               <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="wktid" type="Geometry" multiselect="false" usedinquery="1"/>
+               <inputvalue name="vehicleid" type="Integer" multiselect="false" usedinquery="0"/>
+           </inputvalues>
+       </state>
+       
+       <transition transition="de.intevation.gnv.transition.DefaultTransition">
+           <from state="horizontalprofile_instantaneouspoint_vehicle_with_wkt"/>
+           <to state="horizontalprofile_instantaneouspoint_cruise_with_wkt"/>
+       </transition>
+       
+       <state id="horizontalprofile_instantaneouspoint_cruise_with_wkt" description="horizontalprofile_instantaneouspoint_cruise_with_wkt" state="de.intevation.gnv.state.DefaultState">
+           <queryID>horizontalprofile_instantaneouspoint_cruise_with_wkt</queryID>
+           <dataname>cruiseid</dataname>
+           <data-multiselect>false</data-multiselect>
+           <inputvalues>
+               <inputvalue name="sourceid" type="Integer" multiselect="false"/>
+               <inputvalue name="vehicleid" type="Integer" multiselect="false"/>
+               <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="wktid" type="Geometry" multiselect="false" usedinquery="1"/>
+               <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="0" />
+           </inputvalues>
+       </state>
+       
+       <transition transition="de.intevation.gnv.transition.DefaultTransition">
+           <from state="horizontalprofile_instantaneouspoint_cruise_with_wkt"/>
+           <to state="horizontalprofile_instantaneouspoint_track_with_wkt"/>
+       </transition>
+       
+       <state id="horizontalprofile_instantaneouspoint_track_with_wkt" description="horizontalprofile_instantaneouspoint_track_with_wkt" state="de.intevation.gnv.state.DefaultState">
+           <queryID>horizontalprofile_instantaneouspoint_track_with_wkt</queryID>
+           <dataname>trackid</dataname>
+           <data-multiselect>false</data-multiselect>
+           <inputvalues>
+               <inputvalue name="cruiseid" type="Integer" multiselect="false" usedinquery="1" />
+               <inputvalue name="wktid" type="Geometry" multiselect="false" usedinquery="1"/>
+               <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="trackid" type="Integer" multiselect="false" usedinquery="0" />
+           </inputvalues>
+       </state>
+       
+       <transition transition="de.intevation.gnv.transition.DefaultTransition">
+           <from state="horizontalprofile_instantaneouspoint_track_with_wkt"/>
+           <to state="horizontalprofile_instantaneouspoint_surveyinfo"/>
+       </transition>
+       <!-- Ende Sonderfall Ablaufsteuerung mit Anwendung der Geometrie aus der Mapviewer-Schnittstelle -->
+        
         <!-- Anfang Sonderfall Ablaufsteuerung mit Anwendung des Gebietsfilters  -->
        <state id="horizontalprofile_instantaneouspoint_vehicle" description="horizontalprofile_instantaneouspoint_vehicle" state="de.intevation.gnv.state.DefaultState">
            <queryID>horizontalprofile_instantaneouspoint_vehicle_with_area</queryID>
diff -r 0563389138bb -r 2dc0666db49a gnv-artifacts/doc/conf/queries.properties
--- a/gnv-artifacts/doc/conf/queries.properties	Mon Mar 15 15:39:59 2010 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Mon Mar 15 17:01:42 2010 +0000
@@ -690,6 +690,25 @@
                                                 FEATURECODE = ? )\
                                          ) \
     ORDER BY V.NAME
+
+horizontalprofile_instantaneouspoint_vehicle_with_wkt = SELECT V.VEHICLEID KEY, \
+                V.NAME VALUE \
+    FROM MEDIAN.TRACK, \
+         MEDIAN.VEHICLE V, \
+         MEDIAN.CRUISE C \
+    WHERE V.VEHICLEID = C.VEHICLEID AND \
+          C.CRUISEID = MEDIAN.TRACK.CRUISEID AND \
+          MEDIAN.TRACK.TRACKID IN \
+                      (SELECT DISTINCT S.TRACKID \
+                       FROM MEDIAN.MEASUREMENT M ,\
+                            MEDIAN.INSTANTANEOUSPOINT I, \
+                            MEDIAN.SURVEYINFO S \
+                       WHERE M.SOURCEID = ? AND \
+                             I.FEATUREID = M.FEATUREID AND \
+                             S.SURVEYID = I.SURVEYID)AND \
+                             INTERSECTS(SHAPE,"?") \
+    ORDER BY V.NAME
+
 horizontalprofile_instantaneouspoint_cruise = SELECT DISTINCT \
         C.CRUISEID KEY, \
         V.NAME || ' ' || \
@@ -741,6 +760,31 @@
                                                 FEATURECODE = ? )\
                                          ) \
     ORDER BY V.NAME
+
+horizontalprofile_instantaneouspoint_cruise_with_wkt = SELECT C.CRUISEID KEY, \
+        V.NAME || ' ' || \
+        C.NAME || ' ' || \
+        TO_CHAR(C.STARTDATE,'DD.MM.YYYY') || ' - ' || \
+        TO_CHAR(C.ENDDATE,'DD.MM.YYYY') VALUE, \
+        V.NAME, \
+        C.NAME \
+    FROM MEDIAN.TRACK, \
+         MEDIAN.VEHICLE V, \
+         MEDIAN.CRUISE C \
+    WHERE V.VEHICLEID = C.VEHICLEID AND \
+          C.CRUISEID = MEDIAN.TRACK.CRUISEID AND \
+          MEDIAN.TRACK.TRACKID IN \
+                      (SELECT DISTINCT S.TRACKID \
+                       FROM MEDIAN.MEASUREMENT M ,\
+                            MEDIAN.INSTANTANEOUSPOINT I, \
+                            MEDIAN.SURVEYINFO S \
+                       WHERE M.SOURCEID = ? AND \
+                             C.VEHICLEID  = ? AND \
+                             I.FEATUREID = M.FEATUREID AND \
+                             S.SURVEYID = I.SURVEYID)AND \
+                             INTERSECTS(SHAPE,"?") \
+    ORDER BY V.NAME
+
 horizontalprofile_instantaneouspoint_track= SELECT \
         T.TRACKID KEY, \
         to_char(T.STARTDATE,'DD.MM.YYYY HH24:MI') || ' - '|| to_char(T.ENDDATE,'DD.MM.YYYY HH24:MI') || ' - '|| T.NAME VALUE \
@@ -752,7 +796,7 @@
              
 horizontalprofile_instantaneouspoint_track_with_area = SELECT \
         MEDIAN.TRACK.TRACKID KEY, \
-        to_char(STARTDATE,'DD.MM.YYYY HH24:MI') || ' - '|| to_char(ENDDATE,'DD.MM.YYYY HH24:MI') || ' - '|| NAME VALUE, \
+        to_char(STARTDATE,'DD-MM-YYYY HH24:MI') || ' - '|| to_char(ENDDATE,'DD-MM-YYYY HH24:MI') || ' - '|| NAME VALUE, \
         NAME \
     FROM MEDIAN.TRACK \
     WHERE MEDIAN.TRACK.CRUISEID = ? AND \
@@ -765,6 +809,18 @@
     ORDER BY STARTDATE, \
              ENDDATE, \
              NAME
+
+horizontalprofile_instantaneouspoint_track_with_wkt = SELECT \
+        MEDIAN.TRACK.TRACKID KEY, \
+        to_char(STARTDATE,'DD-MM-YYYY HH24:MI') || ' - '|| to_char(ENDDATE,'DD-MM-YYYY HH24:MI') || ' - '|| NAME VALUE, \
+        NAME \
+    FROM MEDIAN.TRACK \
+    WHERE MEDIAN.TRACK.CRUISEID = ? AND \
+          INTERSECTS(SHAPE, "?") \
+    ORDER BY STARTDATE, \
+             ENDDATE, \
+             NAME
+
 horizontalprofile_instantaneouspoint_surveyinfo = SELECT \
         SURVEYID KEY, \
         to_char(STARTDATE,'DD.MM.YYYY HH24:MI') || ' - '|| to_char(ENDDATE,'DD.MM.YYYY HH24:MI') || ' - '|| DESCRIPTION VALUE \