From 91093229054ce0a921219e5b3ac0ddfbf7d62c66 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 8 May 2017 11:39:43 +0200 Subject: [PATCH] Use https scheme whenever possible, to avoid mixed content issues --- README.md | 10 +++++----- css/style.css | 2 +- index.html | 18 +++++++++--------- js/Map.js | 22 +++++++++++----------- js/Util.js | 8 ++++---- js/plugin/Bing.js | 6 +++--- js/plugin/Routing.js | 2 +- js/plugin/Search.js | 2 +- keys.js.template | 6 +++--- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 70e9934..29d19e5 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ More information: http://brouter.de General BRouter discussions/questions, support: -http://groups.google.com/group/osm-android-bikerouting +https://groups.google.com/group/osm-android-bikerouting ## Installation @@ -75,7 +75,7 @@ This is needed for pre-loading the selected profile (unless you allowed local fi ### Dependencies -Requires [Node and npm](http://nodejs.org/) (or [io.js](https://iojs.org)), [Bower](http://bower.io/) and [Gulp](http://gulpjs.com/): +Requires [Node and npm](https://nodejs.org/) (or [io.js](https://iojs.org)), [Bower](https://bower.io/) and [Gulp](http://gulpjs.com/): npm install -g bower npm install -g gulp @@ -118,12 +118,12 @@ Copyright (c) 2012 [sa3m](https://github.com/sa3m), Copyright (c) 2013 Per Liedm Copyright (c) 2011-2012, Pavel Shramov; [2-clause BSD License](https://github.com/shramov/leaflet-plugins/blob/master/LICENSE) * [Async.js](https://github.com/caolan/async) Copyright (c) 2010-2014 Caolan McMahon; [MIT License](https://github.com/caolan/async/blob/master/LICENSE) -* [Bootstrap](http://getbootstrap.com/) +* [Bootstrap](https://getbootstrap.com/) Copyright (c) 2011-2014 Twitter, Inc; [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE) * [jQuery](https://github.com/jquery/jquery) Copyright 2005, 2014 jQuery Foundation and other contributors; [MIT License](https://github.com/jquery/jquery/blob/master/LICENSE.txt) * [DataTables](https://github.com/DataTables/DataTables) -Copyright (C) 2008-2014, SpryMedia Ltd.; [MIT License](http://www.datatables.net/license/mit) +Copyright (C) 2008-2014, SpryMedia Ltd.; [MIT License](https://www.datatables.net/license/MIT-LICENCE) * [Leaflet.EasyButton](https://github.com/CliffCloud/Leaflet.EasyButton) Copyright (C) 2014 Daniel Montague; [MIT License](https://github.com/CliffCloud/Leaflet.EasyButton/blob/master/LICENSE) * [Bootbox](https://github.com/makeusabrew/bootbox) @@ -135,4 +135,4 @@ Copyright (c) 2012 Makina Corpus, [MIT License](https://github.com/makinacorpus/ * [Leaflet.Locate](https://github.com/domoritz/leaflet-locatecontrol) Copyright (c) 2014 Dominik Moritz, [MIT License](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/LICENSE) * [Font Awesome](http://fontawesome.io/license/) -by Dave Gandy; [SIL OFL 1.1](http://scripts.sil.org/OFL) (Font), MIT License (Code), CC BY 3.0 (Documentation) +by Dave Gandy; [SIL OFL 1.1](https://scripts.sil.org/OFL) (Font), MIT License (Code), CC BY 3.0 (Documentation) diff --git a/css/style.css b/css/style.css index 7e28243..f546044 100644 --- a/css/style.css +++ b/css/style.css @@ -110,7 +110,7 @@ footer { } /* dashed line animation, derived from Chris Coyier and others -http://css-tricks.com/svg-line-animation-works/ +https://css-tricks.com/svg-line-animation-works/ */ .loading-trailer { -webkit-animation: dash 0.4s linear infinite; diff --git a/index.html b/index.html index 00d62b4..94ea82f 100644 --- a/index.html +++ b/index.html @@ -64,11 +64,11 @@
Map data
- © OpenStreetMap contributors - under ODbL + © OpenStreetMap contributors + under ODbL
OpenstreetMap.de tiles
-
openstreetmap.de
+
openstreetmap.de
OpenTopoMap tiles
© OpenTopoMap @@ -77,13 +77,13 @@
Thunderforest tiles
- © Thunderforest - under CC-BY-SA 2.0 + © Thunderforest + under CC-BY-SA 2.0
Waymarked Trails tiles
- © Waymarked Trails - under CC-BY-SA 3.0 DE + © Waymarked Trails + under CC-BY-SA 3.0 DE
BRouter
@@ -139,7 +139,7 @@ Contact:
  • General discussions/questions, support:
    - http://groups.google.com/group/osm-android-bikerouting + https://groups.google.com/group/osm-android-bikerouting
  • Bug reports and feature requests:
      @@ -157,7 +157,7 @@

      Data:
      - This is based on OpenStreetMap. It is usually updated once a week when a new Planet file is available, + This is based on OpenStreetMap. It is usually updated once a week when a new Planet file is available, see dates of data files.

      diff --git a/js/Map.js b/js/Map.js index 8c1f06b..d1930aa 100644 --- a/js/Map.js +++ b/js/Map.js @@ -8,28 +8,28 @@ BR.Map = { var maxZoom = 19; - var osm = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + var osm = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom: maxZoom }); - var osmde = L.tileLayer('http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', { + var osmde = L.tileLayer('https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', { maxNativeZoom: 18, maxZoom: maxZoom }); - var topo = L.tileLayer('http://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', { + var topo = L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', { maxNativeZoom: 17, maxZoom: maxZoom }); - var thunderforestAttribution = 'tiles © Thunderforest ' - + '(CC-BY-SA 2.0)'; + var thunderforestAttribution = 'tiles © Thunderforest ' + + '(CC-BY-SA 2.0)'; var thunderforestAuth = BR.keys.thunderforest ? '?apikey=' + BR.keys.thunderforest : ''; - var cycle = L.tileLayer('http://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' + thunderforestAuth, { + var cycle = L.tileLayer('https://{s}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' + thunderforestAuth, { maxNativeZoom: 18, maxZoom: maxZoom }); - var outdoors = L.tileLayer('http://{s}.tile.thunderforest.com/outdoors/{z}/{x}/{y}.png' + thunderforestAuth, { + var outdoors = L.tileLayer('https://{s}.tile.thunderforest.com/outdoors/{z}/{x}/{y}.png' + thunderforestAuth, { maxNativeZoom: 18, maxZoom: maxZoom }); @@ -39,16 +39,16 @@ BR.Map = { maxZoom: maxZoom, subdomains: ['server', 'services'], attribution: 'World Imagery ' - + '© Esri, sources: ' + + '© Esri, sources: ' + 'Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Getmapping, Aerogrid, IGN, IGP, and the GIS User Community' }); - var cycling = L.tileLayer('http://tile.waymarkedtrails.org/cycling/{z}/{x}/{y}.png', { + var cycling = L.tileLayer('https://tile.waymarkedtrails.org/cycling/{z}/{x}/{y}.png', { maxNativeZoom: 18, opacity: 0.7, maxZoom: maxZoom }); - var hiking = L.tileLayer('http://tile.waymarkedtrails.org/hiking/{z}/{x}/{y}.png', { + var hiking = L.tileLayer('https://tile.waymarkedtrails.org/hiking/{z}/{x}/{y}.png', { maxNativeZoom: 18, opacity: 0.7, maxZoom: maxZoom @@ -86,7 +86,7 @@ BR.Map = { minZoom: 1, maxZoom: 19, attribution: '© DigitalGlobe (' - + 'Terms of Use)' + + 'Terms of Use)' }); baseLayers['DigitalGlobe Recent Imagery'] = recent; } diff --git a/js/Util.js b/js/Util.js index 4ff5d8a..87799fd 100644 --- a/js/Util.js +++ b/js/Util.js @@ -33,12 +33,12 @@ BR.Util = { // check if localStorage is available, especially for catching SecurityError // when cookie settings are blocking access (Chrome, Pale Moon, older Firefox) - // + // // see also https://github.com/Modernizr/Modernizr/blob/master/feature-detects/storage/localstorage.js - // + // // https://developer.mozilla.org/en-US/docs/Web/API/Web_Storage_API/Using_the_Web_Storage_API#Testing_for_support_vs_availability - // by Mozilla Contributors, with modifications; - // Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ + // by Mozilla Contributors, with modifications; + // Any copyright is dedicated to the Public Domain. https://creativecommons.org/publicdomain/zero/1.0/ localStorageAvailable: function() { try { var storage = window.localStorage, diff --git a/js/plugin/Bing.js b/js/plugin/Bing.js index 981820f..ed076b8 100644 --- a/js/plugin/Bing.js +++ b/js/plugin/Bing.js @@ -1,8 +1,8 @@ BR.BingLayer = L.BingLayer.extend({ options: { maxZoom: 19, - attribution: 'Bing Maps' - + ' (TOU)' + attribution: 'Bing Maps' + + ' (TOU)' }, initialize: function(key, options) { @@ -11,7 +11,7 @@ BR.BingLayer = L.BingLayer.extend({ this._logo = L.control({position: 'bottomleft'}); this._logo.onAdd = function (map) { this._div = L.DomUtil.create('div', 'bing-logo'); - this._div.innerHTML = ''; + this._div.innerHTML = ''; return this._div; }; }, diff --git a/js/plugin/Routing.js b/js/plugin/Routing.js index 29559a8..30e39ed 100644 --- a/js/plugin/Routing.js +++ b/js/plugin/Routing.js @@ -152,7 +152,7 @@ BR.Routing = L.Routing.extend({ // transparent than with a single layer and the slider is non-linear. The // inverted formula is used to get the same result as with a single layer. // SVG simple alpha compositing: Ca' = 1 - (1 - Ea) * (1 - Ca) - // http://www.w3.org/TR/SVG11/masking.html#SimpleAlphaBlending + // https://www.w3.org/TR/SVG11/masking.html#SimpleAlphaBlending var sourceOpacity = 1 - Math.sqrt(1 - opacity); this.options.styles.track.opacity = sourceOpacity; diff --git a/js/plugin/Search.js b/js/plugin/Search.js index 373ea86..81e2ce1 100644 --- a/js/plugin/Search.js +++ b/js/plugin/Search.js @@ -8,7 +8,7 @@ BR.Search = L.Control.Geocoder.extend({ onAdd: function (map) { map.attributionControl.addAttribution( - 'search by Nominatim'); + 'search by Nominatim'); return L.Control.Geocoder.prototype.onAdd.call(this, map); }, diff --git a/keys.js.template b/keys.js.template index 2597bd4..a2b4e64 100644 --- a/keys.js.template +++ b/keys.js.template @@ -3,13 +3,13 @@ // COPYING: Please get your own API keys from the sites listed below BR.keys = { - // Bing maps, http://www.microsoft.com/maps/default.aspx + // Bing maps, https://www.microsoft.com/maps/default.aspx bing: '', - + // DigitalGlobe, https://developer.digitalglobe.com/maps-api/#plans digitalGlobe: '', - // Thunderforest, http://thunderforest.com/pricing/ + // Thunderforest, https://thunderforest.com/pricing/ thunderforest: '' };