Changeset 3956 for TI05-delivery


Ignore:
Timestamp:
28/05/08 12:00:54 (11 years ago)
Author:
domlowe
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/wms_controller.py

    r3822 r3956  
    55""" 
    66 
     7import re 
    78from cStringIO import StringIO 
    89from sets import Set 
     
    212213        for dimName, dim in layerObj.dimensions.items(): 
    213214            defaultValue = dim.extent[0] 
    214             dimValues[dimName] = self.getOwsParam(dimName, 
     215            escapedDimName=self._mapDimToParam(dimName) 
     216            dimValues[escapedDimName] = self.getOwsParam(escapedDimName, 
    215217                                                  default=defaultValue) 
    216218        return dimValues 
     
    301303 
    302304            dimValues = self._getDimValues(layerObj) 
    303  
     305             
     306            #now need to revert modified dim values (e.g. height_dim) back to dim values the layerMapper understands (e.g. height) 
     307            restoredDimValues={} 
     308            for dim in dimValues: 
     309                restoredDim=self._mapParamToDim(dim) 
     310                restoredDimValues[restoredDim]=dimValues[dim] 
     311                 
    304312            #------------------------------------------------------- 
    305313            # The real work 
    306314            #!TODO: Minimum and maximum values 
    307315 
    308             slab = self._retrieveSlab(layerObj, srs, dimValues, 
     316            slab = self._retrieveSlab(layerObj, srs, restoredDimValues, 
    309317                                      dict(minValue=0, maxValue=100)) 
    310318 
Note: See TracChangeset for help on using the changeset viewer.