diff options
Diffstat (limited to 'perllib/FixMyStreet')
| -rw-r--r-- | perllib/FixMyStreet/Map.pm | 3 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/Tilma/Original.pm | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm index 0313fbe4f..0902914dd 100644 --- a/perllib/FixMyStreet/Map.pm +++ b/perllib/FixMyStreet/Map.pm @@ -17,6 +17,7 @@ use mySociety::Gaze; use mySociety::GeoUtil qw(national_grid_to_wgs84); use mySociety::Locale; use mySociety::Web qw(ent NewURL); +use Utils; # Run on module boot up load(); @@ -60,7 +61,7 @@ conversion. sub map_features_easting_northing { my ( $q, $easting, $northing, $interval ) = @_; - my ( $lat, $lon ) = national_grid_to_wgs84( $easting, $northing, 'G' ); + my ( $lat, $lon ) = Utils::convert_en_to_latlon( $easting, $northing ); return map_features( $q, $lat, $lon, $interval ); } diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm index 5f5a102ac..81b123b30 100644 --- a/perllib/FixMyStreet/Map/Tilma/Original.pm +++ b/perllib/FixMyStreet/Map/Tilma/Original.pm @@ -13,7 +13,8 @@ use LWP::Simple; use Cobrand; use mySociety::Web qw(ent NewURL); -use mySociety::GeoUtil qw(national_grid_to_wgs84); +use mySociety::GeoUtil; +use Utils; sub _ll_to_en { my ($lat, $lon) = @_; @@ -239,7 +240,7 @@ sub tile_xy_to_wgs84 { my $easting = tile_to_os($x); my $northing = tile_to_os($y); - my ( $lat, $lon ) = national_grid_to_wgs84( $easting, $northing, 'G' ); + my ( $lat, $lon ) = Utils::convert_en_to_latlon( $easting, $northing ); return ( $lat, $lon ); } |