# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1255429066 0
# Node ID dbf68950b4d950949142609615051ab7218a71f8
# Parent  1b2fc94766c9e3ee80e7bd9eb4933d7bcb468057
Added real Coordinate-Query to HorizontalProfile- and VerticalProfile-Mesh

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

diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Oct 13 10:17:46 2009 +0000
@@ -1,3 +1,11 @@
+2009-10-13  Tim Englich  <tim.englich@intevation.de>
+
+	* src/test/ressources/verticalprofile_mesh/verticalprofile_step_*_feed.xml, 
+	  src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_*_feed.xml: 
+	  Switched to Szenario where it is possible to select Data using the Coordinate. 
+	* src/test/ressources/conf.xml,
+	  src/test/ressources/queries.properties:
+	  Switched to SFS-Conformant-Queries in HorzintalProfile- and VerticalProfile-Mesh  
 2009-10-13  Tim Englich  <tim.englich@intevation.de>
 
     * src/main/resources/lang/artifactMessages_*.properties: 
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/conf.xml
--- a/gnv-artifacts/src/test/ressources/conf.xml	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/conf.xml	Tue Oct 13 10:17:46 2009 +0000
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <artifact-database>
     <factories>
         <context-factory>de.intevation.gnv.artifacts.context.GNVArtifactContextFactory</context-factory>
@@ -443,7 +442,7 @@
                     </inputvalues>
                 </transition>
                 
-                <transition id="verticalprofile_mesh_point" description="verticalprofile_mesh_point" transition="de.intevation.gnv.transition.DefaultTransition">
+                <transition id="verticalprofile_mesh_point" description="verticalprofile_mesh_point" transition="de.intevation.gnv.transition.CoordinateSelectionTransition">
                     <queryID>verticalprofile_mesh_point</queryID>
                     <dataname>mesh_point</dataname>
                     <data-multiselect>false</data-multiselect>
@@ -452,7 +451,7 @@
                     </reachableTransitions>
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
-                         <inputvalue name="mesh_coordinate" type="Integer" multiselect="false"/>
+                         <inputvalue name="mesh_coordinate" type="Coordinate" multiselect="false"/>
                     </inputvalues>
                 </transition>
                 
@@ -700,7 +699,7 @@
                     </inputvalues>
                 </transition>
                 
-                <transition id="horizontalprofile_mesh_point" description="horizontalprofile_mesh_point" transition="de.intevation.gnv.transition.DefaultTransition">
+                <transition id="horizontalprofile_mesh_point" description="horizontalprofile_mesh_point" transition="de.intevation.gnv.transition.CoordinateSelectionTransition">
                     <queryID>verticalprofile_mesh_point</queryID>
                     <dataname>mesh_point</dataname>
                     <data-multiselect>false</data-multiselect>
@@ -709,7 +708,7 @@
                     </reachableTransitions>
                     <inputvalues>
                          <inputvalue name="meshid" type="Integer" multiselect="false"/>
-                         <inputvalue name="mesh_coordinate" type="Integer" multiselect="false"/>
+                         <inputvalue name="mesh_coordinate" type="Coordinate" multiselect="false"/>
                     </inputvalues>
                 </transition>
                  <transition id="horizontalprofile_mesh_axis" description="horizontalprofile_mesh_point" transition="de.intevation.gnv.transition.profile.horizontal.NorthSouthEastWestTransition">
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_feed.xml
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_feed.xml	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_03_feed.xml	Tue Oct 13 10:17:46 2009 +0000
@@ -3,5 +3,7 @@
 	<art:type name="feed" />
 	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
 	<art:hash value="29647319" />
-	<art:data />
+	<art:data>
+        <art:input name="mesh_coordinate" value="56n30 6e20" />
+    </art:data>
 </art:action>
\ No newline at end of file
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_feed.xml
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_feed.xml	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_04_feed.xml	Tue Oct 13 10:17:46 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
 	<art:hash value="29647319" />
 	<art:data>
-		<art:input name="mesh_point" value="2003416" />
+		<art:input name="mesh_point" value="2003771" />
 	</art:data>
 </art:action>
\ No newline at end of file
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_feed.xml
--- a/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_feed.xml	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/horizontalProfile_mesh/horizontalprofile_step_08_feed.xml	Tue Oct 13 10:17:46 2009 +0000
@@ -4,7 +4,7 @@
 	<art:uuid value="1f6a63e2-c9d6-4ab1-830e-1effbc189d68" />
 	<art:hash value="29647319" />
 	<art:data>
-		<art:input name="dateid" value="2009.10.03 23:45:00" />
-		<art:input name="dateid" value="2009.10.04 00:00:00" />
+		<art:input name="dateid" value="2009.10.15 23:00:00" />
+		<art:input name="dateid" value="2009.10.16 00:00:00" />
 	</art:data>
 </art:action>
\ No newline at end of file
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/queries.properties
--- a/gnv-artifacts/src/test/ressources/queries.properties	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/queries.properties	Tue Oct 13 10:17:46 2009 +0000
@@ -230,14 +230,15 @@
     FROM MEDIAN.MESH m \
     order by m.NAME
     
-verticalprofile_mesh_point = SELECT FEATUREID KEY, \
-        SHAPE VALUE \
-    FROM MEDIAN.MESHPOINT mp , \
-         MEDIAN.MESH m \
-    WHERE m.OBJECTID = ? AND \
-          m.MESHID = mp.MESHID AND \
-          mp.KPOSITION = 1 AND \
-          rownum < 10
+verticalprofile_mesh_point = SELECT FEATUREID, \
+        ST_ASTEXT(SHAPE) \
+    FROM MEDIAN.MESHPOINT \
+    WHERE MESHID  in \
+        (SELECT DISTINCT MESHID \
+         FROM MEDIAN.MESH \
+         WHERE OBJECTID = ?) AND \
+         KPOSITION = 1 AND \
+         INTERSECTS(SHAPE,"?")
           
 verticalprofile_mesh_parameter=SELECT distinct \
         p.PARAMETERID KEY , \
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_feed.xml
--- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_feed.xml	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_02_feed.xml	Tue Oct 13 10:17:46 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="041fd0b2-5d77-49a8-b19f-5f3f553bda5d" />
 	<art:hash value="31343478" />
 	<art:data>
-		<art:input name="meshid" value="1" />
+		<art:input name="meshid" value="3" />
 	</art:data>
 </art:action>
\ No newline at end of file
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_feed.xml
--- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_feed.xml	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_03_feed.xml	Tue Oct 13 10:17:46 2009 +0000
@@ -3,5 +3,7 @@
 	<art:type name="feed" />
 	<art:uuid value="041fd0b2-5d77-49a8-b19f-5f3f553bda5d" />
 	<art:hash value="31343478" />
-	<art:data />
+    <art:data>
+        <art:input name="mesh_coordinate" value="56n30 6e20" />
+    </art:data>
 </art:action>
\ No newline at end of file
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_feed.xml
--- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_feed.xml	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_04_feed.xml	Tue Oct 13 10:17:46 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="041fd0b2-5d77-49a8-b19f-5f3f553bda5d" />
 	<art:hash value="31343478" />
 	<art:data>
-		<art:input name="mesh_point" value="3002488" />
-	</art:data>
+        <art:input name="mesh_point" value="2003771" />
+    </art:data>
 </art:action>
\ No newline at end of file
diff -r 1b2fc94766c9 -r dbf68950b4d9 gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml
--- a/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml	Tue Oct 13 09:11:23 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/verticalprofile_mesh/verticalprofile_step_06_feed.xml	Tue Oct 13 10:17:46 2009 +0000
@@ -4,6 +4,6 @@
 	<art:uuid value="041fd0b2-5d77-49a8-b19f-5f3f553bda5d" />
 	<art:hash value="31343478" />
 	<art:data>
-		<art:input name="dateid" value="2009.10.01 00:00:00" />
+		<art:input name="dateid" value="2009.10.16 00:00:00" />
 	</art:data>
 </art:action>
\ No newline at end of file