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

Timestamp:

03/04/08 15:45:26 (13 years ago)

Author:

spascoe

Message:

Renaming dimension parameter names to avoid clashes

File:

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

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

@@ -104 +104 @@
             dims = {}
             for dimName, dim in layer.dimensions.items():
-                dims[dimName] = Dimension(valuesUnit=dim.units,
+                dimParam = self._mapDimToParam(dimName)
+                dims[dimParam] = Dimension(valuesUnit=dim.units,
                                           unitSymbol=dim.units,
                                           possibleValues=
@@ -169 +170 @@
         return format
 
+    _escapedDimNames = ['width', 'height', 'version', 'request',
+                        'layers', 'styles', 'crs', 'srs', 'bbox',
+                        'format', 'transparent', 'bgcolor',
+                        'exceptions']
+    def _mapDimToParam(self, dimName):
+        """
+        Dimension names might clash with WMS parameter names, making
+        them inaccessible in WMS requests.  This method maps a
+        dimension name to a parameter name that appears in the
+        capabilities document and WMS requests.
+
+        """
+        if dimName.lower() in self._escapedDimNames:
+            return dimName+'_dim'
+        else:
+            return dimName
+        
+    def _mapParamToDim(self, dimParam):
+        """
+        Maps a dimension parameter name to it's real dimension name.
+
+        @see: _mapDimToParam()
+
+        """
+        try:
+            dimName = re.match(r'(.*)_dim$', dimParam).group(1)
+            if dimName.lower() in self._escapedDimNames:
+                return dimName
+            else:
+                return dimParam
+        except AttributeError:
+            return dimParam
+
+
     #-------------------------------------------------------------------------
     # OWS Operation methods
@@ -209 +244 @@
         for dimName, dim in layerObj.dimensions.items():
             defaultValue = dim.extent[0]
-            dimValues[dimName] = self.getOwsParam(dimName, default=defaultValue)
+            dimParam = self._mapDimToParam(dimName)
+            dimValues[dimName] = self.getOwsParam(dimParam, default=defaultValue)
             
         #---------------------------------------------------------------------
@@ -333 +369 @@
         for dimName, dim in layerObj.dimensions.items():
             defaultValue = dim.extent[0]
-            dimValues[dimName] = self.getOwsParam(dimName, default=defaultValue)
+            dimParam = self._mapDimToParam(dimName)
+            dimValues[dimName] = self.getOwsParam(dimParam, default=defaultValue)
         # Get pixel location
         i = int(self.getOwsParam('i'))