aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md3
-rw-r--r--perllib/FixMyStreet/App/Controller/Report/New.pm9
-rw-r--r--perllib/FixMyStreet/Geocode/Google.pm16
-rw-r--r--perllib/FixMyStreet/Script/Reports.pm4
-rw-r--r--t/Mock/GoogleGeocoder.pm36
-rw-r--r--t/geocode/google.t22
-rw-r--r--templates/web/base/report/_inspect.html4
-rw-r--r--templates/web/base/report/new/category_extras_fields.html2
8 files changed, 83 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ce4b0b58..018d69fcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,12 +24,15 @@
- Ensure all reports graph can't dip downward. #1956
- Fix error sending `requires_inspection` reports. #1961
- Fix timezone related test failure. #1984
+ - Restore display of extra fields on inspector form. #1994
- Admin improvements:
- Admin can anonymize/hide all a user's reports. #1942 #1943
- Admin can log a user out. #1975
- Admin can remove a user's account details. #1944
- Superusers can have optional two-factor authentication. #1973
+ - Development improvements:
- Add script to remove expired sessions. #1987
+ - 'components' parameter can be passed to Google geocoder. #1994
- UK:
- Lazy load images in the footer.
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index eff45013f..f9e07dd41 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1398,10 +1398,11 @@ sub redirect_or_confirm_creation : Private {
if ( $report->confirmed ) {
# Subscribe problem reporter to email updates
$c->forward( 'create_reporter_alert' );
- if ($c->stash->{contributing_as_another_user} && $report->user->email) {
- $c->send_email( 'other-reported.txt', {
- to => [ [ $report->user->email, $report->name ] ],
- } );
+ if ($c->stash->{contributing_as_another_user} && $report->user->email
+ && !$c->cobrand->report_sent_confirmation_email) {
+ $c->send_email( 'other-reported.txt', {
+ to => [ [ $report->user->email, $report->name ] ],
+ } );
}
# If the user has shortlist permission, and either we're not on a
# council cobrand or the just-created problem is owned by the cobrand
diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm
index e64d02c4c..162101953 100644
--- a/perllib/FixMyStreet/Geocode/Google.pm
+++ b/perllib/FixMyStreet/Geocode/Google.pm
@@ -8,6 +8,7 @@ package FixMyStreet::Geocode::Google;
use strict;
use Utils;
+use URI::Escape;
# string STRING CONTEXT
# Looks up on Google Maps API, and caches, a user-inputted location.
@@ -19,11 +20,13 @@ sub string {
my $params = $c->cobrand->disambiguate_location($s);
+ my $components = "";
+
# For some reason adding gl=uk is no longer sufficient to make google
- # think we are in the UK for some locations so we explictly add UK to
- # the address.
- if ($c->cobrand->country eq 'GB' && $s !~ /, *UK/ && $s !~ /united *kingdom$/) {
- $s .= ', UK';
+ # think we are in the UK for some locations so we explicitly tell Google
+ # the country.
+ if ($c->cobrand->country eq 'GB') {
+ $components = "country:GB";
}
$s = FixMyStreet::Geocode::escape($s);
@@ -37,8 +40,13 @@ sub string {
} elsif ($params->{country}) {
$url .= '&region=' . $params->{country};
}
+ if ($params->{components}) {
+ $components .= ($components ? '|' : '') . URI::Escape::uri_escape_utf8($params->{components});
+ }
$url .= '&language=' . $params->{lang} if $params->{lang};
+ $url .= '&components=' . $components if $components;
+
my $args = 'key=' . FixMyStreet->config('GOOGLE_MAPS_API_KEY');
my $js = FixMyStreet::Geocode::cache('google', $url, $args, qr/"status"\s*:\s*"(OVER_QUERY_LIMIT|REQUEST_DENIED|INVALID_REQUEST|UNKNOWN_ERROR)"/);
if (!$js) {
diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index d6a614651..8e4a4aec1 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -306,9 +306,9 @@ sub _send_report_sent_email {
$h,
{
To => $row->user->email,
- From => [ FixMyStreet->config('CONTACT_EMAIL'), $cobrand->contact_name ],
+ From => [ $cobrand->contact_email, $cobrand->contact_name ],
},
- FixMyStreet->config('CONTACT_EMAIL'),
+ $cobrand->contact_email,
$nomail,
$cobrand,
$row->lang,
diff --git a/t/Mock/GoogleGeocoder.pm b/t/Mock/GoogleGeocoder.pm
new file mode 100644
index 000000000..fd741c00e
--- /dev/null
+++ b/t/Mock/GoogleGeocoder.pm
@@ -0,0 +1,36 @@
+package t::Mock::GoogleGeocoder;
+
+use JSON::MaybeXS;
+use Web::Simple;
+use LWP::Protocol::PSGI;
+
+has json => (
+ is => 'lazy',
+ default => sub {
+ JSON->new->utf8->pretty->allow_blessed->convert_blessed;
+ },
+);
+
+sub dispatch_request {
+ my $self = shift;
+
+ sub (GET + /maps/api/geocode/json + ?*) {
+ my ($self, $args) = @_;
+ my $response = {};
+ if ($args->{address} =~ /result/) {
+ $response->{status} = 'OK';
+ push @{$response->{results}}, { formatted_address => 'High Street, Old Town, City of Edinburgh, Scotland', geometry => { location => { lng => -3.1858425, lat => 55.9504009 } } };
+ }
+ if ($args->{address} eq 'two results') {
+ push @{$response->{results}}, { geometry => { location => { lat => "55.8596449", "lng" => "-4.240377" } }, formatted_address => "High Street, Collegelands, Merchant City, Glasgow, Scotland" };
+ }
+ my $json = mySociety::Locale::in_gb_locale {
+ $self->json->encode($response);
+ };
+ return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
+ },
+}
+
+LWP::Protocol::PSGI->register(t::Mock::GoogleGeocoder->to_psgi_app, host => 'maps.googleapis.com');
+
+__PACKAGE__->run_if_script;
diff --git a/t/geocode/google.t b/t/geocode/google.t
new file mode 100644
index 000000000..ee3c15ea8
--- /dev/null
+++ b/t/geocode/google.t
@@ -0,0 +1,22 @@
+package FixMyStreet::Cobrand::Tester;
+use parent 'FixMyStreet::Cobrand::Default';
+sub country { 'GB' }
+sub disambiguate_location { { components => 'country:IE' } }
+
+package main;
+
+use FixMyStreet::Test;
+use FixMyStreet::Geocode::Google;
+use Catalyst::Test 'FixMyStreet::App';
+use t::Mock::GoogleGeocoder;
+
+my $c = ctx_request('/');
+my $r = FixMyStreet::Geocode::Google::string("one result", $c);
+ok $r->{latitude};
+ok $r->{longitude};
+
+$c->stash->{cobrand} = FixMyStreet::Cobrand::Tester->new;
+$r = FixMyStreet::Geocode::Google::string("two results", $c);
+is scalar @{$r->{error}}, 2;
+
+done_testing;
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index eb2564157..1893826de 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -65,9 +65,9 @@
data-defect-types='[% category_defect_types.$cat_name %]'
data-templates='[% templates_by_category.$cat_name %]'>
[% IF cat_name == problem.category %]
- [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$category %]
+ [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$cat_name hide_notices=1 %]
[% ELSE %]
- [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$category report_meta='' %]
+ [% INCLUDE 'report/new/category_extras_fields.html' report_meta='' metas=category_extras.$cat_name hide_notices=1 %]
[% END %]
</p>
[% END %]
diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html
index 9c2731730..5cbdcc524 100644
--- a/templates/web/base/report/new/category_extras_fields.html
+++ b/templates/web/base/report/new/category_extras_fields.html
@@ -5,7 +5,7 @@
<input type="hidden" value="" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]">
- [% ELSE %]
+ [% ELSIF meta.variable != 'false' || NOT hide_notices %]
<label for="[% cat_prefix %]form_[% meta_name %]">[% meta.description %]</label>
[% IF field_errors.$meta_name %]
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 15:16:13 +0000