Load the examples resources with HTTPS

This commit is contained in:
Frederic Junod
2016-05-12 09:38:35 +02:00
parent 9eadf1505a
commit bd635ed01f
37 changed files with 45 additions and 51 deletions

View File

@@ -61,7 +61,7 @@
<a id="copy-button"><i class="fa fa-clipboard"></i> Copy</a> <a id="copy-button"><i class="fa fa-clipboard"></i> Copy</a>
<a id="jsfiddle-button"><i class="fa fa-jsfiddle"></i> Edit</a> <a id="jsfiddle-button"><i class="fa fa-jsfiddle"></i> Edit</a>
</div> </div>
<form method="POST" id="jsfiddle-form" target="_blank" action="http://jsfiddle.net/api/post/library/pure/"> <form method="POST" id="jsfiddle-form" target="_blank" action="https://jsfiddle.net/api/post/library/pure/">
<textarea class="hidden" name="js">{{ js.source }}</textarea> <textarea class="hidden" name="js">{{ js.source }}</textarea>
<textarea class="hidden" name="css">{{ css.source }}</textarea> <textarea class="hidden" name="css">{{ css.source }}</textarea>
<textarea class="hidden" name="html">{{ contents }}</textarea> <textarea class="hidden" name="html">{{ contents }}</textarea>

View File

@@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Quattrocento+Sans:400,400italic,700); @import url(https://fonts.googleapis.com/css?family=Quattrocento+Sans:400,400italic,700);
.navbar-inverse { .navbar-inverse {
border: 0; border: 0;
} }

View File

@@ -8,7 +8,7 @@ logoElement.href = 'http://www.osgeo.org/';
logoElement.target = '_blank'; logoElement.target = '_blank';
var logoImage = document.createElement('img'); var logoImage = document.createElement('img');
logoImage.src = 'http://www.osgeo.org/sites/all/themes/osgeo/logo.png'; logoImage.src = 'https://www.osgeo.org/sites/all/themes/osgeo/logo.png';
logoElement.appendChild(logoImage); logoElement.appendChild(logoImage);

View File

@@ -150,7 +150,7 @@ var map = new ol.Map({
layers: [ layers: [
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.json' url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure'
}) })
}), }),
new ol.layer.Vector({ new ol.layer.Vector({

View File

@@ -6,7 +6,7 @@ docs: >
<p>The example loads TopoJSON geometries and uses d3 (<code>d3.geo.path</code>) to render these geometries to a canvas element that is then used as the image of an ol3 image layer.</p> <p>The example loads TopoJSON geometries and uses d3 (<code>d3.geo.path</code>) to render these geometries to a canvas element that is then used as the image of an ol3 image layer.</p>
tags: "d3" tags: "d3"
resources: resources:
- http://d3js.org/d3.v3.min.js - https://d3js.org/d3.v3.min.js
- http://d3js.org/topojson.v1.min.js - https://d3js.org/topojson.v1.min.js
--- ---
<div id="map" class="map"></div> <div id="map" class="map"></div>

View File

@@ -55,7 +55,7 @@ var vectorLayer = new ol.layer.Vector({
var rasterLayer = new ol.layer.Tile({ var rasterLayer = new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.json', url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure',
crossOrigin: '' crossOrigin: ''
}) })
}); });

View File

@@ -39,7 +39,7 @@ var vectorLayer = new ol.layer.Vector({
var rasterLayer = new ol.layer.Tile({ var rasterLayer = new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.json', url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure',
crossOrigin: '' crossOrigin: ''
}) })
}); });

View File

@@ -17,8 +17,7 @@ var extents = {
var base = new ol.layer.Tile({ var base = new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/' + url: 'https://api.tiles.mapbox.com/v3/mapbox.world-light.json?secure',
'mapbox.world-light.json',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}) })
}); });
@@ -26,8 +25,7 @@ var base = new ol.layer.Tile({
var overlay = new ol.layer.Tile({ var overlay = new ol.layer.Tile({
extent: extents.India, extent: extents.India,
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/' + url: 'https://api.tiles.mapbox.com/v3/mapbox.world-black.json?secure',
'mapbox.world-black.json',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}) })
}); });

View File

@@ -14,15 +14,13 @@ var map = new ol.Map({
layers: [ layers: [
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/' + url: 'https://api.tiles.mapbox.com/v3/mapbox.20110804-hoa-foodinsecurity-3month.json?secure',
'mapbox.20110804-hoa-foodinsecurity-3month.json',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}) })
}), }),
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/' + url: 'https://api.tiles.mapbox.com/v3/mapbox.world-borders-light.json?secure',
'mapbox.world-borders-light.json',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}) })
}) })

View File

@@ -31,7 +31,7 @@ for (var z = zoomOffset / reuseZoomLevels; z <= 22 / reuseZoomLevels; ++z) {
resolutions.push(156543.03392804097 / Math.pow(2, z * reuseZoomLevels)); resolutions.push(156543.03392804097 / Math.pow(2, z * reuseZoomLevels));
} }
function tileUrlFunction(tileCoord) { function tileUrlFunction(tileCoord) {
return ('http://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' + return ('https://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' +
'{z}/{x}/{y}.vector.pbf?access_token=' + key) '{z}/{x}/{y}.vector.pbf?access_token=' + key)
.replace('{z}', String(tileCoord[0] * reuseZoomLevels + zoomOffset)) .replace('{z}', String(tileCoord[0] * reuseZoomLevels + zoomOffset))
.replace('{x}', String(tileCoord[1])) .replace('{x}', String(tileCoord[1]))

View File

@@ -25,7 +25,7 @@ var map = new ol.Map({
format: new ol.format.MVT(), format: new ol.format.MVT(),
tileGrid: ol.tilegrid.createXYZ({maxZoom: 22}), tileGrid: ol.tilegrid.createXYZ({maxZoom: 22}),
tilePixelRatio: 16, tilePixelRatio: 16,
url: 'http://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' + url: 'https://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' +
'{z}/{x}/{y}.vector.pbf?access_token=' + key '{z}/{x}/{y}.vector.pbf?access_token=' + key
}), }),
style: createMapboxStreetsV6Style() style: createMapboxStreetsV6Style()

View File

@@ -18,8 +18,7 @@ var map = new ol.Map({
}), }),
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/' + url: 'https://api.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy.json?secure',
'mapbox.natural-earth-hypso-bathy.json',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}), }),
minResolution: 2000, minResolution: 2000,

View File

@@ -45,8 +45,7 @@ var map = new ol.Map({
layers: [ layers: [
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/' + url: 'https://api.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy.json?secure',
'mapbox.natural-earth-hypso-bathy.json',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}) })
}) })

View File

@@ -20,7 +20,7 @@ docs: >
</p> </p>
tags: "raster, pixel" tags: "raster, pixel"
resources: resources:
- http://d3js.org/d3.v3.min.js - https://d3js.org/d3.v3.min.js
cloak: cloak:
AkGbxXx6tDWf1swIhPJyoAVp06H0s0gDTYslNWWHZ6RoPqMpB9ld5FY1WutX8UoF: Your Bing Maps Key from http://www.bingmapsportal.com/ here AkGbxXx6tDWf1swIhPJyoAVp06H0s0gDTYslNWWHZ6RoPqMpB9ld5FY1WutX8UoF: Your Bing Maps Key from http://www.bingmapsportal.com/ here
--- ---

View File

@@ -8,7 +8,7 @@ docs: >
in <a href="http://epsg.io/">EPSG.io</a> database. in <a href="http://epsg.io/">EPSG.io</a> database.
tags: "reprojection, projection, proj4js, epsg.io" tags: "reprojection, projection, proj4js, epsg.io"
resources: resources:
- http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
--- ---
<div id="map" class="map"></div> <div id="map" class="map"></div>
<form class="form-inline"> <form class="form-inline">

View File

@@ -6,6 +6,6 @@ docs: >
This example shows client-side reprojection of single image source. This example shows client-side reprojection of single image source.
tags: "reprojection, projection, proj4js, image, imagestatic" tags: "reprojection, projection, proj4js, image, imagestatic"
resources: resources:
- http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
--- ---
<div id="map" class="map"></div> <div id="map" class="map"></div>

View File

@@ -6,7 +6,7 @@ docs: >
This example shows client-side raster reprojection between various projections. This example shows client-side raster reprojection between various projections.
tags: "reprojection, projection, proj4js, osm, wms, wmts, hidpi" tags: "reprojection, projection, proj4js, osm, wms, wmts, hidpi"
resources: resources:
- http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
--- ---
<div id="map" class="map"></div> <div id="map" class="map"></div>
<form class="form-inline"> <form class="form-inline">

View File

@@ -87,7 +87,7 @@ layers['wms21781'] = new ol.layer.Tile({
'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale', 'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale',
'FORMAT': 'image/jpeg' 'FORMAT': 'image/jpeg'
}, },
url: 'http://wms.geo.admin.ch/', url: 'https://wms.geo.admin.ch/',
projection: 'EPSG:21781' projection: 'EPSG:21781'
}) })
}); });

View File

@@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Quattrocento+Sans:400,400italic,700); @import url(https://fonts.googleapis.com/css?family=Quattrocento+Sans:400,400italic,700);
body { body {
font-family: 'Quattrocento Sans', sans-serif; font-family: 'Quattrocento Sans', sans-serif;

View File

@@ -6,6 +6,6 @@ docs: >
This example shows client-side reprojection of OpenStreetMap to NAD83 Indiana East, including a ScaleLine control with US units. This example shows client-side reprojection of OpenStreetMap to NAD83 Indiana East, including a ScaleLine control with US units.
tags: "reprojection, projection, openstreetmap, nad83, tile, scaleline" tags: "reprojection, projection, openstreetmap, nad83, tile, scaleline"
resources: resources:
- http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
--- ---
<div id="map" class="map"></div> <div id="map" class="map"></div>

View File

@@ -13,7 +13,7 @@ var map = new ol.Map({
}), }),
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/mapbox.va-quake-aug.json', url: 'https://api.tiles.mapbox.com/v3/mapbox.va-quake-aug.json?secure',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}) })
}) })

View File

@@ -6,6 +6,6 @@ docs: >
Example of a Sphere Mollweide map with a Graticule component. Example of a Sphere Mollweide map with a Graticule component.
tags: "graticule, Mollweide, projection, proj4js" tags: "graticule, Mollweide, projection, proj4js"
resources: resources:
- http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
--- ---
<div id="map" class="map"></div> <div id="map" class="map"></div>

View File

@@ -21,7 +21,7 @@ var map = new ol.Map({
new ol.layer.Image({ new ol.layer.Image({
source: new ol.source.ImageStatic({ source: new ol.source.ImageStatic({
attributions: '© <a href="http://xkcd.com/license.html">xkcd</a>', attributions: '© <a href="http://xkcd.com/license.html">xkcd</a>',
url: 'http://imgs.xkcd.com/comics/online_communities.png', url: 'https://imgs.xkcd.com/comics/online_communities.png',
projection: projection, projection: projection,
imageExtent: extent imageExtent: extent
}) })

View File

@@ -78,7 +78,7 @@ Progress.prototype.hide = function() {
var progress = new Progress(document.getElementById('progress')); var progress = new Progress(document.getElementById('progress'));
var source = new ol.source.TileJSON({ var source = new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/mapbox.world-bright.json', url: 'https://api.tiles.mapbox.com/v3/mapbox.world-bright.json?secure',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}); });

View File

@@ -8,7 +8,7 @@ var map = new ol.Map({
layers: [ layers: [
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.json', url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure',
crossOrigin: 'anonymous' crossOrigin: 'anonymous'
}) })
}) })

View File

@@ -9,13 +9,13 @@ var key = 'pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiRk1kMWZaSSJ9.E5BkluenyWQMsBLsuByrmg';
var mapLayer = new ol.layer.Tile({ var mapLayer = new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v4/mapbox.geography-class.json?access_token=' + key url: 'https://api.tiles.mapbox.com/v4/mapbox.geography-class.json?secure&access_token=' + key
}) })
}); });
var gridSource = new ol.source.TileUTFGrid({ var gridSource = new ol.source.TileUTFGrid({
url: 'http://api.tiles.mapbox.com/v4/mapbox.geography-class.json?access_token=' + key url: 'https://api.tiles.mapbox.com/v4/mapbox.geography-class.json?secure&access_token=' + key
}); });
var gridLayer = new ol.layer.Tile({source: gridSource}); var gridLayer = new ol.layer.Tile({source: gridSource});

View File

@@ -12,7 +12,7 @@ goog.require('ol.style.Style');
var raster = new ol.layer.Tile({ var raster = new ol.layer.Tile({
source: new ol.source.TileJSON({ source: new ol.source.TileJSON({
url: 'http://api.tiles.mapbox.com/v3/mapbox.world-dark.json' url: 'https://api.tiles.mapbox.com/v3/mapbox.world-dark.json?secure'
}) })
}); });

View File

@@ -57,7 +57,7 @@ var raster = new ol.layer.Tile({
source: new ol.source.XYZ({ source: new ol.source.XYZ({
attributions: 'Tiles © <a href="http://services.arcgisonline.com/ArcGIS/' + attributions: 'Tiles © <a href="http://services.arcgisonline.com/ArcGIS/' +
'rest/services/World_Topo_Map/MapServer">ArcGIS</a>', 'rest/services/World_Topo_Map/MapServer">ArcGIS</a>',
url: 'http://server.arcgisonline.com/ArcGIS/rest/services/' + url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' +
'World_Topo_Map/MapServer/tile/{z}/{y}/{x}' 'World_Topo_Map/MapServer/tile/{z}/{y}/{x}'
}) })
}); });

View File

@@ -99,7 +99,7 @@ var raster = new ol.layer.Tile({
source: new ol.source.XYZ({ source: new ol.source.XYZ({
attributions: 'Tiles © <a href="http://services.arcgisonline.com/ArcGIS/' + attributions: 'Tiles © <a href="http://services.arcgisonline.com/ArcGIS/' +
'rest/services/World_Topo_Map/MapServer">ArcGIS</a>', 'rest/services/World_Topo_Map/MapServer">ArcGIS</a>',
url: 'http://server.arcgisonline.com/ArcGIS/rest/services/' + url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' +
'World_Topo_Map/MapServer/tile/{z}/{y}/{x}' 'World_Topo_Map/MapServer/tile/{z}/{y}/{x}'
}) })
}); });

View File

@@ -45,7 +45,7 @@ var layers = [
new ol.layer.Tile({ new ol.layer.Tile({
extent: extent, extent: extent,
source: new ol.source.TileWMS({ source: new ol.source.TileWMS({
url: 'http://wms.geo.admin.ch/', url: 'https://wms.geo.admin.ch/',
crossOrigin: 'anonymous', crossOrigin: 'anonymous',
attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' + attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
'en/home.html">Pixelmap 1:1000000 / geo.admin.ch</a>', 'en/home.html">Pixelmap 1:1000000 / geo.admin.ch</a>',
@@ -59,7 +59,7 @@ var layers = [
new ol.layer.Tile({ new ol.layer.Tile({
extent: extent, extent: extent,
source: new ol.source.TileWMS({ source: new ol.source.TileWMS({
url: 'http://wms.geo.admin.ch/', url: 'https://wms.geo.admin.ch/',
crossOrigin: 'anonymous', crossOrigin: 'anonymous',
attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' + attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
'en/home.html">National parks / geo.admin.ch</a>', 'en/home.html">National parks / geo.admin.ch</a>',

View File

@@ -6,7 +6,7 @@ docs: >
With [Proj4js](http://proj4js.org/) integration, OpenLayers can transform coordinates between arbitrary projections. With [Proj4js](http://proj4js.org/) integration, OpenLayers can transform coordinates between arbitrary projections.
tags: "wms, single image, proj4js, projection" tags: "wms, single image, proj4js, projection"
resources: resources:
- http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js - https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
- http://epsg.io/21781-1753.js - https://epsg.io/21781-1753.js
--- ---
<div id="map" class="map"></div> <div id="map" class="map"></div>

View File

@@ -33,7 +33,7 @@ var layers = [
new ol.layer.Image({ new ol.layer.Image({
extent: extent, extent: extent,
source: new ol.source.ImageWMS({ source: new ol.source.ImageWMS({
url: 'http://wms.geo.admin.ch/', url: 'https://wms.geo.admin.ch/',
crossOrigin: 'anonymous', crossOrigin: 'anonymous',
attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' + attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
'en/home.html">Pixelmap 1:1000000 / geo.admin.ch</a>', 'en/home.html">Pixelmap 1:1000000 / geo.admin.ch</a>',
@@ -47,7 +47,7 @@ var layers = [
new ol.layer.Image({ new ol.layer.Image({
extent: extent, extent: extent,
source: new ol.source.ImageWMS({ source: new ol.source.ImageWMS({
url: 'http://wms.geo.admin.ch/', url: 'https://wms.geo.admin.ch/',
crossOrigin: 'anonymous', crossOrigin: 'anonymous',
attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' + attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
'en/home.html">National parks / geo.admin.ch</a>', 'en/home.html">National parks / geo.admin.ch</a>',

View File

@@ -17,7 +17,7 @@ var layers = [
'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale', 'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale',
'FORMAT': 'image/jpeg' 'FORMAT': 'image/jpeg'
}, },
url: 'http://wms.geo.admin.ch/' url: 'https://wms.geo.admin.ch/'
}) })
}), }),
new ol.layer.Image({ new ol.layer.Image({
@@ -27,7 +27,7 @@ var layers = [
crossOrigin: 'anonymous', crossOrigin: 'anonymous',
params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'}, params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'},
serverType: 'mapserver', serverType: 'mapserver',
url: 'http://wms.geo.admin.ch/' url: 'https://wms.geo.admin.ch/'
}) })
}) })
]; ];

View File

@@ -6,7 +6,7 @@ goog.require('ol.layer.Tile');
goog.require('ol.source.WMTS'); goog.require('ol.source.WMTS');
var capabilitiesUrl = 'http://www.basemap.at/wmts/1.0.0/WMTSCapabilities.xml'; var capabilitiesUrl = 'https://www.basemap.at/wmts/1.0.0/WMTSCapabilities.xml';
// HiDPI support: // HiDPI support:
// * Use 'bmaphidpi' layer (pixel ratio 2) for device pixel ratio > 1 // * Use 'bmaphidpi' layer (pixel ratio 2) for device pixel ratio > 1

View File

@@ -43,7 +43,7 @@ var tileGrid = new ol.tilegrid.WMTS({
var key = '2mqbg0z6cx7ube8gsou10nrt'; var key = '2mqbg0z6cx7ube8gsou10nrt';
var ign_source = new ol.source.WMTS({ var ign_source = new ol.source.WMTS({
url: 'http://wxs.ign.fr/' + key + '/wmts', url: 'https://wxs.ign.fr/' + key + '/wmts',
layer: 'GEOGRAPHICALGRIDSYSTEMS.MAPS', layer: 'GEOGRAPHICALGRIDSYSTEMS.MAPS',
matrixSet: 'PM', matrixSet: 'PM',
format: 'image/jpeg', format: 'image/jpeg',

View File

@@ -31,7 +31,7 @@ var map = new ol.Map({
source: new ol.source.WMTS({ source: new ol.source.WMTS({
attributions: 'Tiles © <a href="http://services.arcgisonline.com/arcgis/rest/' + attributions: 'Tiles © <a href="http://services.arcgisonline.com/arcgis/rest/' +
'services/Demographics/USA_Population_Density/MapServer/">ArcGIS</a>', 'services/Demographics/USA_Population_Density/MapServer/">ArcGIS</a>',
url: 'http://services.arcgisonline.com/arcgis/rest/' + url: 'https://services.arcgisonline.com/arcgis/rest/' +
'services/Demographics/USA_Population_Density/MapServer/WMTS/', 'services/Demographics/USA_Population_Density/MapServer/WMTS/',
layer: '0', layer: '0',
matrixSet: 'EPSG:3857', matrixSet: 'EPSG:3857',

View File

@@ -17,7 +17,7 @@ var map = new ol.Map({
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.XYZ({ source: new ol.source.XYZ({
attributions: [attribution], attributions: [attribution],
url: 'http://server.arcgisonline.com/ArcGIS/rest/services/' + url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' +
'World_Topo_Map/MapServer/tile/{z}/{y}/{x}' 'World_Topo_Map/MapServer/tile/{z}/{y}/{x}'
}) })
}) })