diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-03-09 10:33:26 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-03-13 16:46:31 +0000 |
| commit | 77d9804e958be13d7995d130fd6e4cfda2527a03 (patch) | |
| tree | 00b8b6b187921307a932299ce1ce8f6d87c1a7e1 | |
| parent | c0fb85e249180ed58dd436caece3328938256296 (diff) | |
Minor refactor of assets object.
| -rw-r--r-- | web/cobrands/fixmystreet/assets.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js index 26a13dc1d..804932f63 100644 --- a/web/cobrands/fixmystreet/assets.js +++ b/web/cobrands/fixmystreet/assets.js @@ -253,14 +253,15 @@ fixmystreet.assets = { var protocol_options; var protocol; if (options.http_options !== undefined) { - protocol_options = OpenLayers.Util.extend(options.http_options, {}); - if (protocol_options.format_class) { - protocol_options.format = new protocol_options.format_class(protocol_options.format_options); - } else { - protocol_options.format = new OpenLayers.Format.GML({ - geometryName: options.geometryName - }); + protocol_options = options.http_options; + OpenLayers.Util.applyDefaults(options, { + format_class: OpenLayers.Format.GML, + format_options: {} + }); + if (options.geometryName) { + options.format_options.geometryName = options.geometryName; } + protocol_options.format = new options.format_class(options.format_options); protocol = new OpenLayers.Protocol.HTTP(protocol_options); } else { protocol_options = { |