diff options
| author | Chris Mytton <chrismytton@gmail.com> | 2019-11-27 13:45:48 +0000 |
|---|---|---|
| committer | Chris Mytton <chrismytton@gmail.com> | 2019-11-27 13:45:48 +0000 |
| commit | 855ef20bc4f4ee6d4b0b12cd363e1fc43d16d110 (patch) | |
| tree | 7250d9cde706b638724e0aca44e0c6d305a2af86 /t/cobrand | |
| parent | 7ce3a0a38967bd5a35b20b95c38c5471d44998e4 (diff) | |
[Bexley] Switch to use MasterMap map type
Now that both Peterborough and Bexley are using MasterMap data we can
combine them into a single "MasterMap" map type to reduce code
duplication.
Diffstat (limited to 't/cobrand')
| -rw-r--r-- | t/cobrand/bexley.t | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/t/cobrand/bexley.t b/t/cobrand/bexley.t index 3cf71798e..6b618762f 100644 --- a/t/cobrand/bexley.t +++ b/t/cobrand/bexley.t @@ -6,7 +6,6 @@ use Catalyst::Test 'FixMyStreet::App'; use_ok 'FixMyStreet::Cobrand::Bexley'; use_ok 'FixMyStreet::Geocode::Bexley'; -use_ok 'FixMyStreet::Map::Bexley'; my $ukc = Test::MockModule->new('FixMyStreet::Cobrand::UKCouncils'); $ukc->mock('lookup_site_code', sub { @@ -43,7 +42,6 @@ $category->update; FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'bexley' ], MAPIT_URL => 'http://mapit.uk/', - MAP_TYPE => 'Bexley', STAGING_FLAGS => { send_reports => 1, skip_checks => 0 }, COBRAND_FEATURES => { open311_email => { bexley => { p1 => 'p1@bexley', lighting => 'thirdparty@notbexley.example.com,another@notbexley.example.com' } } }, }, sub { @@ -183,23 +181,6 @@ subtest 'nearest road returns correct road' => sub { is $cobrand->_nearest_feature($cfg, 545451, 174380, $features), '20101226'; }; -subtest 'correct map tiles used' => sub { - my %test = ( - 16 => [ '-', 'oml' ], - 20 => [ '.', 'bexley' ] - ); - foreach my $zoom (qw(16 20)) { - my $tiles = FixMyStreet::Map::Bexley->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", - ]; - } -}; - my $geo = Test::MockModule->new('FixMyStreet::Geocode'); $geo->mock('cache', sub { my $typ = shift; |