Changeset 4038

Timestamp:

08/24/07 19:50:43 (11 months ago)

Author:

crschmidt

Message:

Allow for users to determine whether the bounding box should be encoded or
not on WMS and WFS layers. This change, by default, makes us compliant
with the WMS spec again.

Files:

• trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WFS.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/WMS.js (modified) (2 diffs)
• trunk/openlayers/tests/BaseTypes/test_Bounds.html (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_WFS.html (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_WMS.html (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_WrapDateLine.html (modified) (2 diffs)
• trunk/openlayers/tests/Tile/test_Image.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js

@@ -99 +99 @@
-                 + " right-top=(" + this.right + "," + this.top + ")" );
-    },
+
+    /**
+     * APIMethod: toArray
+     *
+     * Return:
+     * {Array} array of left, bottom, right, top
+     */
+    toArray: function() {
+        return [this.left, this.bottom, this.right, this.top];
+    },    
-
-    /** 

trunk/openlayers/lib/OpenLayers/Layer/WFS.js

@@ -52 +52 @@
-     */
-    vectorMode: true, 
+    
+    /**
+     * APIProperty: encodeBBOX
+     * {Boolean} Should the BBOX commas be encoded? The WMS spec says 'no', 
+     * but some services want it that way. Default false.
+     */
+    encodeBBOX: false,
-
-    /**
@@ -197 +204 @@
-            var url = this.getFullRequestString();
-        
-
+
+
-            url += "&" + OpenLayers.Util.getParameterString(params);
-

trunk/openlayers/lib/OpenLayers/Layer/WMS.js

@@ -44 +44 @@
-     */
-    isBaseLayer: true,
+    
+    /**
+     * APIProperty: encodeBBOX
+     * {Boolean} Should the BBOX commas be encoded? The WMS spec says 'no', 
+     * but some services want it that way. Default false.
+     */
+    encodeBBOX: false,
- 
-    /**
@@ -147 +154 @@
-        var imageSize = this.getImageSize(); 
-        return this.getFullRequestString(
-bounds.toBBOX
+ this.encodeBBOX ?  bounds.toBBOX() : bounds.toArray
-                      WIDTH:imageSize.w,
-                      HEIGHT:imageSize.h});

trunk/openlayers/tests/BaseTypes/test_Bounds.html

@@ -61 +61 @@
-         t.eq( bounds.toString(), "left-bottom=(1,2) right-top=(3,4)", "toString() returns correct value." ); 
-     }
+     function test_Bounds_toArray(t) {
+         t.plan( 1 );
+         bounds = new OpenLayers.Bounds(1,2,3,4);
+         t.eq( bounds.toArray(), [1,2,3,4], "toArray() returns correct value." ); 
+     }
-
-     function test_04_Bounds_contains(t) {

trunk/openlayers/tests/Layer/test_WFS.html

@@ -29 +29 @@
-
-    }
+    function test_Layer_WFS_drawmap(t) {
+        t.plan(2);
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
+            "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+        map.addLayer(layer);
+
+        layer = new OpenLayers.Layer.WFS( "Owl Survey",
+            "http://www.bsc-eoc.org/cgi-bin/bsc_ows.asp?",
+            {typename: "OWLS", maxfeatures: 10},
+            { featureClass: OpenLayers.Feature.WFS});
+        map.addLayer(layer);
+        map.addControl(new OpenLayers.Control.LayerSwitcher());
+        try { 
+            map.setCenter(new OpenLayers.LonLat(-100, 60), 3);
+        } catch (Exception) {
+        }    
+        t.eq(layer.tile.url, "http://www.bsc-eoc.org/cgi-bin/bsc_ows.asp?typename=OWLS&maxfeatures=10&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&SRS=EPSG%3A4326&BBOX=-187.890625,-36.6796875,-12.109375,156.6796875", "Tile URL is set correctly when not encoded");
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
+            "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'}
+            );
+        map.addLayer(layer);
+
+        layer = new OpenLayers.Layer.WFS( "Owl Survey",
+            "http://www.bsc-eoc.org/cgi-bin/bsc_ows.asp?",
+            {typename: "OWLS", maxfeatures: 10},
+            { featureClass: OpenLayers.Feature.WFS, 'encodeBBOX': true});
+        map.addLayer(layer);
+        map.addControl(new OpenLayers.Control.LayerSwitcher());
+        try { 
+            map.setCenter(new OpenLayers.LonLat(-100, 60), 3);
+        } catch (Exception) {
+        }  
+        t.eq(layer.tile.url, "http://www.bsc-eoc.org/cgi-bin/bsc_ows.asp?typename=OWLS&maxfeatures=10&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&SRS=EPSG%3A4326&BBOX=-187.890625%2C-36.679687%2C-12.109375%2C156.679688", "Tile URL is set correctly when not encoded");
+    }
+
-  // -->
-  </script>

trunk/openlayers/tests/Layer/test_WMS.html

@@ -58 +58 @@
-        var url = "http://octo.metacarta.com/cgi-bin/mapserv";
-        layer = new OpenLayers.Layer.WMS(name, url, params);
+        var map = new OpenLayers.Map('map');
+        map.addLayer(layer);
+        var pixel = new OpenLayers.Pixel(5,6);
+        var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
+        tile.draw();
+
+        var img = tile.imgDiv;
+        var tParams = OpenLayers.Util.extend({},
+                        OpenLayers.Util.upperCaseObject(params));
+        tParams = OpenLayers.Util.extend(tParams, {
+            SERVICE: "WMS", VERSION: "1.1.1",
+            REQUEST: "GetMap", STYLES: "",
+            EXCEPTIONS: "application/vnd.ogc.se_inimage",
+            SRS: "EPSG:4326", BBOX: [1,2,3,4],
+            WIDTH: "256", HEIGHT: "256"
+        });
+        t.eq( img.src,
+             url + "?" + OpenLayers.Util.getParameterString(tParams),
+             "image src is created correctly via addtile" );
+        t.eq( tile.frame.style.top, "6px", "image top is set correctly via addtile" );
+        t.eq( tile.frame.style.left, "5px", "image top is set correctly via addtile" );
+
+        var firstChild = layer.div.firstChild.firstChild;
+        if (!isMozilla)
+            t.ok( true, "skipping element test outside of Mozilla");
+        else
+            t.ok( firstChild instanceof HTMLElement, "div first child is an image object" );
+        t.eq( firstChild.src,
+             url + "?" + OpenLayers.Util.getParameterString(tParams),
+             "div first child is correct image object" );
+        t.eq( tile.position.toString(), "x=5,y=6", "Position of tile is set correctly." );
+        map.destroy();
+    }
+    
+    function test_Layer_WMS_bboxEncoding (t) {
+        t.plan( 6 );
+    
+        var url = "http://octo.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.WMS(name, url, params, {encodeBBOX:true});
-        var map = new OpenLayers.Map('map');
-        map.addLayer(layer);

trunk/openlayers/tests/Layer/test_WrapDateLine.html

@@ -128 +128 @@
-
-        var url = "http://octo.metacarta.com/cgi-bin/mapserv";
-
+,encodeBBOX:true
-        var m = new OpenLayers.Map('map');
-        m.addLayer(layer);
@@ -160 +160 @@
-                     "prov_bound,fedlimit,rail,road,popplace",
-             transparent: "true", format: "image/png"},
-
+,encodeBBOX:true
-        var m = new OpenLayers.Map('map');
-        m.addLayers([baselayer,layer]);

trunk/openlayers/tests/Tile/test_Image.html

@@ -65 +65 @@
-            REQUEST: "GetMap", STYLES: "",
-            EXCEPTIONS: "application/vnd.ogc.se_inimage", FORMAT: "image/jpeg",
-"1,2,3,4"
+[1,2,3,4]
-            WIDTH: String(size.w), HEIGHT: String(size.h)
-        };
@@ -87 +87 @@
-        var map = new OpenLayers.Map('map');
-        var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-
+, encodeBBOX: true
-        map.addLayer(layer);
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-185,-90,-180,90), url, size);