[Bristol] Change to OS Maps API tiles.

The asset layer configuration will need updating to remove the Bristol-specific max_resolution lines.
mysociety · Feb 17, 2023 · fb58aa3 · fb58aa3
1 parent 8d58ccc
commit fb58aa3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 114 deletions.
diff --git a/perllib/FixMyStreet/Cobrand/Bristol.pm b/perllib/FixMyStreet/Cobrand/Bristol.pm
@@ -27,11 +27,11 @@ sub council_area { return 'Bristol'; }
 sub council_name { return 'Bristol County Council'; }
 sub council_url { return 'bristol'; }
 
-=item * Bristol uses its own mapping tiles
+=item * Bristol use the OS Maps API at all zoom levels.
 
 =cut
 
-sub map_type { 'Bristol' }
+sub map_type { 'OS::API' }
 
 =item * Users with a bristol.gov.uk email can always be found in the admin.
 

diff --git a/perllib/FixMyStreet/Map/Bristol.pm b/perllib/FixMyStreet/Map/Bristol.pm
diff --git a/t/map/tests.t b/t/map/tests.t
@@ -3,19 +3,15 @@ use Test::More;
 
 my $requires = {
     'Bing' => 'map-bing-ol.js',
-    'Bristol' => 'map-wmts-bristol.js',
-    'Bromley' => 'map-fms.js',
     'CheshireEast' => 'map-cheshireeast.js',
     'FMS' => 'map-fms.js',
     'Google' => 'map-google.js',
     'GoogleOL' => 'map-google-ol.js',
     'HighwaysEngland' => 'map-fms.js',
     'Hounslow' => 'map-wmts-hounslow.js',
-    'Lincolnshire' => 'lincolnshire/assets.js',
     'MasterMap' => 'map-mastermap.js',
     'OS::FMS' => 'map-fms-os.js',
     'OS::API' => 'map-os.js',
-    'OS::Premium' => 'map-os.js',
     'OSM' => 'OpenStreetMap.js',
     'OSM::CycleMap' => 'OpenStreetMap.js',
     'OSM::StreetView' => 'map-streetview.js',

diff --git a/web/js/map-wmts-bristol.js b/web/js/map-wmts-bristol.js