Ignore:
Timestamp:
01/11/07 14:14:20 (12 years ago)
Author:
domlowe
Message:

couple of minor template changes

Location:
TI05-delivery/ows_framework/trunk/ows_server/ows_server
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs1_0_0.py

    r2969 r2978  
    165165                bbox=csmlbbox.getBox() 
    166166                timeLimits=csmlbbox.getTimeLimits() 
    167                 crsname=csmlbbox.getCRSName()                 
    168             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) 
     167                crsname=csmlbbox.getCRSName()                           
     168            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)], crs=crsname, timeDomain=timeLimits) 
    169169            CoverageDescriptions.append(cd) 
    170170        return CoverageDescriptions 
     
    227227                    raise OWS_E.InvalidParameterValue('Coverage  with name=%s not found'%ident, 'identifiers') 
    228228                self.features[ident]=feature 
    229             c.covDescs=self._buildCoverageDescriptions() 
     229            if not hasattr(self,'covDescs'): 
     230                self.covDescs=self._buildCoverageDescriptions() 
     231            c.covDescs=self.covDescs 
    230232            r=render_response('wcs1_0_0_DescribeCoverageResponse', format='xml') 
    231233            r.headers['content-type'] = 'text/xml' 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs1_1_0.py

    r2964 r2978  
    123123            csmlbbox=c.dataset.getCSMLBoundingBox() 
    124124            bbox=csmlbbox.getBox() 
    125         #crs= csmlbbox.getCRSName() 
    126125        crs=feature.getNativeCRS() 
    127         crslist=[crs] #TODO, get these crs from the csml features 
     126        crslist=[crs]  
    128127        return WcsDatasetSummary(identifier=feature.id, 
    129128                                 titles=cvgTitle, 
     
    166165                timeLimits=csmlbbox.getTimeLimits() 
    167166                crsname=csmlbbox.getCRSName()                 
    168             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) 
     167            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)], crs=crsname, timeDomain=timeLimits) 
    169168            CoverageDescriptions.append(cd) 
    170169        return CoverageDescriptions 
     
    207206    @parameter('Version', possibleValues=['1.1.0']) 
    208207    @parameter('Identifiers', required=True) 
    209     @parameter('Format', possibleValues=['text/xml'], required=True)  #IS THIS MANDATORY 
     208    @parameter('Format', possibleValues=['text/xml'] 
    210209    def DescribeCoverage(self, uri, version, service, identifiers, format='text/xml'): 
    211210        """ 
     
    221220                    raise OWS_E.InvalidParameterValue('Coverage  with id=%s not found'%ident, 'identifiers') 
    222221                self.features[ident]=feature 
    223             c.covDescs=self._buildCoverageDescriptions() 
     222            if not hasattr(self,'covDescs'): 
     223                self.covDescs=self._buildCoverageDescriptions() 
     224            c.covDescs=self.covDescs 
    224225            r=render_response('wcs_DescribeCoverageResponse', format='xml') 
    225226            r.headers['content-type'] = 'text/xml' 
     
    239240    @parameter('BoundingBox', required=True, validator=V.bbox_2or3d) 
    240241    @parameter('TimeSequence',required=True, validator=V.iso8601_time) 
    241     @parameter('Format', possibleValues=['application/netcdf'], required=True) 
     242    @parameter('Format', possibleValues=['cf-netcdf'], required=True) 
    242243    @parameter('Store', validator = V.boolean('Store')) 
    243244    @parameter('Status', validator = V.boolean('Status')) 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/wcs_CoverageDescription.py

    r2864 r2978  
    99    Extends DatasetSummary from ows common 
    1010    """ 
    11     def __init__(self, identifier, timeDomain, **kw): 
     11    def __init__(self, identifier, timeDomain, crs=None, **kw): 
    1212        super(CoverageDescription, self).__init__(**kw) 
    1313        self.identifier=identifier 
    1414        self.timeLimits=timeDomain 
     15        self.crs=crs 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ows/wcs_capabilities.kid

    r2889 r2978  
    113113                </ows:Phone>                         
    114114                <ows:Address py:if="cn.address is not None"> 
    115                     <ows:DeliveryPoint>                   
    116                     <span py:for="d in cn.address.deliveryPoints" py:replace="d"/> 
    117                     </ows:DeliveryPoint> 
     115                    <ows:DeliveryPoint py:for="d in cn.address.deliveryPoints" py:content="d"/> 
    118116                    <ows:City py:content="cn.address.city"/> 
    119117                    <ows:AdministrativeArea py:content="cn.address.administrativeArea"/> 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/wcs1_0_0_Capabilities.kid

    r2969 r2978  
    117117                </phone>                         
    118118                <address py:if="cn.address is not None"> 
    119                     <deliveryPoint>                   
    120                     <span py:for="d in cn.address.deliveryPoints" py:replace="d"/> 
    121                     </deliveryPoint> 
     119                    <deliveryPoint py:for="d in cn.address.deliveryPoints" py:content="d"/> 
    122120                    <city py:content="cn.address.city"/> 
    123121                    <administrativeArea py:content="cn.address.administrativeArea"/> 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/wcs1_0_0_DescribeCoverageResponse.kid

    r2963 r2978  
    3737        </rangeSet> 
    3838        <supportedCRSs> 
    39              <requestCRSs></requestCRSs> 
    40             <responseCRSs></responseCRSs> 
     39             <requestCRSs>${cd.crs}</requestCRSs> 
     40            <responseCRSs>${cd.crs}</responseCRSs> 
    4141        </supportedCRSs> 
    4242        <supportedFormats> 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/wcs_DescribeCoverageResponse.kid

    r2905 r2978  
    4141            </Field> 
    4242        </Range> 
    43         <SupportedCRS></SupportedCRS> 
    44         <SupportedFormat>application/CF-netcdf</SupportedFormat> 
     43        <SupportedCRS>${cd.crs}</SupportedCRS> 
     44        <SupportedFormat>cf-netcdf</SupportedFormat> 
    4545    </CoverageDescription> 
    4646</CoverageDescriptions> 
Note: See TracChangeset for help on using the changeset viewer.