diff options
Diffstat (limited to 'web/alert.cgi')
| -rwxr-xr-x | web/alert.cgi | 118 |
1 files changed, 90 insertions, 28 deletions
diff --git a/web/alert.cgi b/web/alert.cgi index 896ca9ccc..e2a4efaac 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -11,6 +11,7 @@ use strict; use Standard; use Digest::SHA1 qw(sha1_hex); +use Encode; use Error qw(:try); use CrossSell; use FixMyStreet::Alert; @@ -96,28 +97,76 @@ sub alert_list { return alert_front_page($q, $error) if $error; my $pretty_pc = $input_h{pc}; + my $pretty_pc_text;# This one isnt't getting the nbsp. if (mySociety::PostcodeUtil::is_valid_postcode($input{pc})) { $pretty_pc = mySociety::PostcodeUtil::canonicalise_postcode($input{pc}); + $pretty_pc_text = $pretty_pc; + $pretty_pc_text =~ s/ //g; $pretty_pc =~ s/ / /; } my $errors = ''; $errors = '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>' if @errors; - my @types = (@$mySociety::VotingArea::council_parent_types, @$mySociety::VotingArea::council_child_types); - my %councils = map { $_ => 1 } @$mySociety::VotingArea::council_parent_types; + my $cobrand = Page::get_cobrand($q); + my @types = (Cobrand::area_types($cobrand), @$mySociety::VotingArea::council_child_types); + my %councils = map { $_ => 1 } Cobrand::area_types($cobrand); my $areas = mySociety::MaPit::call('point', "4326/$lon,$lat", type => \@types); - my $cobrand = Page::get_cobrand($q); my ($success, $error_msg) = Cobrand::council_check($cobrand, { all_councils => $areas }, $q, 'alert'); - if (!$success){ + if (!$success) { return alert_front_page($q, $error_msg); } return alert_front_page($q, _('That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific.')) if keys %$areas == 0; my ($options, $options_start, $options_end); - if (keys %$areas == 2) { + if (mySociety::Config::get('COUNTRY') eq 'NO') { + + my (@options, $fylke, $kommune); + foreach (values %$areas) { + if ($_->{type} eq 'NKO') { + $kommune = $_; + } else { + $fylke = $_; + } + } + my $kommune_name = $kommune->{name}; + my $fylke_name = $fylke->{name}; + + if ($fylke->{id} == 3) { # Oslo + + push @options, [ 'council', $fylke->{id}, Page::short_name($fylke), + sprintf(_("Problems within %s"), $fylke_name) ]; + + $options_start = "<div><ul id='rss_feed'>"; + $options = alert_list_options($q, @options); + $options_end = "</ul>"; + + } else { + + push @options, + [ 'area', $kommune->{id}, Page::short_name($kommune), $kommune_name ], + [ 'area', $fylke->{id}, Page::short_name($fylke), $fylke_name ]; + $options_start = '<div id="rss_list">'; + $options = $q->p($q->strong(_('Problems within the boundary of:'))) . + $q->ul(alert_list_options($q, @options)); + @options = (); + push @options, + [ 'council', $kommune->{id}, Page::short_name($kommune), $kommune_name ], + [ 'council', $fylke->{id}, Page::short_name($fylke), $fylke_name ]; + $options .= $q->p($q->strong(_('Or problems reported to:'))) . + $q->ul(alert_list_options($q, @options)); + $options_end = $q->p($q->small(_('FixMyStreet sends different categories of problem +to the appropriate council, so problems within the boundary of a particular council +might not match the problems sent to that council. For example, a graffiti report +will be sent to the district council, so will appear in both of the district +council’s alerts, but will only appear in the "Within the boundary" alert +for the county council.'))) . '</div><div id="rss_buttons">'; + + } + + } elsif (keys %$areas == 2) { # One-tier council my (@options, $council, $ward); @@ -128,10 +177,12 @@ sub alert_list { $ward = $_; } } - push @options, [ 'council', $council->{id}, Page::short_name($council->{name}), - sprintf(_("Problems within %s"), $council->{name}) ]; - push @options, [ 'ward', $council->{id}.':'.$ward->{id}, Page::short_name($council->{name}) . '/' - . Page::short_name($ward->{name}), sprintf(_("Problems within %s ward"), $ward->{name}) ]; + my $council_name = $council->{name}; + my $ward_name = $ward->{name}; + push @options, [ 'council', $council->{id}, Page::short_name($council), + sprintf(_("Problems within %s"), $council_name) ]; + push @options, [ 'ward', $council->{id}.':'.$ward->{id}, Page::short_name($council) . '/' + . Page::short_name($ward), sprintf(_("Problems within %s ward"), $ward_name) ]; $options_start = "<div><ul id='rss_feed'>"; $options = alert_list_options($q, @options); @@ -144,8 +195,9 @@ sub alert_list { foreach (values %$areas) { $council = $_; } - push @options, [ 'council', $council->{id}, Page::short_name($council->{name}), - sprintf(_("Problems within %s"), $council->{name}) ]; + my $council_name = $council->{name}; + push @options, [ 'council', $council->{id}, Page::short_name($council), + sprintf(_("Problems within %s"), $council_name) ]; $options_start = "<div><ul id='rss_feed'>"; $options = alert_list_options($q, @options); @@ -166,26 +218,30 @@ sub alert_list { $d_ward = $_; } } + my $district_name = $district->{name}; + my $d_ward_name = $d_ward->{name}; + my $county_name = $county->{name}; + my $c_ward_name = $c_ward->{name}; push @options, - [ 'area', $district->{id}, Page::short_name($district->{name}), $district->{name} ], - [ 'area', $district->{id}.':'.$d_ward->{id}, Page::short_name($district->{name}) . '/' - . Page::short_name($d_ward->{name}), "$d_ward->{name} ward, $district->{name}" ], - [ 'area', $county->{id}, Page::short_name($county->{name}), $county->{name} ], - [ 'area', $county->{id}.':'.$c_ward->{id}, Page::short_name($county->{name}) . '/' - . Page::short_name($c_ward->{name}), "$c_ward->{name} ward, $county->{name}" ]; + [ 'area', $district->{id}, Page::short_name($district), $district_name ], + [ 'area', $district->{id}.':'.$d_ward->{id}, Page::short_name($district) . '/' + . Page::short_name($d_ward), "$d_ward_name ward, $district_name" ], + [ 'area', $county->{id}, Page::short_name($county), $county_name ], + [ 'area', $county->{id}.':'.$c_ward->{id}, Page::short_name($county) . '/' + . Page::short_name($c_ward), "$c_ward_name ward, $county_name" ]; $options_start = '<div id="rss_list">'; $options = $q->p($q->strong(_('Problems within the boundary of:'))) . $q->ul(alert_list_options($q, @options)); @options = (); push @options, - [ 'council', $district->{id}, Page::short_name($district->{name}), $district->{name} ], - [ 'ward', $district->{id}.':'.$d_ward->{id}, Page::short_name($district->{name}) . '/' . Page::short_name($d_ward->{name}), - "$district->{name}, within $d_ward->{name} ward" ]; + [ 'council', $district->{id}, Page::short_name($district), $district_name ], + [ 'ward', $district->{id}.':'.$d_ward->{id}, Page::short_name($district) . '/' . Page::short_name($d_ward), + "$district_name, within $d_ward_name ward" ]; if ($q->{site} ne 'emptyhomes') { push @options, - [ 'council', $county->{id}, Page::short_name($county->{name}), $county->{name} ], - [ 'ward', $county->{id}.':'.$c_ward->{id}, Page::short_name($county->{name}) . '/' - . Page::short_name($c_ward->{name}), "$county->{name}, within $c_ward->{name} ward" ]; + [ 'council', $county->{id}, Page::short_name($county), $county_name ], + [ 'ward', $county->{id}.':'.$c_ward->{id}, Page::short_name($county) . '/' + . Page::short_name($c_ward), "$county_name, within $c_ward_name ward" ]; $options .= $q->p($q->strong(_('Or problems reported to:'))) . $q->ul(alert_list_options($q, @options)); $options_end = $q->p($q->small(_('FixMyStreet sends different categories of problem @@ -238,17 +294,23 @@ feed, or enter your email address to subscribe to an email alert.')); <input type="radio" name="feed" id="local:$lat:$lon" value="local:$lat:$lon"$checked> <label for="local:$lat:$lon">$rss_label</label> EOF - my $rss_feed = Cobrand::url($cobrand, "/rss/l/$lat,$lon", $q); + my $rss_feed; + if ($pretty_pc_text) { + $rss_feed = Cobrand::url($cobrand, "/rss/pc/$pretty_pc_text/", $q); + } else { + $rss_feed = Cobrand::url($cobrand, "/rss/l/$lat,$lon/", $q); + } + my $default_link = Cobrand::url($cobrand, "/alert?type=local;feed=local:$lat:$lon", $q); my $rss_details = _('(a default distance which covers roughly 200,000 people)'); $out .= $rss_details; $out .= " <a href='$rss_feed'><img src='/i/feed.png' width='16' height='16' title='" . _('RSS feed of nearby problems') . "' alt='" . _('RSS feed') . "' border='0'></a>"; $out .= '</p> <p id="rss_local_alt">' . _('(alternatively the RSS feed can be customised, within'); - my $rss_feed_2k = Cobrand::url($cobrand, "/rss/l/$lat,$lon/2", $q); - my $rss_feed_5k = Cobrand::url($cobrand, "/rss/l/$lat,$lon/5", $q); - my $rss_feed_10k = Cobrand::url($cobrand, "/rss/l/$lat,$lon/10", $q); - my $rss_feed_20k = Cobrand::url($cobrand, "/rss/l/$lat,$lon/20", $q); + my $rss_feed_2k = Cobrand::url($cobrand, $rss_feed.'2', $q); + my $rss_feed_5k = Cobrand::url($cobrand, $rss_feed.'5', $q); + my $rss_feed_10k = Cobrand::url($cobrand, $rss_feed.'10', $q); + my $rss_feed_20k = Cobrand::url($cobrand, $rss_feed.'20', $q); $out .= <<EOF; <a href="$rss_feed_2k">2km</a> / <a href="$rss_feed_5k">5km</a> / <a href="$rss_feed_10k">10km</a> / <a href="$rss_feed_20k">20km</a>) |