From 1b8f50e5a3ea0a08c88cc5676467743ab03741b2 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Mon, 9 Dec 2019 17:13:10 +0000 Subject: base files for displaying WMS maps Basic config and setup files for using WMS based map tiles. These still require config in appropriate cobrand perl and javascript files --- web/js/map-OpenLayers.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 6142b3e23..182cd79a1 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -943,10 +943,23 @@ $.extend(fixmystreet.utils, { // This option is thankfully used by them both numZoomLevels: fixmystreet.numZoomLevels }, fixmystreet.layer_options[i]); - if (fixmystreet.layer_options[i].matrixIds) { - layer = new fixmystreet.map_type(fixmystreet.layer_options[i]); + var layer_options = fixmystreet.layer_options[i]; + if (layer_options.wms_version) { + var options = { + layers: layer_options.layer_names[0], + size: layer_options.tile_size, + format: layer_options.format + }; + layer = new fixmystreet.map_type( + layer_options.name, + layer_options.url, + options, + layer_options + ); + } else if (layer_options.matrixIds) { + layer = new fixmystreet.map_type(layer_options); } else { - layer = new fixmystreet.map_type(fixmystreet.layer_name, fixmystreet.layer_options[i]); + layer = new fixmystreet.map_type(fixmystreet.layer_name, layer_options); } fixmystreet.map.addLayer(layer); } -- cgit v1.2.3