From 978548b085c28cd896ee8378dda3f53f1df90a80 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 16 Oct 2016 00:14:52 -0600 Subject: [PATCH 01/14] Use https for cdn.polyfill.io --- changelog/upgrade-notes.md | 4 ++-- changelog/v3.14.0.md | 2 +- changelog/v3.15.0.md | 2 +- config/examples/example.html | 2 +- doc/quickstart.hbs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md index 5aa85d168f..cf766cf7a1 100644 --- a/changelog/upgrade-notes.md +++ b/changelog/upgrade-notes.md @@ -179,7 +179,7 @@ var v3source = new ol.source.TileUTFGrid({ #### Internet Explorer 9 support -As of this release, OpenLayers requires a `classList` polyfill for IE 9 support. See http://cdn.polyfill.io/v2/docs/features#Element_prototype_classList. +As of this release, OpenLayers requires a `classList` polyfill for IE 9 support. See https://cdn.polyfill.io/v2/docs/features#Element_prototype_classList. #### Immediate rendering API @@ -228,7 +228,7 @@ The default cache size is `2048`. #### Internet Explorer 9 support -As of this release, OpenLayers requires a `requestAnimationFrame`/`cancelAnimationFrame` polyfill for IE 9 support. See http://cdn.polyfill.io/v2/docs/features/#requestAnimationFrame. +As of this release, OpenLayers requires a `requestAnimationFrame`/`cancelAnimationFrame` polyfill for IE 9 support. See https://cdn.polyfill.io/v2/docs/features/#requestAnimationFrame. #### Layer pre-/postcompose event changes diff --git a/changelog/v3.14.0.md b/changelog/v3.14.0.md index 0097dc92b9..24efc99c6e 100644 --- a/changelog/v3.14.0.md +++ b/changelog/v3.14.0.md @@ -17,7 +17,7 @@ The v3.14.0 release includes features and fixes from 93 pull requests since the #### Internet Explorer 9 support -As of this release, OpenLayers requires a `requestAnimationFrame`/`cancelAnimationFrame` polyfill for IE 9 support. See http://cdn.polyfill.io/v2/docs/features/#requestAnimationFrame. +As of this release, OpenLayers requires a `requestAnimationFrame`/`cancelAnimationFrame` polyfill for IE 9 support. See https://cdn.polyfill.io/v2/docs/features/#requestAnimationFrame. #### Layer pre-/postcompose event changes diff --git a/changelog/v3.15.0.md b/changelog/v3.15.0.md index e06539f1d3..5e5c161859 100644 --- a/changelog/v3.15.0.md +++ b/changelog/v3.15.0.md @@ -18,7 +18,7 @@ The v3.15.0 release includes features and fixes from 136 pull requests since the #### Internet Explorer 9 support -As of this release, OpenLayers requires a `classList` polyfill for IE 9 support. See http://cdn.polyfill.io/v2/docs/features#Element_prototype_classList. +As of this release, OpenLayers requires a `classList` polyfill for IE 9 support. See https://cdn.polyfill.io/v2/docs/features#Element_prototype_classList. #### Immediate rendering API diff --git a/config/examples/example.html b/config/examples/example.html index 2726943767..a744b63a36 100644 --- a/config/examples/example.html +++ b/config/examples/example.html @@ -74,7 +74,7 @@ <title>{{ title }}</title> <link rel="stylesheet" href="http://openlayers.org/en/v{{ olVersion }}/css/ol.css" type="text/css"> <!-- The line below is only needed for old environments like Internet Explorer and Android 4.x --> - <script src="http://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script> + <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script> <script src="http://openlayers.org/en/v{{ olVersion }}/build/ol.js"></script>{{#if extraHead.remote}} {{ indent extraHead.remote spaces=4 }}{{/if}}{{#if css.source}} <style> diff --git a/doc/quickstart.hbs b/doc/quickstart.hbs index 0b6d81cd73..5c4eb6a16c 100644 --- a/doc/quickstart.hbs +++ b/doc/quickstart.hbs @@ -63,7 +63,7 @@ The first part is to include the JavaScript library. For the purpose of this tut **Optional:** If the application is intended to run on old platforms like Internet Explorer or Android 4.x, another script needs to be included before OpenLayers: ```xml - + ``` From 9875df39bfe109968ed0ee6e51d3b563cbdd226b Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 16 Oct 2016 00:16:15 -0600 Subject: [PATCH 02/14] Use https for openlayers.org --- DEVELOPING.md | 2 +- README.md | 6 +++--- changelog/upgrade-notes.md | 10 +++++----- changelog/v3.18.0.md | 2 +- changelog/v3.2.0.md | 2 +- changelog/v3.5.0.md | 8 ++++---- config/examples/example.html | 6 +++--- doc/quickstart.hbs | 6 +++--- doc/tutorials/custom-builds.md | 4 ++-- doc/tutorials/raster-reprojection.md | 10 +++++----- package.json | 2 +- src/ol/assertionerror.js | 4 ++-- src/ol/map.js | 2 +- tasks/build-examples.js | 4 ++-- tasks/build.js | 2 +- test/spec/ol/assertionerror.test.js | 2 +- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/DEVELOPING.md b/DEVELOPING.md index 2bbbf0555b..a900bc8c21 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -77,7 +77,7 @@ Then, just point your browser in your bro Run examples against the `ol.js` standalone build: The examples can also be run against the `ol.js` standalone build, just like -the examples [hosted](http://openlayers.org/en/master/examples/) on GitHub. +the examples [hosted](https://openlayers.org/en/master/examples/) on GitHub. Start by executing the `host-examples` build target: $ make host-examples diff --git a/README.md b/README.md index f8ba0bcd9c..976db69b67 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ [![Coverage Status](https://coveralls.io/repos/openlayers/ol3/badge.svg?branch=master)](https://coveralls.io/r/openlayers/ol3?branch=master) [![OSGeo Project](https://img.shields.io/badge/OSGeo-Project-brightgreen.svg)](http://osgeo.org/) -[OpenLayers 3](http://openlayers.org/) is a high-performance, feature-packed library for creating interactive maps on the web. It can display map tiles, vector data and markers loaded from any source on any web page. OpenLayers has been developed to further the use of geographic information of all kinds. It is completely free, Open Source JavaScript, released under the 2-clause BSD License (also known as the FreeBSD). +[OpenLayers 3](https://openlayers.org/) is a high-performance, feature-packed library for creating interactive maps on the web. It can display map tiles, vector data and markers loaded from any source on any web page. OpenLayers has been developed to further the use of geographic information of all kinds. It is completely free, Open Source JavaScript, released under the 2-clause BSD License (also known as the FreeBSD). ## Getting Started -- Download the [latest release](http://openlayers.org/download/) +- Download the [latest release](https://openlayers.org/download/) - Install with npm: `npm install openlayers` - Clone the repo: `git clone git@github.com:openlayers/ol3.git` @@ -18,7 +18,7 @@ OpenLayers runs on all modern browsers that support [HTML5](https://html.spec.wh ## Documentation -Check out the [hosted examples](http://openlayers.org/en/latest/examples/), the [workshop](http://openlayers.org/workshop/) or the [API documentation](http://openlayers.org/en/latest/apidoc/). +Check out the [hosted examples](https://openlayers.org/en/latest/examples/), the [workshop](https://openlayers.org/workshop/) or the [API documentation](https://openlayers.org/en/latest/apidoc/). ## Bugs diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md index cf766cf7a1..ab0bdc1cfd 100644 --- a/changelog/upgrade-notes.md +++ b/changelog/upgrade-notes.md @@ -70,7 +70,7 @@ The DOM renderer has been removed. Instead, the Canvas renderer should be used. #### Changes in the way assertions are handled -Previously, minified builds of the library did not have any assertions. This caused applications to fail silently or with cryptic stack traces. Starting with this release, developers get notified of many runtime errors through the new `ol.AssertionError`. This error has a `code` property. The meaning of the code can be found on http://openlayers.org/en/latest/doc/errors/. There are additional console assertion checks in debug mode when the `goog.DEBUG` compiler flag is `true`. As this is `true` by default, it is recommended that those creating custom builds set this to `false` so these assertions are stripped.' +Previously, minified builds of the library did not have any assertions. This caused applications to fail silently or with cryptic stack traces. Starting with this release, developers get notified of many runtime errors through the new `ol.AssertionError`. This error has a `code` property. The meaning of the code can be found on https://openlayers.org/en/latest/doc/errors/. There are additional console assertion checks in debug mode when the `goog.DEBUG` compiler flag is `true`. As this is `true` by default, it is recommended that those creating custom builds set this to `false` so these assertions are stripped.' #### Removal of `ol.ENABLE_NAMED_COLORS` @@ -546,7 +546,7 @@ now specify an `extent` instead of `widths`. These settings are used to restrict }); ``` - See http://openlayers.org/en/master/examples/vector-layer.html for a real example. + See https://openlayers.org/en/master/examples/vector-layer.html for a real example. Note that you no longer need to set a `projection` on the source! @@ -568,7 +568,7 @@ now specify an `extent` instead of `widths`. These settings are used to restrict The above code uses jQuery to send an Ajax request, but you can obviously use any Ajax library. - See http://openlayers.org/en/master/examples/igc.html for a real example. + See https://openlayers.org/en/master/examples/igc.html for a real example. * Note about KML @@ -626,9 +626,9 @@ now specify an `extent` instead of `widths`. These settings are used to restrict }); ``` - See http://openlayers.org/en/master/examples/vector-osm.html for a real example. + See https://openlayers.org/en/master/examples/vector-osm.html for a real example. -* The experimental `ol.loadingstrategy.createTile` function has been renamed to `ol.loadingstrategy.tile`. The signature of the function hasn't changed. See http://openlayers.org/en/master/examples/vector-osm.html for an example. +* The experimental `ol.loadingstrategy.createTile` function has been renamed to `ol.loadingstrategy.tile`. The signature of the function hasn't changed. See https://openlayers.org/en/master/examples/vector-osm.html for an example. #### Change to `ol.style.Icon` diff --git a/changelog/v3.18.0.md b/changelog/v3.18.0.md index f977d4f976..ad1de8109d 100644 --- a/changelog/v3.18.0.md +++ b/changelog/v3.18.0.md @@ -14,7 +14,7 @@ The v3.18.0 release includes features and fixes from almost 120 pull requests si #### Changes in the way assertions are handled -Previously, minified builds of the library did not have any assertions. This caused applications to fail silently or with cryptic stack traces. Starting with this release, developers get notified of many runtime errors through the new `ol.AssertionError`. This error has a `code` property. The meaning of the code can be found on http://openlayers.org/en/latest/doc/errors/. There are additional console assertion checks in debug mode when the `goog.DEBUG` compiler flag is `true`. As this is `true` by default, it is recommended that those creating custom builds set this to `false` so these assertions are stripped.' +Previously, minified builds of the library did not have any assertions. This caused applications to fail silently or with cryptic stack traces. Starting with this release, developers get notified of many runtime errors through the new `ol.AssertionError`. This error has a `code` property. The meaning of the code can be found on https://openlayers.org/en/latest/doc/errors/. There are additional console assertion checks in debug mode when the `goog.DEBUG` compiler flag is `true`. As this is `true` by default, it is recommended that those creating custom builds set this to `false` so these assertions are stripped.' #### Removal of `ol.ENABLE_NAMED_COLORS` diff --git a/changelog/v3.2.0.md b/changelog/v3.2.0.md index 6c55abd1d1..316ded23a9 100644 --- a/changelog/v3.2.0.md +++ b/changelog/v3.2.0.md @@ -2,7 +2,7 @@ ## Summary -The 3.1.0 release includes 70 merged pull requests since 3.1.0. Of note, the KML format [now parses `NetworkingLink` tags](https://github.com/openlayers/ol3/pull/3171). The [measure example](http://openlayers.org/en/v3.2.0/examples/measure.html) was [reworked](https://github.com/openlayers/ol3/pull/3206) to display measurements and help messages while drawing. A WMTS GetCapabilities format was [added](https://github.com/openlayers/ol3/pull/3026). The WebGL renderer [now supports feature hit detection](https://github.com/openlayers/ol3/pull/3065) (on point features). And you can now [detect](https://github.com/openlayers/ol3/pull/3172) features/colored pixels on image and tile layers! See the full list of [changes](#changes) below. +The 3.1.0 release includes 70 merged pull requests since 3.1.0. Of note, the KML format [now parses `NetworkingLink` tags](https://github.com/openlayers/ol3/pull/3171). The [measure example](https://openlayers.org/en/v3.2.0/examples/measure.html) was [reworked](https://github.com/openlayers/ol3/pull/3206) to display measurements and help messages while drawing. A WMTS GetCapabilities format was [added](https://github.com/openlayers/ol3/pull/3026). The WebGL renderer [now supports feature hit detection](https://github.com/openlayers/ol3/pull/3065) (on point features). And you can now [detect](https://github.com/openlayers/ol3/pull/3172) features/colored pixels on image and tile layers! See the full list of [changes](#changes) below. ## Upgrade notes diff --git a/changelog/v3.5.0.md b/changelog/v3.5.0.md index 65ada6311e..ca32fae572 100644 --- a/changelog/v3.5.0.md +++ b/changelog/v3.5.0.md @@ -53,7 +53,7 @@ The 3.5.0 release includes features and fixes from a whopping 129 pull requests }); ``` - See http://openlayers.org/en/master/examples/vector-layer.html for a real example. + See https://openlayers.org/en/master/examples/vector-layer.html for a real example. Note that you no longer need to set a `projection` on the source! @@ -75,7 +75,7 @@ The 3.5.0 release includes features and fixes from a whopping 129 pull requests The above code uses jQuery to send an Ajax request, but you can obviously use any Ajax library. - See http://openlayers.org/en/master/examples/igc.html for a real example. + See https://openlayers.org/en/master/examples/igc.html for a real example. * Note about KML @@ -133,9 +133,9 @@ The 3.5.0 release includes features and fixes from a whopping 129 pull requests }); ``` - See http://openlayers.org/en/master/examples/vector-osm.html for a real example. + See https://openlayers.org/en/master/examples/vector-osm.html for a real example. -* The experimental `ol.loadingstrategy.createTile` function has been renamed to `ol.loadingstrategy.tile`. The signature of the function hasn't changed. See http://openlayers.org/en/master/examples/vector-osm.html for an example. +* The experimental `ol.loadingstrategy.createTile` function has been renamed to `ol.loadingstrategy.tile`. The signature of the function hasn't changed. See https://openlayers.org/en/master/examples/vector-osm.html for an example. ### Change to `ol.style.Icon` diff --git a/config/examples/example.html b/config/examples/example.html index a744b63a36..eb91cec622 100644 --- a/config/examples/example.html +++ b/config/examples/example.html @@ -66,16 +66,16 @@ - + 
<!DOCTYPE html>
 <html>
   <head>
     <title>{{ title }}</title>
-    <link rel="stylesheet" href="http://openlayers.org/en/v{{ olVersion }}/css/ol.css" type="text/css">
+    <link rel="stylesheet" href="https://openlayers.org/en/v{{ olVersion }}/css/ol.css" type="text/css">
     <!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
     <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
-    <script src="http://openlayers.org/en/v{{ olVersion }}/build/ol.js"></script>{{#if extraHead.remote}}
+    <script src="https://openlayers.org/en/v{{ olVersion }}/build/ol.js"></script>{{#if extraHead.remote}}
 {{ indent extraHead.remote spaces=4 }}{{/if}}{{#if css.source}}
     <style>
 {{ indent css.source spaces=6 }}    </style>{{/if}}
diff --git a/doc/quickstart.hbs b/doc/quickstart.hbs
index 5c4eb6a16c..da8850b00b 100644
--- a/doc/quickstart.hbs
+++ b/doc/quickstart.hbs
@@ -13,14 +13,14 @@ Below you'll find a complete working example.  Create a new file, copy in the co
 
 
   
-    
+    
     
-    
+    
     OpenLayers 3 example
   
   
@@ -55,7 +55,7 @@ To include a map a web page you will need 3 things:
 ### Include OpenLayers
 
 ```xml
-  
+  
 ```
 
 The first part is to include the JavaScript library. For the purpose of this tutorial, here we simply point to the openlayers.org website to get the whole library. In a production environment, we would build a custom version of the library including only the module needed for our application.
diff --git a/doc/tutorials/custom-builds.md b/doc/tutorials/custom-builds.md
index a9c2a41665..8eeb13bbea 100644
--- a/doc/tutorials/custom-builds.md
+++ b/doc/tutorials/custom-builds.md
@@ -95,7 +95,7 @@ var map = new ol.Map({
 });
 ```
 
-Note that this JavaScript code corresponds to OpenLayers 3's [`simple`](http://openlayers.org/en/master/examples/simple.html) example.
+Note that this JavaScript code corresponds to OpenLayers 3's [`simple`](https://openlayers.org/en/master/examples/simple.html) example.
 
 You are now ready to create your first OpenLayers 3 build. Use the following command to create the build:
 
@@ -180,7 +180,7 @@ Note that `build.js` currently requires you to enter an output file and will wri
 
 ## A more complicated example
 
-Now let's try a more complicated example: [`heatmaps-earthquakes`](http://openlayers.org/en/master/examples/heatmap-earthquakes.html). The build configuration file looks like this:
+Now let's try a more complicated example: [`heatmaps-earthquakes`](https://openlayers.org/en/master/examples/heatmap-earthquakes.html). The build configuration file looks like this:
 
 ```json
 {
diff --git a/doc/tutorials/raster-reprojection.md b/doc/tutorials/raster-reprojection.md
index 473b440850..8dbe9a4b05 100644
--- a/doc/tutorials/raster-reprojection.md
+++ b/doc/tutorials/raster-reprojection.md
@@ -35,10 +35,10 @@ var map = new ol.Map({
 If a source (based on `ol.source.TileImage` or `ol.source.Image`) has a projection different from the current `ol.View`’s projection then the reprojection happens automatically under the hood.
 
 ### Examples
-- [Raster reprojection demo](http://openlayers.org/en/master/examples/reprojection.html)
-- [OpenStreetMap to WGS84 reprojection](http://openlayers.org/en/master/examples/reprojection-wgs84.html)
-- [Reprojection with EPSG.io database search](http://openlayers.org/en/master/examples/reprojection-by-code.html)
-- [Image reprojection](http://openlayers.org/en/master/examples/reprojection-image.html)
+- [Raster reprojection demo](https://openlayers.org/en/master/examples/reprojection.html)
+- [OpenStreetMap to WGS84 reprojection](https://openlayers.org/en/master/examples/reprojection-wgs84.html)
+- [Reprojection with EPSG.io database search](https://openlayers.org/en/master/examples/reprojection-by-code.html)
+- [Image reprojection](https://openlayers.org/en/master/examples/reprojection-image.html)
 
 ### Custom projection
 The easiest way to use a custom projection is to add the [Proj4js](http://proj4js.org/) library to your project and then define the projection using a proj4 definition string.
@@ -122,7 +122,7 @@ Although this is mathematically correct behavior of the inverse transformation,
 A possible general solution would be to calculate the forward transformation for every vertex as well - but this would significantly decrease performance (especially for computationally expensive transformations).
 
 Therefore a recommended workaround is to define a proper visibility extent on the `ol.layer.Tile` in the view projection.
-Setting such a limit is demonstrated in the [reprojection demo example](http://openlayers.org/en/master/examples/reprojection.html).
+Setting such a limit is demonstrated in the [reprojection demo example](https://openlayers.org/en/master/examples/reprojection.html).
 
 ### Resolution calculation
 When determining source tiles to load, the ideal source resolution needs to be calculated.
diff --git a/package.json b/package.json
index 4066ea4a17..dbbdfa512e 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "mapping",
     "ol3"
   ],
-  "homepage": "http://openlayers.org/",
+  "homepage": "https://openlayers.org/",
   "scripts": {
     "install": "node tasks/install.js",
     "postinstall": "closure-util update",
diff --git a/src/ol/assertionerror.js b/src/ol/assertionerror.js
index cc3c723885..e7e5b2e9c8 100644
--- a/src/ol/assertionerror.js
+++ b/src/ol/assertionerror.js
@@ -17,12 +17,12 @@ ol.AssertionError = function(code) {
    * @type {string}
    */
   this.message = 'Assertion failed. See ' +
-      (ol.VERSION ? 'http://openlayers.org/en/' + ol.VERSION.split('-')[0] : '') +
+      (ol.VERSION ? 'https://openlayers.org/en/' + ol.VERSION.split('-')[0] : '') +
       '/doc/errors/#' + code + ' for details.';
 
   /**
    * Error code. The meaning of the code can be found on
-   * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
+   * {@link https://openlayers.org/en/latest/errors.html} (replace `latest` with
    * the version found in the OpenLayers script's header comment if a version
    * other than the latest is used).
    * @type {number}
diff --git a/src/ol/map.js b/src/ol/map.js
index 6b887fe2ae..78c989b7b3 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -41,7 +41,7 @@ goog.require('ol.transform');
  * @const
  * @type {string}
  */
-ol.OL3_URL = 'http://openlayers.org/';
+ol.OL3_URL = 'https://openlayers.org/';
 
 
 /**
diff --git a/tasks/build-examples.js b/tasks/build-examples.js
index 68c9dffa42..98a7aaf01d 100644
--- a/tasks/build-examples.js
+++ b/tasks/build-examples.js
@@ -84,7 +84,7 @@ function augmentExamples(files, metalsmith, done) {
       }
       var jsSource = files[jsFilename].contents.toString()
           // Change data paths to absolute urls
-          .replace(/'data\//g, '\'http://openlayers.org/en/v' + pkg.version + '/examples/data/');
+          .replace(/'data\//g, '\'https://openlayers.org/en/v' + pkg.version + '/examples/data/');
       if (file.cloak) {
         for (var key in file.cloak) {
           jsSource = jsSource.replace(new RegExp(key, 'g'), file.cloak[key]);
@@ -115,7 +115,7 @@ function augmentExamples(files, metalsmith, done) {
         for (var i = 0, ii = file.resources.length; i < ii; ++i) {
           var resource = file.resources[i];
           var remoteResource = resource.indexOf('//') === -1 ?
-              'http://openlayers.org/en/v' + pkg.version + '/examples/' +
+              'https://openlayers.org/en/v' + pkg.version + '/examples/' +
                   resource : resource;
           fiddleResources[i] = remoteResource;
           if (isJsRegEx.test(resource)) {
diff --git a/tasks/build.js b/tasks/build.js
index e43d4a4f8a..e10df63199 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -242,7 +242,7 @@ function getVersion(callback) {
  *     ready to be written into a file, or any error.
  */
 function addHeader(compiledSource, callback) {
-  var header = '// OpenLayers 3. See http://openlayers.org/\n';
+  var header = '// OpenLayers 3. See https://openlayers.org/\n';
   header += '// License: https://raw.githubusercontent.com/openlayers/' +
       'ol3/master/LICENSE.md\n';
   if (version !== '') {
diff --git a/test/spec/ol/assertionerror.test.js b/test/spec/ol/assertionerror.test.js
index b81f69264e..19c18bbcd8 100644
--- a/test/spec/ol/assertionerror.test.js
+++ b/test/spec/ol/assertionerror.test.js
@@ -12,7 +12,7 @@ describe('ol.AssertionError', function() {
     var origVersion = ol.VERSION;
     ol.VERSION = 'foo';
     var error = new ol.AssertionError(42);
-    expect(error.message).to.be('Assertion failed. See http://openlayers.org/en/foo/doc/errors/#42 for details.');
+    expect(error.message).to.be('Assertion failed. See https://openlayers.org/en/foo/doc/errors/#42 for details.');
     ol.VERSION = origVersion;
   });
   it('has an error code', function() {

From 100c42e671b604c273c0dd08712598faf8dd8095 Mon Sep 17 00:00:00 2001
From: Tim Schaub 
Date: Sun, 16 Oct 2016 00:25:47 -0600
Subject: [PATCH 03/14] 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');

From da402b22af8b4afb028ddee3ebc283568efe4062 Mon Sep 17 00:00:00 2001
From: Tim Schaub 
Date: Sun, 16 Oct 2016 00:26:50 -0600
Subject: [PATCH 04/14] Use https for www.opencyclemap.org

---
 examples/igc.html                     | 2 +-
 examples/igc.js                       | 2 +-
 examples/localized-openstreetmap.html | 2 +-
 examples/localized-openstreetmap.js   | 2 +-
 src/ol/attribution.js                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/igc.html b/examples/igc.html
index 59e6c084de..e6fcb7cc01 100644
--- a/examples/igc.html
+++ b/examples/igc.html
@@ -3,7 +3,7 @@ layout: example.html
 title: IGC Data
 shortdesc: Example of tracks recorded from multiple paraglider flights on the same day, read from an IGC file.
 docs: >
-  
The five tracks contain a total of 49,707 unique coordinates. Zoom in to see more detail. The background layer is from OpenCycleMap.

+  
The five tracks contain a total of 49,707 unique coordinates. Zoom in to see more detail. The background layer is from OpenCycleMap.

 tags: "complex-geometry, closest-feature, igc, opencyclemap"
 ---
 

diff --git a/examples/igc.js b/examples/igc.js
index f1eefe1fe6..4993e7eac5 100644
--- a/examples/igc.js
+++ b/examples/igc.js
@@ -85,7 +85,7 @@ var map = new ol.Map({
     new ol.layer.Tile({
       source: new ol.source.OSM({
         attributions: [
-          'All maps © OpenCycleMap',
+          'All maps © OpenCycleMap',
           ol.source.OSM.ATTRIBUTION
         ],
         url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
diff --git a/examples/localized-openstreetmap.html b/examples/localized-openstreetmap.html
index 620d9c834a..8ceb3eefc2 100644
--- a/examples/localized-openstreetmap.html
+++ b/examples/localized-openstreetmap.html
@@ -3,7 +3,7 @@ layout: example.html
 title: Localized OpenStreetMap
 shortdesc: Example of a localized OpenStreetMap map with a custom tile server and a custom attribution.
 docs: >
-  
The base layer is OpenCycleMap with an overlay from OpenSeaMap.
+  
The base layer is OpenCycleMap with an overlay from OpenSeaMap.
 tags: "localized-openstreetmap, openseamap, openstreetmap"
 ---
 

diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js
index 99a4b65f23..f0403cd760 100644
--- a/examples/localized-openstreetmap.js
+++ b/examples/localized-openstreetmap.js
@@ -8,7 +8,7 @@ goog.require('ol.source.OSM');
 var openCycleMapLayer = new ol.layer.Tile({
   source: new ol.source.OSM({
     attributions: [
-      'All maps © OpenCycleMap',
+      'All maps © OpenCycleMap',
       ol.source.OSM.ATTRIBUTION
     ],
     url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
diff --git a/src/ol/attribution.js b/src/ol/attribution.js
index 2297b075f3..36b61feb22 100644
--- a/src/ol/attribution.js
+++ b/src/ol/attribution.js
@@ -15,7 +15,7 @@ goog.require('ol.tilegrid');
  *       attributions: [
  *         new ol.Attribution({
  *           html: 'All maps © ' +
- *               'OpenCycleMap'
+ *               'OpenCycleMap'
  *         }),
  *         ol.source.OSM.ATTRIBUTION
  *       ],

From ff754a0a9fc9b256238615618e2d88d312224b5f Mon Sep 17 00:00:00 2001
From: Tim Schaub 
Date: Sun, 16 Oct 2016 00:34:06 -0600
Subject: [PATCH 05/14] Use https for www.openstreetmap.org

---
 examples/data/kml/2012-02-10.kml         | 4 ++--
 examples/mapbox-vector-tiles-advanced.js | 2 +-
 examples/mapbox-vector-tiles.js          | 2 +-
 externs/olx.js                           | 2 +-
 src/ol/source/osm.js                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/data/kml/2012-02-10.kml b/examples/data/kml/2012-02-10.kml
index ad7b112f4d..4ad89f7621 100644
--- a/examples/data/kml/2012-02-10.kml
+++ b/examples/data/kml/2012-02-10.kml
@@ -4,7 +4,7 @@
     Created from OpenStreetMap data. Renderer v0.5