aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Geocode.pm
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2011-06-21 12:06:34 +0100
committerStruan Donald <struan@exo.org.uk>2011-06-21 12:06:34 +0100
commit2c5ddf10d9179d641bd70dc4602f33ee59fc8799 (patch)
tree9071b301c3e00e8639644045504df1e02d8b8132 /perllib/FixMyStreet/Geocode.pm
parent0f232284cd42dcea741ce1131151cefaf2e9e150 (diff)
parent62ba3756efd59ec2d39b07b5b0ccd109da355d08 (diff)
Merge branch 'master' into new_statuses
Diffstat (limited to 'perllib/FixMyStreet/Geocode.pm')
-rw-r--r--perllib/FixMyStreet/Geocode.pm12
1 files changed, 0 insertions, 12 deletions
diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm
index 423cec9b6..d5cc7f1d3 100644
--- a/perllib/FixMyStreet/Geocode.pm
+++ b/perllib/FixMyStreet/Geocode.pm
@@ -10,14 +10,12 @@ package FixMyStreet::Geocode;
use strict;
use Encode;
-use Error qw(:try);
use File::Slurp;
use File::Path ();
use LWP::Simple;
use Digest::MD5 qw(md5_hex);
use URI::Escape;
-use Utils;
use mySociety::Config;
use mySociety::Locale;
use mySociety::MaPit;
@@ -72,16 +70,6 @@ sub geocoded_string_coordinates {
} elsif ( $js =~ /"coordinates" *: *\[ *(.*?), *(.*?),/ ) {
$longitude = $1;
$latitude = $2;
- if ( $c->cobrand->country eq 'GB') {
- try {
- my ($easting, $northing) = Utils::convert_latlon_to_en( $latitude, $longitude );
- } catch Error::Simple with {
- mySociety::Locale::pop(); # We threw exception, so it won't have happened.
- $error = shift;
- $error = _('That location does not appear to be in Britain; please try again.')
- if $error =~ /out of the area covered/;
- }
- }
}
return ($latitude, $longitude, $error);
}