Merge remote-tracking branch 'origin/master' into fmb-read-only

Conflicts:
	.gitignore
	bin/make_css
	conf/general.yml-example
	perllib/FixMyStreet/App/Controller/Council.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/Cobrand/Default.pm
	templates/web/default/around/around_index.html
	templates/web/default/index.html
	templates/web/emptyhomes/index.html
	templates/web/fixmystreet/around/around_index.html
	templates/web/fixmystreet/index.html
	web/fixmystreet_app_cgi.cgi
	web/fixmystreet_app_fastcgi.cgi

1 files changed, 7 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 119337e37..693f42e4f 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -25,7 +25,8 @@ sub map_template {
 }
 
 sub map_tiles {
-    my ($self, $x, $y, $z) = @_;
+    my ( $self, %params ) = @_;
+    my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
     my $tile_url = $self->base_tile_url();
     return [
         "http://a.$tile_url/$z/" . ($x - 1) . "/" . ($y - 1) . ".png",
@@ -73,26 +74,23 @@ sub display_map {
     my $zoom = defined $c->req->params->{zoom} ? $c->req->params->{zoom} + 0 : $default_zoom;
     $zoom = $numZoomLevels - 1 if $zoom >= $numZoomLevels;
     $zoom = 0 if $zoom < 0;
-    my $zoom_act = $zoomOffset + $zoom;
-    my ($x_tile, $y_tile) = latlon_to_tile_with_adjust($params{latitude}, $params{longitude}, $zoom_act);
+    $params{zoom_act} = $zoomOffset + $zoom;
+    ($params{x_tile}, $params{y_tile}) = latlon_to_tile_with_adjust($params{latitude}, $params{longitude}, $params{zoom_act});
 
     foreach my $pin (@{$params{pins}}) {
-        ($pin->{px}, $pin->{py}) = latlon_to_px($pin->{latitude}, $pin->{longitude}, $x_tile, $y_tile, $zoom_act);
+        ($pin->{px}, $pin->{py}) = latlon_to_px($pin->{latitude}, $pin->{longitude}, $params{x_tile}, $params{y_tile}, $params{zoom_act});
     }
 
     $c->stash->{map} = {
         %params,
         type => $self->map_template(),
         map_type => $self->map_type(),
-        tiles => $self->map_tiles( $x_tile, $y_tile, $zoom_act ),
+        tiles => $self->map_tiles( %params ),
         copyright => $self->copyright(),
-        x_tile => $x_tile,
-        y_tile => $y_tile,
         zoom => $zoom,
-        zoom_act => $zoom_act,
         zoomOffset => $zoomOffset,
         numZoomLevels => $numZoomLevels,
-        compass => compass( $x_tile, $y_tile, $zoom_act ),
+        compass => compass( $params{x_tile}, $params{y_tile}, $params{zoom_act} ),
     };
 }