Changeset 841

Timestamp:

08/14/07 13:55:21

Author:

dokai

Message:

Fixed rendering of multiple WMS layers.

Files:

• PCL/trunk/PCL-MapServer/cartography/engine/mapserver/rendering.py (modified) (3 diffs)
• PCL/trunk/PCL-MapServer/tests/testimages.py (modified) (1 diff)

PCL/trunk/PCL-MapServer/cartography/engine/mapserver/rendering.py

@@ -1119 +1119 @@
-            lo.connection = datastore._wms.capabilities.getOperationByName('GetMap').methods['Get']['url']
-            lo.connectiontype = mapscript.MS_WMS
-
-
+
+
+
+
-            _set_projection(lo, bounds.srs)
-       
@@ -1126 +1128 @@
-            lo.metadata.set('wms_srs', layer.ows_srs)
-            # for format, try ows_format, fall back on the map format
-
-
+
-
-            # connection timeout
@@ -1133 +1134 @@
-                    str(getattr(layer, 'timeout', 30)))
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    
-            # Work around for mapserver 4.4 bug

PCL/trunk/PCL-MapServer/tests/testimages.py

@@ -176 +176 @@
-        self.mapper = MapRenderer('MapServer', fontset=FONTSET,
-            incoming='/tmp/')
+
+    def test_multiple_wms_layers(self):
+        # WMS
+        url = "http://wms.jpl.nasa.gov/wms.cgi?"
+        store = WMSRasterStore(url, '1.1.1')
+        layer = Layer(store, 'modis,global_mosaic')
+        layer.ows_srs = 'EPSG:4326'
+        layer.ows_format = 'image/jpeg'
+        layer.ows_style = 'default,pseudo'
+        style = Style()
+        style.rules.append(Rule('r', [RasterSymbolizer()]))
+        wms = ContextLayer('wms', layer, style)
+
+        map = MapContext([wms])
+        srs = SpatialReference(epsg=4326)
+        view = View(srs, [-10, 30, 30, 70])
+        size = [300, 300]
+        image = self.mapper.render(map, view, 'image/jpeg', size,  
+            bgcolor='#000000', transparent=0, debug=True)
+        assert image.size == size
+        assert image.mimetype == 'image/jpeg'
+        f = open('test_multiple_wms_layers.jpg', 'wb')
+        f.write(image.getdata())
+        f.close()        
+
+    def test_multiple_wms_layers_with_mismatched_styles(self):
+        # WMS
+
+        url = "http://wms.jpl.nasa.gov/wms.cgi?"
+        store = WMSRasterStore(url, '1.1.1')
+        layer = Layer(store, 'modis,global_mosaic')
+        layer.ows_srs = 'EPSG:4326'
+        layer.ows_format = 'image/jpeg'
+        layer.ows_style = 'default,pseudo,mismatch'
+        style = Style()
+        style.rules.append(Rule('r', [RasterSymbolizer()]))
+        wms = ContextLayer('wms', layer, style)
+
+        map = MapContext([wms])
+        srs = SpatialReference(epsg=4326)
+        view = View(srs, [-10, 30, 30, 70])
+        size = [300, 300]
+
+        # We'd like to test with the following assertion, but
+        # rendering.py swallows all exceptions :(
+        #self.assertRaises(ValueError, lambda:self.mapper.render(map, view, 'image/jpeg', size,  
+        #    bgcolor='#000000', transparent=0, debug=True))
+
+        # There we just render and verify manually that we get an error image. 
+        image = self.mapper.render(map, view, 'image/jpeg', size,  
+                                   bgcolor='#000000', transparent=0, debug=True)
+        assert image.size == size
+        assert image.mimetype == 'image/jpeg'
+        f = open('test_multiple_layers_with_mismatched_styles.jpg', 'wb')
+        f.write(image.getdata())
+        f.close()        
+        
+        
+
-    def test_world(self):
-        # WMS