diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-10-11 16:51:09 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-10-11 19:41:32 +0100 |
| commit | 0407e599b3dff6ac04f89acb12a4727ee3d481bc (patch) | |
| tree | 9db3efb0e9382bfc070aca05359528c5f0bffa61 /web/js/map-OpenStreetMap.js | |
| parent | a4175ffd108308ad6c848c0dbac3cb05a58b4eec (diff) | |
Upgrade main OpenLayers to 2.13.1.
Diffstat (limited to 'web/js/map-OpenStreetMap.js')
| -rw-r--r-- | web/js/map-OpenStreetMap.js | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 79c646f7b..fc0afedc3 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -16,36 +16,6 @@ function set_map_config(perm) { // http://www.openstreetmap.org/openlayers/OpenStreetMap.js (added maxResolution) /** - * Namespace: Util.OSM - */ -OpenLayers.Util.OSM = {}; - -/** - * Constant: MISSING_TILE_URL - * {String} URL of image to display for missing tiles - */ -OpenLayers.Util.OSM.MISSING_TILE_URL = "http://www.openstreetmap.org/openlayers/img/404.png"; - -/** - * Property: originalOnImageLoadError - * {Function} Original onImageLoadError function. - */ -OpenLayers.Util.OSM.originalOnImageLoadError = OpenLayers.Util.onImageLoadError; - -/** - * Function: onImageLoadError - */ -OpenLayers.Util.onImageLoadError = function() { - if (this.src.match(/^http:\/\/[abc]\.[a-z]+\.openstreetmap\.org\//)) { - this.src = OpenLayers.Util.OSM.MISSING_TILE_URL; - } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) { - // do nothing - this layer is transparent - } else { - OpenLayers.Util.OSM.originalOnImageLoadError(); - } -}; - -/** * Class: OpenLayers.Layer.OSM.Mapnik * * Inherits from: @@ -67,7 +37,7 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { ]; options = OpenLayers.Util.extend({ /* Below line added to OSM's file in order to allow minimum zoom level */ - maxResolution: 156543.0339/Math.pow(2, options.zoomOffset || 0), + maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0), numZoomLevels: 19, buffer: 0 }, options); @@ -101,7 +71,7 @@ OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, { ]; options = OpenLayers.Util.extend({ /* Below line added to OSM's file in order to allow minimum zoom level */ - maxResolution: 156543.0339/Math.pow(2, options.zoomOffset || 0), + maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0), numZoomLevels: 19, buffer: 0 }, options); @@ -134,7 +104,7 @@ OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, { ]; options = OpenLayers.Util.extend({ /* Below line added to OSM's file in order to allow minimum zoom level */ - maxResolution: 156543.0339/Math.pow(2, options.zoomOffset || 0), + maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0), numZoomLevels: 19, buffer: 0 }, options); |