Merge remote branch 'origin/zurich'

Conflicts:
	bin/open311-populate-service-list
	bin/send-comments
	bin/update-all-reports
	conf/crontab.ugly
	db/schema.sql
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/App/Controller/Reports.pm
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/LichfieldDC.pm
	perllib/FixMyStreet/DB/Result/Open311conf.pm
	perllib/FixMyStreet/DB/Result/Problem.pm
	perllib/FixMyStreet/DB/ResultSet/Problem.pm
	perllib/FixMyStreet/SendReport.pm
	perllib/FixMyStreet/SendReport/Email.pm
	perllib/FixMyStreet/SendReport/Open311.pm
	perllib/Open311/GetServiceRequestUpdates.pm
	perllib/Open311/PopulateServiceList.pm
	t/app/controller/report_new.t
	t/app/controller/rss.t
	templates/web/bromley/report/display.html
	templates/web/default/admin/council_contacts.html
	templates/web/default/common_header_tags.html
	templates/web/default/dashboard/index.html
	templates/web/default/front/stats.html
	templates/web/default/report/_main.html
	templates/web/default/report/update-form.html
	templates/web/emptyhomes/index.html
	templates/web/emptyhomes/report/display.html
	templates/web/emptyhomes/report/new/councils_text_all.html
	templates/web/emptyhomes/reports/body.html
	templates/web/emptyhomes/reports/index.html
	templates/web/fixmystreet/report/new/fill_in_details_form.html
	templates/web/fixmystreet/report/update-form.html
	web/cobrands/fixmystreet/fixmystreet.js
	web/js/fixmystreet.js

1 files changed, 8 insertions, 16 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index 3382c0cea..7b8cb649f 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -164,12 +164,12 @@ sub get_services : Private {
 
     if ($lat || $lon) {
         my $area_types = $c->cobrand->area_types;
-        my $all_councils = mySociety::MaPit::call('point',
+        my $all_areas = mySociety::MaPit::call('point',
                                                   "4326/$lon,$lat",
                                                   type => $area_types);
         $categories = $categories->search( {
-            area_id => [ keys %$all_councils ],
-        } );
+            'body_areas.area_id' => [ keys %$all_areas ],
+        }, { join => { 'body' => 'body_areas' } } );
     }
 
     my @categories = $categories->search( undef, {
@@ -223,19 +223,11 @@ sub output_requests : Private {
     );
 
     my @problemlist;
-    my @councils;
     while ( my $problem = $problems->next ) {
         my $id = $problem->id;
 
         $problem->service( 'Web interface' ) unless $problem->service;
 
-        if ($problem->council) {
-            (my $council = $problem->council) =~ s/\|.*//g;
-            my @council_ids = split(/,/, $council);
-            push(@councils, @council_ids);
-            $problem->council( \@council_ids );
-        }
-
         $problem->state( $statusmap{$problem->state} );
 
         my $request =
@@ -256,7 +248,7 @@ sub output_requests : Private {
             'service_code' => [ $problem->category ],
             'service_name' => [ $problem->category ],
 #            'service_notice' => [ {} ],
-            'agency_responsible' =>  $problem->council , # FIXME Not according to Open311 v2
+            'agency_responsible' =>  $problem->bodies , # FIXME Not according to Open311 v2
 #            'zipcode' => [ {} ],
             'interface_used' => [ $problem->service ], # Not in Open311 v2
         };
@@ -288,12 +280,12 @@ sub output_requests : Private {
         }
         push(@problemlist, $request);
     }
-    my $areas_info = mySociety::MaPit::call('areas', \@councils);
+
     foreach my $request (@problemlist) {
         if ($request->{agency_responsible}) {
-            my @council_names = map { $areas_info->{$_}->{name} } @{$request->{agency_responsible}} ;
+            my @body_names = map { $_->name } values %{$request->{agency_responsible}} ;
             $request->{agency_responsible} =
-                [ {'recipient' => [ @council_names ] } ];
+                [ {'recipient' => [ @body_names ] } ];
         }
     }
     $c->forward( 'format_output', [ {
@@ -319,7 +311,7 @@ sub get_requests : Private {
         service_request_id => [ '=', 'id' ],
         service_code       => [ '=', 'category' ],
         status             => [ 'IN', 'state' ],
-        agency_responsible => [ '~', 'council' ],
+        agency_responsible => [ '~', 'bodies_str' ],
         interface_used     => [ '=', 'service' ],
         has_photo          => [ '=', 'photo' ],
     );