Tidy up map parmeters.

4 files changed, 8 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index ac665055b..eef805da8 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -189,14 +189,14 @@ sub display_location : Private {
     } } @$on_map_all, @$around_map;
 
     {    # FIXME - ideally this indented code should be in the templates
-        $c->stash->{map_html} = FixMyStreet::Map::display_map(
+        FixMyStreet::Map::display_map(
             $c,
             latitude  => $latitude,
             longitude => $longitude,
-            type      => 1,
+            clickable => 1,
             pins      => \@pins,
         );
-        $c->stash->{map_js}       = FixMyStreet::Map::header_js();
+        $c->stash->{map_js} = FixMyStreet::Map::header_js();
     }
 
     return 1;
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index f46b98510..ba714a736 100755
--- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm
+++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -256,7 +256,7 @@ sub display : Private {
     );
     $c->stash->{updates} = $updates;
 
-    $c->stash->{map_start_html} = FixMyStreet::Map::display_map(
+    FixMyStreet::Map::display_map(
         $c,
         latitude  => $problem->latitude,
         longitude => $problem->longitude,
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 82f553d71..82d83e318 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -150,11 +150,10 @@ sub generate_map_tags : Private {
 
     my $problem = $c->stash->{problem};
 
-    $c->stash->{map_start_html} = FixMyStreet::Map::display_map(
+    FixMyStreet::Map::display_map(
         $c,
         latitude  => $problem->latitude,
         longitude => $problem->longitude,
-        type      => 0,
         pins      => $problem->used_map
         ? [ {
             latitude  => $problem->latitude,
@@ -163,7 +162,7 @@ sub generate_map_tags : Private {
           } ]
         : [],
     );
-    $c->stash->{map_js}       = FixMyStreet::Map::header_js();
+    $c->stash->{map_js} = FixMyStreet::Map::header_js();
 
     return 1;
 }
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 2bba93cd4..ba864eca4 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -903,11 +903,11 @@ sub generate_map : Private {
 
     # Don't do anything if the user skipped the map
     unless ( $c->req->param('skipped') ) {
-        $c->stash->{map_html} = FixMyStreet::Map::display_map(
+        FixMyStreet::Map::display_map(
             $c,
             latitude  => $latitude,
             longitude => $longitude,
-            type      => 1,
+            clickable => 1,
             pins      => [ {
                 latitude  => $latitude,
                 longitude => $longitude,