Ignore:
Timestamp:
20/08/07 13:53:23 (12 years ago)
Author:
domlowe
Message:

added base_url to endpoint in capabilities xlinks, changed bounding box handling in wcs

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

Legend:

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

    r2822 r2831  
    9494    def _loadFeatureDimensions(self, feature): 
    9595        dims = {} 
    96         #!WARNING 
    97         # This bit is a hack until the CSML API implements a mechanism 
    98         # to determine which elements of a domain are longitude and latitude. 
    9996        lon=feature.getLongitudeAxis() 
    10097        lat=feature.getLongitudeAxis() 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

    r2802 r2831  
    100100        ows_endpoint = h.url_for(controller=request.environ['pylons.routes_dict']['controller']) 
    101101         
     102        #Deduce base_url from config 
     103        base_url =request.environ['ndgConfig'].get('DEFAULT','server') 
     104 
     105         
    102106        # Get the server-level configuration data from an XML file 
    103107        config = request.environ['paste.config'] 
     
    117121                p = getattr(op, '_ows_parameters', {}) 
    118122                c = getattr(op, '_ows_constraints', {}) 
    119                 od[op._ows_name] = Operation(get=RequestMethod(href=ows_endpoint), 
     123                od[op._ows_name] = Operation(get=RequestMethod(href=base_url+ows_endpoint), 
    120124                                             post=None, 
    121125                                             parameters=p, 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ows/wcs_capabilities.kid

    r2826 r2831  
    5959    <ows:Keywords> 
    6060    </ows:Keywords> 
    61     <ows:WGS84BoundingBox py:for="bb in ds.boundingBoxes" 
    62                  minx="${bb.lowerCorner[0]}" 
    63                  miny="${bb.lowerCorner[1]}" 
    64                  maxx="${bb.upperCorner[0]}" 
    65                  maxy="${bb.upperCorner[1]}"/> 
     61 
     62    <ows:WGS84BoundingBox py:for="bb in ds.boundingBoxes"> 
     63            <ows:LowerCorner>${bb.lowerCorner[0]} ${bb.lowerCorner[1]}</ows:LowerCorner>                   
     64            <ows:UpperCorner>${bb.upperCorner[0]} ${bb.upperCorner[1]}</ows:UpperCorner>         
     65    </ows:WGS84BoundingBox> 
    6666    <CoverageSummary py:for="ds1 in ds.datasetSummaries" py:replace="coverageSummary(ds1)"/> 
    6767  </CoverageSummary> 
Note: See TracChangeset for help on using the changeset viewer.