From 9788133b03970550dc712233631356a790b2f398 Mon Sep 17 00:00:00 2001 From: eykamp Date: Wed, 2 Jan 2013 15:36:17 +0100 Subject: [PATCH 1/5] Update notes/2.13.md --- notes/2.13.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/notes/2.13.md b/notes/2.13.md index 8fdaf0a1d0..9de5f7626e 100644 --- a/notes/2.13.md +++ b/notes/2.13.md @@ -68,3 +68,7 @@ Corresponding issue/pull requests: # Different return type for OpenLayers.Format.WMSDescribeLayer The return type of WMSDescribeLayer format's `read` method was different from the one of the VersionedOGC format superclass. So it was changed from an array to an object with a layerDescriptions property that holds the array. For backwards compatibility, the object still has a length property and 0, ..., n properties with the previous array values. + +# Moved errorProperty from the base class to the parser + +This was necessary for WCS support because there are no properties in common between versions 1.0.0 and 1.1.0 that were appropriate for checking. The only existing code that this affected was WFS parsing. From 459e38c2d69e82f1258bf6b06a3ae7c0182a4dbc Mon Sep 17 00:00:00 2001 From: Christopher Eykamp Date: Fri, 18 Jan 2013 15:54:38 +0100 Subject: [PATCH 2/5] Update tests --- tests/Format/WMSCapabilities/v1_1_1.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Format/WMSCapabilities/v1_1_1.html b/tests/Format/WMSCapabilities/v1_1_1.html index e3b0863624..cf79a3b3f1 100644 --- a/tests/Format/WMSCapabilities/v1_1_1.html +++ b/tests/Format/WMSCapabilities/v1_1_1.html @@ -235,8 +235,6 @@ t.eq(elevation.values, ["0","1000","3000","5000","10000"], "Parsing of comma-separated values done correctly"); - - } function test_contactinfo(t) { From 5bb5530fd719d9e532df1a6f1ac5096042017b72 Mon Sep 17 00:00:00 2001 From: Christopher Eykamp Date: Fri, 18 Jan 2013 15:58:49 +0100 Subject: [PATCH 3/5] Added tests --- tests/Format/WMSCapabilities/v1_1_1.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Format/WMSCapabilities/v1_1_1.html b/tests/Format/WMSCapabilities/v1_1_1.html index cf79a3b3f1..bd231095db 100644 --- a/tests/Format/WMSCapabilities/v1_1_1.html +++ b/tests/Format/WMSCapabilities/v1_1_1.html @@ -238,7 +238,7 @@ } function test_contactinfo(t) { - t.plan(15); + t.plan(18); var xml = document.getElementById("ogcsample").firstChild.nodeValue; var doc = new OpenLayers.Format.XML().read(xml); @@ -246,6 +246,10 @@ var obj = new OpenLayers.Format.WMSCapabilities().read(doc); var service = obj.service; + t.eq(personPrimary.name, "OGC:WMS", "name parsed correctly"); + t.eq(personPrimary.title, "Acme Corp. Map Server", "title parsed correctly"); + t.eq(personPrimary.abstract, "WMT Map Server maintained by Acme Corporation. Contact: webmaster@wmt.acme.com. High-quality maps showing roadrunner nests and possible ambush locations.", "abstract parsed correctly"); + var contactinfo = service.contactInformation; t.ok(contactinfo, "object contains contactInformation property"); From da62be0137bd78606f0cc7951cde16bae15ee514 Mon Sep 17 00:00:00 2001 From: Christopher Eykamp Date: Tue, 22 Jan 2013 15:44:19 +0100 Subject: [PATCH 4/5] Fix irregular character that Ruby/Rails objects to --- lib/OpenLayers/Marker/Box.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/OpenLayers/Marker/Box.js b/lib/OpenLayers/Marker/Box.js index 5b100a8400..c3086bfe78 100644 --- a/lib/OpenLayers/Marker/Box.js +++ b/lib/OpenLayers/Marker/Box.js @@ -81,7 +81,7 @@ OpenLayers.Marker.Box = OpenLayers.Class(OpenLayers.Marker, { * sz - {} * * Returns: - * {DOMElement} A new DOM Image with this markerīs icon set at the + * {DOMElement} A new DOM Image with this marker's icon set at the * location passed-in */ draw: function(px, sz) { From c179c8493b09f0bb9839bb91122dc2581243896e Mon Sep 17 00:00:00 2001 From: Christopher Eykamp Date: Tue, 22 Jan 2013 15:50:19 +0100 Subject: [PATCH 5/5] Simplify pull request --- tests/Format/WMSCapabilities/v1_1_1.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/Format/WMSCapabilities/v1_1_1.html b/tests/Format/WMSCapabilities/v1_1_1.html index bd231095db..e3b0863624 100644 --- a/tests/Format/WMSCapabilities/v1_1_1.html +++ b/tests/Format/WMSCapabilities/v1_1_1.html @@ -235,10 +235,12 @@ t.eq(elevation.values, ["0","1000","3000","5000","10000"], "Parsing of comma-separated values done correctly"); + + } function test_contactinfo(t) { - t.plan(18); + t.plan(15); var xml = document.getElementById("ogcsample").firstChild.nodeValue; var doc = new OpenLayers.Format.XML().read(xml); @@ -246,10 +248,6 @@ var obj = new OpenLayers.Format.WMSCapabilities().read(doc); var service = obj.service; - t.eq(personPrimary.name, "OGC:WMS", "name parsed correctly"); - t.eq(personPrimary.title, "Acme Corp. Map Server", "title parsed correctly"); - t.eq(personPrimary.abstract, "WMT Map Server maintained by Acme Corporation. Contact: webmaster@wmt.acme.com. High-quality maps showing roadrunner nests and possible ambush locations.", "abstract parsed correctly"); - var contactinfo = service.contactInformation; t.ok(contactinfo, "object contains contactInformation property");