From 92bc41ffea83a39ce582f7c445d03c092125dcf5 Mon Sep 17 00:00:00 2001 From: Chris Mytton Date: Tue, 12 May 2020 14:19:15 +0100 Subject: Make year in map copyright notices dynamic --- web/js/map-fms.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'web/js/map-fms.js') diff --git a/web/js/map-fms.js b/web/js/map-fms.js index ac27cfbce..925fe1fa2 100644 --- a/web/js/map-fms.js +++ b/web/js/map-fms.js @@ -38,14 +38,15 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { var logo = ''; var c = this.map.getCenter(); var in_uk = c ? this.in_uk(c) : true; + var year = (new Date()).getFullYear(); if (z >= 16 && in_uk) { - copyrights = 'Contains Highways England and Ordnance Survey data © Crown copyright and database right 2016'; + copyrights = 'Contains Highways England and Ordnance Survey data © Crown copyright and database right ' + year; } else { logo = ''; if (in_uk) { - copyrights = '© 2016 Microsoft. © AND, Navteq, Highways England, Ordnance Survey'; + copyrights = '© ' + year + ' Microsoft. © AND, Navteq, Highways England, Ordnance Survey'; } else { - copyrights = '© 2016 Microsoft. © AND, Navteq, Ordnance Survey'; + copyrights = '© ' + year + ' Microsoft. © AND, Navteq, Ordnance Survey'; } } this._updateAttribution(copyrights, logo); -- cgit v1.2.3 From 76b2704d4e9a0b0d2c8af704a68652d7b4d81780 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 9 Jul 2020 15:41:18 +0100 Subject: [Bromley] Tidy up tilma URL bits. --- web/js/map-fms.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'web/js/map-fms.js') diff --git a/web/js/map-fms.js b/web/js/map-fms.js index 925fe1fa2..0e263c0a5 100644 --- a/web/js/map-fms.js +++ b/web/js/map-fms.js @@ -1,4 +1,4 @@ -fixmystreet.maps.tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/oml' ]; +fixmystreet.maps.tile_base = '//{S}tilma.mysociety.org/oml'; fixmystreet.maps.config = (function(original) { return function(){ @@ -52,13 +52,15 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { this._updateAttribution(copyrights, logo); }, + tile_prefix: [ '', 'a-', 'b-', 'c-' ], + get_urls: function(bounds, z) { var urls; var in_uk = this.in_uk(bounds.getCenterLonLat()); if (z >= 16 && in_uk) { urls = []; - for (var i=0; i< fixmystreet.maps.tile_base[0].length; i++) { - urls.push( fixmystreet.maps.tile_base[1].replace('{S}', fixmystreet.maps.tile_base[0][i]) + "/${z}/${x}/${y}.png" ); + for (var i=0; i< this.tile_prefix.length; i++) { + urls.push( fixmystreet.maps.tile_base.replace('{S}', this.tile_prefix[i]) + "/${z}/${x}/${y}.png" ); } } else { var type = ''; -- cgit v1.2.3 From 196e3cafcfcec0cc1a050a9d07aad81156ee794e Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 9 Jul 2020 17:38:00 +0100 Subject: Use up-to-date Bing map URLs. --- web/js/map-fms.js | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'web/js/map-fms.js') diff --git a/web/js/map-fms.js b/web/js/map-fms.js index 0e263c0a5..8af6adec3 100644 --- a/web/js/map-fms.js +++ b/web/js/map-fms.js @@ -44,9 +44,9 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { } else { logo = ''; if (in_uk) { - copyrights = '© ' + year + ' Microsoft. © AND, Navteq, Highways England, Ordnance Survey'; + copyrights = '© ' + year + ' Microsoft, HERE, Highways England, Ordnance Survey'; } else { - copyrights = '© ' + year + ' Microsoft. © AND, Navteq, Ordnance Survey'; + copyrights = '© ' + year + ' Microsoft, HERE, Ordnance Survey'; } } this._updateAttribution(copyrights, logo); @@ -55,24 +55,23 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { tile_prefix: [ '', 'a-', 'b-', 'c-' ], get_urls: function(bounds, z) { - var urls; + var urls = [], i; var in_uk = this.in_uk(bounds.getCenterLonLat()); if (z >= 16 && in_uk) { urls = []; - for (var i=0; i< this.tile_prefix.length; i++) { + for (i=0; i< this.tile_prefix.length; i++) { urls.push( fixmystreet.maps.tile_base.replace('{S}', this.tile_prefix[i]) + "/${z}/${x}/${y}.png" ); } + } else if (z > 11 && in_uk) { + var type = 'g=8702&lbl=l1&productSet=mmOS&key=' + fixmystreet.key; + var tile_base = "//ecn.t{S}.tiles.virtualearth.net/tiles/r${id}?" + type; + for (i=0; i<4; i++) { + urls.push(tile_base.replace('{S}', i)); + } } else { - var type = ''; - if (z > 11 && in_uk) { - type = '&productSet=mmOS&key=' + fixmystreet.key; + for (i=0; i<4; i++) { + urls.push(this.tile_base.replace('{S}', i)); } - urls = [ - "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, - "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, - "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type, - "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type - ]; } return urls; }, -- cgit v1.2.3 From 009c42448270895f97302747a69485de432d537d Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 19 May 2020 17:02:50 +0100 Subject: Add aerial view toggle to Bing Maps & subclasses. Co-authored-by: Dave Arter Co-authored-by: Matthew Somerville --- web/js/map-fms.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'web/js/map-fms.js') diff --git a/web/js/map-fms.js b/web/js/map-fms.js index 8af6adec3..bb51467a7 100644 --- a/web/js/map-fms.js +++ b/web/js/map-fms.js @@ -1,12 +1,5 @@ fixmystreet.maps.tile_base = '//{S}tilma.mysociety.org/oml'; -fixmystreet.maps.config = (function(original) { - return function(){ - original(); - fixmystreet.map_type = OpenLayers.Layer.BingUK; - }; -})(fixmystreet.maps.config); - OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { uk_bounds: [ new OpenLayers.Bounds(-6.6, 49.8, 1.102680, 51), @@ -78,3 +71,8 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { CLASS_NAME: "OpenLayers.Layer.BingUK" }); + +fixmystreet.layer_options = [ + { map_type: OpenLayers.Layer.BingUK }, + { map_type: OpenLayers.Layer.BingAerial } +]; -- cgit v1.2.3