diff options
| author | Dave Arter <davea@mysociety.org> | 2017-03-16 10:38:34 -0400 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-30 17:14:10 +0100 |
| commit | 21bde113503d86f1791e170d1133710a2ed32077 (patch) | |
| tree | 62bdac04f7da9dc53686d10f0aa3c345c78f3333 | |
| parent | 97dd5b788578cedbf65672fd65d88bcf37d9a56b (diff) | |
Use lat/lon on inspection form if local coordinates aren’t available
| -rw-r--r-- | templates/web/base/report/_inspect.html | 12 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/staff.js | 2 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index 5e97de3f4..d2ba1cc88 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -12,9 +12,15 @@ </p> <p> [% SET local_coords = problem.local_coords; %] - <strong>[% loc('Easting/Northing:') %]</strong> - <span id="problem_easting">[% local_coords.0 IF local_coords %]</span>, - <span id="problem_northing">[% local_coords.1 IF local_coords %]</span> + [% IF local_coords %] + <strong>[% loc('Easting/Northing:') %]</strong> + <span id="problem_easting">[% local_coords.0 %]</span>, + <span id="problem_northing">[% local_coords.1 %]</span> + [% ELSE %] + <strong>[% loc('Latitude/Longitude:') %]</strong> + <span id="problem_latitude">[% problem.latitude %]</span> + <span id="problem_longitude">[% problem.longitude %]</span>, + [% END %] <input type="hidden" name="longitude" value="[% problem.longitude %]"> <input type="hidden" name="latitude" value="[% problem.latitude %]"> </p> diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js index 9825a37ea..b92a70f9c 100644 --- a/web/cobrands/fixmystreet/staff.js +++ b/web/cobrands/fixmystreet/staff.js @@ -266,6 +266,8 @@ $.extend(fixmystreet.set_up, { ); $("#problem_northing").text(bng.lat.toFixed(1)); $("#problem_easting").text(bng.lon.toFixed(1)); + $("#problem_latitude").text(latlon.lat.toFixed(6)); + $("#problem_longitude").text(latlon.lon.toFixed(6)); $("form#report_inspect_form input[name=latitude]").val(latlon.lat); $("form#report_inspect_form input[name=longitude]").val(latlon.lon); }); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 2a5af940d..40539f385 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -331,6 +331,8 @@ var fixmystreet = fixmystreet || {}; ); $("#problem_northing").text(bng.y.toFixed(1)); $("#problem_easting").text(bng.x.toFixed(1)); + $("#problem_latitude").text(lonlat.y.toFixed(6)); + $("#problem_longitude").text(lonlat.x.toFixed(6)); $("form#report_inspect_form input[name=latitude]").val(lonlat.y); $("form#report_inspect_form input[name=longitude]").val(lonlat.x); }, |