diff --git a/lib/OpenLayers/Format/WMSCapabilities/v1.js b/lib/OpenLayers/Format/WMSCapabilities/v1.js
index 6f909731ef..f9cd1c8c2b 100644
--- a/lib/OpenLayers/Format/WMSCapabilities/v1.js
+++ b/lib/OpenLayers/Format/WMSCapabilities/v1.js
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
+/* Copyright (c) 2006-2010 by OpenLayers Contributors (see authors.txt for
* full list of contributors). Published under the Clear BSD license.
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
* full text of the license. */
@@ -303,14 +303,17 @@ OpenLayers.Format.WMSCapabilities.v1 = OpenLayers.Class(
this.readChildNodes(node, obj);
},
"Get": function(node, obj) {
- this.readChildNodes(node, obj);
+ obj.get = {};
+ this.readChildNodes(node, obj.get);
},
"Post": function(node, obj) {
- this.readChildNodes(node, obj);
+ obj.post = {};
+ this.readChildNodes(node, obj.post);
},
"GetMap": function(node, obj) {
obj.getmap = {formats: []};
this.readChildNodes(node, obj.getmap);
+ obj.getmap.href = obj.getmap.get.href || obj.getmap.post.href; // backwards compatibility
},
"GetFeatureInfo": function(node, obj) {
obj.getfeatureinfo = {formats: []};
diff --git a/tests/Format/WMSCapabilities/v1_1_1.html b/tests/Format/WMSCapabilities/v1_1_1.html
index 22ee8cb7d6..f6a44d3827 100644
--- a/tests/Format/WMSCapabilities/v1_1_1.html
+++ b/tests/Format/WMSCapabilities/v1_1_1.html
@@ -5,7 +5,7 @@
function test_read(t) {
- t.plan(15);
+ t.plan(17);
var xml = document.getElementById("gssample").firstChild.nodeValue;
var doc = new OpenLayers.Format.XML().read(xml);
@@ -22,6 +22,16 @@
"http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&",
"getmap href parsed"
);
+ t.eq(
+ getmap.get.href,
+ getmap.href,
+ "getmap.get.href parsed"
+ );
+ t.eq(
+ getmap.post,
+ undefined,
+ "getmap.post not available"
+ );
t.ok(capability.layers, "layers parsed");
t.eq(capability.layers.length, 22, "correct number of layers parsed");
@@ -422,12 +432,16 @@ Changes:
image/jpeg
-
+ xlink:href="http://hostname:port/path/get" />
+
+
+