From 100c42e671b604c273c0dd08712598faf8dd8095 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 16 Oct 2016 00:25:47 -0600 Subject: [PATCH] Use https for services.arcgisonline.com --- examples/arcgis-image.js | 2 +- examples/arcgis-tiled.js | 2 +- examples/vector-esri-edit.js | 2 +- examples/vector-esri.js | 2 +- examples/wmts.js | 2 +- examples/xyz-esri-4326-512.js | 2 +- examples/xyz-esri.js | 2 +- test/spec/ol/format/wmts/arcgis.xml | 12 ++++++------ test/spec/ol/source/wmts.test.js | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/arcgis-image.js b/examples/arcgis-image.js index 00a7787ef6..4e1068f606 100644 --- a/examples/arcgis-image.js +++ b/examples/arcgis-image.js @@ -5,7 +5,7 @@ goog.require('ol.layer.Image'); goog.require('ol.source.OSM'); goog.require('ol.source.ImageArcGISRest'); -var url = 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' + +var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' + 'Specialty/ESRI_StateCityHighway_USA/MapServer'; var layers = [ diff --git a/examples/arcgis-tiled.js b/examples/arcgis-tiled.js index b04042baf9..568258f624 100644 --- a/examples/arcgis-tiled.js +++ b/examples/arcgis-tiled.js @@ -4,7 +4,7 @@ goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); goog.require('ol.source.TileArcGISRest'); -var url = 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' + +var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' + 'Specialty/ESRI_StateCityHighway_USA/MapServer'; var layers = [ diff --git a/examples/vector-esri-edit.js b/examples/vector-esri-edit.js index 055e1f9f85..5709688ab2 100644 --- a/examples/vector-esri-edit.js +++ b/examples/vector-esri-edit.js @@ -55,7 +55,7 @@ var vector = new ol.layer.Vector({ var raster = new ol.layer.Tile({ source: new ol.source.XYZ({ - attributions: 'Tiles © ArcGIS', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' + 'World_Topo_Map/MapServer/tile/{z}/{y}/{x}' diff --git a/examples/vector-esri.js b/examples/vector-esri.js index deda97931b..110c740412 100644 --- a/examples/vector-esri.js +++ b/examples/vector-esri.js @@ -97,7 +97,7 @@ var vector = new ol.layer.Vector({ var raster = new ol.layer.Tile({ source: new ol.source.XYZ({ - attributions: 'Tiles © ArcGIS', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/' + 'World_Topo_Map/MapServer/tile/{z}/{y}/{x}' diff --git a/examples/wmts.js b/examples/wmts.js index 08f8921138..89aaba98b3 100644 --- a/examples/wmts.js +++ b/examples/wmts.js @@ -29,7 +29,7 @@ var map = new ol.Map({ new ol.layer.Tile({ opacity: 0.7, source: new ol.source.WMTS({ - attributions: 'Tiles © ArcGIS', url: 'https://services.arcgisonline.com/arcgis/rest/' + 'services/Demographics/USA_Population_Density/MapServer/WMTS/', diff --git a/examples/xyz-esri-4326-512.js b/examples/xyz-esri-4326-512.js index 15c8ab0056..7baa19090f 100644 --- a/examples/xyz-esri-4326-512.js +++ b/examples/xyz-esri-4326-512.js @@ -14,7 +14,7 @@ var projection = ol.proj.get('EPSG:4326'); // The tile size supported by the ArcGIS tile service. var tileSize = 512; -var urlTemplate = 'http://services.arcgisonline.com/arcgis/rest/services/' + +var urlTemplate = 'https://services.arcgisonline.com/arcgis/rest/services/' + 'ESRI_Imagery_World_2D/MapServer/tile/{z}/{y}/{x}'; var map = new ol.Map({ diff --git a/examples/xyz-esri.js b/examples/xyz-esri.js index 1320a3f445..8a3ed393c3 100644 --- a/examples/xyz-esri.js +++ b/examples/xyz-esri.js @@ -7,7 +7,7 @@ goog.require('ol.source.XYZ'); var attribution = new ol.Attribution({ - html: 'Tiles © ArcGIS' }); diff --git a/test/spec/ol/format/wmts/arcgis.xml b/test/spec/ol/format/wmts/arcgis.xml index d98f965335..070dd3bab7 100644 --- a/test/spec/ol/format/wmts/arcgis.xml +++ b/test/spec/ol/format/wmts/arcgis.xml @@ -16,7 +16,7 @@ + xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/1.0.0/WMTSCapabilities.xml"> RESTful @@ -25,7 +25,7 @@ + xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS?"> KVP @@ -39,7 +39,7 @@ + xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/tile/1.0.0/"> RESTful @@ -47,7 +47,7 @@ + xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS?"> KVP @@ -84,7 +84,7 @@ GoogleMapsCompatible @@ -403,6 +403,6 @@ diff --git a/test/spec/ol/source/wmts.test.js b/test/spec/ol/source/wmts.test.js index 471e673ab3..8102989336 100644 --- a/test/spec/ol/source/wmts.test.js +++ b/test/spec/ol/source/wmts.test.js @@ -176,7 +176,7 @@ describe('ol.source.WMTS', function() { expect(options.urls).to.be.an('array'); expect(options.urls).to.have.length(1); expect(options.urls[0]).to.be.eql( - 'http://services.arcgisonline.com/arcgis/rest/services/' + + 'https://services.arcgisonline.com/arcgis/rest/services/' + 'Demographics/USA_Population_Density/MapServer/WMTS?'); }); @@ -191,7 +191,7 @@ describe('ol.source.WMTS', function() { expect(options.urls).to.be.an('array'); expect(options.urls).to.have.length(1); expect(options.urls[0]).to.be.eql( - 'http://services.arcgisonline.com/arcgis/rest/services/' + + 'https://services.arcgisonline.com/arcgis/rest/services/' + 'Demographics/USA_Population_Density/MapServer/WMTS/' + 'tile/1.0.0/Demographics_USA_Population_Density/' + '{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png');