diff options
| author | Struan Donald <struan@exo.org.uk> | 2017-09-20 15:40:14 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2017-09-28 12:33:25 +0100 |
| commit | 22acc7613cad96477689023a97827c72f9da872d (patch) | |
| tree | b46fa0fe72a6a6f14412f776d6c9a350d603df1d | |
| parent | 8890888e59ac83e503de4f19a6d84aabaf62aa20 (diff) | |
show nearest address for report in inspector panel
If we've stored the nearest address then display that at the top of the
inspector panel.
Fixes mysociety/fixmystreetforcouncils#234
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 9 | ||||
| -rw-r--r-- | t/app/controller/report_inspect.t | 37 | ||||
| -rw-r--r-- | templates/web/base/report/_inspect.html | 6 |
4 files changed, 53 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ba754f953..7ea73749e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Shortlist menu item always remains a link #1855 - Admin improvements: - Character length limit can be placed on report detailed information #1848 + - Inspector panel shows nearest address if available #1850 * v2.2 (13th September 2017) - New features: diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 0c2dc2aa1..b954a68ab 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -618,6 +618,15 @@ sub meta_line { return $meta; } +sub nearest_address { + my $self = shift; + + return '' unless $self->geocode; + + my $address = $self->geocode->{resourceSets}[0]{resources}[0]; + return $address->{name}; +} + sub body { my ( $problem, $c ) = @_; my $body; diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t index fb18526ac..45bb4f8a7 100644 --- a/t/app/controller/report_inspect.t +++ b/t/app/controller/report_inspect.t @@ -261,6 +261,43 @@ FixMyStreet::override_config { }); }; } + + subtest "check nearest address display" => sub { + $mech->get_ok("/report/$report_id"); + $mech->content_lacks('Nearest calculated address', 'No address displayed'); + + my $data = { + resourceSets => [ { + resources => [ { + address => { + addressLine => 'Constitution Hill', + locality => 'London', + } + } ], + } ], + }; + $report->geocode($data); + $report->update; + $mech->get_ok("/report/$report_id"); + $mech->content_lacks('Nearest calculated address', 'No address displayed'); + + $data = { + resourceSets => [ { + resources => [ { + name => 'Constitution Hill, London, SW1A', + address => { + addressLine => 'Constitution Hill', + locality => 'London', + } + } ], + } ], + }; + $report->geocode($data); + $report->update; + $mech->get_ok("/report/$report_id"); + $mech->content_contains('Nearest calculated address', 'Address displayed'); + $mech->content_contains('Constitution Hill, London, SW1A', 'Correct address displayed'); + } }; foreach my $test ( diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index 2b0970ae5..973db649e 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -34,6 +34,12 @@ <input type="hidden" name="longitude" value="[% problem.longitude %]"> <input type="hidden" name="latitude" value="[% problem.latitude %]"> </p> + [% IF problem.nearest_address() %] + <p> + <strong>[% loc('Nearest calculated address:') %]</strong> + [% problem.nearest_address() %] + </p> + [% END %] <p> <a target="_blank" href="https://www.google.com/maps/dir/Current+Location/[% problem.latitude %],[% problem.longitude %]" class="btn btn--block btn--navigate">[% loc('Navigate to this problem') %]</a> </p> |