ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-added the layer prefix property that got lost with r9883. r=bartvde (closes #2283)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@9931 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2010-01-04 17:59:24 +00:00
parent 2619586558
commit f6b00d7ced
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/OpenLayers/Format/WMSCapabilities/v1.js
View File

@@ -345,6 +345,12 @@ OpenLayers.Format.WMSCapabilities.v1 = OpenLayers.Class(
}; };
obj.nestedLayers.push(layer); obj.nestedLayers.push(layer);
this.readChildNodes(node, layer); this.readChildNodes(node, layer);
if(layer.name) {
var parts = layer.name.split(":");
if(parts.length > 0) {
layer.prefix = parts[0];
}
}
}, },
"Attribution": function(node, obj) { "Attribution": function(node, obj) {
obj.attribution = {}; obj.attribution = {};

3
tests/Format/WMSCapabilities/v1_1_1.html
View File

@@ -5,7 +5,7 @@
function test_read(t) { function test_read(t) {
t.plan(14); t.plan(15);
var xml = document.getElementById("gssample").firstChild.nodeValue; var xml = document.getElementById("gssample").firstChild.nodeValue;
var doc = new OpenLayers.Format.XML().read(xml); var doc = new OpenLayers.Format.XML().read(xml);
@@ -28,6 +28,7 @@
var layer = capability.layers[2]; var layer = capability.layers[2];
t.eq(layer.name, "tiger:tiger_roads", "[2] correct layer name"); t.eq(layer.name, "tiger:tiger_roads", "[2] correct layer name");
t.eq(layer.prefix, "tiger", "[2] correct layer prefix");
t.eq(layer.title, "Manhattan (NY) roads", "[2] correct layer title"); t.eq(layer.title, "Manhattan (NY) roads", "[2] correct layer title");
t.eq( t.eq(
layer["abstract"], layer["abstract"],