Helper function for all latlon to OSGB36 calls.

3 files changed, 1 insertions, 9 deletions

diff --git a/bin/import-flickr b/bin/import-flickr
index b187189b7..f4a838547 100755
--- a/bin/import-flickr
+++ b/bin/import-flickr
@@ -24,7 +24,6 @@ use mySociety::Config;
 use mySociety::DBHandle qw(dbh select_all);
 use mySociety::EmailUtil;
 use mySociety::Email;
-use mySociety::GeoUtil;
 
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
diff --git a/bin/send-reports b/bin/send-reports
index 2d5245269..ef3da8c46 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -27,7 +27,6 @@ use mySociety::Config;
 use mySociety::DBHandle qw(dbh);
 use mySociety::Email;
 use mySociety::EmailUtil;
-use mySociety::GeoUtil;
 use mySociety::Locale;
 use mySociety::MaPit;
 use mySociety::Random qw(random_bytes);
@@ -103,12 +102,7 @@ foreach my $row (@$unsent) {
     $h{easting_northing} = '';
     if ( mySociety::Config::get('COUNTRY') eq 'GB' ) {
 
-        ( $h{easting}, $h{northing} ) =
-          mySociety::Locale::in_gb_locale {
-              mySociety::GeoUtil::wgs84_to_national_grid(
-                  $h{latitude}, $h{longitude}, 'G'
-              );
-          };
+        ( $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}                             #
diff --git a/bin/test-run b/bin/test-run
index b2fea2fb5..1c41e7c3a 100755
--- a/bin/test-run
+++ b/bin/test-run
@@ -27,7 +27,6 @@ use FindBin;
 use mySociety::Config;
 mySociety::Config::set_file('../conf/general');
 use mySociety::DBHandle qw(dbh);
-use mySociety::GeoUtil;
 use mySociety::WebTestHarness;
 use Test::Harness;
 use File::Find;