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

Merge pull request #2658 from oterral/fix_getcap

Browse Source 
Set inherited values when parsing a GetCapabilities
This commit is contained in:
Frédéric Junod
2014-09-25 13:51:40 +02:00
parent 884fb5736c 962f1eecc0
commit 5f51fbc93d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ol/format/wmscapabilitiesformat.js
View File

@@ -327,6 +327,7 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
if (goog.isDef(parentValue)) { if (goog.isDef(parentValue)) {
var childValue = goog.object.setIfUndefined(layerObject, key, []); var childValue = goog.object.setIfUndefined(layerObject, key, []);
childValue = childValue.concat(parentValue); childValue = childValue.concat(parentValue);
goog.object.set(layerObject, key, childValue);
} }
}); });

2
test/spec/ol/format/wmscapabilities.test.js
View File

@@ -97,7 +97,7 @@ describe('ol.format.WMSCapabilities', function() {
expect(layer.Layer.length).to.eql(4); expect(layer.Layer.length).to.eql(4);
expect(layer.Layer[0].Name).to.eql('ROADS_RIVERS'); expect(layer.Layer[0].Name).to.eql('ROADS_RIVERS');
expect(layer.Layer[0].Title).to.eql('Roads and Rivers'); expect(layer.Layer[0].Title).to.eql('Roads and Rivers');
expect(layer.Layer[0].CRS).to.eql(['EPSG:26986']); expect(layer.Layer[0].CRS).to.eql(['EPSG:26986', 'CRS:84']);
expect(layer.Layer[0].Identifier).to.eql(['123456']); expect(layer.Layer[0].Identifier).to.eql(['123456']);
expect(layer.Layer[0].BoundingBox).to.eql([{ expect(layer.Layer[0].BoundingBox).to.eql([{
crs: 'CRS:84', crs: 'CRS:84',