diff options
Diffstat (limited to 'web')
-rwxr-xr-x | web/import.cgi | 8 | ||||
-rwxr-xr-x | web/index.cgi | 5 | ||||
-rwxr-xr-x | web/rss.cgi | 1 |
3 files changed, 3 insertions, 11 deletions
diff --git a/web/import.cgi b/web/import.cgi index 919f7a653..ac36b2ee5 100755 --- a/web/import.cgi +++ b/web/import.cgi @@ -16,7 +16,6 @@ use mySociety::AuthToken; use mySociety::Config; use mySociety::EmailUtil; use mySociety::EvEl; -use mySociety::GeoUtil; use mySociety::Locale; sub main { @@ -65,11 +64,8 @@ sub main { if ( $latitude && mySociety::Config::get('COUNTRY') eq 'GB' ) { try { - mySociety::Locale::in_gb_locale { - mySociety::GeoUtil::wgs84_to_national_grid( $latitude, $longitude, 'G' ); - }; - } - catch Error::Simple with { + Utils::convert_latlon_to_en( $latitude, $longitude ); + } catch Error::Simple with { my $e = shift; push @errors, "We had a problem with the supplied co-ordinates - outside the UK?"; }; diff --git a/web/index.cgi b/web/index.cgi index f5db6e1e7..1a60b05a7 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -24,7 +24,6 @@ use mySociety::AuthToken; use mySociety::Config; use mySociety::DBHandle qw(select_all); use mySociety::EmailUtil; -use mySociety::GeoUtil; use mySociety::Locale; use mySociety::MaPit; use mySociety::PostcodeUtil; @@ -282,9 +281,7 @@ sub submit_problem { # If in UK and we have a lat,lon coocdinate check it is in UK if ( $input{latitude} && mySociety::Config::get('COUNTRY') eq 'GB' ) { try { - mySociety::Locale::in_gb_locale { - mySociety::GeoUtil::wgs84_to_national_grid($input{latitude}, $input{longitude}, 'G'); - }; + Utils::convert_latlon_to_en( $input{latitude}, $input{longitude} ); } catch Error::Simple with { my $e = shift; push @errors, "We had a problem with the supplied co-ordinates - outside the UK?"; diff --git a/web/rss.cgi b/web/rss.cgi index cb5221537..2a9aeaa52 100755 --- a/web/rss.cgi +++ b/web/rss.cgi @@ -15,7 +15,6 @@ use URI::Escape; use FixMyStreet::Alert; use FixMyStreet::Geocode; use mySociety::MaPit; -use mySociety::GeoUtil; use mySociety::Gaze; use Utils; |