# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1268645036 0
# Node ID d23ad22bcfe7603137549db89120ef689f9e2e10
# Parent  f6630d0203daf0419d5d2c9649d5269e5e45e027
 Integrated lookup of the Geometry which was put to the Artifact during the Instantiation

gnv-artifacts/trunk@767 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r f6630d0203da -r d23ad22bcfe7 gnv-artifacts/ChangeLog
--- 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): 
diff -r f6630d0203da -r d23ad22bcfe7 gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java
--- 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};
-                    
                 }
             }