--- a/gnv-artifacts/src/test/ressources/queries.properties	Tue Oct 13 10:30:01 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/queries.properties	Wed Oct 14 10:49:35 2009 +0000
@@ -425,22 +425,23 @@
     WHERE M.FEATUREID = IP.FEATUREID AND \
           IP.SURVEYID = ? \
     ORDER BY M.ZLOCATION
-horizontalprofile_instantaneouspoint_chart_data = SELECT MSV.OBJECTID XORDINATE_XCOORD , \
-        MSV.OBJECTID XORDINATE_YCOORD , \
+horizontalprofile_instantaneouspoint_chart_data = SELECT ST_ASTEXT(SHAPE) , \
+        MEDIAN.INSTANTANEOUSPOINT.TIMEVALUE TIME , \
         MSV.DATAVALUE  YORDINATE , \
         MSV.PARAMETERID GROUP1 , \
         ZLOCATION GROUP2 , \
         1 GROUP3 \
-    FROM MEDIAN.INSTANTANEOUSPOINT IP, \
+    FROM MEDIAN.INSTANTANEOUSPOINT, \
          MEDIAN.MEASUREMENT M, \
          MEDIAN.MEASUREDSCALARVALUE MSV \
-    WHERE IP.FEATUREID = M.FEATUREID AND \
+    WHERE MEDIAN.INSTANTANEOUSPOINT.FEATUREID = M.FEATUREID AND \
           M.MEASUREMENTID = MSV.MEASUREMENTID AND \
-          IP.SURVEYID = ? AND \
+          MEDIAN.INSTANTANEOUSPOINT.SURVEYID = ? AND \
           M.ZLOCATION IN (?) AND \
           MSV.PARAMETERID in (?) \
     ORDER BY MSV.PARAMETERID, \
-             M.ZLOCATION
+             M.ZLOCATION, \
+             MEDIAN.INSTANTANEOUSPOINT.TIMEVALUE
              
 #############################################
 #############################################
@@ -464,25 +465,27 @@
             JPOSITION = (select JPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?)) \
     order by mp.KPOSITION
     
-horizontalprofile_mesh_chart_data = select mp.IPOSITION XORDINATE_XCOORD, mp.JPOSITION XORDINATE_YCOORD, \
+horizontalprofile_mesh_chart_data =  SELECT ST_ASTEXT(SHAPE), \
            msv.DATAVALUE YORDINATE, \
            msv.PARAMETERID GROUP1, \
            msv.TIMEVALUE GROUP2, \
-           mp.KPOSITION GROUP3 \
+           MEDIAN.MESHPOINT.KPOSITION GROUP3, \
+           MEDIAN.MESHPOINT.JPOSITION , \
+           MEDIAN.MESHPOINT.IPOSITION \
     from MEDIAN.MESHLAYER ml, \
-         MEDIAN.MESHPOINT mp, \
+         MEDIAN.MESHPOINT , \
          MEDIAN.MESH m, \
          MEDIAN.MESHSCALARVALUE msv \
-    where msv.FEATUREID = mp. FEATUREID AND \
-          ml.KPOSITION = mp.KPOSITION and \
-          ml.MESHID = mp.MESHID and \
-          m.MESHID = mp.MESHID AND \
+    where msv.FEATUREID = MEDIAN.MESHPOINT. FEATUREID AND \
+          ml.KPOSITION = MEDIAN.MESHPOINT.KPOSITION and \
+          ml.MESHID = MEDIAN.MESHPOINT.MESHID and \
+          m.MESHID = MEDIAN.MESHPOINT.MESHID AND \
           m.PARTIDMIN <= msv.PARTID AND \
           m.PARTIDMAX >= msv.PARTID AND \
           msv.PARAMETERID in (?) AND \
           msv.TIMEVALUE in (?) AND \
           m.OBJECTID = ? AND \
-          mp.FEATUREID in \
+          MEDIAN.MESHPOINT.FEATUREID in \
             ( select FEATUREID \
               from MEDIAN.MESHPOINT mp, \
                    MEDIAN.MESH m \
@@ -490,9 +493,9 @@
                     mp.MESHID = m.MESHID  AND \
                     KPOSITION in ( ? ) and \
                     ? = (select ? from MEDIAN.MESHPOINT where FEATUREID = ?)) \
-   order by mp.KPOSITION, \
+   order by MEDIAN.MESHPOINT.KPOSITION, \
             msv.TIMEVALUE, \
             msv.PARAMETERID, \
-            mp.JPOSITION , \
-            mp.IPOSITION
+            MEDIAN.MESHPOINT.JPOSITION , \
+            MEDIAN.MESHPOINT.IPOSITION
              
\ No newline at end of file