diff options
Diffstat (limited to 'perllib/FixMyStreet/Map/Tilma')
| -rw-r--r-- | perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm | 79 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm | 77 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/Tilma/Original.pm | 337 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm | 28 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm | 28 |
5 files changed, 0 insertions, 549 deletions
diff --git a/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm b/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm deleted file mode 100644 index 9ae5829c4..000000000 --- a/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/perl -# -# FixMyStreet:Map::Tilma::1_10k_OL -# Using tilma.mysociety.org with OpenLayers -# -# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ - -package FixMyStreet::Map::Tilma::OL::1_10k; - -use strict; - -use constant TILE_WIDTH => 254; -use constant TIF_SIZE_M => 5000; -use constant TIF_SIZE_PX => 7874; -use constant SCALE_FACTOR => TIF_SIZE_M / (TIF_SIZE_PX / TILE_WIDTH); -use constant TILE_TYPE => '10k-full'; - -sub header_js { - return ' -<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script> -<script type="text/javascript" src="/js/map-OpenLayers.js"></script> -<script type="text/javascript" src="/js/map-tilma-ol.js"></script> -<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script> -'; -} - -# display_map Q PARAMS -# PARAMS include: -# EASTING, NORTHING for the centre point of the map -# TYPE is 1 if the map is clickable, 2 if clickable and has a form upload, -# 0 if not clickable -# PINS is array of pins to show, location and colour -# PRE/POST are HTML to show above/below map -sub display_map { - my ($self, $q, %params) = @_; - $params{pre} ||= ''; - $params{post} ||= ''; - - my @pins; - foreach my $pin (@{$params{pins}}) { - $pin->[3] ||= ''; - push @pins, "[ $pin->[0], $pin->[1], '$pin->[2]', '$pin->[3]' ]"; - } - my $pins_js = join(",\n", @pins); - - my $out = FixMyStreet::Map::header($q, $params{type}); - my $tile_width = TILE_WIDTH; - my $tile_type = TILE_TYPE; - my $sf = SCALE_FACTOR / TILE_WIDTH; - my $copyright = _('© Crown copyright. All rights reserved. Ministry of Justice 100037819 2008.'); - $out .= <<EOF; -<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}"> -<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}"> -<script type="text/javascript"> -var fixmystreet = { - 'tilewidth': $tile_width, - 'tileheight': $tile_width, - 'latitude': $params{latitude}, - 'longitude': $params{longitude}, - 'pins': [ $pins_js ], - 'tile_type': '$tile_type', - 'maxResolution': $sf -}; -</script> -<div id="map_box"> - $params{pre} - <div id="map"> - <div id="watermark"></div> - </div> - <p id="copyright">$copyright</p> -$params{post} -</div> -<div id="side"> -EOF - return $out; -} - -1; diff --git a/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm b/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm deleted file mode 100644 index 7a898b55b..000000000 --- a/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/perl -# -# FixMyStreet:Map::TilmaXY -# Using tilma.mysociety.org but accessing images directly. -# -# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ - -package FixMyStreet::Map::Tilma::OL::StreetView; - -use strict; - -use constant TILE_WIDTH => 250; -use constant TIF_SIZE_M => 5000; -use constant TIF_SIZE_PX => 5000; -use constant SCALE_FACTOR => TIF_SIZE_M / (TIF_SIZE_PX / TILE_WIDTH); -use constant TILE_TYPE => 'streetview'; - -sub header_js { - return ' -<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script> -<script type="text/javascript" src="/js/map-OpenLayers.js"></script> -<script type="text/javascript" src="/js/map-tilma-ol.js"></script> -<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script> -'; -} - -# display_map Q PARAMS -# PARAMS include: -# EASTING, NORTHING for the centre point of the map -# TYPE is 1 if the map is clickable, 2 if clickable and has a form upload, -# 0 if not clickable -# PINS is array of pins to show, location and colour -# PRE/POST are HTML to show above/below map -sub display_map { - my ($self, $q, %params) = @_; - $params{pre} ||= ''; - $params{post} ||= ''; - - my @pins; - foreach my $pin (@{$params{pins}}) { - $pin->[3] ||= ''; - push @pins, "[ $pin->[0], $pin->[1], '$pin->[2]', '$pin->[3]' ]"; - } - my $pins_js = join(",\n", @pins); - - my $out = FixMyStreet::Map::header($q, $params{type}); - my $tile_width = TILE_WIDTH; - my $tile_type = TILE_TYPE; - my $sf = SCALE_FACTOR / TILE_WIDTH; - my $copyright = _('Map contains Ordnance Survey data © Crown copyright and database right 2010.'); - $out .= <<EOF; -<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}"> -<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}"> -<script type="text/javascript"> -var fixmystreet = { - 'tilewidth': $tile_width, - 'tileheight': $tile_width, - 'latitude': $params{latitude}, - 'longitude': $params{longitude}, - 'pins': [ $pins_js ], - 'tile_type': '$tile_type', - 'maxResolution': $sf -}; -</script> -<div id="map_box"> - $params{pre} - <div id="map"></div> - <p id="copyright">$copyright</p> - $params{post} -</div> -<div id="side"> -EOF - return $out; -} - -1; diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm deleted file mode 100644 index 0af6ed277..000000000 --- a/perllib/FixMyStreet/Map/Tilma/Original.pm +++ /dev/null @@ -1,337 +0,0 @@ -#!/usr/bin/perl -# -# FixMyStreet:Map -# Adding the ability to have different maps on FixMyStreet. -# -# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ - -package FixMyStreet::Map::Tilma::Original; - -use strict; -use LWP::Simple; - -use Cobrand; -use mySociety::GeoUtil; -use mySociety::Locale; -use mySociety::Web qw(ent NewURL); -use Utils; -use RABX; - -sub TILE_WIDTH() { return $FixMyStreet::Map::map_class->tile_width; } -sub SCALE_FACTOR() { return $FixMyStreet::Map::map_class->scale_factor; } -sub TILE_TYPE() { return $FixMyStreet::Map::map_class->tile_type; } - -sub _ll_to_en { - my ($lat, $lon) = @_; - return Utils::convert_latlon_to_en( $lat, $lon ); -} - -sub header_js { - return ' -<script type="text/javascript" src="/js/map-tilma.js"></script> -'; -} - -# display_map Q PARAMS -# PARAMS include: -# latitude, longitude for the centre point of the map -# TYPE is 1 if the map is clickable, 2 if clickable and has a form upload, -# 0 if not clickable -# PINS is array of pins to show, location and colour -# PRE/POST are HTML to show above/below map -sub display_map { - my ($self, $q, %params) = @_; - $params{pre} ||= ''; - $params{post} ||= ''; - my $mid_point = TILE_WIDTH; # Map is 2 TILE_WIDTHs in size, square. - if (my $mp = Cobrand::tilma_mid_point(Page::get_cobrand($q))) { - $mid_point = $mp; - } - - # convert map center point to easting, northing - ( $params{easting}, $params{northing} ) = - _ll_to_en( $params{latitude}, $params{longitude} ); - - # FIXME - convert all pins to lat, lng - # all the pins are currently [lat, lng, colour] - convert them - foreach my $pin ( @{ $params{pins} ||= [] } ) { - my ( $lat, $lon ) = ( $pin->[0], $pin->[1] ); - my ( $e, $n ) = _ll_to_en( $lat, $lon ); - ( $pin->[0], $pin->[1] ) = ( $e, $n ); - } - - # X/Y tile co-ords may be overridden in the query string - my @vars = qw(x y); - my %input = map { $_ => $q->param($_) || '' } @vars; - ($input{x}) = $input{x} =~ /^(\d+)/; $input{x} ||= 0; - ($input{y}) = $input{y} =~ /^(\d+)/; $input{y} ||= 0; - - my ($x, $y, $px, $py) = os_to_px_with_adjust($q, $params{easting}, $params{northing}, $input{x}, $input{y}); - - my $pins = ''; - foreach my $pin (@{$params{pins}}) { - my $pin_x = os_to_px($pin->[0], $x); - my $pin_y = os_to_px($pin->[1], $y, 1); - $pins .= display_pin($q, $pin_x, $pin_y, $pin->[2]); - } - - $px = defined($px) ? $mid_point - $px : 0; - $py = defined($py) ? $mid_point - $py : 0; - $x = int($x)<=0 ? 0 : $x; - $y = int($y)<=0 ? 0 : $y; - my $url = 'http://tilma.mysociety.org/tileserver/' . TILE_TYPE . '/'; - my $tiles_url = $url . ($x-1) . '-' . $x . ',' . ($y-1) . '-' . $y . '/RABX'; - my $tiles = LWP::Simple::get($tiles_url); - return '<div id="map_box"> <div id="map"><div id="drag">' . _("Unable to fetch the map tiles from the tile server.") . '</div></div></div><div id="side">' if !$tiles; - my $tileids = RABX::unserialise($tiles); - my $tl = ($x-1) . '.' . $y; - my $tr = $x . '.' . $y; - my $bl = ($x-1) . '.' . ($y-1); - my $br = $x . '.' . ($y-1); - return '<div id="side">' if (!$tileids->[0][0] || !$tileids->[0][1] || !$tileids->[1][0] || !$tileids->[1][1]); - my $tl_src = $url . $tileids->[0][0]; - my $tr_src = $url . $tileids->[0][1]; - my $bl_src = $url . $tileids->[1][0]; - my $br_src = $url . $tileids->[1][1]; - - my $cobrand = Page::get_cobrand($q); - my $root_path_js = Cobrand::root_path_js($cobrand, $q); - my $out = FixMyStreet::Map::header($q, $params{type}); - my $img_type; - if ($params{type}) { - $out .= <<EOF; -<input type="hidden" name="x" id="formX" value="$x"> -<input type="hidden" name="y" id="formY" value="$y"> -<input type="hidden" name="latitude" value="$params{latitude}"> -<input type="hidden" name="longitude" value="$params{longitude}"> -EOF - $img_type = '<input type="image"'; - } else { - $img_type = '<img'; - } - my $imgw = TILE_WIDTH . 'px'; - my $tile_width = TILE_WIDTH; - my $tile_type = TILE_TYPE; - $out .= <<EOF; -<script type="text/javascript"> -$root_path_js -var fixmystreet = { - 'x': $x - 3, - 'y': $y - 3, - 'start_x': $px, - 'start_y': $py, - 'tile_type': '$tile_type', - 'tilewidth': $tile_width, - 'tileheight': $tile_width -}; -</script> -<div id="map_box"> -$params{pre} - <div id="map"><div id="drag"> - $img_type alt="NW map tile" id="t2.2" name="tile_$tl" src="$tl_src" style="top:0px; left:0;">$img_type alt="NE map tile" id="t2.3" name="tile_$tr" src="$tr_src" style="top:0px; left:$imgw;"><br>$img_type alt="SW map tile" id="t3.2" name="tile_$bl" src="$bl_src" style="top:$imgw; left:0;">$img_type alt="SE map tile" id="t3.3" name="tile_$br" src="$br_src" style="top:$imgw; left:$imgw;"> - <div id="pins">$pins</div> - </div> -EOF - $out .= '<div id="watermark"></div>' if $self->watermark(); - $out .= compass($q, $x, $y); - my $copyright = $self->copyright(); - $out .= <<EOF; - </div> - <p id="copyright">$copyright</p> -$params{post} -</div> -<div id="side"> -EOF - return $out; -} - -sub display_pin { - my ($q, $px, $py, $col, $num) = @_; - $num = '' if !$num || $num > 9; - my $host = Page::base_url_with_lang($q, undef); - my %cols = (red=>'R', green=>'G', blue=>'B', purple=>'P'); - my $out = '<img class="pin" src="' . $host . '/i/pin' . $cols{$col} - . $num . '.gif" alt="' . _('Problem') . '" style="top:' . ($py-59) - . 'px; left:' . ($px) . 'px; position: absolute;">'; - return $out unless $_ && $_->{id} && $col ne 'blue'; - my $cobrand = Page::get_cobrand($q); - my $url = Cobrand::url($cobrand, NewURL($q, -url => '/report/' . $_->{id}), $q); - $out = '<a title="' . ent($_->{title}) . '" href="' . $url . '">' . $out . '</a>'; - return $out; -} - -sub map_pins { - my ($self, $q, $x, $y, $sx, $sy, $interval) = @_; - - my $e = tile_to_os($x); - my $n = tile_to_os($y); - - my ( $lat, $lon ) = Utils::convert_en_to_latlon( $e, $n ); - my ( $around_map, $around_map_list, $nearby, $dist ) = - FixMyStreet::Map::map_features( $q, $lat, $lon, $interval ); - - my $pins = ''; - foreach (@$around_map) { - ( $_->{easting}, $_->{northing} ) = - _ll_to_en( $_->{latitude}, $_->{longitude} ); - my $px = os_to_px($_->{easting}, $sx); - my $py = os_to_px($_->{northing}, $sy, 1); - my $col = $_->{state} eq 'fixed' ? 'green' : 'red'; - $pins .= display_pin($q, $px, $py, $col); - } - - foreach (@$nearby) { - ( $_->{easting}, $_->{northing} ) = - _ll_to_en( $_->{latitude}, $_->{longitude} ); - my $px = os_to_px($_->{easting}, $sx); - my $py = os_to_px($_->{northing}, $sy, 1); - my $col = $_->{state} eq 'fixed' ? 'green' : 'red'; - $pins .= display_pin($q, $px, $py, $col); - } - - return ($pins, $around_map_list, $nearby, $dist); -} - -# P is easting or northing -# C is centre tile reference of displayed map -sub os_to_px { - my ($p, $c, $invert) = @_; - return tile_to_px(os_to_tile($p), $c, $invert); -} - -# Convert tile co-ordinates to pixel co-ordinates from top left of map -# C is centre tile reference of displayed map -sub tile_to_px { - my ($p, $c, $invert) = @_; - $p = TILE_WIDTH * ($p - $c + 1); - $p = 2 * TILE_WIDTH - $p if $invert; - $p = int($p + .5 * ($p <=> 0)); - return $p; -} - -# Tile co-ordinates are linear scale of OS E/N -# Will need more generalising when more zooms appear -sub os_to_tile { - return $_[0] / SCALE_FACTOR; -} - -sub tile_to_os { - return int($_[0] * SCALE_FACTOR + 0.5); -} - -=head2 tile_xy_to_wgs84 - - ($lat, $lon) = tile_xy_to_wgs84( $x, $y ); - -Takes the tile x,y and converts to lat, lon. - -=cut - -sub tile_xy_to_wgs84 { - my ( $self, $x, $y ) = @_; - - my $easting = tile_to_os($x); - my $northing = tile_to_os($y); - - my ( $lat, $lon ) = Utils::convert_en_to_latlon( $easting, $northing ); - return ( $lat, $lon ); -} - - -sub click_to_tile { - my ($pin_tile, $pin, $invert) = @_; - $pin -= TILE_WIDTH while $pin > TILE_WIDTH; - $pin += TILE_WIDTH while $pin < 0; - $pin = TILE_WIDTH - $pin if $invert; # image submits measured from top down - return $pin_tile + $pin / TILE_WIDTH; -} - -# Given some click co-ords (the tile they were on, and where in the -# tile they were), convert to OSGB36 and return. -sub click_to_os { - my ($pin_tile_x, $pin_x, $pin_tile_y, $pin_y) = @_; - my $tile_x = click_to_tile($pin_tile_x, $pin_x); - my $tile_y = click_to_tile($pin_tile_y, $pin_y, 1); - my $easting = tile_to_os($tile_x); - my $northing = tile_to_os($tile_y); - return ($easting, $northing); -} - -# Given some click co-ords (the tile they were on, and where in the -# tile they were), convert to WGS84 and return. -sub click_to_wgs84 { - my $self = shift; - my $q = shift; - my ( $easting, $northing ) = click_to_os(@_); - my ( $lat, $lon ) = mySociety::GeoUtil::national_grid_to_wgs84( $easting, $northing, 'G' ); - return ( $lat, $lon ); -} - -# Given (E,N) and potential override (X,Y), return the X/Y tile for the centre -# of the map (either to get the point near the middle, or the override X,Y), -# and the pixel co-ords of the point, relative to that map. -sub os_to_px_with_adjust { - my ($q, $easting, $northing, $in_x, $in_y) = @_; - - my $x = os_to_tile($easting); - my $y = os_to_tile($northing); - my $x_tile = $in_x || int($x); - my $y_tile = $in_y || int($y); - - # Try and have point near centre of map - if (!$in_x && $x - $x_tile > 0.5) { - $x_tile += 1; - } - if (!$in_y && $y - $y_tile > 0.5) { - $y_tile += 1; - } - - my $px = os_to_px($easting, $x_tile); - my $py = os_to_px($northing, $y_tile, 1); - if ($q->{site} eq 'barnet') { # Map is 380px, so might need to adjust - if (!$in_x && $px > 380) { - $x_tile++; - $px = os_to_px($easting, $x_tile); - } - if (!$in_y && $py > 380) { - $y_tile--; - $py = os_to_px($northing, $y_tile, 1); - } - } - - return ($x_tile, $y_tile, $px, $py); -} - -sub compass ($$$) { - my ( $q, $x, $y ) = @_; - my @compass; - for ( my $i = $x - 1 ; $i <= $x + 1 ; $i++ ) { - for ( my $j = $y - 1 ; $j <= $y + 1 ; $j++ ) { - $compass[$i][$j] = NewURL( $q, x => $i, y => $j ); - } - } - my $recentre = NewURL($q); - my $host = Page::base_url_with_lang( $q, undef ); - return <<EOF; -<table cellpadding="0" cellspacing="0" border="0" id="compass"> -<tr valign="bottom"> -<td align="right"><a rel="nofollow" href="${compass[$x-1][$y+1]}"><img src="$host/i/arrow-northwest.gif" alt="NW" width=11 height=11></a></td> -<td align="center"><a rel="nofollow" href="${compass[$x][$y+1]}"><img src="$host/i/arrow-north.gif" vspace="3" alt="N" width=13 height=11></a></td> -<td><a rel="nofollow" href="${compass[$x+1][$y+1]}"><img src="$host/i/arrow-northeast.gif" alt="NE" width=11 height=11></a></td> -</tr> -<tr> -<td><a rel="nofollow" href="${compass[$x-1][$y]}"><img src="$host/i/arrow-west.gif" hspace="3" alt="W" width=11 height=13></a></td> -<td align="center"><a rel="nofollow" href="$recentre"><img src="$host/i/rose.gif" alt="Recentre" width=35 height=34></a></td> -<td><a rel="nofollow" href="${compass[$x+1][$y]}"><img src="$host/i/arrow-east.gif" hspace="3" alt="E" width=11 height=13></a></td> -</tr> -<tr valign="top"> -<td align="right"><a rel="nofollow" href="${compass[$x-1][$y-1]}"><img src="$host/i/arrow-southwest.gif" alt="SW" width=11 height=11></a></td> -<td align="center"><a rel="nofollow" href="${compass[$x][$y-1]}"><img src="$host/i/arrow-south.gif" vspace="3" alt="S" width=13 height=11></a></td> -<td><a rel="nofollow" href="${compass[$x+1][$y-1]}"><img src="$host/i/arrow-southeast.gif" alt="SE" width=11 height=11></a></td> -</tr> -</table> -EOF -} - -1; diff --git a/perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm b/perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm deleted file mode 100644 index 722df2a46..000000000 --- a/perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/perl -# -# FixMyStreet:Map -# Adding the ability to have different maps on FixMyStreet. -# -# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ - -package FixMyStreet::Map::Tilma::Original::1_10k; -use base 'FixMyStreet::Map::Tilma::Original'; - -use strict; - -sub tile_width { return 254; } -sub tif_size_m { return 5000; } -sub tif_size_px { return 7874; } -sub scale_factor { return tif_size_m() / (tif_size_px() / tile_width()); } -sub tile_type { return '10k-full'; } - -sub copyright { - return _('© Crown copyright. All rights reserved. Ministry of Justice 100037819 2008.'); -} - -sub watermark { - return 1; -} - -1; diff --git a/perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm b/perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm deleted file mode 100644 index fe03fdb00..000000000 --- a/perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/perl -# -# FixMyStreet:Map -# Adding the ability to have different maps on FixMyStreet. -# -# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ - -package FixMyStreet::Map::Tilma::Original::StreetView; -use base 'FixMyStreet::Map::Tilma::Original'; - -use strict; - -sub tile_width { return 250; } -sub tif_size_m { return 5000; } -sub tif_size_px { return 5000; } -sub scale_factor { return tif_size_m() / (tif_size_px() / tile_width()); } -sub tile_type { return 'streetview'; } - -sub copyright { - return _('Map contains Ordnance Survey data © Crown copyright and database right 2010.'); -} - -sub watermark { - return 0; -} - -1; |