Mercurial > dive4elements > gnv-client
changeset 729:d23ad22bcfe7
Integrated lookup of the Geometry which was put to the Artifact during the Instantiation
gnv-artifacts/trunk@767 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Mon, 15 Mar 2010 09:23:56 +0000 |
| parents | f6630d0203da |
| children | 452fad121560 |
| files | gnv-artifacts/ChangeLog gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java |
| diffstat | 2 files changed, 26 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Fri Mar 12 11:36:38 2010 +0000 +++ b/gnv-artifacts/ChangeLog Mon Mar 15 09:23:56 2010 +0000 @@ -1,3 +1,9 @@ +2010-03-15 Tim Englich <tim.englich@intevation.de> + + * src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java (fetchData): + Integrated lookup of the Geometry which was put to the Artifact during + the Instantiation (e.g. was send from the MapViewer to the GNV). + 2010-03-12 Tim Englich <tim.englich@intevation.de> * src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java (fetchColumns):
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Fri Mar 12 11:36:38 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Mon Mar 15 09:23:56 2010 +0000 @@ -177,13 +177,28 @@ where, geometryWKT}; }else{ - // TODO: Look into the presetting for an WKT + //Look into the presetting for an WKT + InputData geometryWKTData = this.preSettings.get("geometry"); + if (geometryWKTData != null){ + queryValues = new String[]{columns, + table, + where, + geometryWKTData.getValue()}; + }else{ + queryValues = new String[]{columns,table,where}; + } + } + }else{ + //Look into the presetting for an WKT + InputData geometryWKTData = this.preSettings.get("geometry"); + if (geometryWKTData != null){ + queryValues = new String[]{columns, + table, + where, + geometryWKTData.getValue()}; + }else{ queryValues = new String[]{columns,table,where}; } - }else{ - // TODO: Look into the presetting for an WKT - queryValues = new String[]{columns,table,where}; - } }