Merge branch 'migrate_to_catalyst' of ssh://git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst

1 files changed, 5 insertions, 25 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 5a33718da..180d2198d 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -894,35 +894,15 @@ sub generate_map : Private {
     my $latitude  = $c->stash->{latitude};
     my $longitude = $c->stash->{longitude};
 
+    ( $c->stash->{short_latitude}, $c->stash->{short_longitude} ) =
+      map { Utils::truncate_coordinate($_) }
+      ( $c->stash->{latitude}, $c->stash->{longitude} );
+
     # Forms that allow photos need a different enctype
     my $allow_photo_upload = $c->cobrand->allow_photo_upload;
 
     # Don't do anything if the user skipped the map
-    if ( $c->req->param('skipped') ) {
-
-        my $enctype =
-          $allow_photo_upload
-          ? ' enctype="multipart/form-data"'
-          : '';
-
-        my $cobrand_form_elements =
-          $c->cobrand->form_elements('mapSkippedForm');
-
-        my $form_action = $c->uri_for('');
-        my $pc          = encode_entities( $c->stash->{pc} );
-
-        $c->stash->{map_html} = <<"END_MAP_HTML";
-<form action="$form_action" method="post" name="mapSkippedForm"$enctype>
-<input type="hidden" name="latitude"  value="$latitude">
-<input type="hidden" name="longitude" value="$longitude">
-<input type="hidden" name="pc" value="$pc">
-<input type="hidden" name="skipped" value="1">
-$cobrand_form_elements
-<div>
-END_MAP_HTML
-
-    }
-    else {
+    unless ( $c->req->param('skipped') ) {
         my $map_type = $allow_photo_upload ? 2 : 1;
 
         $c->stash->{map_html} = FixMyStreet::Map::display_map(