Merge branch 'master' into migrate_to_catalyst

1 files changed, 4 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm
index 81b123b30..b6d24fd6a 100644
--- a/perllib/FixMyStreet/Map/Tilma/Original.pm
+++ b/perllib/FixMyStreet/Map/Tilma/Original.pm
@@ -12,13 +12,14 @@ use strict;
 use LWP::Simple;
 
 use Cobrand;
-use mySociety::Web qw(ent NewURL);
 use mySociety::GeoUtil;
+use mySociety::Locale;
+use mySociety::Web qw(ent NewURL);
 use Utils;
 
 sub _ll_to_en {
     my ($lat, $lon) = @_;
-    return mySociety::GeoUtil::wgs84_to_national_grid( $lat, $lon, 'G' );    
+    return Utils::convert_latlon_to_en( $lat, $lon );
 }
 
 sub header_js {
@@ -268,7 +269,7 @@ sub click_to_os {
 # tile they were), convert to WGS84 and return.
 sub click_to_wgs84 {
     my ( $easting, $northing ) = FixMyStreet::Map::click_to_os(@_);
-    my ( $lat, $lon ) = national_grid_to_wgs84( $easting, $northing, 'G' );
+    my ( $lat, $lon ) = mySociety::GeoUtil::national_grid_to_wgs84( $easting, $northing, 'G' );
     return ( $lat, $lon );
 }