Fix bug whereby lat/lon were being stored the wrong way round in local alerts.

4 files changed, 9 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Alert.pm b/perllib/FixMyStreet/App/Controller/Alert.pm
index 70a86a936..d8e783431 100644
--- a/perllib/FixMyStreet/App/Controller/Alert.pm
+++ b/perllib/FixMyStreet/App/Controller/Alert.pm
@@ -257,7 +257,7 @@ sub set_local_alert_options : Private {
         m{ \A local: ( [\+\-]? \d+ \.? \d* ) : ( [\+\-]? \d+ \.? \d* ) }xms )
     {
         $type = 'local_problems';
-        push @params, $1, $2;
+        push @params, $2, $1; # Note alert parameters are lon,lat
     }
 
     my $options = {
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index eadf2beea..a1120470b 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -315,12 +315,15 @@ sub signup_for_alerts : Private {
     my ( $self, $c ) = @_;
 
     if ( $c->stash->{add_alert} ) {
+        my $update = $c->stash->{update};
         my $alert = $c->model('DB::Alert')->find_or_create(
-            user       => $c->stash->{update}->user,
-            alert_type => 'new_updates',
-            parameter  => $c->stash->{update}->problem_id,
-            confirmed  => 1,
-        );
+            user         => $update->user,
+            alert_type   => 'new_updates',
+            parameter    => $update->problem_id,
+            cobrand      => $update->cobrand,
+            cobrand_data => $update->cobrand_data,
+            lang         => $update->lang,
+        )->confirm();
 
         $alert->update;
     }
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 92dbced15..993cd752e 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -4,7 +4,6 @@ use namespace::autoclean;
 
 use Problems;
 use POSIX qw(strcoll);
-# use FixMyStreet::Alert;
 use mySociety::MaPit;
 use mySociety::VotingArea;
 
diff --git a/perllib/FixMyStreet/App/Controller/Tokens.pm b/perllib/FixMyStreet/App/Controller/Tokens.pm
index 958188ca0..92a44e756 100644
--- a/perllib/FixMyStreet/App/Controller/Tokens.pm
+++ b/perllib/FixMyStreet/App/Controller/Tokens.pm
@@ -4,8 +4,6 @@ use namespace::autoclean;
 
 BEGIN { extends 'Catalyst::Controller'; }
 
-use FixMyStreet::Alert;
-
 =head1 NAME
 
 FixMyStreet::App::Controller::Tokens - Handle auth tokens