Skip to content
Closed
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
2 changes: 1 addition & 1 deletion folium/templates/d3_ref.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.3/d3.min.js" charset="utf-8"></script>
2 changes: 1 addition & 1 deletion folium/templates/dvf_js_ref.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<script src="https://wrobstory.github.io/leaflet-dvf/leaflet-dvf.markers.min.js"></script>
<script src="//wrobstory.github.io/leaflet-dvf/leaflet-dvf.markers.min.js"></script>
12 changes: 6 additions & 6 deletions folium/templates/fol_template.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<!DOCTYPE html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
<script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
<link rel="stylesheet" href="//cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
<script src="//cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>

<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>

<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">

<link rel="stylesheet" href="https://rawgit.com/lvoogdt/Leaflet.awesome-markers/2.0/develop/dist/leaflet.awesome-markers.css">
<script src="https://rawgithub.com/lvoogdt/Leaflet.awesome-markers/2.0/develop/dist/leaflet.awesome-markers.js"></script>
<link rel="stylesheet" href="//rawgit.com/lvoogdt/Leaflet.awesome-markers/2.0/develop/dist/leaflet.awesome-markers.css">
<script src="//rawgithub.com/lvoogdt/Leaflet.awesome-markers/2.0/develop/dist/leaflet.awesome-markers.js"></script>


<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster-src.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster.js"></script>

<link rel="stylesheet" href="http://birdage.github.io/Leaflet.awesome-markers/dist/leaflet.awesome.rotate.css">
<link rel="stylesheet" href="//birdage.github.io/Leaflet.awesome-markers/dist/leaflet.awesome.rotate.css">

{{ dvf_js }}
{{ d3 }}
Expand Down
8 changes: 4 additions & 4 deletions folium/templates/geojson_template.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!DOCTYPE html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
<script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="http://d3js.org/queue.v1.min.js"></script>
<link rel="stylesheet" href="//cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
<script src="//cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.3/d3.min.js" charset="utf-8"></script>
<script src="//d3js.org/queue.v1.min.js"></script>

{{ dvf_js }}
{{ topojson }}
Expand Down
2 changes: 1 addition & 1 deletion folium/templates/ipynb_init_css.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.css" />
<link rel="stylesheet" href="//cdn.leafletjs.com/leaflet-0.7.2/leaflet.css" />
<style>
.leaflet-popup-content {
color: black !important;
Expand Down
12 changes: 6 additions & 6 deletions folium/templates/ipynb_init_js.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

var load_folium_libs = function(){
console.log('Loading all Folium libraries...')
$.getScript("http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.js", function(){
$.getScript('https://wrobstory.github.io/leaflet-dvf/leaflet-dvf.markers.min.js', function(){
$.getScript("//cdn.leafletjs.com/leaflet-0.7.2/leaflet.js", function(){
$.getScript('//wrobstory.github.io/leaflet-dvf/leaflet-dvf.markers.min.js', function(){
if (window['vg'] === undefined){
$.getScript("http://wrobstory.github.io/vega/vega.v1.3.3.js", function(){
$.getScript("//wrobstory.github.io/vega/vega.v1.3.3.js", function(){
load_folium_charts();
});
} else {
Expand All @@ -27,9 +27,9 @@
if(typeof define === "function" && define.amd){
var load_paths = {
paths: {
topojson:'http://d3js.org/topojson.v1.min',
queue: 'http://d3js.org/queue.v1.min',
d3: 'http://d3js.org/d3.v3.min'
topojson:'//d3js.org/topojson.v1.min',
queue: '//d3js.org/queue.v1.min',
d3: '//d3js.org/d3.v3.min'
}
};
var libs = ['d3', 'queue', 'topojson'];
Expand Down
2 changes: 1 addition & 1 deletion folium/templates/jquery_ref.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<script src="https://code.jquery.com/jquery-2.1.0.min.js"></script>
<script src="//code.jquery.com/jquery-2.1.0.min.js"></script>
73 changes: 71 additions & 2 deletions folium/templates/leaflet-dvf.markers.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion folium/templates/tiles/cloudmade/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map data (c) <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery (c) <a href="http://cloudmade.com">CloudMade</a>
Map data (c) <a href="//openstreetmap.org">OpenStreetMap</a> contributors, <a href="//creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery (c) <a href="//cloudmade.com">CloudMade</a>
2 changes: 1 addition & 1 deletion folium/templates/tiles/cloudmade/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://{s}.tile.cloudmade.com/{{ API_key }}/997/256/{z}/{x}/{y}.png
//{s}.tile.cloudmade.com/{{ API_key }}/997/256/{z}/{x}/{y}.png
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapbox/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map tiles by <a href="http://www.mapbox.com/m">Mapbox</a> Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
Map tiles by <a href="//www.mapbox.com/m">Mapbox</a> Data by <a href="//openstreetmap.org">OpenStreetMap</a>, under <a href="//creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapbox/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://{s}.tiles.mapbox.com/v3/{{ API_key }}/{z}/{x}/{y}.png
//{s}.tiles.mapbox.com/v3/{{ API_key }}/{z}/{x}/{y}.png
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapboxbright/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map tiles by <a href="http://www.mapbox.com/m">Mapbox</a> Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
Map tiles by <a href="//www.mapbox.com/m">Mapbox</a> Data by <a href="//openstreetmap.org">OpenStreetMap</a>, under <a href="//creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapboxbright/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://{s}.tiles.mapbox.com/v3/mapbox.world-bright/{z}/{x}/{y}.png
//{s}.tiles.mapbox.com/v3/mapbox.world-bright/{z}/{x}/{y}.png
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapboxcontrolroom/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map tiles by <a href="http://www.mapbox.com/m">Mapbox</a> Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
Map tiles by <a href="//www.mapbox.com/m">Mapbox</a> Data by <a href="//openstreetmap.org">OpenStreetMap</a>, under <a href="//creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapboxcontrolroom/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://{s}.tiles.mapbox.com/v3/mapbox.control-room/{z}/{x}/{y}.png
//{s}.tiles.mapbox.com/v3/mapbox.control-room/{z}/{x}/{y}.png
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapquestopen/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map tiles by <a href="http://open.mapquest.com/">MapQuest</a> Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
Map tiles by <a href="//open.mapquest.com/">MapQuest</a> Data by <a href="//openstreetmap.org">OpenStreetMap</a>, under <a href="//creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapquestopen/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png
//otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapquestopenaerial/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map tiles by <a href="http://open.mapquest.com/">MapQuest Open Aerial</a>.Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, FarmService Agency.
Map tiles by <a href="//open.mapquest.com/">MapQuest Open Aerial</a>.Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, FarmService Agency.
Expand Down
2 changes: 1 addition & 1 deletion folium/templates/tiles/mapquestopenaerial/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png
//otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png
2 changes: 1 addition & 1 deletion folium/templates/tiles/openstreetmap/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map data (c) <a href="http://openstreetmap.org">OpenStreetMap</a> contributors
Map data (c) <a href="//openstreetmap.org">OpenStreetMap</a> contributors
2 changes: 1 addition & 1 deletion folium/templates/tiles/openstreetmap/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
2 changes: 1 addition & 1 deletion folium/templates/tiles/stamenterrain/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
Map tiles by <a href="//stamen.com">Stamen Design</a>, under <a href="//creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="//openstreetmap.org">OpenStreetMap</a>, under <a href="//creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
2 changes: 1 addition & 1 deletion folium/templates/tiles/stamenterrain/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://{s}.tile.stamen.com/terrain/{z}/{x}/{y}.jpg
//{s}.tile.stamen.com/terrain/{z}/{x}/{y}.jpg
2 changes: 1 addition & 1 deletion folium/templates/tiles/stamentoner/attr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
Map tiles by <a href="//stamen.com">Stamen Design</a>, under <a href="//creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="//openstreetmap.org">OpenStreetMap</a>, under <a href="//creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
2 changes: 1 addition & 1 deletion folium/templates/tiles/stamentoner/tiles.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.jpg
//{s}.tile.stamen.com/toner/{z}/{x}/{y}.jpg
2 changes: 1 addition & 1 deletion folium/templates/topojson_ref.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<script src="http://d3js.org/topojson.v1.min.js"></script>
<script src="//d3js.org/topojson.v1.min.js"></script>
2 changes: 1 addition & 1 deletion folium/templates/vega_ref.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<script src="http://trifacta.github.io/vega/vega.js"></script>
<script src="//trifacta.github.io/vega/vega.js"></script>