aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App/Controller
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2016-04-22 16:48:57 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-05-18 12:57:52 +0100
commit1a1bfff12415a7793fee22bcd4e5e39e10dbd4d3 (patch)
tree6313f583e4e278ad3fb2885b8bd0493bd429b23c /perllib/FixMyStreet/App/Controller
parent66d93ceaed9df6ff3e0e28a62e655ad769c99614 (diff)
Fallback if request to Gaze fails.
Fixes #1286.
Diffstat (limited to 'perllib/FixMyStreet/App/Controller')
-rw-r--r--perllib/FixMyStreet/App/Controller/Alert.pm7
-rwxr-xr-xperllib/FixMyStreet/App/Controller/Rss.pm10
2 files changed, 7 insertions, 10 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Alert.pm b/perllib/FixMyStreet/App/Controller/Alert.pm
index 6972bbc04..ddda02abd 100644
--- a/perllib/FixMyStreet/App/Controller/Alert.pm
+++ b/perllib/FixMyStreet/App/Controller/Alert.pm
@@ -5,6 +5,7 @@ use namespace::autoclean;
BEGIN { extends 'Catalyst::Controller'; }
use mySociety::EmailUtil qw(is_valid_email);
+use FixMyStreet::Gaze;
=head1 NAME
@@ -441,11 +442,7 @@ sub determine_location : Private {
$c->go('index');
}
- my $dist =
- mySociety::Gaze::get_radius_containing_population( $c->stash->{latitude},
- $c->stash->{longitude}, 200000 );
- $dist = int( $dist * 10 + 0.5 );
- $dist = $dist / 10.0;
+ my $dist = FixMyStreet::Gaze::get_radius_containing_population($c->stash->{latitude}, $c->stash->{longitude});
$c->stash->{population_radius} = $dist;
return 1;
diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm
index 8d4f8313c..183b233a8 100755
--- a/perllib/FixMyStreet/App/Controller/Rss.pm
+++ b/perllib/FixMyStreet/App/Controller/Rss.pm
@@ -8,7 +8,7 @@ use XML::RSS;
use FixMyStreet::App::Model::PhotoSet;
-use mySociety::Gaze;
+use FixMyStreet::Gaze;
use mySociety::Locale;
use mySociety::MaPit;
use mySociety::Sundries qw(ordinal);
@@ -143,10 +143,10 @@ sub local_problems_ll : Private {
$c->stash->{qs} .= ";d=$d";
$d = 100 if $d > 100;
} else {
- $d = mySociety::Gaze::get_radius_containing_population( $lat, $lon, 200000 );
- $d = int( $d * 10 + 0.5 ) / 10;
- mySociety::Locale::in_gb_locale {
- $d = sprintf("%f", $d);
+ $d = FixMyStreet::Gaze::get_radius_containing_population($lat, $lon);
+ # Needs to be with a '.' for db passing
+ $d = mySociety::Locale::in_gb_locale {
+ sprintf("%f", $d);
}
}