Changeset 3671 for TI05-delivery


Ignore:
Timestamp:
25/03/08 14:06:50 (11 years ago)
Author:
spascoe
Message:

Resupporting WMS 1.3.0

Location:
TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/wms_controller.py

    r3575 r3671  
    4646                                                                  'GetLegend', 
    4747                                                                  'GetInfo'] 
    48     validVersions = ['1.1.1'] 
     48    validVersions = ['1.1.1', '1.3.0'] 
    4949 
    5050    #------------------------------------------------------------------------- 
     
    6767 
    6868    def _renderCapabilities(self, version, format): 
    69         t = ows_controller.templateLoader.load('wms_capabilities_1_1_1.xml') 
     69        if version == '1.1.1': 
     70            t = ows_controller.templateLoader.load('wms_capabilities_1_1_1.xml') 
     71        elif version == '1.3.0': 
     72            t = ows_controller.templateLoader.load('wms_capabilities_1_3_0.xml') 
     73        else: 
     74            # We should never get here!  The framework should raise an exception before now. 
     75            raise RuntimeError("Version %s not supported" % version) 
     76         
    7077        return t.generate(c=c).render() 
    7178 
     
    163170        width = int(self.getOwsParam('width')) 
    164171        height = int(self.getOwsParam('height')) 
    165         srs = self.getOwsParam('srs') 
     172 
     173        if version == '1.1.1': 
     174            srs = self.getOwsParam('srs') 
     175        else: 
     176            srs = self.getOwsParam('crs') 
     177 
    166178        if srs not in layerObj.crss: 
    167179            raise InvalidParameterValue('Layer %s does not support SRS %s' % (layerName, srs)) 
  • TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/util.py

    r3481 r3671  
    3737     
    3838    if clientVersion is None: 
    39         return versions[-1] 
     39        return serialise_version(versions[-1]) 
    4040     
    4141    cv = parse_version(clientVersion) 
Note: See TracChangeset for help on using the changeset viewer.