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. --- perllib/FixMyStreet/Map/Bing.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'perllib/FixMyStreet/Map/Bing.pm') diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm index 97a0d229f..97b947902 100644 --- a/perllib/FixMyStreet/Map/Bing.pm +++ b/perllib/FixMyStreet/Map/Bing.pm @@ -29,14 +29,12 @@ sub get_quadkey { return $key; } -sub map_tile_base { - '', "//ecn.%s.tiles.virtualearth.net/tiles/r%s.png?g=6570"; -} +my $road_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z'; sub map_tiles { my ( $self, %params ) = @_; my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} ); - my ($tile_sep, $tile_base) = $self->map_tile_base; + my $tile_base = $road_base; return [ sprintf($tile_base, 't0', $self->get_quadkey($x-1, $y-1, $z)), sprintf($tile_base, 't1', $self->get_quadkey($x, $y-1, $z)), -- 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 --- perllib/FixMyStreet/Map/Bing.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'perllib/FixMyStreet/Map/Bing.pm') diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm index 97b947902..4463b4ed2 100644 --- a/perllib/FixMyStreet/Map/Bing.pm +++ b/perllib/FixMyStreet/Map/Bing.pm @@ -8,6 +8,8 @@ use strict; sub map_type { '' } +sub map_template { 'bing' } + sub map_javascript { [ '/vendor/OpenLayers/OpenLayers.fixmystreet.js', '/js/map-OpenLayers.js', @@ -29,12 +31,21 @@ sub get_quadkey { return $key; } +sub display_map { + my ($self, $c, %params) = @_; + + $params{aerial} = $c->get_param("aerial") ? 1 : 0; + + $self->SUPER::display_map($c, %params); +} + my $road_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z'; +my $aerial_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=A,G,L&src=t&og=969&n=z'; sub map_tiles { my ( $self, %params ) = @_; my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} ); - my $tile_base = $road_base; + my $tile_base = $params{aerial} ? $aerial_base : $road_base; return [ sprintf($tile_base, 't0', $self->get_quadkey($x-1, $y-1, $z)), sprintf($tile_base, 't1', $self->get_quadkey($x, $y-1, $z)), -- cgit v1.2.3 From 102824cc005f48ba751e8cbb445c304cc1e25098 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 14 Jul 2020 09:17:41 +0100 Subject: Fix non-JS aerial tile display. --- perllib/FixMyStreet/Map/Bing.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perllib/FixMyStreet/Map/Bing.pm') diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm index 4463b4ed2..723dcd6dc 100644 --- a/perllib/FixMyStreet/Map/Bing.pm +++ b/perllib/FixMyStreet/Map/Bing.pm @@ -39,8 +39,8 @@ sub display_map { $self->SUPER::display_map($c, %params); } -my $road_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z'; -my $aerial_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=A,G,L&src=t&og=969&n=z'; +my $road_base = '//%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z'; +my $aerial_base = '//%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=A,G,L&src=t&og=969&n=z'; sub map_tiles { my ( $self, %params ) = @_; -- cgit v1.2.3 From 4770393b3de8d38649a66b9608048c15ec73347a Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 16 Jul 2020 13:08:56 +0100 Subject: Add aerial option to OSM maps. --- perllib/FixMyStreet/Map/Bing.pm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'perllib/FixMyStreet/Map/Bing.pm') diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm index 723dcd6dc..17bdc3a53 100644 --- a/perllib/FixMyStreet/Map/Bing.pm +++ b/perllib/FixMyStreet/Map/Bing.pm @@ -8,8 +8,6 @@ use strict; sub map_type { '' } -sub map_template { 'bing' } - sub map_javascript { [ '/vendor/OpenLayers/OpenLayers.fixmystreet.js', '/js/map-OpenLayers.js', @@ -31,14 +29,6 @@ sub get_quadkey { return $key; } -sub display_map { - my ($self, $c, %params) = @_; - - $params{aerial} = $c->get_param("aerial") ? 1 : 0; - - $self->SUPER::display_map($c, %params); -} - my $road_base = '//%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z'; my $aerial_base = '//%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=A,G,L&src=t&og=969&n=z'; -- cgit v1.2.3