[Pywps-commits] r1166 - in branches/pywps-3.2-soap/pywps: Templates/1_0_0/inc Wps/Execute

[scm-commit@wald.intevation.org]

Author: jesus
Date: 2011-07-06 11:22:58 +0200 (Wed, 06 Jul 2011)
New Revision: 1166

Modified:
   branches/pywps-3.2-soap/pywps/Templates/1_0_0/inc/Execute_Data_Inputs.tmpl
   branches/pywps-3.2-soap/pywps/Wps/Execute/__init__.py
Log:
BUG: No dimensions or crs in BBOX lineage. BUG: BBOX lineage XML wouldnt parse

Modified: branches/pywps-3.2-soap/pywps/Templates/1_0_0/inc/Execute_Data_Inputs.tmpl
===================================================================
--- branches/pywps-3.2-soap/pywps/Templates/1_0_0/inc/Execute_Data_Inputs.tmpl	2011-07-06 08:46:31 UTC (rev 1165)
+++ branches/pywps-3.2-soap/pywps/Templates/1_0_0/inc/Execute_Data_Inputs.tmpl	2011-07-06 09:22:58 UTC (rev 1166)
@@ -8,7 +8,7 @@
                     <wps:LiteralData dataType="<TMPL_VAR type>" uom="<TMPL_VAR uom>"><TMPL_VAR literaldata></wps:LiteralData>
                 </TMPL_IF>
                 <TMPL_IF bboxdata>
-                    <wps:BoundingBoxData ows:crs="<TMPL_VAR crs>" ows:dimensions="<TMPL_VAR dimensions>">
+                    <wps:BoundingBoxData crs="<TMPL_VAR crs>" dimensions="<TMPL_VAR dimensions>">
                         <ows:LowerCorner><TMPL_VAR minx> <TMPL_VAR miny></ows:LowerCorner>
                         <ows:UpperCorner><TMPL_VAR maxx> <TMPL_VAR maxy></ows:UpperCorner>
                     </wps:BoundingBoxData>

Modified: branches/pywps-3.2-soap/pywps/Wps/Execute/__init__.py
===================================================================
--- branches/pywps-3.2-soap/pywps/Wps/Execute/__init__.py	2011-07-06 08:46:31 UTC (rev 1165)
+++ branches/pywps-3.2-soap/pywps/Wps/Execute/__init__.py	2011-07-06 09:22:58 UTC (rev 1166)
@@ -803,14 +803,9 @@
     def _lineageBBoxInput(self,input,bboxInput):
         """ Fill input of bbox data """
         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["crs"] = input.crs
+        bboxInput["dimensions"] = input.value.dimensions
+       
         #((minx,miny),(maxx, maxy))
         bboxInput["minx"] = input.value.coords[0][0]
         bboxInput["miny"] = input.value.coords[0][1]