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

Use https for services.arcgisonline.com

Browse Source
This commit is contained in:
Tim Schaub
2016-10-16 00:25:47 -06:00
parent 9875df39bf
commit 100c42e671
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/arcgis-image.js
+1 -1
View File
@@ -5,7 +5,7 @@ goog.require('ol.layer.Image');
goog.require('ol.source.OSM'); goog.require('ol.source.OSM');
goog.require('ol.source.ImageArcGISRest'); 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'; 'Specialty/ESRI_StateCityHighway_USA/MapServer';
var layers = [ var layers = [
examples/arcgis-tiled.js
+1 -1
View File
@@ -4,7 +4,7 @@ goog.require('ol.layer.Tile');
goog.require('ol.source.OSM'); goog.require('ol.source.OSM');
goog.require('ol.source.TileArcGISRest'); 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'; 'Specialty/ESRI_StateCityHighway_USA/MapServer';
var layers = [ var layers = [
examples/vector-esri-edit.js
+1 -1
View File
@@ -55,7 +55,7 @@ var vector = new ol.layer.Vector({
var raster = new ol.layer.Tile({ 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="https://services.arcgisonline.com/ArcGIS/' +
'rest/services/World_Topo_Map/MapServer">ArcGIS</a>', 'rest/services/World_Topo_Map/MapServer">ArcGIS</a>',
url: 'https://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}'
examples/vector-esri.js
+1 -1
View File
@@ -97,7 +97,7 @@ var vector = new ol.layer.Vector({
var raster = new ol.layer.Tile({ 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="https://services.arcgisonline.com/ArcGIS/' +
'rest/services/World_Topo_Map/MapServer">ArcGIS</a>', 'rest/services/World_Topo_Map/MapServer">ArcGIS</a>',
url: 'https://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}'
examples/wmts.js
+1 -1
View File
@@ -29,7 +29,7 @@ var map = new ol.Map({
new ol.layer.Tile({ new ol.layer.Tile({
opacity: 0.7, opacity: 0.7,
source: new ol.source.WMTS({ source: new ol.source.WMTS({
attributions: 'Tiles © <a href="http://services.arcgisonline.com/arcgis/rest/' + attributions: 'Tiles © <a href="https://services.arcgisonline.com/arcgis/rest/' +
'services/Demographics/USA_Population_Density/MapServer/">ArcGIS</a>', 'services/Demographics/USA_Population_Density/MapServer/">ArcGIS</a>',
url: 'https://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/',
examples/xyz-esri-4326-512.js
+1 -1
View File
@@ -14,7 +14,7 @@ var projection = ol.proj.get('EPSG:4326');
// The tile size supported by the ArcGIS tile service. // The tile size supported by the ArcGIS tile service.
var tileSize = 512; 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}'; 'ESRI_Imagery_World_2D/MapServer/tile/{z}/{y}/{x}';
var map = new ol.Map({ var map = new ol.Map({
examples/xyz-esri.js
+1 -1
View File
@@ -7,7 +7,7 @@ goog.require('ol.source.XYZ');
var attribution = new ol.Attribution({ var attribution = new ol.Attribution({
html: 'Tiles © <a href="http://services.arcgisonline.com/ArcGIS/' + html: 'Tiles © <a href="https://services.arcgisonline.com/ArcGIS/' +
'rest/services/World_Topo_Map/MapServer">ArcGIS</a>' 'rest/services/World_Topo_Map/MapServer">ArcGIS</a>'
}); });
test/spec/ol/format/wmts/arcgis.xml
+6 -6
View File
@@ -16,7 +16,7 @@
<ows:DCP> <ows:DCP>
<ows:HTTP> <ows:HTTP>
<ows:Get <ows:Get
xlink:href="http://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/1.0.0/WMTSCapabilities.xml"> xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/1.0.0/WMTSCapabilities.xml">
<ows:Constraint name="GetEncoding"> <ows:Constraint name="GetEncoding">
<ows:AllowedValues> <ows:AllowedValues>
<ows:Value>RESTful</ows:Value> <ows:Value>RESTful</ows:Value>
@@ -25,7 +25,7 @@
</ows:Get> </ows:Get>
<!-- add KVP binding in 10.1 --> <!-- add KVP binding in 10.1 -->
<ows:Get <ows:Get
xlink:href="http://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS?"> xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS?">
<ows:Constraint name="GetEncoding"> <ows:Constraint name="GetEncoding">
<ows:AllowedValues> <ows:AllowedValues>
<ows:Value>KVP</ows:Value> <ows:Value>KVP</ows:Value>
@@ -39,7 +39,7 @@
<ows:DCP> <ows:DCP>
<ows:HTTP> <ows:HTTP>
<ows:Get <ows:Get
xlink:href="http://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/tile/1.0.0/"> xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/tile/1.0.0/">
<ows:Constraint name="GetEncoding"> <ows:Constraint name="GetEncoding">
<ows:AllowedValues> <ows:AllowedValues>
<ows:Value>RESTful</ows:Value> <ows:Value>RESTful</ows:Value>
@@ -47,7 +47,7 @@
</ows:Constraint> </ows:Constraint>
</ows:Get> </ows:Get>
<ows:Get <ows:Get
xlink:href="http://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS?"> xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS?">
<ows:Constraint name="GetEncoding"> <ows:Constraint name="GetEncoding">
<ows:AllowedValues> <ows:AllowedValues>
<ows:Value>KVP</ows:Value> <ows:Value>KVP</ows:Value>
@@ -84,7 +84,7 @@
<TileMatrixSet>GoogleMapsCompatible</TileMatrixSet> <TileMatrixSet>GoogleMapsCompatible</TileMatrixSet>
</TileMatrixSetLink> </TileMatrixSetLink>
<ResourceURL format="image/png" resourceType="tile" <ResourceURL format="image/png" resourceType="tile"
template="http://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" template="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"
/> />
</Layer> </Layer>
<!--TileMatrixSet--> <!--TileMatrixSet-->
@@ -403,6 +403,6 @@
</TileMatrixSet> </TileMatrixSet>
</Contents> </Contents>
<ServiceMetadataURL <ServiceMetadataURL
xlink:href="http://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/1.0.0/WMTSCapabilities.xml" xlink:href="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/1.0.0/WMTSCapabilities.xml"
/> />
</Capabilities> </Capabilities>
test/spec/ol/source/wmts.test.js
+2 -2
View File
@@ -176,7 +176,7 @@ describe('ol.source.WMTS', function() {
expect(options.urls).to.be.an('array'); expect(options.urls).to.be.an('array');
expect(options.urls).to.have.length(1); expect(options.urls).to.have.length(1);
expect(options.urls[0]).to.be.eql( 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?'); '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.be.an('array');
expect(options.urls).to.have.length(1); expect(options.urls).to.have.length(1);
expect(options.urls[0]).to.be.eql( 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/' + 'Demographics/USA_Population_Density/MapServer/WMTS/' +
'tile/1.0.0/Demographics_USA_Population_Density/' + 'tile/1.0.0/Demographics_USA_Population_Density/' +
'{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png'); '{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png');