Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use https scheme whenever possible, to avoid mixed content issues #87

Merged
merged 1 commit into from
May 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)
2 changes: 1 addition & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ <h4 class="modal-title">Credits</h4>
<dl>
<dt>Map data</dt>
<dd>
&copy; <a target="_blank" href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>
under <a target="_blank" href="http://opendatacommons.org/licenses/odbl/">ODbL</a>
&copy; <a target="_blank" href="https://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>
under <a target="_blank" href="https://opendatacommons.org/licenses/odbl/">ODbL</a>
</dd>
<dt>OpenstreetMap.de tiles</dt>
<dd><a target="_blank" href="http://openstreetmap.de/karte.html">openstreetmap.de</a></dd>
<dd><a target="_blank" href="https://openstreetmap.de/karte.html">openstreetmap.de</a></dd>
<dt>OpenTopoMap tiles</dt>
<dd>
&copy; <a target="_blank" href="https://opentopomap.org">OpenTopoMap</a>
Expand All @@ -77,13 +77,13 @@ <h4 class="modal-title">Credits</h4>
</dd>
<dt>Thunderforest tiles</dt>
<dd>
&copy; <a target="_blank" href="http://www.thunderforest.com">Thunderforest</a>
under <a target="_blank" href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA 2.0</a>
&copy; <a target="_blank" href="https://www.thunderforest.com">Thunderforest</a>
under <a target="_blank" href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA 2.0</a>
</dd>
<dt>Waymarked Trails tiles</dt>
<dd>
&copy; <a target="_blank" href="http://cycling.waymarkedtrails.org">Waymarked Trails</a>
under <a target="_blank" href="http://creativecommons.org/licenses/by-sa/3.0/de/deed.en">CC-BY-SA 3.0 DE</a>
&copy; <a target="_blank" href="https://cycling.waymarkedtrails.org">Waymarked Trails</a>
under <a target="_blank" href="https://creativecommons.org/licenses/by-sa/3.0/de/deed.en">CC-BY-SA 3.0 DE</a>
</dd>
<dt>BRouter</dt>
<dd>
Expand Down Expand Up @@ -139,7 +139,7 @@ <h4 class="modal-title">About</h4>
<i>Contact:</i><br>
<ul>
<li>General discussions/questions, support:<br>
<a href="http://groups.google.com/group/osm-android-bikerouting" target="_blank">http://groups.google.com/group/osm-android-bikerouting</a>
<a href="https://groups.google.com/group/osm-android-bikerouting" target="_blank">https://groups.google.com/group/osm-android-bikerouting</a>
</li>
<li>Bug reports and feature requests:
<ul>
Expand All @@ -157,7 +157,7 @@ <h4 class="modal-title">About</h4>
</p>
<p>
<i>Data:</i><br>
This is based on <a href="http://www.openstreetmap.org" target="_blank">OpenStreetMap</a>. It is usually updated once a week when a new Planet file is available,
This is based on <a href="https://www.openstreetmap.org" target="_blank">OpenStreetMap</a>. It is usually updated once a week when a new Planet file is available,
see dates of <a href="http://brouter.de/brouter/segments4/" target="_blank">data files</a>.
</p>
<p>
Expand Down
22 changes: 11 additions & 11 deletions js/Map.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 &copy; <a target="_blank" href="http://www.thunderforest.com">Thunderforest</a> '
+ '(<a target="_blank" href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA 2.0</a>)';
var thunderforestAttribution = 'tiles &copy; <a target="_blank" href="https://www.thunderforest.com">Thunderforest</a> '
+ '(<a target="_blank" href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA 2.0</a>)';
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
});
Expand All @@ -39,16 +39,16 @@ BR.Map = {
maxZoom: maxZoom,
subdomains: ['server', 'services'],
attribution: '<a target="_blank" href="http://goto.arcgisonline.com/maps/World_Imagery">World Imagery</a> '
+ '&copy; <a target="_blank" href="http://www.esri.com/">Esri</a>, sources: '
+ '&copy; <a target="_blank" href="https://www.esri.com/">Esri</a>, 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
Expand Down Expand Up @@ -86,7 +86,7 @@ BR.Map = {
minZoom: 1,
maxZoom: 19,
attribution: '&copy; <a href="https://www.digitalglobe.com/platforms/mapsapi">DigitalGlobe</a> ('
+ '<a href="http://bit.ly/mapsapiview">Terms of Use</a>)'
+ '<a href="https://bit.ly/mapsapiview">Terms of Use</a>)'
});
baseLayers['DigitalGlobe Recent Imagery'] = recent;
}
Expand Down
8 changes: 4 additions & 4 deletions js/Util.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions js/plugin/Bing.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
BR.BingLayer = L.BingLayer.extend({
options: {
maxZoom: 19,
attribution: '<a target="_blank" href="http://www.bing.com/maps/">Bing Maps</a>'
+ ' (<a target="_blank" href="http://go.microsoft.com/?linkid=9710837">TOU</a>)'
attribution: '<a target="_blank" href="https://www.bing.com/maps/">Bing Maps</a>'
+ ' (<a target="_blank" href="https://go.microsoft.com/?linkid=9710837">TOU</a>)'
},

initialize: function(key, options) {
Expand All @@ -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 = '<img src="http://www.microsoft.com/maps/images/branding/Bing%20logo%20white_50px-19px.png">';
this._div.innerHTML = '<img src="https://www.microsoft.com/maps/images/branding/Bing%20logo%20white_50px-19px.png">';
return this._div;
};
},
Expand Down
2 changes: 1 addition & 1 deletion js/plugin/Routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion js/plugin/Search.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BR.Search = L.Control.Geocoder.extend({

onAdd: function (map) {
map.attributionControl.addAttribution(
'search by <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim</a>');
'search by <a href="https://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim</a>');

return L.Control.Geocoder.prototype.onAdd.call(this, map);
},
Expand Down
6 changes: 3 additions & 3 deletions keys.js.template
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
};

Expand Down