Mercurial > dive4elements > gnv-client
changeset 306:e7f1c79bf9cd
Bugfix for issue91, wrong depth will be drawn in TimeseriesCharts in Meshes
gnv-artifacts/trunk@364 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Tue, 24 Nov 2009 13:29:36 +0000 |
| parents | 91c37bf28c0e |
| children | f0f106c7b906 |
| files | gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml gnv-artifacts/doc/conf/queries.properties gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java |
| diffstat | 4 files changed, 30 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Mon Nov 23 17:20:14 2009 +0000 +++ b/gnv-artifacts/ChangeLog Tue Nov 24 13:29:36 2009 +0000 @@ -1,3 +1,19 @@ +2009-11-24 Tim Englich <tim.englich@intevation.de> + + * src/test/java/de/intevation/gnv/artifacts/TestCallContext.java (TestCallContext): + Removed Compilationerrors that were triggert by API-Changes in + Module Artifact-Database. + + * doc/conf/queries.properties, + doc/conf/products/timeseries/conf_mesh.xml: + Removed Meshpoint from SQL-Query because the same value will be + insert by using the depthid. + depthid on layer 1 = featureid + In the old configuration only Charts on Layer 1 were drawn. + issue91 + + + 2009-11-23 Ingo Weinzierl <ingo.weinzierl@intevation.de> * src/main/java/de/intevation/gnv/transition/OutputTransitionBase.java:
--- a/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml Mon Nov 23 17:20:14 2009 +0000 +++ b/gnv-artifacts/doc/conf/products/timeseries/conf_mesh.xml Tue Nov 24 13:29:36 2009 +0000 @@ -130,8 +130,8 @@ <queryID>timeseries_mesh_chart_data</queryID> <queryID-odv>timeseries_mesh_odv_data</queryID-odv> <inputvalues> - <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/> - <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="1"/> + <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/> + <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/> <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/> <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="1"/> <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
--- a/gnv-artifacts/doc/conf/queries.properties Mon Nov 23 17:20:14 2009 +0000 +++ b/gnv-artifacts/doc/conf/queries.properties Tue Nov 24 13:29:36 2009 +0000 @@ -178,7 +178,7 @@ where (m.OBJECTID = ? AND \ msv.PARTID >= m.PARTIDMIN AND \ msv.PARTID <= m.PARTIDMAX ) AND \ - msv.FEATUREID in ( ? ) AND \ + msv.FEATUREID = mp.FEATUREID AND \ msv.PARAMETERID in ( ? ) AND \ mp.FEATUREID in ( ? ) AND \ msv.TIMEVALUE >= ? AND \ @@ -209,7 +209,7 @@ m.SOURCEID = SI.SOURCEID AND \ ML.MESHID = MEDIAN.MESHPOINT.MESHID AND \ ML.KPOSITION = MEDIAN.MESHPOINT.KPOSITION AND \ - msv.FEATUREID in ( ? ) AND \ + msv.FEATUREID = MEDIAN.MESHPOINT.FEATUREID AND \ msv.PARAMETERID in (? ) AND \ MEDIAN.MESHPOINT.FEATUREID in ( ? ) AND \ msv.TIMEVALUE >= ? AND \
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java Mon Nov 23 17:20:14 2009 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java Tue Nov 24 13:29:36 2009 +0000 @@ -46,4 +46,14 @@ return this.callMeta; } + public Object getContextValue(Object key) { + + return null; + } + + public Object putContextValue(Object key, Object value) { + + return null; + } + }