From be858d56ca861e3843d3f5abebfa86d9556f7708 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 20 Feb 2014 19:46:41 +0100 Subject: [PATCH] make website work with https without browser complaints --- website/js/tiles.js | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/website/js/tiles.js b/website/js/tiles.js index 37e243ab..fdf5224c 100644 --- a/website/js/tiles.js +++ b/website/js/tiles.js @@ -3,30 +3,6 @@ */ 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 @@ -44,9 +20,9 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { */ initialize: function(name, options) { var url = [ - "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png", - "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png", - "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png" + "//a.tile.openstreetmap.org/${z}/${x}/${y}.png", + "//b.tile.openstreetmap.org/${z}/${x}/${y}.png", + "//c.tile.openstreetmap.org/${z}/${x}/${y}.png" ]; options = OpenLayers.Util.extend({ numZoomLevels: 19, buffer: 0, attribution : '© OpenStreetMap and contributors, under an open license' }, options);