# HG changeset patch # User Tim Englich # Date 1253716375 0 # Node ID dbd141c6bb9730cd3a92d01c1a613d25d9cfec1e # Parent c8d1f7b9e5a87884eb622def0521eeccbb51c4fe Added Support for VerticalProfiles for InstantaneousPoints gnv-artifacts/trunk@115 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r c8d1f7b9e5a8 -r dbd141c6bb97 gnv-artifacts/Changelog --- 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 + + * 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 * src/main/java/de/intevation/gnv/transition/TransitionBase.java (prepareInputData4DateDBQuery) Edited: diff -r c8d1f7b9e5a8 -r dbd141c6bb97 gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java --- /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 + * + */ +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"; + } +} diff -r c8d1f7b9e5a8 -r dbd141c6bb97 gnv-artifacts/src/test/ressources/conf.xml --- 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 de.intevation.artifactdatabase.DefaultArtifactFactory + de.intevation.artifactdatabase.DefaultArtifactFactory @@ -83,6 +85,16 @@ + + + + de.intevation.artifactdatabase.DefaultArtifactFactory + + + + + @@ -389,6 +401,58 @@ + + + + + verticalprofile_instantaneouspoint_series + featureid + false + + verticalprofile_instantaneouspoint_point + + + + + + verticalprofile_instantaneouspoint_point + instantaneouspoint_point + false + + verticalprofile_instantaneouspoint_parameterv + + + + + + + verticalprofile_instantaneouspoint_parameter + parameterid + true + + verticalprofile_instantaneouspoint_calculate_results + + + + + + + + verticalprofile_instantaneouspoint_chart_data + + + + + + + + + + + + + +

../geo-backend/src/test/ressources/ArcSDEConnectionPoolTestCase.properties diff -r c8d1f7b9e5a8 -r dbd141c6bb97 gnv-artifacts/src/test/ressources/queries.properties --- 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