Changeset 2833 for TI05-delivery/ows_framework/trunk

Timestamp:

21/08/07 10:05:25 (12 years ago)

Author:

domlowe

Message:

changes to enable SupportedFormats? and SupportedCRS parameters

Location:

TI05-delivery/ows_framework/trunk

Files:

• ows_common/ows_common/wcs.py (modified) (3 diffs)
• ows_server/ows_server/controllers/csml_wcs.py (modified) (1 diff)
• ows_server/ows_server/templates/ows/wcs_capabilities.kid (modified) (1 diff)
• ows_server/ows_server/templates/wcs_getCoverageResponse.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_common/ows_common/wcs.py

@@ -9 +9 @@
 """
 
-#NOTE, much of this is straight from WMS and needs to be overhauled.
+#NOTE, much of this is straight from WMS and needs to be overhauled. TODO
 
 
@@ -17 +17 @@
 class WcsDatasetSummary(DatasetSummary):
     """
-    We don't know how WMS will map Layer attributes onto an extension of DatasetSummary
-    so a pragmatic approach is taken here.
-    
-    @ivar CRSs
-    @type CRSs: iterable of str
-    @ivar styles: Style descriptors, default ['']
-    @type styles: iterable of Style objects
-    @ivar dimensions
-    @type dimensions: dictionary mapping dimension names to Dimension objects
-    @ivar attribution
-    @type attribution: None or Attribution object
-    @ivar authorityURLs
-    @type authorityURLs: iterable of AuthorityUrl objects
-    @ivar identifiers
-    @type identifiers: iterable of Identifier objects
-    @ivar dataURLs
-    @type dataURLs: iterable of DataUrl objects
-    @ivar featureListURLs
-    @type featureListURLS: iterable of FeatureListURL objects
-    @ivar minScaleDenominator
-    @type minScaleDenominator: None or double
-    @ivar maxScaleDenominator
-    @type maxScaleDenominator: None or double
-
     """
-    def __init__(self, CRSs=[], styles=[''], dimensions={}, attribution=None, authorityURLs=[],
-                description=None, dataURLs=[], featureListURLs=[],
-                 minScaleDenominator=None, maxScaleDenominator=None, **kw):
+    def __init__(self, CRSs=[], description=None, formats=[],supportedCRSs=[],**kw):
         super(WcsDatasetSummary, self).__init__(**kw)
 
         self.CRSs = CRSs
-        self.styles = styles
-        self.dimensions = dimensions
-        self.attribution = attribution
-        self.authorityURLs = authorityURLs
         self.description=description
-        self.dataURLs = dataURLs
-        self.featureListURLs = featureListURLs
-        self.minScaleDenominator = minScaleDenominator
-        self.maxScaleDenominator = maxScaleDenominator
+        self.formats=formats
+        self.supportedCRSs=supportedCRSs
 
-
-class Style(object):
-    """
-    @ivar name
-    @type name: str
-    @ivar title
-    @type title: str
-    @ivar abstract
-    @type abstract: None or str
-    @ivar legendURLs
-    @type legendURLS: iterable of LegendURL objests
-    @ivar styleSheetURL
-    @type styleSheetURL: None or FormattedURL object
-    @ivar styleURL
-    @type styleURL: None or FormattedURL object
-
-    """
-    def __init__(self, name, title, abstract=None, legendURLs=[], styleSheetURL=None,
-                 styleURL=None):
-        self.name = name
-        self.title = title
-        self.abstract = abstract
-        self.legendURLs = legendURLs
-        self.styleSheetURL = styleSheetURL
-        self.styleURL = styleURL
 
 class FormattedURL(object):
@@ -96 +39 @@
         self.onlineResource = onlineResource
 
-class LegendURL(FormattedURL):
-    """
-    @ivar width
-    @type width: None or int
-    @ivar height:
-    @type height: None or int
-
-    """
-    def __init__(self, width, height, **kw):
-        super(LegendURL, self).__init__(**kw)
-        
-        self.width = width
-        self.height = height
 
 class Dimension(Domain):

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

@@ -113 +113 @@
         cvgAbstract=[feature.description.CONTENT]
         bbox=c.dataset.getBoundingBox()  #TODO, use the bounding box of the feature not the dataset.
+        crslist=['ndgcrs1', 'ndgcrs2'] #TODO, get these crs from the csml features
         return WcsDatasetSummary(identifier=feature.id,
                                  titles=cvgTitle,
                                  boundingBoxes=[BoundingBox([bbox[0],bbox[1]], [bbox[2],bbox[3]],
-                                 crs='CRS:84')], dimensions=dims,  description=cvgDescription,abstracts=cvgAbstract
+                                 crs='CRS:84')], description=cvgDescription,abstracts=cvgAbstract, formats=['application/cf-netcdf'],
+                                 supportedCRSs=crslist
                                  )
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ows/wcs_capabilities.kid

@@ -59 +59 @@
     <ows:Keywords>
     </ows:Keywords>
-
     <ows:WGS84BoundingBox py:for="bb in ds.boundingBoxes">
             <ows:LowerCorner>${bb.lowerCorner[0]} ${bb.lowerCorner[1]}</ows:LowerCorner>                  
             <ows:UpperCorner>${bb.upperCorner[0]} ${bb.upperCorner[1]}</ows:UpperCorner>        
-    </ows:WGS84BoundingBox>
+    </ows:WGS84BoundingBox>    
+    <SupportedCRS py:for="crs in ds.supportedCRSs" 
+                py:content="crs"/>    
+    <SupportedFormat py:for="format in ds.formats" 
+                py:content="format"/>
     <CoverageSummary py:for="ds1 in ds.datasetSummaries" py:replace="coverageSummary(ds1)"/>
   </CoverageSummary>

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

@@ -8 +8 @@
         <ows:Abstract>Created from getCoverage request to NDG WCS</ows:Abstract>
         <Identifier>${c.fileID}</Identifier>
-        <Reference>xlink:href="${c.hyperlink}" xlink:role="urn:ogc:def:role:WCS:1.1:metadata"</Reference>
+        <Reference xlink:href="${c.hyperlink}" xlink:role="urn:ogc:def:role:WCS:1.1:metadata"/>
     </Coverage>
 </Coverages>