Changeset 2600

Timestamp:

18/06/07 15:10:48 (12 years ago)

Author:

domlowe

Message:

temporal and spatial subsetting basics working for wcs

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py (modified) (3 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py

@@ -14 +14 @@
 from ows_server.controllers.csml_api import get_csml_doc
 from ows_server.lib.decorators import *
+import ows_server.lib.validators as V
 
 from elementtree import ElementTree as ET
@@ -100 +101 @@
     @parameter('Version', possibleValues=['1.1.0'], required=True)
     @parameter('Identifier', required=True)
-    @parameter('BoundingBox')
-    @parameter('TimeSequence')
+    @parameter('BoundingBox', required=True, validator=V.bbox_2d)
+    @parameter('TimeSequence',required=True)  #TODO, need validator to handle iso8601 time strings
     @parameter('Format', possibleValues=['image/netcdf'], required=True)
     
     #TODO some more parameter to add here
     # Dimension parameters Time, Elevation, etc. are handled separately
-    def GetCoverage(self, file, version, format, identifier, boundingBox=None, timeSequence=None):
+    def GetCoverage(self, file, version, format, identifier, boundingbox, timesequence):
         
         # Retrieve dataset and selected feature
@@ -115 +116 @@
 
         #set bounding box TODO
-        sel = dict(time=('1905-04-15T00:00:00.0' ,'1905-12-15T00:00:00.0'), longitude = (-1,10), latitude=(30,45))
-        if boundingBox is not None:
-            sel = dict(latitude=(boundingBox[1], boundingBox[3]), longitude=(boundingBox[0], boundingBox[2]))
+        sel = dict(latitude=(boundingbox[1], boundingbox[3]), longitude=(boundingbox[0], boundingbox[2]))
+        sel['time']=timesequence #needs validating
+        
         # Extract via CSML.subsetToGridSeries()
         filename = extractToNetCDF(feature, sel)