Changeset 2831

Timestamp:

20/08/07 13:53:23 (14 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:

• controllers/csml_wcs.py (modified) (1 diff)
• lib/base.py (modified) (2 diffs)
• templates/ows/wcs_capabilities.kid (modified) (1 diff)

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

@@ -94 +94 @@
     def _loadFeatureDimensions(self, feature):
         dims = {}
-        #!WARNING
-        # This bit is a hack until the CSML API implements a mechanism
-        # to determine which elements of a domain are longitude and latitude.
         lon=feature.getLongitudeAxis()
         lat=feature.getLongitudeAxis()

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

@@ -100 +100 @@
         ows_endpoint = h.url_for(controller=request.environ['pylons.routes_dict']['controller'])
         
+        #Deduce base_url from config
+        base_url =request.environ['ndgConfig'].get('DEFAULT','server')
+
+        
         # Get the server-level configuration data from an XML file
         config = request.environ['paste.config']
@@ -117 +121 @@
                 p = getattr(op, '_ows_parameters', {})
                 c = getattr(op, '_ows_constraints', {})
-                od[op._ows_name] = Operation(get=RequestMethod(href=ows_endpoint),
+                od[op._ows_name] = Operation(get=RequestMethod(href=base_url+ows_endpoint),
                                              post=None,
                                              parameters=p,

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"
-                 minx="${bb.lowerCorner[0]}"
-                 miny="${bb.lowerCorner[1]}"
-                 maxx="${bb.upperCorner[0]}"
-                 maxy="${bb.upperCorner[1]}"/>
+
+    <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>
     <CoverageSummary py:for="ds1 in ds.datasetSummaries" py:replace="coverageSummary(ds1)"/>
   </CoverageSummary>