From a40d8348e1d02964dfe22afa0c5ad02c3738b47a Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sat, 4 Apr 2015 23:06:28 +0200 Subject: [PATCH] move some tiles to HTTPs, add comments for others on what state https support is in --- js/map.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/js/map.js b/js/map.js index 1ecff12..490bfac 100644 --- a/js/map.js +++ b/js/map.js @@ -17,19 +17,19 @@ var gMapStyles = { // and http://wiki.openstreetmap.org/wiki/Tiles or http://wiki.openstreetmap.org/wiki/TMS osm_mapnik: {name: "OpenStreetMap (Mapnik)", - url: "http://[a-c].tile.openstreetmap.org/{z}/{x}/{y}.png", + url: "https://[a-c].tile.openstreetmap.org/{z}/{x}/{y}.png", copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, osm_cyclemap: {name: "Cycle Map (OSM)", - url: "http://[a-c].tile.opencyclemap.org/cycle/{z}/{x}/{y}.png", + url: "https://[a-c].tile.thunderforest.com/cycle/{z}/{x}/{y}.png", // "http://[a-c].tile.opencyclemap.org/cycle/{z}/{x}/{y}.png", copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, osm_transmap: {name: "Transport Map (OSM)", - url: "http://[a-c].tile2.opencyclemap.org/transport/{z}/{x}/{y}.png", + url: "https://[a-c].tile.thunderforest.com/transport/{z}/{x}/{y}.png", // "http://[a-c].tile2.opencyclemap.org/transport/{z}/{x}/{y}.png", copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, osm_germany: {name: "OSM German Style", - url: "http://[a-d].tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png", + url: "http://[a-d].tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png", // https is not supported at all copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, // oepnvkarte: // XXX: toolserver.org does not support CORS at this time :( // {name: "ÖPNV-Karte (OSM)", @@ -37,7 +37,7 @@ var gMapStyles = { // copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by MeMoMaps under CC-BY-SA.'}, mapquest_open: {name: "MapQuest OSM", - url: "http://otile[1-4].mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png", + url: "http://otile[1-4].mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png", // https has wrong cert, akamai instead of mqcdn copyright: 'Map data © OpenStreetMap and contributors (ODbL/CC-BY-SA), tiles courtesy of MapQuest.'}, mapquest_aerial: {name: "MapQuest Open Aerial", @@ -45,22 +45,22 @@ var gMapStyles = { copyright: 'Tiles Courtesy of MapQuest, portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency.'}, osm_hot: {name: "OSM HOT style", - url: "http://[a-c].tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", + url: "http://[a-c].tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", // https has CAcert which doesn't work in browsers copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, // hikebike: // XXX: toolserver.org does not support CORS at this time :( // {name: "Hike and Bike (OSM)", // url: "http://toolserver.org/tiles/hikebike/{z}/{x}/{y}.png", // copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, stamen_toner: - {name: "Stamen Toner (B+W)", + {name: "Stamen Toner (B+W)", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com url: "http://[a-c].tile.stamen.com/toner/{z}/{x}/{y}.jpg", copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by Stamen Design, under CC BY 3.0.'}, stamen_terrain: - {name: "Stamen Terrain (USA only)", + {name: "Stamen Terrain (USA only)", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com url: "http://[a-c].tile.stamen.com/terrain/{z}/{x}/{y}.jpg", copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by Stamen Design, under CC BY 3.0.'}, stamen_watercolor: - {name: "Stamen Watercolor (artistic)", + {name: "Stamen Watercolor (artistic)", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com url: "http://[a-c].tile.stamen.com/watercolor/{z}/{x}/{y}.jpg", copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by Stamen Design, under CC BY 3.0.'}, }; -- 2.35.3