rebase to master branch

This commit is contained in:
Sascha Hagedorn 2016-07-28 19:23:42 +02:00
commit 0cf2b325e8
6 changed files with 30 additions and 15 deletions

View file

@ -20,7 +20,9 @@
"Leaflet.EasyButton": "*",
"bootbox": "~4.4.0",
"seiyria-bootstrap-slider": "~4.8.1",
"url-search-params": "~0.5.0"
"url-search-params": "~0.5.0",
"Leaflet.RestoreView": "makinacorpus/Leaflet.RestoreView#master",
"leaflet.locatecontrol": "^0.52.0"
},
"overrides": {
"leaflet": {
@ -79,6 +81,9 @@
},
"url-search-params": {
"main": "build/url-search-params.js"
},
"Leaflet.RestoreView": {
"main": "leaflet.restoreview.js"
}
},
"resolutions": {

12
dist/brouter-web.css vendored

File diff suppressed because one or more lines are too long

4
dist/brouter-web.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -78,6 +78,9 @@
zoom: 6,
worldCopyJump: true
});
if (!map.restoreView()) {
map.setView([50.99, 9.86], 6);
}
map.attributionControl.addAttribution(
'<a href="http://brouter.de/brouter" target="_blank">BRouter</a> &copy; Arndt Brenschede, '
+ 'routing + map data &copy; <a target="_blank" href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors '
@ -145,6 +148,11 @@
// left sidebar as additional control position
map._controlCorners[leftPaneId] = L.DomUtil.create('div', 'leaflet-' + leftPaneId, map._controlContainer);
L.control.locate({
icon: 'glyphicon glyphicon-screenshot',
iconLoading: 'glyphicon glyphicon-refresh',
}).addTo(map);
document.getElementById('about_link').onclick = function() {
bootbox.alert({
title: 'About',