cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some mixed content issues

Browse source
This commit is contained in:
Tom Hughes 2014-02-08 17:43:34 +00:00
parent 78c040d575
commit a7f9ca32b7
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/leaflet.map.js.erb
View file

@ -36,7 +36,7 @@ L.OSM.Map = L.Map.extend({
name: I18n.t("javascripts.map.base.transport_map")
}),
new L.OSM.MapQuestOpen({
attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='https://developer.mapquest.com/content/osm/mq_logo.png'>",
code: "Q",
keyid: "mapquest",
name: I18n.t("javascripts.map.base.mapquest")

22
vendor/assets/leaflet/leaflet.osm.js vendored
View file

@ -2,7 +2,9 @@ L.OSM = {};
L.OSM.TileLayer = L.TileLayer.extend({
options: {
url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
url: document.location.protocol === 'https:' ?
'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' :
'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
attribution: '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>'
},
@ -14,28 +16,36 @@ L.OSM.TileLayer = L.TileLayer.extend({
L.OSM.Mapnik = L.OSM.TileLayer.extend({
options: {
url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
url: document.location.protocol === 'https:' ?
'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' :
'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
maxZoom: 19
}
});
L.OSM.CycleMap = L.OSM.TileLayer.extend({
options: {
url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png',
attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>"
}
});
L.OSM.TransportMap = L.OSM.TileLayer.extend({
options: {
url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png'
url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png',
attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>"
}
});
L.OSM.MapQuestOpen = L.OSM.TileLayer.extend({
options: {
url: 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
url: document.location.protocol === 'https:' ?
'https://otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png' :
'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
subdomains: '1234',
attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>"
attribution: document.location.protocol === 'https:' ?
"Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='https://developer.mapquest.com/content/osm/mq_logo.png'>" :
"Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>"
}
});