aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Map
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet/Map')
-rw-r--r--perllib/FixMyStreet/Map/BathNES.pm18
-rw-r--r--perllib/FixMyStreet/Map/Bromley.pm3
-rw-r--r--perllib/FixMyStreet/Map/Buckinghamshire.pm19
-rw-r--r--perllib/FixMyStreet/Map/Zurich.pm12
4 files changed, 45 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/Map/BathNES.pm b/perllib/FixMyStreet/Map/BathNES.pm
new file mode 100644
index 000000000..9c9c3c11d
--- /dev/null
+++ b/perllib/FixMyStreet/Map/BathNES.pm
@@ -0,0 +1,18 @@
+# FixMyStreet:Map::BathNES
+# More JavaScript, for street assets
+
+package FixMyStreet::Map::BathNES;
+use base 'FixMyStreet::Map::OSM';
+
+use strict;
+
+sub map_javascript { [
+ '/vendor/OpenLayers/OpenLayers.bathnes.js',
+ '/vendor/OpenLayers.Projection.OrdnanceSurvey.js',
+ '/js/map-OpenLayers.js',
+ '/js/map-OpenStreetMap.js',
+ '/cobrands/fixmystreet/assets.js',
+ '/cobrands/bathnes/js.js',
+] }
+
+1; \ No newline at end of file
diff --git a/perllib/FixMyStreet/Map/Bromley.pm b/perllib/FixMyStreet/Map/Bromley.pm
index 1310c2a5a..22e4147f6 100644
--- a/perllib/FixMyStreet/Map/Bromley.pm
+++ b/perllib/FixMyStreet/Map/Bromley.pm
@@ -10,10 +10,11 @@ use base 'FixMyStreet::Map::FMS';
use strict;
sub map_javascript { [
- '/vendor/OpenLayers/OpenLayers.fixmystreet.js',
+ '/vendor/OpenLayers/OpenLayers.buckinghamshire.js',
'/js/map-OpenLayers.js',
'/js/map-bing-ol.js',
'/js/map-fms.js',
+ '/cobrands/fixmystreet/assets.js',
'/cobrands/bromley/map.js',
] }
diff --git a/perllib/FixMyStreet/Map/Buckinghamshire.pm b/perllib/FixMyStreet/Map/Buckinghamshire.pm
new file mode 100644
index 000000000..b6d86d4b9
--- /dev/null
+++ b/perllib/FixMyStreet/Map/Buckinghamshire.pm
@@ -0,0 +1,19 @@
+# FixMyStreet:Map::Buckinghamshire
+# More JavaScript, for street assets
+
+package FixMyStreet::Map::Buckinghamshire;
+use base 'FixMyStreet::Map::OSM';
+
+use strict;
+
+sub map_javascript { [
+ '/vendor/OpenLayers/OpenLayers.buckinghamshire.js',
+ '/vendor/OpenLayers.Projection.OrdnanceSurvey.js',
+ '/js/map-OpenLayers.js',
+ '/js/map-OpenStreetMap.js',
+ '/cobrands/fixmystreet-uk-councils/roadworks.js',
+ '/cobrands/fixmystreet/assets.js',
+ '/cobrands/buckinghamshire/js.js',
+] }
+
+1;
diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm
index 8b4a3d931..6d9a309ff 100644
--- a/perllib/FixMyStreet/Map/Zurich.pm
+++ b/perllib/FixMyStreet/Map/Zurich.pm
@@ -22,20 +22,20 @@ sub tile_parameters {
my $self = shift;
my $params = {
urls => [
- 'https://www.gis.stadt-zuerich.ch/maps/rest/services/tiled95/LuftbildHybrid/MapServer/WMTS/tile',
- 'https://www.gis.stadt-zuerich.ch/maps/rest/services/tiled95/Stadtplan3D/MapServer/WMTS/tile'
+ 'http://www.ogc.stadt-zuerich.ch/mapproxy/wmts/',
+ 'http://www.ogc.stadt-zuerich.ch/mapproxy/wmts/',
],
layer_names => [ 'LuftbildHybrid', 'Stadtplan3D' ],
wmts_version => '1.0.0',
layer_style => 'default',
- matrix_set => 'default028mm',
- suffix => '.jpg', # appended to tile URLs
+ matrix_set => 'stzh',
+ suffix => '.jpeg', # appended to tile URLs
size => 512, # pixels
dpi => 96,
inches_per_unit => 39.3701, # BNG uses metres
projection => 'EPSG:2056',
- origin_x => -27386400.0,
- origin_y => 31814500.0,
+ origin_x => 2672499.0,
+ origin_y => 1256999.0,
};
return $params;
}