Skip to content

Commit f3b6d64

Browse files
author
Bart van den Eijnden
committed
Merge pull request openlayers#1153 from georchestra/wmc_gutter
Handle gutter value in WMC (r=@bartvde)
2 parents e39a5d8 + ef0b7f6 commit f3b6d64

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

lib/OpenLayers/Format/Context.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ OpenLayers.Format.Context = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,
109109
units: layerContext.units,
110110
isBaseLayer: layerContext.isBaseLayer,
111111
opacity: layerContext.opacity,
112+
gutter: layerContext.gutter,
112113
displayInLayerSwitcher: layerContext.displayInLayerSwitcher,
113114
singleTile: layerContext.singleTile,
114115
tileSize: (layerContext.tileSize) ?

lib/OpenLayers/Format/WMC.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ OpenLayers.Format.WMC = OpenLayers.Class(OpenLayers.Format.Context, {
6262
units: layer.units,
6363
isBaseLayer: layer.isBaseLayer,
6464
opacity: layer.opacity == 1 ? undefined : layer.opacity,
65+
gutter: layer.gutter == 0 ? undefined : layer.gutter,
6566
displayInLayerSwitcher: layer.displayInLayerSwitcher,
6667
singleTile: layer.singleTile,
6768
tileSize: (layer.singleTile || !layer.tileSize) ?

lib/OpenLayers/Format/WMC/v1.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,14 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
238238
var obj = {"width": node.getAttribute("width"), "height": node.getAttribute("height")};
239239
layerContext.tileSize = obj;
240240
},
241-
241+
242+
/**
243+
* Method: read_ol_gutter
244+
*/
245+
read_ol_gutter: function(layerContext, node) {
246+
layerContext.gutter = parseInt(this.getChildValue(node));
247+
},
248+
242249
/**
243250
* Method: read_ol_isBaseLayer
244251
*/
@@ -992,7 +999,7 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
992999

9931000
var properties = [
9941001
"transparent", "numZoomLevels", "units", "isBaseLayer",
995-
"opacity", "displayInLayerSwitcher", "singleTile"
1002+
"opacity", "displayInLayerSwitcher", "singleTile", "gutter"
9961003
];
9971004
var child;
9981005
for(var i=0, len=properties.length; i<len; ++i) {

0 commit comments

Comments
 (0)