From ddab23ae7a6dd9bf45870a67c6b61c14a71c71aa Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 18 Jan 2013 16:25:25 +0000 Subject: Change default map type to Hybrid. --- web/js/map-wmts-zurich.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/js/map-wmts-zurich.js') diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index 63f3f9cd7..f29d9bd8b 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -40,11 +40,11 @@ fixmystreet.layer_options = { projection: new OpenLayers.Projection("EPSG:21781"), - name: "Luftbild", - layer: "Luftbild", + name: "Hybrid", + layer: "Hybrid", matrixSet: "nativeTileMatrixSet", requestEncoding: "REST", - url: "http://www.wmts.stadt-zuerich.ch/Luftbild/MapServer/WMTS/tile/", + url: "http://www.wmts.stadt-zuerich.ch/Hybrid/MapServer/WMTS/tile/", style: "default", matrixIds: [ { identifier: "0", matrixHeight: 2, matrixWidth: 2, scaleDenominator: 250000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, -- cgit v1.2.3 From 7b4ff6d6a37368cada7939dd635981d01f4fc37e Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 18 Jan 2013 18:07:11 +0000 Subject: Remove non-working most zoomed in level. --- web/js/map-wmts-zurich.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/js/map-wmts-zurich.js') diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index f29d9bd8b..e79fd2ec2 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -35,7 +35,7 @@ fixmystreet.map_options = { maxExtent: new OpenLayers.Bounds(676000, 241000, 690000, 255000), units: 'm', - scales: [ '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000', '500'] + scales: [ '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000' ] }; fixmystreet.layer_options = { -- cgit v1.2.3 From 55150a623a4cff21398b47bd788ebd258f8a8ece Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 18 Jan 2013 18:10:28 +0000 Subject: Add ability for multiple base map layers, add Zurich Stadtplan. --- web/js/map-wmts-zurich.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'web/js/map-wmts-zurich.js') diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index e79fd2ec2..5e296372f 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -24,6 +24,7 @@ new OpenLayers.Control.ArgParser(), fixmystreet.nav_control, new OpenLayers.Control.Permalink(permalink_id), + new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; @@ -59,6 +60,12 @@ { identifier: "9", matrixHeight: 415, matrixWidth: 414, scaleDenominator: 500, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } } ] }; + fixmystreet.layer_options = [ + fixmystreet.layer_options, OpenLayers.Util.extend({}, fixmystreet.layer_options) + ]; + fixmystreet.layer_options[1].name = "Stadtplan"; + fixmystreet.layer_options[1].layer = "Stadtplan"; + fixmystreet.layer_options[1].url = "http://www.wmts.stadt-zuerich.ch/Stadtplan/MapServer/WMTS/tile/"; // Give main code a new bbox_strategy that translates between // lat/lon and our swiss coordinates -- cgit v1.2.3 From 401da7a5661fda2e37262b88a2d108b04ab1064b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 18 Jan 2013 18:29:00 +0000 Subject: Remove LayerSwitcher, will do it manually. --- web/js/map-wmts-zurich.js | 1 - 1 file changed, 1 deletion(-) (limited to 'web/js/map-wmts-zurich.js') diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index 5e296372f..7712742bb 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -24,7 +24,6 @@ new OpenLayers.Control.ArgParser(), fixmystreet.nav_control, new OpenLayers.Control.Permalink(permalink_id), - new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; -- cgit v1.2.3 From bf239bf5dfc3e02015f5d200d37f867a1deeb427 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 18 Jan 2013 18:48:22 +0000 Subject: Add layer switcher to current map task bar. --- web/js/map-wmts-zurich.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'web/js/map-wmts-zurich.js') diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index 7712742bb..12d267775 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -2,6 +2,16 @@ * Maps for FMZ using Zurich council's WMTS tile server */ +$(function(){ + $('#map_layer_toggle').toggle(function(){ + $(this).text('Luftbild'); + fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]); + }, function(){ + $(this).text('Stadtplan'); + fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]); + }); +}); + /* * set_map_config() is called on dom ready in map-OpenLayers.js * to setup the way the map should operate. @@ -38,7 +48,7 @@ scales: [ '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000' ] }; - fixmystreet.layer_options = { + var layer_options = { projection: new OpenLayers.Projection("EPSG:21781"), name: "Hybrid", layer: "Hybrid", @@ -60,11 +70,12 @@ ] }; fixmystreet.layer_options = [ - fixmystreet.layer_options, OpenLayers.Util.extend({}, fixmystreet.layer_options) + layer_options, OpenLayers.Util.applyDefaults({ + name: "Stadtplan", + layer: "Stadtplan", + url: "http://www.wmts.stadt-zuerich.ch/Stadtplan/MapServer/WMTS/tile/" + }, layer_options) ]; - fixmystreet.layer_options[1].name = "Stadtplan"; - fixmystreet.layer_options[1].layer = "Stadtplan"; - fixmystreet.layer_options[1].url = "http://www.wmts.stadt-zuerich.ch/Stadtplan/MapServer/WMTS/tile/"; // Give main code a new bbox_strategy that translates between // lat/lon and our swiss coordinates -- cgit v1.2.3