[Pywps-commits] r1164 - branches/pywps-3.2-soap/pywps/Wps/Execute

[scm-commit@wald.intevation.org]

Author: jesus
Date: 2011-07-06 10:44:59 +0200 (Wed, 06 Jul 2011)
New Revision: 1164

Modified:
   branches/pywps-3.2-soap/pywps/Wps/Execute/__init__.py
Log:
BUG: BBOX lineage wasnt working. _lineageBBOXInput() changed before restructure of BBOX object

Modified: branches/pywps-3.2-soap/pywps/Wps/Execute/__init__.py
===================================================================
--- branches/pywps-3.2-soap/pywps/Wps/Execute/__init__.py	2011-07-01 09:02:50 UTC (rev 1163)
+++ branches/pywps-3.2-soap/pywps/Wps/Execute/__init__.py	2011-07-06 08:44:59 UTC (rev 1164)
@@ -717,8 +717,8 @@
         """Called, if lineage request was set. Fills the <DataInputs> part of
         output XML document.
         """
+        
         templateInputs = []
-
         for identifier in self.process.inputs.keys():
             input = self.process.inputs[identifier]
 
@@ -729,11 +729,11 @@
 
                 templateInput = {}
                 wpsInput["lineaged"] = True
-
+                
                 templateInput["identifier"] = input.identifier
                 templateInput["title"] = self.process.i18n(input.title)
                 templateInput["abstract"] = self.process.i18n(input.abstract)
-
+                
                 if input.type == "LiteralValue":
                     templateInput = self._lineageLiteralInput(input,wpsInput,templateInput)
                 elif input.type == "ComplexValue" and \
@@ -745,6 +745,7 @@
                 elif input.type == "BoundingBoxValue":
                     templateInput = self._lineageBBoxInput(input,templateInput)
 
+
                 templateInputs.append(templateInput)
 
         self.templateProcessor.set("Inputs",templateInputs)
@@ -804,10 +805,17 @@
         bboxInput["bboxdata"] = 1
         bboxInput["crss"] = [input.crs]
         bboxInput["dimensions"] = input.dimensions
-        bboxInput["minx"] = input.minx
-        bboxInput["miny"] = input.miny
-        bboxInput["maxx"] = input.maxx
-        bboxInput["maxy"] = input.maxy
+        
+        #bboxInput["minx"] = input.minx
+        #bboxInput["miny"] = input.miny
+        #bboxInput["maxx"] = input.maxx
+        #bboxInput["maxy"] = input.maxy
+        
+        #((minx,miny),(maxx, maxy))
+        bboxInput["minx"] = input.value.coords[0][0]
+        bboxInput["miny"] = input.value.coords[0][1]
+        bboxInput["maxx"] = input.value.coords[1][0]
+        bboxInput["maxy"] = input.value.coords[1][1]
         return bboxInput
 
     def outputDefinitions(self):
@@ -984,7 +992,7 @@
         return bboxOutput
 
     def _asReferenceOutput(self,templateOutput, output):
-
+        
         # copy the file to output directory
         # literal value
         if output.type == "LiteralValue":