diff options
| -rw-r--r-- | perllib/FixMyStreet/Map/Zurich.pm | 12 | ||||
| -rw-r--r-- | web/js/map-wmts-zurich.js | 107 |
2 files changed, 53 insertions, 66 deletions
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; } diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index 0a753e831..eda0fbf44 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -4,112 +4,99 @@ // From 'fullExtent' from http://www.gis.stadt-zuerich.ch/maps/rest/services/tiled95/LuftbildHybrid/MapServer?f=pjson fixmystreet.maps.layer_bounds = new OpenLayers.Bounds( - 2674687.5, // W - 1240500, // S - 2690000, // E - 1255500); // N + 2672499, // W + 1238999, // S + 2689999, // E + 1256999); // N fixmystreet.maps.matrix_ids = [ - // The two highest zoom levels are pretty much useless so they're disabled. - // { - // "matrixHeight": 882, - // "scaleDenominator": 241905.24571522293, - // "identifier": "0", - // "tileWidth": 512, - // "supportedCRS": "urn:ogc:def:crs:EPSG::2056", - // "tileHeight": 512, - // "matrixWidth": 868 - // }, - // { - // "matrixHeight": 1764, - // "scaleDenominator": 120952.62285761147, - // "identifier": "1", - // "tileWidth": 512, - // "supportedCRS": "urn:ogc:def:crs:EPSG::2056", - // "tileHeight": 512, - // "matrixWidth": 1735 - // }, - { - "matrixHeight": 3527, - "scaleDenominator": 60476.31142880573, + "matrixHeight": 7, + "scaleDenominator": 241904.761905, + "identifier": "0", + "tileWidth": 512, + "tileHeight": 512, + "matrixWidth": 13 + }, + { + "matrixHeight": 14, + "scaleDenominator": 120952.380952, + "identifier": "1", + "tileWidth": 512, + "tileHeight": 512, + "matrixWidth": 25 + }, + { + "matrixHeight": 28, + "scaleDenominator": 60476.1904761, "identifier": "2", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 3470 + "matrixWidth": 49 }, { - "matrixHeight": 7053, - "scaleDenominator": 30238.155714402867, + "matrixHeight": 56, + "scaleDenominator": 30238.0952382, "identifier": "3", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 6939 + "matrixWidth": 97 }, { - "matrixHeight": 14106, - "scaleDenominator": 15119.077857201433, + "matrixHeight": 111, + "scaleDenominator": 15119.0476189, "identifier": "4", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 13877 + "matrixWidth": 194 }, { - "matrixHeight": 28211, - "scaleDenominator": 7559.538928600717, + "matrixHeight": 222, + "scaleDenominator": 7559.52380964, "identifier": "5", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 27753 + "matrixWidth": 388 }, { - "matrixHeight": 56422, - "scaleDenominator": 3779.7694643003583, + "matrixHeight": 443, + "scaleDenominator": 3779.76190464, "identifier": "6", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 55505 + "matrixWidth": 776 }, { - "matrixHeight": 112844, - "scaleDenominator": 1889.8847321501792, + "matrixHeight": 886, + "scaleDenominator": 1889.8809525, "identifier": "7", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 111010 + "matrixWidth": 1551 }, { - "matrixHeight": 225687, - "scaleDenominator": 944.9423660750896, + "matrixHeight": 1772, + "scaleDenominator": 944.940476071, "identifier": "8", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 222020 + "matrixWidth": 3101 }, { - "matrixHeight": 451374, - "scaleDenominator": 472.4711830375448, + "matrixHeight": 3544, + "scaleDenominator": 472.470238214, "identifier": "9", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 444039 + "matrixWidth": 6201 }, { - "matrixHeight": 902748, - "scaleDenominator": 236.2355915187724, + "matrixHeight": 7087, + "scaleDenominator": 236.235118929, "identifier": "10", "tileWidth": 512, - "supportedCRS": "urn:ogc:def:crs:EPSG::2056", "tileHeight": 512, - "matrixWidth": 888078 + "matrixWidth": 12402 } ]; |