Switch easting/northing output to one line.

This is more friendly for e.g. copy and pasting by someone using the
Dynamics CRM software. Fixes #997.

3 files changed, 2 insertions, 68 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index a84a309ee..10d395684 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -302,10 +302,7 @@ sub send_reports {
             ( $h{easting}, $h{northing} ) = Utils::convert_latlon_to_en( $h{latitude}, $h{longitude} );
 
             # email templates don't have conditionals so we need to farmat this here
-            $h{easting_northing}                             #
-              = "Easting: $h{easting}\n\n"                   #
-              . "Northing: $h{northing}\n\n";
-
+            $h{easting_northing} = "Easting/Northing: $h{easting}/$h{northing}\n\n";
         }
 
         if ( $row->used_map ) {
diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt
index b3853e1a5..7fa0a23da 100644
--- a/templates/email/default/submit-example.txt
+++ b/templates/email/default/submit-example.txt
@@ -27,9 +27,7 @@ you approach the junction along Bournville Lane from the east,
 which leads to vehicles rolling back as they fall in and out of it
 whilst waiting at the junction.
 
-Easting: 404517
-
-Northing: 280922
+Easting/Northing: 404517/280922
 
 Latitude: 52.4262642791826
 
diff --git a/templates/email/fixamingata/submit-example.txt b/templates/email/fixamingata/submit-example.txt
deleted file mode 100644
index c11d613ad..000000000
--- a/templates/email/fixamingata/submit-example.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Subject: Problem Report: Dangerous pothole
-
-Dear Birmingham City Council,
-
-A user of FixMyStreet has submitted the following report of a
-local problem that they believe might require your attention.
-
-To view a map of the precise location of this issue, or to provide
-an update on the problem, please visit the following link:
-
-    http://www.fixmystreet.com/report/39092
-
-----------
-
-Name: Matthew Somerville
-
-Email: [...]
-
-Phone: [...]
-
-Category: Potholes
-
-Subject: Dangerous pothole
-
-Details: There is a large pothole almost on the give way line as
-you approach the junction along Bournville Lane from the east,
-which leads to vehicles rolling back as they fall in and out of it
-whilst waiting at the junction.
-
-Easting: 404517
-
-Northing: 280922
-
-Latitude: 52.4262642791826
-
-Longitude: -1.93500217285966
-
-Nearest road to the pin placed on the map (automatically
-generated by Bing Maps): Bournville Lane, Birmingham B30 1
-
-Nearest postcode to the pin placed on the map (automatically
-generated): B30 1LA (83m away)
-
-----------
-
-Replies to this email will go to the user who submitted the problem.
-
-Yours,  
-The FixMyStreet team
-
-This message was sent via FixMyStreet, a project of UKCOD,
-registered charity number 1076346. If there is a more appropriate
-email address for messages about 'Potholes', please let us know by
-visiting <http://www.fixmystreet.com/contact>. This will help
-improve the service for local people. We also welcome any other
-feedback you may have.
-
-FixMyStreet is now available for full integration into council
-websites, making life easier for both you and your residents.
-Read more here: https://www.fixmystreet.com/council
-