Changeset 3806

Timestamp:

21/04/08 12:11:53 (13 years ago)

Author:

spascoe

Message:

 

Location:

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons

Files:

• templates/wms_capabilities_1_3_0.xml (modified) (2 diffs)
• wms_controller.py (modified) (5 diffs)

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/templates/wms_capabilities_1_3_0.xml

@@ -138 +138 @@
 
   </Service>
-  
   <!--! These fields are represented in ows_common as service constraints -->
   <Capability py:with="sm=c.capabilities; om=sm.operationsMetadata">
     <py:if test="om is not None">
-      <?python ops = ['GetCapabilities', 'GetMap', 'GetFeatureInfo'] ?>
+      <?python
+        ops = ['GetCapabilities', 'GetMap', 'GetFeatureInfo']
+        eops = [x for x in om.operationDict.keys() if x not in ops]
+      ?>
       <Request>
         <py:for each="opName in ops" py:if="opName in om.operationDict.keys()">
@@ -155 +157 @@
         </py:for>
       </Request>
+      <_ExtendedCapabilities>
+      <Request>
+        <py:for each="opName in eops">
+          <span py:content="markupOperation(opName, om.operationDict[opName])" py:strip="True"/>
+        </py:for>
+        <py:for each="opName in eops">
+          <?python exceptions = om.operationDict[opName].parameters.get('ExceptionFormat') ?>
+          <Exception py:if="exceptions is not None">
+            <Format py:for="e in exceptions.possibleValues.allowedValues"
+                    py:content="e"/>
+          </Exception>
+        </py:for>
+      </Request>
+      </_ExtendedCapabilities>
     </py:if>
     

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

@@ -108 +108 @@
             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=
@@ -202 +203 @@
         return format
 
+    _escapedDimNames = ['width', 'height', 'version', 'request',
+                        'layers', 'styles', 'crs', 'srs', 'bbox',
+                        'format', 'transparent', 'bgcolor',
+                        'exceptions']
+
+    def _getDimValues(self, layerObj):
+        dimValues = {}
+        for dimName, dim in layerObj.dimensions.items():
+            defaultValue = dim.extent[0]
+            dimValues[dimName] = self.getOwsParam(dimName,
+                                                  default=defaultValue)
+        return dimValues
+
+    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
+
+
+    def _retrieveSlab(self, layerObj, srs, dimValues, renderOpts):
+        # Find the slab in the cache first
+        cacheKey = layerObj.getCacheKey(srs, dimValues)
+        
+        slab = self._layerSlabCache.get(cacheKey)
+        if slab is None:
+            slab = layerObj.getSlab(srs, dimValues, renderOpts)
+            if cacheKey is not None:
+                self._layerSlabCache[cacheKey] = slab
+
+        return slab
+
     #-------------------------------------------------------------------------
     # OWS Operation methods
@@ -238 +294 @@
                 'Format %s not supported' % format, 'format')
 
-        # Dimension handling
         finalImg = Image.new('RGBA', (width, height), (0,0,0,0))
         # Multiple Layers handling..  
@@ -244 +299 @@
             if srs not in layerObj.crss:
                 raise InvalidParameterValue('Layer %s does not support SRS %s' % (layerName, srs))
-            
-            dimValues = {}
-            for dimName, dim in layerObj.dimensions.items():
-                defaultValue = dim.extent[0]
-                dimValues[dimName] = self.getOwsParam(dimName, default=defaultValue)
-            
-        #---------------------------------------------------------------------
-        # The real work
-        #!TODO: Minimum and maximum values
-        
-        # Find the slab in the cache first
-            cacheKey = layerObj.getCacheKey(srs, dimValues)
-
-            slab = self._layerSlabCache.get(cacheKey)
-            if slab is None:
-                slab = layerObj.getSlab(srs, dimValues, dict(minValue=0, maxValue=100))
-                if cacheKey is not None:
-                                self._layerSlabCache[cacheKey] = slab
-
-        # We must request a bbox within the layer's bbox.
+
+            dimValues = self._getDimValues(layerObj)
+
+            #-------------------------------------------------------
+            # The real work
+            #!TODO: Minimum and maximum values
+
+            slab = self._retrieveSlab(layerObj, srs, dimValues,
+                                      dict(minValue=0, maxValue=100))
+
+            # We must request a bbox within the layer's bbox.
             lbbox = layerObj.getBBox(srs)
             ibbox = bbox_util.intersection(bbox, lbbox)
@@ -271 +317 @@
             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)