Changeset 3575 for TI05-delivery/ows_framework

Timestamp:

10/03/08 16:59:09 (13 years ago)

Author:

spascoe

Message:

Type errors

Location:

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

Files:

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

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

@@ -61 +61 @@
     <!--!NOTE: this is an ad-hoc implementation not using the ows_common.model classes
          TODO: fixme -->
+    <!-- TODO ScaleHint -->
+
+    <Dimension py:for="d_n, d in ds.dimensions.iteritems()"
+               name="${d_n}" units="${d.valuesUnit}"
+               unitSymbol="${d.unitSymbol}"/>
+    <Extent py:for="d_n, d in ds.dimensions.iteritems()" name="${d_n}" default="${d.defaultValue}" 
+            py:content="','.join(d.possibleValues.allowedValues)"/>
+<!--! nearestValue="${int(d.nearestValue)}" -->
     <Style>
       <Name>default</Name>
@@ -71 +79 @@
     </Style>
 
-    <!-- TODO ScaleHint -->
-
-    <Dimension py:for="d_n, d in ds.dimensions.iteritems()"
-               name="${d_n}" units="${d.valuesUnit}"
-               unitSymbol="${d.unitSymbol}"/>
-    <Extent py:for="d_n, d in ds.dimensions.iteritems()" name="${d_n}" default="${d.defaultValue}" 
-            py:content="','.join(d.possibleValues.allowedValues)"/>
-<!--! nearestValue="${int(d.nearestValue)}" -->
 
   </Layer>

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

@@ -78 +78 @@
         ows_controller.addOperation('GetContext')
         ows_controller.addOperation('GetLegend',
-                                    formats='image/png')
+                                    formats=['image/png'])
         ows_controller.addOperation('GetInfo')
         log.debug('Loading capabilities contents')
@@ -107 +107 @@
             # Stuff that should go in the capabilities tree eventually
             ds.legendSize = layer.legendSize
-            ds.legendFormats = 'image/png'
+            ds.legendFormats = ['image/png']
 
             c.capabilities.contents.datasetSummaries.append(ds)