diff options
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Peterborough.pm | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/MasterMap.pm | 39 | ||||
| -rw-r--r-- | t/map/mastermap.t | 22 | ||||
| -rw-r--r-- | t/map/tests.t | 1 | ||||
| -rw-r--r-- | web/js/map-mastermap.js | 24 |
5 files changed, 87 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm index eb4ab815c..fcdf44859 100644 --- a/perllib/FixMyStreet/Cobrand/Peterborough.pm +++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm @@ -12,6 +12,7 @@ sub council_area_id { 2566 } sub council_area { 'Peterborough' } sub council_name { 'Peterborough City Council' } sub council_url { 'peterborough' } +sub map_type { 'MasterMap' } sub send_questionnaires { 0 } diff --git a/perllib/FixMyStreet/Map/MasterMap.pm b/perllib/FixMyStreet/Map/MasterMap.pm new file mode 100644 index 000000000..a2e0acd54 --- /dev/null +++ b/perllib/FixMyStreet/Map/MasterMap.pm @@ -0,0 +1,39 @@ +# FixMyStreet:Map::MasterMap +# +# A combination of FMS OS maps and our own tiles + +package FixMyStreet::Map::MasterMap; +use base 'FixMyStreet::Map::FMS'; + +use strict; + +use constant ZOOM_LEVELS => 7; + +sub map_template { 'fms' } + +sub map_javascript { [ + '/vendor/OpenLayers/OpenLayers.wfs.js', + '/js/map-OpenLayers.js', + '/js/map-bing-ol.js', + '/js/map-fms.js', + '/js/map-mastermap.js', +] } + +sub map_tiles { + my ( $self, %params ) = @_; + my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} ); + if ($z >= 17) { + my $base = "//%stilma.mysociety.org/mastermap/%d/%d/%d.png"; + return [ + sprintf($base, 'a.', $z, $x-1, $y-1), + sprintf($base, 'b.', $z, $x, $y-1), + sprintf($base, 'c.', $z, $x-1, $y), + sprintf($base, '', $z, $x, $y), + ]; + } else { + return $self->SUPER::map_tiles(%params); + } +} + +1; + diff --git a/t/map/mastermap.t b/t/map/mastermap.t new file mode 100644 index 000000000..109142379 --- /dev/null +++ b/t/map/mastermap.t @@ -0,0 +1,22 @@ +use FixMyStreet::TestMech; + +use FixMyStreet::Map::MasterMap; + +subtest 'correct map tiles used' => sub { + my %test = ( + 16 => [ '-', 'oml' ], + 20 => [ '.', 'mastermap' ] + ); + foreach my $zoom (qw(16 20)) { + my $tiles = FixMyStreet::Map::MasterMap->map_tiles(x_tile => 123, y_tile => 456, zoom_act => $zoom); + my ($sep, $lyr) = @{$test{$zoom}}; + is_deeply $tiles, [ + "//a${sep}tilma.mysociety.org/$lyr/$zoom/122/455.png", + "//b${sep}tilma.mysociety.org/$lyr/$zoom/123/455.png", + "//c${sep}tilma.mysociety.org/$lyr/$zoom/122/456.png", + "//tilma.mysociety.org/$lyr/$zoom/123/456.png", + ]; + } +}; + +done_testing(); diff --git a/t/map/tests.t b/t/map/tests.t index f1f29dc06..1c5c2b64a 100644 --- a/t/map/tests.t +++ b/t/map/tests.t @@ -14,6 +14,7 @@ my $requires = { 'Hounslow' => 'map-wmts-hounslow.js', 'IsleOfWight' => 'map-wmts-isleofwight.js', 'OSM' => 'OpenStreetMap.js', + 'MasterMap' => 'map-mastermap.js', 'CycleMap' => 'OpenStreetMap.js', 'MapQuest' => 'OpenStreetMap.js', 'StreetView' => 'map-streetview.js', diff --git a/web/js/map-mastermap.js b/web/js/map-mastermap.js new file mode 100644 index 000000000..d12a79bd0 --- /dev/null +++ b/web/js/map-mastermap.js @@ -0,0 +1,24 @@ +fixmystreet.maps.config = (function(original) { + return function(){ + original(); + fixmystreet.map_type = OpenLayers.Layer.MasterMap; + }; +})(fixmystreet.maps.config); + +OpenLayers.Layer.MasterMap = OpenLayers.Class(OpenLayers.Layer.BingUK, { + get_urls: function(bounds, z) { + if (z < 17) { + return OpenLayers.Layer.BingUK.prototype.get_urls.apply(this, arguments); + } + + var urls = []; + var servers = [ '', 'a.', 'b.', 'c.' ]; + var base = "//{S}tilma.mysociety.org/mastermap/${z}/${x}/${y}.png"; + for (var i=0; i < servers.length; i++) { + urls.push( base.replace('{S}', servers[i]) ); + } + return urls; + }, + + CLASS_NAME: "OpenLayers.Layer.MasterMap" +}); |