Merge branch 'feature/leaflet1.6' into develop

www/external/TileLayer.Grayscale.js

@@ -4,45 +4,50 @@
 
 L.TileLayer.Grayscale = L.TileLayer.extend({
 	options: {
-		enableCanvas: true
+		quotaRed: 21,
+		quotaGreen: 71,
+		quotaBlue: 8,
+		quotaDividerTune: 0,
+		quotaDivider: function() {
+			return this.quotaRed + this.quotaGreen + this.quotaBlue + this.quotaDividerTune;
+		}
 	},
 
 	initialize: function (url, options) {
-		var canvasEl = document.createElement('canvas');
+		options = options || {}
-		if( !(canvasEl.getContext && canvasEl.getContext('2d')) ) {
+		options.crossOrigin = true;
-			options.enableCanvas = false;
-		}
-
 		L.TileLayer.prototype.initialize.call(this, url, options);
+
+		this.on('tileload', function(e) {
+			this._makeGrayscale(e.tile);
+		});
 	},
 
-	_loadTile: function (tile, tilePoint) {
+	_createTile: function () {
-		tile.setAttribute('crossorigin', 'anonymous');
+		var tile = L.TileLayer.prototype._createTile.call(this);
-		L.TileLayer.prototype._loadTile.call(this, tile, tilePoint);
+		tile.crossOrigin = "Anonymous";
+		return tile;
 	},
 
-	_tileOnLoad: function () {
+	_makeGrayscale: function (img) {
-		if (this._layer.options.enableCanvas && !this.canvasContext) {
+		if (img.getAttribute('data-grayscaled'))
+			return;
+
+                img.crossOrigin = '';
 		var canvas = document.createElement("canvas");
-			canvas.width = canvas.height = this._layer.options.tileSize;
+		canvas.width = img.width;
-			this.canvasContext = canvas.getContext("2d");
+		canvas.height = img.height;
-		}
+		var ctx = canvas.getContext("2d");
-		var ctx = this.canvasContext;
+		ctx.drawImage(img, 0, 0);
 
-		if (ctx) {
+		var imgd = ctx.getImageData(0, 0, canvas.width, canvas.height);
-			this.onload  = null; // to prevent an infinite loop
-			ctx.drawImage(this, 0, 0);
-			var imgd = ctx.getImageData(0, 0, this._layer.options.tileSize, this._layer.options.tileSize);
 		var pix = imgd.data;
 		for (var i = 0, n = pix.length; i < n; i += 4) {
-				pix[i] = pix[i + 1] = pix[i + 2] = (3 * pix[i] + 4 * pix[i + 1] + pix[i + 2]) / 8;
+                        pix[i] = pix[i + 1] = pix[i + 2] = (this.options.quotaRed * pix[i] + this.options.quotaGreen * pix[i + 1] + this.options.quotaBlue * pix[i + 2]) / this.options.quotaDivider();
 		}
 		ctx.putImageData(imgd, 0, 0);
-			this.removeAttribute("crossorigin");
+		img.setAttribute('data-grayscaled', true);
-			this.src = ctx.canvas.toDataURL();
+		img.src = canvas.toDataURL();
-		}
-
-		L.TileLayer.prototype._tileOnLoad.call(this);
 	}
 });
 

www/external/css/dvf.css

@@ -1,207 +0,0 @@
-div.leaflet-div-icon {
-	text-align: center;
-	vertical-align: middle;
-	border-radius: 4px;
-	padding: 2px 2px 0px 2px;
-	font-size: small;
-	margin: 0px auto;
-	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-	width: auto;
-	background: '#fff';
-	background-color: #f5f5f5;
-	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: linear-gradient(top, #ffffff, #e6e6e6);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
-	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-	filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-	border: 1px solid #cccccc;
-	border-bottom-color: #b3b3b3;
-	-webkit-border-radius: 10px;
-	-moz-border-radius: 10px;
-	border-radius: 10px;
-	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-div.leaflet-div-icon div {
-	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;	
-	margin: 0px;	
-	padding: 0px;	
-	line-height: 12px;
-}
-
-div.leaflet-div-icon div div {
-	display: block;
-	font-size: xx-small;
-}
-
-div.legend-content {
-	margin: 0px;
-	padding: 0px;
-}
-
-div.legend-box {
-	width: 10px;
-	height: 10px;
-	display: inline-block;
-	margin-right: 8px;
-	border: solid 1px #000;
-	margin-bottom: 0px;
-}
-
-div.leaflet-div-icon div div.legend-box  {
-	width: 5px;
-	height: 5px;
-	display: inline-block;
-	margin-right: 4px;
-	margin-bottom: 0px;
-}
-
-div.leaflet-div-icon div div.key {
-	margin: 2px 4px 0px 0px;
-	font-weight: bold;
-	line-height: 10px;
-	display: inline-block;
-}
-
-.data-layer-legend div {
-	display: inline-block;
-	font-size: small;
-}
-
-.data-layer-legend .legend-box, .data-layer-legend .key {
-	vertical-align: middle;
-}
-
-.choropleth-text {
-	font-size: x-small;
-	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;	
-	vertical-align: middle;
-	text-align: center;
-}
-
-.scale-bars i {
-	vertical-align: bottom;
-	display: inline-block;
-	background-color: silver;
-	height: 14px;
-}
-
-.min-value, .max-value {
-	vertical-align: middle;
-	width: 50px;
-}
-
-.min-value {
-	text-align: right;
-	margin-right: 6px;
-}
-
-.max-value {
-	text-align: left;
-	margin-left: 6px;
-}
-
-.scale-value {
-	text-align: center;
-	position: relative;
-}
-
-.data-layer-legend {
-	padding: 8px 0px 0px 0px;
-}
-
-.scale-bars {
-	vertical-align: middle;
-	line-height: 10px;
-}
-
-.legend-title {
-	font-weight: bold;
-}
-
-.leaflet-popup-content {
-	overflow: auto;
-	max-height: 300px;
-}
-
-.palette-element {
-	display: inline-block;
-	width: 12px;
-	height: 14px;
-}
-
-.leaflet-control-legend {
-	background-color: rgba(255, 255, 255, 0.7);
-	padding: 0px;
-	border-radius: 4px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	max-height: 70px;
-	width: 268px;
-	box-shadow: 0 1px 7px #999;
-	overflow: hidden;
-}
-
-.leaflet-control-legend.larger {
-	max-height: 50%;
-	overflow: auto;
-}
-
-.leaflet-control-legend .legend {
-	padding: 10px;
-}
-
-.leaflet-control-legend i {
-	background-image: none;
-	vertical-align: text-bottom;
-}
-
-.photo {
-	width: 100%;
-	height: 100%;
-	padding: 2px;
-	background-color: white;
-	box-shadow: 2px 2px 3px rgba(100, 100, 100, 0.5);
-	opacity: 0;
-	-moz-transition: opacity 1s; /* Firefox 4 */
-	-webkit-transition: opacity 1s; /* Safari and Chrome */
-	-o-transition: opacity 1s;
-	transition: opacity 1s;
-}
-
-.photo-info {
-	background-color: rgba(0, 0, 0, 0.6);
-	padding: 10px;
-	position: absolute;
-	top: 0px;
-	color: white;
-	margin: 2px;
-}
-
-.photo-link {
-	float: right;
-	height: 14px;
-}
-
-.author-link {
-	margin-left: 2px;
-	width: 400px;
-	display: block;
-	font-style: italic;
-	font-weight: bold;
-}
-
-text.leaflet-svg-text {
-	alignment-baseline: central;
-	dominant-baseline: central;
-	text-anchor: middle;
-}
-

www/external/css/leaflet.label.css

@@ -1,54 +0,0 @@
-.leaflet-label {
-	background: rgb(235, 235, 235);
-	background: rgba(235, 235, 235, 0.81);
-	background-clip: padding-box;
-	border-color: #777;
-	border-color: rgba(0,0,0,0.25);
-	border-radius: 4px;
-	border-style: solid;
-	border-width: 4px;
-	color: #111;
-	display: block;
-	font: 12px/20px "Helvetica Neue", Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	padding: 1px 6px;
-	position: absolute;
-	-webkit-user-select: none;
-	   -moz-user-select: none;
-	    -ms-user-select: none;
-	        user-select: none;
-	pointer-events: none;
-	white-space: nowrap;
-	z-index: 6;
-}
-
-.leaflet-label.leaflet-clickable {
-	cursor: pointer;
-	pointer-events: auto;
-}
-
-.leaflet-label:before,
-.leaflet-label:after {
-	border-top: 6px solid transparent;
-	border-bottom: 6px solid transparent;
-	content: none;
-	position: absolute;
-	top: 5px;
-}
-
-.leaflet-label:before {
-	border-right: 6px solid black;
-	border-right-color: inherit;
-	left: -10px;
-}
-
-.leaflet-label:after {
-	border-left: 6px solid black;
-	border-left-color: inherit;
-	right: -10px;
-}
-
-.leaflet-label-right:before,
-.leaflet-label-left:after {
-	content: "";
-}

www/external/leaflet.css

@@ -1,478 +0,0 @@
-/* required styles */
-
-.leaflet-map-pane,
-.leaflet-tile,
-.leaflet-marker-icon,
-.leaflet-marker-shadow,
-.leaflet-tile-pane,
-.leaflet-tile-container,
-.leaflet-overlay-pane,
-.leaflet-shadow-pane,
-.leaflet-marker-pane,
-.leaflet-popup-pane,
-.leaflet-overlay-pane svg,
-.leaflet-zoom-box,
-.leaflet-image-layer,
-.leaflet-layer {
-	position: absolute;
-	left: 0;
-	top: 0;
-	}
-.leaflet-container {
-	overflow: hidden;
-	-ms-touch-action: none;
-	}
-.leaflet-tile,
-.leaflet-marker-icon,
-.leaflet-marker-shadow {
-	-webkit-user-select: none;
-	   -moz-user-select: none;
-	        user-select: none;
-	-webkit-user-drag: none;
-	}
-.leaflet-marker-icon,
-.leaflet-marker-shadow {
-	display: block;
-	}
-/* map is broken in FF if you have max-width: 100% on tiles */
-.leaflet-container img {
-	max-width: none !important;
-	}
-/* stupid Android 2 doesn't understand "max-width: none" properly */
-.leaflet-container img.leaflet-image-layer {
-	max-width: 15000px !important;
-	}
-.leaflet-tile {
-	filter: inherit;
-	visibility: hidden;
-	}
-.leaflet-tile-loaded {
-	visibility: inherit;
-	}
-.leaflet-zoom-box {
-	width: 0;
-	height: 0;
-	}
-/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
-.leaflet-overlay-pane svg {
-	-moz-user-select: none;
-	}
-
-.leaflet-tile-pane    { z-index: 2; }
-.leaflet-objects-pane { z-index: 3; }
-.leaflet-overlay-pane { z-index: 4; }
-.leaflet-shadow-pane  { z-index: 5; }
-.leaflet-marker-pane  { z-index: 6; }
-.leaflet-popup-pane   { z-index: 7; }
-
-.leaflet-vml-shape {
-	width: 1px;
-	height: 1px;
-	}
-.lvml {
-	behavior: url(#default#VML);
-	display: inline-block;
-	position: absolute;
-	}
-
-
-/* control positioning */
-
-.leaflet-control {
-	position: relative;
-	z-index: 7;
-	pointer-events: auto;
-	}
-.leaflet-top,
-.leaflet-bottom {
-	position: absolute;
-	z-index: 1000;
-	pointer-events: none;
-	}
-.leaflet-top {
-	top: 0;
-	}
-.leaflet-right {
-	right: 0;
-	}
-.leaflet-bottom {
-	bottom: 0;
-	}
-.leaflet-left {
-	left: 0;
-	}
-.leaflet-control {
-	float: left;
-	clear: both;
-	}
-.leaflet-right .leaflet-control {
-	float: right;
-	}
-.leaflet-top .leaflet-control {
-	margin-top: 10px;
-	}
-.leaflet-bottom .leaflet-control {
-	margin-bottom: 10px;
-	}
-.leaflet-left .leaflet-control {
-	margin-left: 10px;
-	}
-.leaflet-right .leaflet-control {
-	margin-right: 10px;
-	}
-
-
-/* zoom and fade animations */
-
-.leaflet-fade-anim .leaflet-tile,
-.leaflet-fade-anim .leaflet-popup {
-	opacity: 0;
-	-webkit-transition: opacity 0.2s linear;
-	   -moz-transition: opacity 0.2s linear;
-	     -o-transition: opacity 0.2s linear;
-	        transition: opacity 0.2s linear;
-	}
-.leaflet-fade-anim .leaflet-tile-loaded,
-.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
-	opacity: 1;
-	}
-
-.leaflet-zoom-anim .leaflet-zoom-animated {
-	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-	     -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
-	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
-	}
-.leaflet-zoom-anim .leaflet-tile,
-.leaflet-pan-anim .leaflet-tile,
-.leaflet-touching .leaflet-zoom-animated {
-	-webkit-transition: none;
-	   -moz-transition: none;
-	     -o-transition: none;
-	        transition: none;
-	}
-
-.leaflet-zoom-anim .leaflet-zoom-hide {
-	visibility: hidden;
-	}
-
-
-/* cursors */
-
-.leaflet-clickable {
-	cursor: pointer;
-	}
-.leaflet-container {
-	cursor: -webkit-grab;
-	cursor:    -moz-grab;
-	}
-.leaflet-popup-pane,
-.leaflet-control {
-	cursor: auto;
-	}
-.leaflet-dragging .leaflet-container,
-.leaflet-dragging .leaflet-clickable {
-	cursor: move;
-	cursor: -webkit-grabbing;
-	cursor:    -moz-grabbing;
-	}
-
-
-/* visual tweaks */
-
-.leaflet-container {
-	background: #ddd;
-	outline: 0;
-	}
-.leaflet-container a {
-	color: #0078A8;
-	}
-.leaflet-container a.leaflet-active {
-	outline: 2px solid orange;
-	}
-.leaflet-zoom-box {
-	border: 2px dotted #38f;
-	background: rgba(255,255,255,0.5);
-	}
-
-
-/* general typography */
-.leaflet-container {
-	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-	}
-
-
-/* general toolbar styles */
-
-.leaflet-bar {
-	box-shadow: 0 1px 5px rgba(0,0,0,0.65);
-	border-radius: 4px;
-	}
-.leaflet-bar a,
-.leaflet-bar a:hover {
-	background-color: #fff;
-	border-bottom: 1px solid #ccc;
-	width: 26px;
-	height: 26px;
-	line-height: 26px;
-	display: block;
-	text-align: center;
-	text-decoration: none;
-	color: black;
-	}
-.leaflet-bar a,
-.leaflet-control-layers-toggle {
-	background-position: 50% 50%;
-	background-repeat: no-repeat;
-	display: block;
-	}
-.leaflet-bar a:hover {
-	background-color: #f4f4f4;
-	}
-.leaflet-bar a:first-child {
-	border-top-left-radius: 4px;
-	border-top-right-radius: 4px;
-	}
-.leaflet-bar a:last-child {
-	border-bottom-left-radius: 4px;
-	border-bottom-right-radius: 4px;
-	border-bottom: none;
-	}
-.leaflet-bar a.leaflet-disabled {
-	cursor: default;
-	background-color: #f4f4f4;
-	color: #bbb;
-	}
-
-.leaflet-touch .leaflet-bar a {
-	width: 30px;
-	height: 30px;
-	line-height: 30px;
-	}
-
-
-/* zoom control */
-
-.leaflet-control-zoom-in,
-.leaflet-control-zoom-out {
-	font: bold 18px 'Lucida Console', Monaco, monospace;
-	text-indent: 1px;
-	}
-.leaflet-control-zoom-out {
-	font-size: 20px;
-	}
-
-.leaflet-touch .leaflet-control-zoom-in {
-	font-size: 22px;
-	}
-.leaflet-touch .leaflet-control-zoom-out {
-	font-size: 24px;
-	}
-
-
-/* layers control */
-
-.leaflet-control-layers {
-	box-shadow: 0 1px 5px rgba(0,0,0,0.4);
-	background: #fff;
-	border-radius: 5px;
-	}
-.leaflet-control-layers-toggle {
-	background-image: url(images/layers.png);
-	width: 36px;
-	height: 36px;
-	}
-.leaflet-retina .leaflet-control-layers-toggle {
-	background-image: url(images/layers-2x.png);
-	background-size: 26px 26px;
-	}
-.leaflet-touch .leaflet-control-layers-toggle {
-	width: 44px;
-	height: 44px;
-	}
-.leaflet-control-layers .leaflet-control-layers-list,
-.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
-	display: none;
-	}
-.leaflet-control-layers-expanded .leaflet-control-layers-list {
-	display: block;
-	position: relative;
-	}
-.leaflet-control-layers-expanded {
-	padding: 6px 10px 6px 6px;
-	color: #333;
-	background: #fff;
-	}
-.leaflet-control-layers-selector {
-	margin-top: 2px;
-	position: relative;
-	top: 1px;
-	}
-.leaflet-control-layers label {
-	display: block;
-	}
-.leaflet-control-layers-separator {
-	height: 0;
-	border-top: 1px solid #ddd;
-	margin: 5px -10px 5px -6px;
-	}
-
-
-/* attribution and scale controls */
-
-.leaflet-container .leaflet-control-attribution {
-	background: #fff;
-	background: rgba(255, 255, 255, 0.7);
-	margin: 0;
-	}
-.leaflet-control-attribution,
-.leaflet-control-scale-line {
-	padding: 0 5px;
-	color: #333;
-	}
-.leaflet-control-attribution a {
-	text-decoration: none;
-	}
-.leaflet-control-attribution a:hover {
-	text-decoration: underline;
-	}
-.leaflet-container .leaflet-control-attribution,
-.leaflet-container .leaflet-control-scale {
-	font-size: 11px;
-	}
-.leaflet-left .leaflet-control-scale {
-	margin-left: 5px;
-	}
-.leaflet-bottom .leaflet-control-scale {
-	margin-bottom: 5px;
-	}
-.leaflet-control-scale-line {
-	border: 2px solid #777;
-	border-top: none;
-	line-height: 1.1;
-	padding: 2px 5px 1px;
-	font-size: 11px;
-	white-space: nowrap;
-	overflow: hidden;
-	-moz-box-sizing: content-box;
-	     box-sizing: content-box;
-
-	background: #fff;
-	background: rgba(255, 255, 255, 0.5);
-	}
-.leaflet-control-scale-line:not(:first-child) {
-	border-top: 2px solid #777;
-	border-bottom: none;
-	margin-top: -2px;
-	}
-.leaflet-control-scale-line:not(:first-child):not(:last-child) {
-	border-bottom: 2px solid #777;
-	}
-
-.leaflet-touch .leaflet-control-attribution,
-.leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-bar {
-	box-shadow: none;
-	}
-.leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-bar {
-	border: 2px solid rgba(0,0,0,0.2);
-	background-clip: padding-box;
-	}
-
-
-/* popup */
-
-.leaflet-popup {
-	position: absolute;
-	text-align: center;
-	}
-.leaflet-popup-content-wrapper {
-	padding: 1px;
-	text-align: left;
-	border-radius: 12px;
-	}
-.leaflet-popup-content {
-	margin: 13px 19px;
-	line-height: 1.4;
-	}
-.leaflet-popup-content p {
-	margin: 18px 0;
-	}
-.leaflet-popup-tip-container {
-	margin: 0 auto;
-	width: 40px;
-	height: 20px;
-	position: relative;
-	overflow: hidden;
-	}
-.leaflet-popup-tip {
-	width: 17px;
-	height: 17px;
-	padding: 1px;
-
-	margin: -10px auto 0;
-
-	-webkit-transform: rotate(45deg);
-	   -moz-transform: rotate(45deg);
-	    -ms-transform: rotate(45deg);
-	     -o-transform: rotate(45deg);
-	        transform: rotate(45deg);
-	}
-.leaflet-popup-content-wrapper,
-.leaflet-popup-tip {
-	background: white;
-
-	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
-	}
-.leaflet-container a.leaflet-popup-close-button {
-	position: absolute;
-	top: 0;
-	right: 0;
-	padding: 4px 4px 0 0;
-	text-align: center;
-	width: 18px;
-	height: 14px;
-	font: 16px/14px Tahoma, Verdana, sans-serif;
-	color: #c3c3c3;
-	text-decoration: none;
-	font-weight: bold;
-	background: transparent;
-	}
-.leaflet-container a.leaflet-popup-close-button:hover {
-	color: #999;
-	}
-.leaflet-popup-scrolled {
-	overflow: auto;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #ddd;
-	}
-
-.leaflet-oldie .leaflet-popup-content-wrapper {
-	zoom: 1;
-	}
-.leaflet-oldie .leaflet-popup-tip {
-	width: 24px;
-	margin: 0 auto;
-
-	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
-	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
-	}
-.leaflet-oldie .leaflet-popup-tip-container {
-	margin-top: -1px;
-	}
-
-.leaflet-oldie .leaflet-control-zoom,
-.leaflet-oldie .leaflet-control-layers,
-.leaflet-oldie .leaflet-popup-content-wrapper,
-.leaflet-oldie .leaflet-popup-tip {
-	border: 1px solid #999;
-	}
-
-
-/* div icon */
-
-.leaflet-div-icon {
-	background: #fff;
-	border: 1px solid #666;
-	}

www/external/leaflet.easyPrint.js

@@ -1,28 +0,0 @@
-
-
-L.Control.EasyPrint = L.Control.extend({
-    options: {
-        position: 'topright',
-        title: 'Print map',
-    },
-
-    onAdd: function () {
-        var container = L.DomUtil.create('div', 'leaflet-control-easyPrint leaflet-bar leaflet-control');
-
-        this.link = L.DomUtil.create('a', 'leaflet-control-easyPrint-button leaflet-bar-part', container);
-        this.link.href = 'javascript:void($("#map").print({stylesheet:"external/easyPrint.css"}))';
-
-        return container;
-    },
-    
-  
-    _click: function (e) {
-        L.DomEvent.stopPropagation(e);
-        L.DomEvent.preventDefault(e);
-    },
-});
-
-L.easyPrint = function() {
-  return new L.Control.EasyPrint();
-};
-

www/index.html.de

@@ -11,10 +11,10 @@
 	<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/cupertino/jquery-ui.css" />
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/css/theme.blue.min.css" integrity="sha512-jJ9r3lTLaH5XXa9ZOsCQU8kLvxdAVzyTWO/pnzdZrshJQfnw1oevJFpoyCDr7K1lqt1hUgqoxA5e2PctVtlSTg==" crossorigin="anonymous" />
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/css/jquery.tablesorter.pager.min.css" integrity="sha512-TWYBryfpFn3IugX13ZCIYHNK3/2sZk3dyXMKp3chZL+0wRuwFr1hDqZR9Qd5SONzn+Lja10hercP2Xjuzz5O3g==" crossorigin="anonymous" />
-	<link rel="stylesheet" href="external/leaflet.css" />
+	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.css" integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin="anonymous" />
-	<!-- link rel="stylesheet" href="external/css/dvf.css" type="text/css" media="screen" / -->
+	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.1/css/dvf.min.css" integrity="sha512-Ts/IYE5D8PaMBUDHcf6O57lOiV923cai3sEXo0WjhakpTxlwodQQJx1YA2t1mDUKO6fIXEngkKFLQNMXK/kBZg==" crossorigin="anonymous" />
-	<link rel="stylesheet" href="external/css/leaflet.label.css" type="text/css" media="screen" />
+	<link type="text/css" rel="stylesheet" href="https://api.mqcdn.com/sdk/mapquest-js/v1.3.2/mapquest.css"/>
-	<link rel="stylesheet" href="external/css/easyPrint.css"/>
+	<link rel="stylesheet" href="external/easyPrint/easyPrint.css"/>
 
 	<!-- jQuery & jQueryUI -->
 	<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
@@ -32,14 +32,11 @@
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/widgets/widget-scroller.min.js" integrity="sha512-1D2qKse1/4gCgLbgmBBv+9fJluAeJIlDgzIyZkovd1xmoyh1SW30lMIzCrD2X8Xs/sIzitUNDy86YagJRSUmaA==" crossorigin="anonymous"></script>
 
 	<!-- Leaflet -->
-	<script type="text/javascript" src="external/leaflet.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.6.0/leaflet.js" integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew==" crossorigin="anonymous"></script>
-	<script type="text/javascript" src="external/TileLayer.Grayscale.js"></script>
+	<!-- <script type="text/javascript" src="external/TileLayer.Grayscale.js"></script> --> <! version of 2017-11-01 downloaded 2020-07-15 -->
-	<script type="text/javascript" src="external/leaflet-dvf.markers.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.1/leaflet-dvf.markers.min.js" integrity="sha512-R/iucaxFnDFUTdZRxUvxzc+sypDQhqnxInBmNjgGE0RaiMl/ektVB1wFS/L0xDZmLFPpEGR0Kw3GEBgtQNFHyg==" crossorigin="anonymous"></script>
-	<script type="text/javascript" src="external/leaflet.label.js"></script>
 	<script src="external/jQuery.print.min.js"></script>
-	<script src="external/leaflet.easyPrint.js"></script>
+	<script src="external/easyPrint/bundle.js"></script>
-	<script src="https://open.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=RPOPuz3lA2GGBtVpEU0ugxtVoGba53Dt"></script>
-	<!-- <script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=RPOPuz3lA2GGBtVpEU0ugxtVoGba53Dt"></script> -->
 	
 	<!-- Map, Events & Stations -->
 	<script type="text/javascript" src="misc.js"></script>

www/map.js

@@ -35,7 +35,7 @@ function addStationMarker(id, lat, lng, station) {
 			radius: config['station']['markerSize'][id] || config['station']['markerSize']['defaultSize'],
 			className: id+' stationMarker',
 		});
-	marker.bindLabel('Station '+station);
+	marker.bindTooltip('Station '+station);
 	stationLayer.addLayer(marker);
 	stationTable[id] = marker;
 };
@@ -143,13 +143,6 @@ $(document).ready(function() {
 	
 	// create baselayer
 	switch ( config['map']['baselayer'] ) {
-	case 'osmde': // add OpenStreetMap.DE tile layer
-		map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
-		L.tileLayer('https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png',
-		{
-			attribution: '&copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-		}).addTo(map);
-		break;
 	case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
 		map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
 		L.tileLayer('//server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}',
@@ -165,38 +158,14 @@ $(document).ready(function() {
 			attribution: 'Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community'
 		}).addTo(map);
 		break;
-	case 'komoot': // add OpenStreetMap.DE tile layer
+	case 'osmde': // add OpenStreetMap.DE tile layer, default
-		map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
-		L.tileLayer('//www.komoot.de/tiles/{s}/{z}/{x}/{y}.png',
-		{
-			attribution: 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a> | Tiles Courtesy of <a href="https://www.komoot.de/">Komoot</a>',
-		}).addTo(map);
-		break;
-	case 'mapquestgray': // add MapQuestOSM tile layer
-		null;
-		// map = L.map('map', { zoomControl: false, worldCopyJump: true, layers: mapLayer }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
-		// L.tileLayer.grayscale('https://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg',
-		// {
-		//	subdomains: '1234',
-		//	detectRetina: true,
-		//	attribution: 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a> | Tiles Courtesy of <a href="https://www.mapquest.com/">MapQuest</a> <img src="https://developer.mapquest.com/content/osm/mq_logo.png">',
-		//}).addTo(map);
-		//break;
-	case 'mapquest': // add MapQuestOSM tile layer
 		null;
 	default:
-		var mapLayer = MQ.mapLayer();
+		map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
-		map = L.map('map', {
+		L.tileLayer('https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png',
-				zoomControl: false,
+		{
-				worldCopyJump: true,
+			attribution: '&copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-				layers: mapLayer,
+		}).addTo(map);
-			}).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
-		//L.tileLayer('https://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg',
-			//{
-				//subdomains: '1234',
-				//detectRetina: true,
-				//attribution: 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a> | Tiles Courtesy of <a href="https://www.mapquest.com/">MapQuest</a> <img src="https://developer.mapquest.com/content/osm/mq_logo.png">',
-			//}).addTo(map);
 	};
 
 	// add controls