Changeset 2864

Timestamp:

31/08/07 14:52:26 (14 years ago)

Author:

domlowe

Message:

temporal domain handling

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/csml_wcs.py (modified) (3 diffs)
• models/wcs_CoverageDescription.py (modified) (1 diff)
• templates/wcs_DescribeCoverageResponse.kid (modified) (1 diff)

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

@@ -112 +112 @@
         cvgDescription=feature.description.CONTENT
         cvgAbstract=[feature.description.CONTENT]
-        bbox=c.dataset.getBoundingBox()  #TODO, use the bounding box of the feature not the dataset.
+        csmlbbox=feature.getCSMLBoundingBox()
+        if csmlbbox is not None:
+            bbox=csmlbbox.getBox()        
+        else:
+            csmlbbox=c.dataset.getCSMLBoundingBox()
+            bbox=csmlbbox.getBox()
         crslist=['ndgcrs1', 'ndgcrs2'] #TODO, get these crs from the csml features
         return WcsDatasetSummary(identifier=feature.id,
@@ -130 +135 @@
         ds = WcsDatasetSummary(titles=['Root Dataset'], datasetSummaries=[], CRSs=['CRS:84'])
         # Add a DatasetSummary for each feature
-
         for f_n in c.dataset.getFeatureList():
             feature_ds = self._loadFeatureSummary(c.dataset.getFeature(f_n))
@@ -140 +144 @@
         """ builds a collection of CoverageDescription objects - used for DescribeCoverage """
         CoverageDescriptions=[]
-        for f in self.features:
-          feature = self.features[f]
-          bbox=c.dataset.getBoundingBox()  #TODO, use the bounding box of the feature not the dataset.
-          cd=CoverageDescription(identifier=f,titles=feature.name.CONTENT, keywords=None, abstracts=feature.description.CONTENT, boundingBoxes=[BoundingBox([bbox[0],bbox[1]], [bbox[2],bbox[3]], crs='CRS:84')])
-          CoverageDescriptions.append(cd)
+        csmlbbox=c.dataset.getCSMLBoundingBox()
+        dsbbox=csmlbbox.getBox()
+        dstimes=csmlbbox.getTimeLimits()
+        dscrs=csmlbbox.getCRSName()
+        for f in self.features:
+            feature = self.features[f]
+            csmlbbox=feature.getCSMLBoundingBox()
+            if csmlbbox is None: #use the bounding box of the feature not the dataset.
+                bbox=dsbbox  
+                timeLimits=dstimes
+                crsname=dscrs
+            else: #use the feature's bounding box info
+                bbox=csmlbbox.getBox()
+                timeLimits=csmlbbox.getTimeLimits()
+                crsname=csmlbbox.getCRSName()                
+            cd=CoverageDescription(identifier=f,titles=feature.name.CONTENT, keywords=None, abstracts=feature.description.CONTENT, boundingBoxes=[BoundingBox([bbox[0],bbox[1]], [bbox[2],bbox[3]], crs=crsname)], timeDomain=timeLimits)
+            CoverageDescriptions.append(cd)
         return CoverageDescriptions
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/wcs_CoverageDescription.py

@@ -9 +9 @@
     Extends DatasetSummary from ows common
     """
-    def __init__(self, identifier, **kw):
+    def __init__(self, identifier, timeDomain, **kw):
         super(CoverageDescription, self).__init__(**kw)
         self.identifier=identifier
+        self.timeLimits=timeDomain

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/wcs_DescribeCoverageResponse.kid

@@ -25 +25 @@
             </SpatialDomain>
             <TemporalDomain>
+                <TimePeriod>
+                    <beginTime>${cd.timeLimits[0]}</beginTime>
+                    <endTime>${cd.timeLimits[1]}</endTime>
+                </TimePeriod>
             </TemporalDomain>
         </Domain>