diff options
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Photo.pm | 5 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Script/Reports.pm | 3 | ||||
| -rw-r--r-- | perllib/Utils/OpenStreetMap.pm | 44 |
3 files changed, 49 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index df4cab2d8..bfb1c5535 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -4,7 +4,7 @@ use namespace::autoclean; BEGIN {extends 'Catalyst::Controller'; } -use JSON; +use JSON::MaybeXS; use File::Path; use File::Slurp; use FixMyStreet::App::Model::PhotoSet; @@ -112,9 +112,8 @@ sub upload : Local { $out = { id => $fileid }; } - my $body = JSON->new->utf8(1)->encode($out); $c->res->content_type('application/json; charset=utf-8'); - $c->res->body($body); + $c->res->body(encode_json($out)); } =head2 process_photo diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm index 55b1bb21c..d26e0fa70 100644 --- a/perllib/FixMyStreet/Script/Reports.pm +++ b/perllib/FixMyStreet/Script/Reports.pm @@ -7,6 +7,7 @@ use CronFns; use DateTime::Format::Pg; use Utils; +use Utils::OpenStreetMap; use mySociety::MaPit; use FixMyStreet; @@ -91,8 +92,10 @@ sub send(;$) { : _('The user could not locate the problem on a map, but to see the area around the location they entered'); $h{closest_address} = ''; + $h{osm_url} = Utils::OpenStreetMap::short_url($h{latitude}, $h{longitude}); if ( $row->used_map ) { $h{closest_address} = $cobrand->find_closest( $h{latitude}, $h{longitude}, $row ); + $h{osm_url} .= '?m'; } if ( $cobrand->allow_anonymous_reports && diff --git a/perllib/Utils/OpenStreetMap.pm b/perllib/Utils/OpenStreetMap.pm new file mode 100644 index 000000000..900569a77 --- /dev/null +++ b/perllib/Utils/OpenStreetMap.pm @@ -0,0 +1,44 @@ +package Utils::OpenStreetMap; + +use strict; +use warnings; +use Exporter 'import'; +use POSIX qw(ceil); + +our @EXPORT_OK = qw(short_url); + +my $chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~"; + +sub short_url { + my ($lat, $lon, $zoom) = @_; + $zoom ||= 16; + my $x = ($lon + 180) * 2**32 / 360; + my $y = ($lat + 90) * 2**32 / 180; + my $code = _interleave($x, $y); + + my $str = ''; + # add eight to the zoom level, which approximates an accuracy of + # one pixel in a tile + my $n = ceil(($zoom + 8) / 3) - 1; + for my $i (0..$n) { + my $digit = ($code >> (58 - 6 * $i)) & 0x3f; + $str .= substr($chars, $digit, 1); + } + # append characters onto the end of the string to represent + # partial zoom levels (characters themselves have a granularity + # of 3 zoom levels). + $str .= "-" x (($zoom + 8) % 3); + return "http://osm.org/go/$str"; +} + +sub _interleave { + my ($x, $y) = @_; + my $c = 0; + for (my $i=31; $i>=0; $i--) { + $c = ($c << 1) | (($x >> $i) & 1); + $c = ($c << 1) | (($y >> $i) & 1); + } + return $c; +} + +1; |