Remove unnecessary display_map_end function.

8 files changed, 7 insertions, 18 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index 86e2ac001..cbffbd080 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -227,7 +227,6 @@ sub display_location : Private {
             pins      => \@pins,
             post      => $map_links
         );
-        $c->stash->{map_end_html} = FixMyStreet::Map::display_map_end(1);
         $c->stash->{map_js}       = FixMyStreet::Map::header_js();
     }
 
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 0b235a06e..0f64c7c78 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -213,7 +213,6 @@ sub generate_map_tags : Private {
         : [],
         post => $map_links
     );
-    $c->stash->{map_end_html} = FixMyStreet::Map::display_map_end(0),
     $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 4c2264c9f..18d1efed5 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -934,9 +934,6 @@ END_MAP_HTML
         );
     }
 
-    # get the closing for the map
-    $c->stash->{map_end} = FixMyStreet::Map::display_map_end(1);
-
     return 1;
 }
 
diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm
index 62dab454b..1d9ce1527 100644
--- a/perllib/FixMyStreet/Map.pm
+++ b/perllib/FixMyStreet/Map.pm
@@ -63,13 +63,6 @@ sub display_map {
     return $map_class->display_map(@_);
 }
 
-sub display_map_end {
-    my ($type) = @_;
-    my $out = '</div>';
-    $out .= '</form>' if ($type);
-    return $out;
-}
-
 sub header {
     my ( $q, $type ) = @_;
     return '' unless $type;
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index 6801552e6..22ba7b084 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -88,6 +88,7 @@
 
 </div>
 
-[% map_end_html %]
+</div>
+</form>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index 7e0501610..564958286 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -131,6 +131,6 @@
     </form>
 </div>
 
-[% map_end_html %]
+</div>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html
index 6b8a4aaa9..64df0c935 100644
--- a/templates/web/default/report/new/fill_in_details.html
+++ b/templates/web/default/report/new/fill_in_details.html
@@ -144,6 +144,7 @@
 </div>
 </div>
 
-[% map_end %]
+</div>
+</form>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html
index 188bacca6..db6a78279 100644
--- a/templates/web/default/report/updates.html
+++ b/templates/web/default/report/updates.html
@@ -21,10 +21,9 @@
             [% line | html %]
         </p>
         [% END %]
-    </div>
-
-    [% INCLUDE 'report/photo.html' object=update %]
 
+        [% INCLUDE 'report/photo.html' object=update %]
+    </div>
     </div>
 [% '</div>' IF loop.last %]
 [% END %]