ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5984 from ahocevar/more-https

Browse Source 
Less examples with mixed content
This commit is contained in:
Andreas Hocevar
2016-10-18 00:50:01 +02:00
committed by GitHub
parent 24d03bc014 68488eced9
commit dc23683c0c
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/data/kml/2012-02-10.kml
+8 -8
View File
@@ -2,7 +2,7 @@
<Document> <Document>
<name>Skimap.org OpenSkiMap </name> <name>Skimap.org OpenSkiMap </name>
<description>Created from OpenStreetMap data. Renderer v0.5</description> <description>Created from OpenStreetMap data. Renderer v0.5</description>
<!-- <!--
Copyright (c) OpenStreetMap Contributors Copyright (c) OpenStreetMap Contributors
https://www.openstreetmap.org/ https://www.openstreetmap.org/
@@ -32,7 +32,7 @@ http://creativecommons.org/licenses/by-sa/2.0/
<IconStyle> <IconStyle>
<scale>0.2</scale> <scale>0.2</scale>
<Icon> <Icon>
<href>http://maps.google.com/mapfiles/kml/shapes/parking_lot.png</href> <href>https://maps.google.com/mapfiles/kml/shapes/parking_lot.png</href>
</Icon> </Icon>
</IconStyle> </IconStyle>
</Style> </Style>
@@ -140,7 +140,7 @@ http://creativecommons.org/licenses/by-sa/2.0/
<IconStyle> <IconStyle>
<scale>0.7</scale> <scale>0.7</scale>
<Icon> <Icon>
<href>http://maps.google.com/mapfiles/kml/pal2/icon21.png</href> <href>https://maps.google.com/mapfiles/kml/pal2/icon21.png</href>
</Icon> </Icon>
</IconStyle> </IconStyle>
</Style> </Style>
@@ -170,7 +170,7 @@ http://creativecommons.org/licenses/by-sa/2.0/
<IconStyle> <IconStyle>
<scale>0.7</scale> <scale>0.7</scale>
<Icon> <Icon>
<href>http://maps.google.com/mapfiles/kml/pal2/icon30.png</href> <href>https://maps.google.com/mapfiles/kml/pal2/icon30.png</href>
</Icon> </Icon>
</IconStyle> </IconStyle>
</Style> </Style>
@@ -188,7 +188,7 @@ http://creativecommons.org/licenses/by-sa/2.0/
<IconStyle> <IconStyle>
<scale>0.7</scale> <scale>0.7</scale>
<Icon> <Icon>
<href>http://maps.google.com/mapfiles/kml/pal2/icon28.png</href> <href>https://maps.google.com/mapfiles/kml/pal2/icon28.png</href>
</Icon> </Icon>
</IconStyle> </IconStyle>
</Style> </Style>
@@ -325,7 +325,7 @@ http://creativecommons.org/licenses/by-sa/2.0/
<IconStyle> <IconStyle>
<scale>0.7</scale> <scale>0.7</scale>
<Icon> <Icon>
<href>http://maps.google.com/mapfiles/kml/pal2/icon40.png</href> <href>https://maps.google.com/mapfiles/kml/pal2/icon40.png</href>
</Icon> </Icon>
</IconStyle> </IconStyle>
</Style> </Style>
@@ -548,7 +548,7 @@ http://creativecommons.org/licenses/by-sa/2.0/
<IconStyle> <IconStyle>
<scale>0.7</scale> <scale>0.7</scale>
<Icon> <Icon>
<href>http://maps.google.com/mapfiles/kml/pal3/icon38.png</href> <href>https://maps.google.com/mapfiles/kml/pal3/icon38.png</href>
</Icon> </Icon>
</IconStyle> </IconStyle>
</Style> </Style>
@@ -559,7 +559,7 @@ http://creativecommons.org/licenses/by-sa/2.0/
<IconStyle> <IconStyle>
<scale>0.7</scale> <scale>0.7</scale>
<Icon> <Icon>
<href>http://maps.google.com/mapfiles/kml/pal3/icon38.png</href> <href>https://maps.google.com/mapfiles/kml/pal3/icon38.png</href>
</Icon> </Icon>
</IconStyle> </IconStyle>
</Style> </Style>
examples/geolocation-orientation.html
-1
View File
@@ -44,7 +44,6 @@ tags: "fullscreen, geolocation, orientation, mobile"
<button id="geolocate">Geolocate Me!</button> <button id="geolocate">Geolocate Me!</button>
<button id="simulate">Simulate</button> <button id="simulate">Simulate</button>
</div> </div>
<script src="http://code.jquery.com/jquery-2.2.3.min.js" type="text/javascript"></script>
<script src="./resources/common.js" type="text/javascript"></script> <script src="./resources/common.js" type="text/javascript"></script>
<script src="loader.js?id=geolocation-orientation" type="text/javascript"></script> <script src="loader.js?id=geolocation-orientation" type="text/javascript"></script>
</body> </body>
examples/igc.js
+1 -1
View File
@@ -88,7 +88,7 @@ var map = new ol.Map({
'All maps © <a href="https://www.opencyclemap.org/">OpenCycleMap</a>', 'All maps © <a href="https://www.opencyclemap.org/">OpenCycleMap</a>',
ol.source.OSM.ATTRIBUTION ol.source.OSM.ATTRIBUTION
], ],
url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' url: 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png'
}) })
}), }),
new ol.layer.Vector({ new ol.layer.Vector({
examples/localized-openstreetmap.js
+1 -1
View File
@@ -11,7 +11,7 @@ var openCycleMapLayer = new ol.layer.Tile({
'All maps © <a href="https://www.opencyclemap.org/">OpenCycleMap</a>', 'All maps © <a href="https://www.opencyclemap.org/">OpenCycleMap</a>',
ol.source.OSM.ATTRIBUTION ol.source.OSM.ATTRIBUTION
], ],
url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' url: 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png'
}) })
}); });
examples/overviewmap-custom.js
+1 -1
View File
@@ -14,7 +14,7 @@ var overviewMapControl = new ol.control.OverviewMap({
layers: [ layers: [
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.OSM({ source: new ol.source.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'
}) })
}) })
], ],
examples/wmts-ign.js
+1 -1
View File
@@ -52,7 +52,7 @@ var ign_source = new ol.source.WMTS({
style: 'normal', style: 'normal',
attributions: [new ol.Attribution({ attributions: [new ol.Attribution({
html: '<a href="http://www.geoportail.fr/" target="_blank">' + html: '<a href="http://www.geoportail.fr/" target="_blank">' +
'<img src="http://api.ign.fr/geoportail/api/js/latest/' + '<img src="https://api.ign.fr/geoportail/api/js/latest/' +
'theme/geoportal/img/logo_gp.gif"></a>' 'theme/geoportal/img/logo_gp.gif"></a>'
})] })]
}); });
examples/xyz.js
+1 -1
View File
@@ -9,7 +9,7 @@ var map = new ol.Map({
layers: [ layers: [
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.XYZ({ source: new ol.source.XYZ({
url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' url: 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png'
}) })
}) })
], ],