Mercurial > dive4elements > gnv-client

changeset 1091:fb2d07f7a5ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added configuration and sql statements for a new product named 'Achsenparalleler Vertikalschnitt. gnv-artifacts/trunk@1205 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Sat, 12 Jun 2010 13:06:40 +0000
parents 51f3edc9d743
children a45908c89997
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/conf.xml gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml gnv-artifacts/doc/conf/queries.properties gnv-artifacts/src/main/resources/lang/artifactMessages.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties
diffstat 8 files changed, 64 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Sat Jun 12 13:00:45 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Sat Jun 12 13:06:40 2010 +0000
@@ -1,3 +1,21 @@
+2010-06-12  Ingo Weinzierl <ingo_weinzierl@web.de>
+
+	* doc/conf/products/horizontalprofile/conf_mesh.xml: Configuration for the
+	  new product 'Achsenparalleler Vertikalschnitt'.
+
+	* doc/conf/queries.properties: A new sql statement to query all points of a
+	  given axis of a mesh.
+
+	* doc/conf/conf.xml: Added the new product to fis 'Modeldaten'.
+
+	* src/main/resources/lang/artifactMessages.properties,
+	  src/main/resources/lang/artifactMessages_de_DE.properties,
+	  src/main/resources/lang/artifactMessages_en.properties,
+	  src/main/resources/lang/artifactMessages_de.properties: Added a name for
+	  the new product 'Achsenparalleler Vertikalschnitt'.
+
+	  TODO: Find an english name for this product!
+
 2010-06-12  Ingo Weinzierl <ingo_weinzierl@web.de>
 
 	* src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshParallelArtifact.java:
--- a/gnv-artifacts/doc/conf/conf.xml	Sat Jun 12 13:00:45 2010 +0000
+++ b/gnv-artifacts/doc/conf/conf.xml	Sat Jun 12 13:06:40 2010 +0000
@@ -201,6 +201,14 @@
                         <parameter name="fisname" value="fis_modeldata"/>
                     </parameters>
                 </product>
+                <product name= "verticalcrosssectionparallel">
+                    <artifact-factory name="verticalCrossSectionMeshParallel" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
+                             ttl="300000" artifact="de.intevation.gnv.profile.verticalcrosssection.VerticalCrossSectionMeshParallelArtifact">de.intevation.gnv.artifacts.GNVArtifactFactory</artifact-factory>
+                    <parameters>
+                        <parameter name="sourceid" value="2"/>
+                        <parameter name="fisname" value="fis_modeldata"/>
+                    </parameters>
+                </product>
                 <product name= "horizontalCrossSection">
                     <artifact-factory name="horizontalCrossSectionMesh" description="Artiefactfactory for Instantiating the Artifact for the FIS Modeldata"  
                              ttl="300000" artifact="de.intevation.gnv.profile.horizontalcrosssection.HorizontalCrossSectionMeshArtifact">de.intevation.gnv.artifacts.GNVArtifactFactory</artifact-factory>
@@ -439,6 +447,8 @@
         
         <artifact name="verticalCrossSectionMesh" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/products/verticalcrosssection/conf_mesh.xml" />
         
+        <artifact name="verticalCrossSectionMeshParallel" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/products/verticalcrosssection/conf_mesh_parallel.xml" />
+        
         <artifact name="horizontalCrossSectionMesh" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/products/horizontalcrosssection/conf_mesh.xml" />
         
         <artifact name="layer" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/products/layer/conf.xml" />
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml	Sat Jun 12 13:00:45 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml	Sat Jun 12 13:06:40 2010 +0000
@@ -178,7 +178,7 @@
            <from state="horizontalprofile_mesh_point_presettings"/>
            <to state="horizontalprofile_mesh_axis"/>
        </transition>
-       
+
        <state id="horizontalprofile_mesh_axis" description="horizontalprofile_mesh_point" state="de.intevation.gnv.state.profile.horizontal.NorthSouthEastWestState">
           <dataname>axisid</dataname>
            <data-multiselect>false</data-multiselect>
--- a/gnv-artifacts/doc/conf/queries.properties	Sat Jun 12 13:00:45 2010 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Sat Jun 12 13:06:40 2010 +0000
@@ -1796,7 +1796,37 @@
              MEDIAN.MESHPOINT.IPOSITION, \
              MEDIAN.MESHPOINT.KPOSITION, \
              msv.PARAMETERID
-             
+
+##############################################
+#### Special case of VerticalCrossSection ####
+##############################################
+verticalcrosssection_mesh_parallel_linestring =  SELECT ST_ASTEXT(SHAPE), \
+    IPOSITION, \
+    JPOSITION \
+    from MEDIAN.MESHLAYER ml, \
+         MEDIAN.MESHPOINT, \
+         MEDIAN.MESH m, \
+         MEDIAN.MESHSCALARVALUE msv \
+    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 \
+          MEDIAN.MESHPOINT.FEATUREID in \
+            ( select FEATUREID \
+              from MEDIAN.MESHPOINT mp, \
+                   MEDIAN.MESH m \
+              where m.OBJECTID = ? AND \
+                    mp.MESHID = m.MESHID  AND \
+                    KPOSITION in ( 1 ) and \
+                    ? = (select ? from MEDIAN.MESHPOINT where FEATUREID = ?)) \
+   order by MEDIAN.MESHPOINT.JPOSITION, \
+            MEDIAN.MESHPOINT.IPOSITION
+
 #############################################
 #############################################
 ########## Horizontalschnitt MESH ###########
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Sat Jun 12 13:00:45 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Sat Jun 12 13:06:40 2010 +0000
@@ -27,6 +27,7 @@
 horizontalProfileCross = Horizontales Schnittprofil
 horizontalCrossSection = Horizontal cross-section
 verticalcrosssection = Vertical cross-section
+verticalcrosssectionparallel = Achsenparalleler Vertikalschnitt
 layer = Layer
 featureid = Station
 mesh_coordinate = Geographic position (e.g. 56n30 6e20)
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Sat Jun 12 13:00:45 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Sat Jun 12 13:06:40 2010 +0000
@@ -26,6 +26,7 @@
 horizontalProfileCross = Horizontales Schnittprofil
 horizontalCrossSection = Horizontalschnitt
 verticalcrosssection = Profilschnitt
+verticalcrosssectionparallel = Achsenparalleler Vertikalschnitt
 layer = Layer
 featureid = Station
 meshid= Datengitter
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Sat Jun 12 13:00:45 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Sat Jun 12 13:06:40 2010 +0000
@@ -26,6 +26,7 @@
 horizontalProfileCross = Horizontales Schnittprofil
 horizontalCrossSection = Horizontalschnitt
 verticalcrosssection = Profilschnitt
+verticalcrosssectionparallel = Achsenparalleler Vertikalschnitt
 layer = Layer
 featureid = Station
 meshid= Datengitter
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Sat Jun 12 13:00:45 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Sat Jun 12 13:06:40 2010 +0000
@@ -27,6 +27,7 @@
 horizontalProfileCross = Horizontales Schnittprofil
 horizontalCrossSection = Horizontal cross-section
 verticalcrosssection = Vertical cross-section
+verticalcrosssectionparallel = Achsenparalleler Vertikalschnitt
 layer = Layer
 featureid = Station
 mesh_coordinate = Geographic position (e.g. 56n30 6e20)
http://dive4elements.wald.intevation.org