From cbe3e9a5af21cef3774585dd489aaedbe7a564bc Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 20 May 2020 17:50:01 +0100
Subject: Map should respect cobrand default zoom, if set.

This brings the behaviour of the code in line with the comment
on Cobrand:Default::default_map_zoom
---
 perllib/FixMyStreet/Map/OSM.pm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'perllib/FixMyStreet/Map/OSM.pm')

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index ef465d7dc..417fdca0b 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -77,11 +77,16 @@ sub generate_map_data {
         $zoomOffset = 0;
     }
 
-    # Adjust zoom level dependent upon population density
-    my $dist = $data->{distance}
-        || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} );
-    my $default_zoom = $data->{cobrand}->default_map_zoom() || ($numZoomLevels - 4);
-    $default_zoom = $numZoomLevels - 3 if $dist < 10;
+    # Adjust zoom level dependent upon population density if cobrand hasn't
+    # specified a default zoom.
+    my $default_zoom;
+    if (my $cobrand_default_zoom = $data->{cobrand}->default_map_zoom) {
+        $default_zoom = $cobrand_default_zoom;
+    } else {
+        my $dist = $data->{distance}
+            || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} );
+        $default_zoom = $dist < 10 ? $numZoomLevels - 3 : $numZoomLevels - 4;
+    }
 
     my $zoom = $data->{zoom} || $default_zoom;
     $zoom = $numZoomLevels - 1 if $zoom >= $numZoomLevels;
-- 
cgit v1.2.3


From 4770393b3de8d38649a66b9608048c15ec73347a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 16 Jul 2020 13:08:56 +0100
Subject: Add aerial option to OSM maps.

---
 perllib/FixMyStreet/Map/OSM.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'perllib/FixMyStreet/Map/OSM.pm')

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 417fdca0b..47c1c8535 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -21,11 +21,13 @@ sub map_template { 'osm' }
 sub map_javascript { [
     '/vendor/OpenLayers/OpenLayers.wfs.js',
     '/js/map-OpenLayers.js',
+    FixMyStreet->config('BING_MAPS_API_KEY') ? ('/js/map-bing-ol.js') : (),
     '/js/map-OpenStreetMap.js',
 ] }
 
 sub map_tiles {
     my ( $self, %params ) = @_;
+    return FixMyStreet::Map::Bing->map_tiles(%params) if $params{aerial};
     my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
     my $tile_url = $self->base_tile_url();
     return [
@@ -59,6 +61,8 @@ sub display_map {
         if defined $c->get_param('lon');
     $params{zoomToBounds} = $params{any_zoom} && !defined $c->get_param('zoom');
 
+    $params{aerial} = $c->get_param("aerial") && FixMyStreet->config('BING_MAPS_API_KEY') ? 1 : 0;
+
     my %data;
     $data{cobrand} = $c->cobrand;
     $data{distance} = $c->stash->{distance};
-- 
cgit v1.2.3


From e268e2b893aaf8a99e457c085e9c77d140b77233 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Aug 2020 21:15:08 +0100
Subject: Allow one more zoom level on most map types.

Not on StreetView/OpenMap Local based, which are not available.
---
 perllib/FixMyStreet/Map/OSM.pm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'perllib/FixMyStreet/Map/OSM.pm')

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 47c1c8535..082605568 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -11,8 +11,9 @@ use Math::Trig;
 use FixMyStreet::Gaze;
 use Utils;
 
-use constant ZOOM_LEVELS    => 6;
+use constant ZOOM_LEVELS    => 7;
 use constant MIN_ZOOM_LEVEL => 13;
+use constant DEFAULT_ZOOM   => 3;
 
 sub map_type { 'OpenLayers.Layer.OSM.Mapnik' }
 
@@ -76,10 +77,6 @@ sub generate_map_data {
 
     my $numZoomLevels = $self->ZOOM_LEVELS;
     my $zoomOffset = $self->MIN_ZOOM_LEVEL;
-    if ($params{any_zoom}) {
-        $numZoomLevels = 19;
-        $zoomOffset = 0;
-    }
 
     # Adjust zoom level dependent upon population density if cobrand hasn't
     # specified a default zoom.
@@ -89,7 +86,13 @@ sub generate_map_data {
     } else {
         my $dist = $data->{distance}
             || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} );
-        $default_zoom = $dist < 10 ? $numZoomLevels - 3 : $numZoomLevels - 4;
+        $default_zoom = $dist < 10 ? $self->DEFAULT_ZOOM : $self->DEFAULT_ZOOM - 1;
+    }
+
+    if ($params{any_zoom}) {
+        $numZoomLevels += $zoomOffset;
+        $default_zoom += $zoomOffset;
+        $zoomOffset = 0;
     }
 
     my $zoom = $data->{zoom} || $default_zoom;
-- 
cgit v1.2.3