Changeset 3561 for TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/wms_controller.py

Timestamp:

07/03/08 10:28:58 (12 years ago)

Author:

spascoe

Message:

Several bugs that were making the Capabilities document invalid.

The DDP test WMS server is now viewable through Cadcorp's Map Browser.

File:

• TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/wms_controller.py (modified) (5 diffs)

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/wms_controller.py

@@ -37 +37 @@
         'image/tiff': 'TIFF'
         }
+    _layerSlabCache = {}
 
     #-------------------------------------------------------------------------
@@ -94 +95 @@
             ds = WmsDatasetSummary(identifier=layerName,
                                    titles=[layer.title],
+                                   CRSs=layer.crss,
                                    boundingBoxes=bboxObjs,
-                                   abstracts=[layer.abstract])
+                                   abstracts=[layer.abstract],
+                                   dimensions=dims)
 
             c.capabilities.contents.datasetSummaries.append(ds)
@@ -123 +126 @@
             raise InvalidParameterValue('Layer %s not found' % layerName, 'layers')
 
-                
+        
         # Coordinate parameters
         bbox = tuple(float(x) for x in self.getOwsParam('bbox').split(','))
@@ -142 +145 @@
         for dimName, dim in layerObj.dimensions.items():
             defaultValue = dim.extent[0]
-            dimValues[dimName] = self.getOwsParam('time', default=defaultValue)
-
+            dimValues[dimName] = self.getOwsParam(dimName, default=defaultValue)
+            
+        #---------------------------------------------------------------------
         # The real work
         #!TODO: Minimum and maximum values
-        slab = layerObj.getSlab(srs, dimValues, dict(minValue=0, maxValue=100))
+        
+        # Find the slab in the cache first
+        cacheKey = layerObj.getCacheKey(srs, dimValues)
+        try:
+            slab = self._layerSlabCache[cacheKey]
+        except KeyError:
+            slab = layerObj.getSlab(srs, dimValues, dict(minValue=0, maxValue=100))
+            self._layerSlabCache[cacheKey] = slab
 
         # We must request a bbox within the layer's bbox.
@@ -156 +167 @@
         log.debug('ibbox = %s' % (ibbox,))
 
-        # If bbox is not within layerObj.bbox then we need to calculate the pixel
-        # offset of the inner bbox, request the right width/height and paste the
-        # image into a blank background
+        # If bbox is not within layerObj.bbox then we need to calculate the
+        # pixel offset of the inner bbox, request the right width/height
+        # and paste the image into a blank background
         if bbox == ibbox:
             img = slab.getImage(bbox, width, height)