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

Timestamp:

28/05/08 12:00:54 (13 years ago)

Author:

domlowe

Message:

Fixed bug - confilicting wms keywords were not being correctly handled when making data requests

File:

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

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

@@ -5 +5 @@
 """
 
+import re
 from cStringIO import StringIO
 from sets import Set
@@ -212 +213 @@
         for dimName, dim in layerObj.dimensions.items():
             defaultValue = dim.extent[0]
-            dimValues[dimName] = self.getOwsParam(dimName,
+            escapedDimName=self._mapDimToParam(dimName)
+            dimValues[escapedDimName] = self.getOwsParam(escapedDimName,
                                                   default=defaultValue)
         return dimValues
@@ -301 +303 @@
 
             dimValues = self._getDimValues(layerObj)
-
+            
+            #now need to revert modified dim values (e.g. height_dim) back to dim values the layerMapper understands (e.g. height)
+            restoredDimValues={}
+            for dim in dimValues:
+                restoredDim=self._mapParamToDim(dim)
+                restoredDimValues[restoredDim]=dimValues[dim]
+                
             #-------------------------------------------------------
             # The real work
             #!TODO: Minimum and maximum values
 
-            slab = self._retrieveSlab(layerObj, srs, dimValues,
+            slab = self._retrieveSlab(layerObj, srs, restoredDimValues,
                                       dict(minValue=0, maxValue=100))