diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/cobrands/fixmystreet/staff.js | 6 | ||||
| -rw-r--r-- | web/cobrands/sass/_layout.scss | 1 | ||||
| -rw-r--r-- | web/js/map-wmts-zurich.js | 107 |
3 files changed, 54 insertions, 60 deletions
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js index 134f57a7f..0dd635437 100644 --- a/web/cobrands/fixmystreet/staff.js +++ b/web/cobrands/fixmystreet/staff.js @@ -232,6 +232,9 @@ $.extend(fixmystreet.set_up, { opts.state = opts.state || $inspect_form.find('[name=state]').val(); var selector = "[data-category='" + opts.category + "']"; var data = $inspect_form.find(selector).data('templates') || []; + if (data.constructor !== Array) { + return; + } data = $.grep(data, function(d, i) { if (!d.state || d.state == opts.state) { return true; @@ -243,6 +246,9 @@ $.extend(fixmystreet.set_up, { function populateSelect($select, data, label_formatter) { $select.find('option:gt(0)').remove(); + if (data.constructor !== Array) { + return; + } $.each(data, function(k,v) { var label = window.fixmystreet.utils[label_formatter](v); var $opt = $('<option></option>').attr('value', v.id).text(label); diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 13c2dff72..b374d8d3e 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -699,6 +699,7 @@ body.authpage { &.static { padding: 0 0 1em; + margin: 0 -1em; // overlap parent side padding position: static; width: auto; // avoid horizontal scrollbar as drawer opens (on devices with permanent scroll bars) } 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 } ]; |