@raruto/leaflet-elevation 2.2.3 → 2.2.6

package/src/index.js

@@ -1,42 +1,42 @@
-/*
- * Copyright (c) 2019, GPL-3.0+ Project, Raruto
- *
- *  This file is free software: you may copy, redistribute and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation, either version 2 of the License, or (at your
- *  option) any later version.
- *
- *  This file is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see .
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *     Copyright (c) 2013-2016, MIT License, Felix “MrMufflon” Bache
- *
- *     Permission to use, copy, modify, and/or distribute this software
- *     for any purpose with or without fee is hereby granted, provided
- *     that the above copyright notice and this permission notice appear
- *     in all copies.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- *     WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- *     WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- *     AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
- *     CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- *     OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- *     NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- *     CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-import * as _ from './utils';
-import { Elevation } from './control';
-
-Elevation.Utils = _;
-
-L.control.elevation = (options) => new Elevation(options);
+/*
+ * Copyright (c) 2019, GPL-3.0+ Project, Raruto
+ *
+ *  This file is free software: you may copy, redistribute and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ *  This file is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see .
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *     Copyright (c) 2013-2016, MIT License, Felix “MrMufflon” Bache
+ *
+ *     Permission to use, copy, modify, and/or distribute this software
+ *     for any purpose with or without fee is hereby granted, provided
+ *     that the above copyright notice and this permission notice appear
+ *     in all copies.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ *     WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ *     WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ *     AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+ *     CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ *     OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ *     NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ *     CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+import * as _ from './utils';
+import { Elevation } from './control';
+
+Elevation.Utils = _;
+
+L.control.elevation = (options) => new Elevation(options);

package/src/options.js

@@ -1,85 +1,85 @@
-import * as _ from './utils';
-
-export var Options = {
-	autofitBounds: true,
-	autohide: false,
-	autohideMarker: true,
-	almostover: true,
-	altitude: true,
-	closeBtn: true,
-	collapsed: false,
-	detached: true,
-	distance: true,
-	distanceMarkers: { lazy: true, distance: true, direction: true },
-	dragging: !L.Browser.mobile,
-	downloadLink: 'link',
-	elevationDiv: "#elevation-div",
-	followMarker: true,
-	imperial: false,
-	legend: true,
-	handlers: ["Distance", "Time", "Altitude", "Slope", "Speed", "Acceleration"],
-	hotline: 'elevation',
-	marker: 'elevation-line',
-	markerIcon: L.divIcon({
-		className: 'elevation-position-marker',
-		html: '<i class="elevation-position-icon"></i>',
-		iconSize: [32, 32],
-		iconAnchor: [16, 16],
-	}),
-	position: "topright",
-	polyline: {
-		className: 'elevation-polyline',
-		color: '#000',
-		opacity: 0.75,
-		weight: 5,
-		lineCap: 'round'
-	},
-	polylineSegments: {
-		className: 'elevation-polyline-segments',
-		color: '#F00',
-		interactive: false,
-	},
-	preferCanvas: false,
-	reverseCoords: false,
-	ruler: true,
-	theme: "lightblue-theme",
-	summary: 'inline',
-	slope: false,
-	speed: false,
-	time: true,
-	timeFactor: 3600,
-	timestamps: false,
-	trkStart: L.circleMarker([0,0], { className: 'start-marker', radius: 6, weight: 2, color: '#fff', fillColor: '#00d800', fillOpacity: 1, interactive: false }),
-	trkEnd: L.circleMarker([0,0], { className: 'end-marker', radius: 6, weight: 2, color: '#fff', fillColor: '#ff0606', fillOpacity: 1, interactive: false }),
-	waypoints: true,
-	wptIcons: {
-		'': L.divIcon({
-			className: 'elevation-waypoint-marker',
-			html: '<i class="elevation-waypoint-icon default"></i>',
-			iconSize: [30, 30],
-			iconAnchor: [8, 30],
-		}),
-	},
-	wptLabels: true,
-	xAttr: "dist",
-	xLabel: "km",
-	yAttr: "z",
-	yLabel: "m",
-	zFollow: false,
-	zooming: !L.Browser.Mobile,
-
-	// Quite uncommon and undocumented options
-	margins: { top: 30, right: 30, bottom: 30, left: 40 },
-	height: (screen.height * 0.3) || 200,
-	width: (screen.width * 0.6) || 600,
-	xTicks: undefined,
-	yTicks: undefined,
-
-	decimalsX: 2,
-	decimalsY: 0,
-	forceAxisBounds: false,
-	interpolation: "curveLinear",
-	skipNullZCoords: false,
-	yAxisMax: undefined,
-	yAxisMin: undefined,
-};
+import * as _ from './utils';
+
+export var Options = {
+	autofitBounds: true,
+	autohide: false,
+	autohideMarker: true,
+	almostover: true,
+	altitude: true,
+	closeBtn: true,
+	collapsed: false,
+	detached: true,
+	distance: true,
+	distanceMarkers: { lazy: true, distance: true, direction: true },
+	dragging: !L.Browser.mobile,
+	downloadLink: 'link',
+	elevationDiv: "#elevation-div",
+	followMarker: true,
+	imperial: false,
+	legend: true,
+	handlers: ["Distance", "Time", "Altitude", "Slope", "Speed", "Acceleration"],
+	hotline: 'elevation',
+	marker: 'elevation-line',
+	markerIcon: L.divIcon({
+		className: 'elevation-position-marker',
+		html: '<i class="elevation-position-icon"></i>',
+		iconSize: [32, 32],
+		iconAnchor: [16, 16],
+	}),
+	position: "topright",
+	polyline: {
+		className: 'elevation-polyline',
+		color: '#000',
+		opacity: 0.75,
+		weight: 5,
+		lineCap: 'round'
+	},
+	polylineSegments: {
+		className: 'elevation-polyline-segments',
+		color: '#F00',
+		interactive: false,
+	},
+	preferCanvas: false,
+	reverseCoords: false,
+	ruler: true,
+	theme: "lightblue-theme",
+	summary: 'inline',
+	slope: false,
+	speed: false,
+	time: true,
+	timeFactor: 3600,
+	timestamps: false,
+	trkStart: { className: 'start-marker', radius: 6, weight: 2, color: '#fff', fillColor: '#00d800', fillOpacity: 1, interactive: false },
+	trkEnd: { className: 'end-marker', radius: 6, weight: 2, color: '#fff', fillColor: '#ff0606', fillOpacity: 1, interactive: false },
+	waypoints: true,
+	wptIcons: {
+		'': L.divIcon({
+			className: 'elevation-waypoint-marker',
+			html: '<i class="elevation-waypoint-icon default"></i>',
+			iconSize: [30, 30],
+			iconAnchor: [8, 30],
+		}),
+	},
+	wptLabels: true,
+	xAttr: "dist",
+	xLabel: "km",
+	yAttr: "z",
+	yLabel: "m",
+	zFollow: false,
+	zooming: !L.Browser.Mobile,
+
+	// Quite uncommon and undocumented options
+	margins: { top: 30, right: 30, bottom: 30, left: 40 },
+	height: (screen.height * 0.3) || 200,
+	width: (screen.width * 0.6) || 600,
+	xTicks: undefined,
+	yTicks: undefined,
+
+	decimalsX: 2,
+	decimalsY: 0,
+	forceAxisBounds: false,
+	interpolation: "curveLinear",
+	skipNullZCoords: false,
+	yAxisMax: undefined,
+	yAxisMin: undefined,
+};

package/src/utils.js

@@ -1,159 +1,159 @@
-/**
- * TODO: exget computed styles of theese values from actual "CSS vars"
- **/
-export const Colors = {
-	'lightblue': { area: '#3366CC', alpha: 0.45, stroke: '#3366CC' },
-	'magenta'  : { area: '#FF005E' },
-	'yellow'   : { area: '#FF0' },
-	'purple'   : { area: '#732C7B' },
-	'steelblue': { area: '#4682B4' },
-	'red'      : { area: '#F00' },
-	'lime'     : { area: '#9CC222', line: '#566B13' }
-};
-
-const SEC  = 1000;
-const MIN  = SEC * 60;
-const HOUR = MIN * 60;
-const DAY  = HOUR * 24;
-
-/**
- * Convert a time (millis) to a human readable duration string (%Dd %H:%M'%S")
- */
-export function formatTime(t) {
-	let d = Math.floor(t / DAY);
-	let h = Math.floor( (t - d * DAY) / HOUR);
-	let m = Math.floor( (t - d * DAY - h * HOUR) / MIN);
-	let s = Math.round( (t - d * DAY - h * HOUR - m * MIN) / SEC);
-	if ( s === 60 ) { m++; s = 0; }
-	if ( m === 60 ) { h++; m = 0; }
-	if ( h === 24 ) { d++; h = 0; }
-	return (d ? d + "d " : '') + h.toString().padStart(2, 0) + ':' + m.toString().padStart(2, 0) + "'" + s.toString().padStart(2, 0) + '"';
-}
-
-/**
- * Convert a time (millis) to human readable date string (dd-mm-yyyy hh:mm:ss)
- */
- export function formatDate(format) {
-	if (!format) {
-		return (time) => (new Date(time)).toLocaleString().replaceAll('/', '-').replaceAll(',', ' ');
-	} else if (format == 'time') {
-		return (time) => (new Date(time)).toLocaleTimeString();
-	} else if (format == 'date') {
-		return (time) => (new Date(time)).toLocaleDateString();
-	}
-	return (time) => format(time);
-}
-
-/**
- * Generate download data event.
- */
- export function saveFile(dataURI, fileName) {
-	let a = create('a', '', { href: dataURI, target: '_new', download: fileName || "", style: "display:none;" });
-	let b = document.body;
-	b.appendChild(a);
-	a.click();
-	b.removeChild(a);
-}
-
-
-/**
- * Convert SVG Path into Path2D and then update canvas
- */
- export function drawCanvas(ctx, path) {
-	path.classed('canvas-path', true);
-
-	ctx.beginPath();
-	ctx.moveTo(0, 0);
-	let p = new Path2D(path.attr('d'));
-
-	ctx.strokeStyle = path.attr('stroke');
-	ctx.fillStyle   = path.attr('fill');
-	ctx.lineWidth   = 1.25;
-	ctx.globalCompositeOperation = 'source-over';
-
-	// stroke opacity
-	ctx.globalAlpha = path.attr('stroke-opacity') || 0.3;
-	ctx.stroke(p);
-
-	// fill opacity
-	ctx.globalAlpha = path.attr('fill-opacity')   || 0.45;
-	ctx.fill(p);
-
-	ctx.globalAlpha = 1;
-
-	ctx.closePath();
-}
-
-/**
- * Loop and extract GPX Extensions handled by "@tmcw/toGeoJSON" (eg. "coordinateProperties" > "times")
- */
-export function coordPropsToMeta(coordProps, name, parser) {
-	return coordProps && (({props, point, id, isMulti }) => {
-		if (props) {
-			for (const key of coordProps) {
-				if (key in props) {
-					point.meta[name] = (parser || parseNumeric).call(this, (isMulti ? props[key][isMulti] : props[key]), id);
-					break;
-				}
-			}
-		}
-	});
-}
-
-/**
- * Extract numeric property (id) from GeoJSON object
- */
-export const parseNumeric  = (property, id) => parseInt((typeof property === 'object' ? property[id] : property));
-
-/**
- * Extract datetime property (id) from GeoJSON object
- */
-export const parseDate = (property, id) => new Date(Date.parse((typeof property === 'object' ? property[id] : property)));
-
-/**
- * A little bit shorter than L.DomUtil
- */
-export const addClass      = (n, str)             => n && str.split(" ").every(s => s && L.DomUtil.addClass(n, s));
-export const removeClass   = (n, str)             => n && str.split(" ").every(s => s && L.DomUtil.removeClass(n, s));
-export const toggleClass   = (n, str, cond)       => (cond ? addClass : removeClass)(n, str);
-export const replaceClass  = (n, rem, add)        => (rem && removeClass(n, rem)) || (add && addClass(n, add));
-export const style         = (n, k, v)            => (typeof v === "undefined" && L.DomUtil.getStyle(n, k)) || n.style.setProperty(k, v);
-export const toggleStyle   = (n, k, v, cond)      => style(n, k, cond ? v : '');
-export const setAttributes = (n, attrs)           => { for (let k in attrs) { n.setAttribute(k, attrs[k]); } };
-export const toggleEvent   = (el, e, fn, cond)    => el[cond ? 'on' : 'off'](e, fn);
-export const create        = (tag, str, attrs, n) => { let elem = L.DomUtil.create(tag, str || ""); if (attrs) setAttributes(elem, attrs); if (n) append(n, elem); return elem; };
-export const append        = (n, c)               => n.appendChild(c);
-export const insert        = (n, c, pos)          => n.insertAdjacentElement(pos, c);
-export const select        = (str, n)             => (n || document).querySelector(str);
-export const each          = (obj, fn)            => { for (let i in obj) fn(obj[i], i); };
-export const randomId      = ()                   => Math.random().toString(36).substr(2, 9);
-
-/**
- * TODO: use generators instead? (ie. "yield")
- */
-export const iMax = (iVal, max = -Infinity) => (iVal > max ? iVal : max); 
-export const iMin = (iVal, min = +Infinity) => (iVal < min ? iVal : min);
-export const iAvg = (iVal, avg = 0, idx = 1) => (iVal + avg * (idx - 1)) / idx;
-export const iSum = (iVal, sum = 0) => iVal + sum;
-
-/**
- * Alias for some leaflet core functions
- */
-export const { on, off }           = L.DomEvent;
-export const { throttle, wrapNum } = L.Util;
-export const { hasClass }          = L.DomUtil;
-
-/**
- * Limit floating point precision
- */
-export const round        = L.Util.formatNum;
-
-/**
- * Limit a number between min / max values
- */
-export const clamp     = (val, range)           => range ? (val < range[0] ? range[0] : val > range[1] ? range[1] : val) : val;
-
-/**
- * Limit a delta difference between two values
- */
+/**
+ * TODO: exget computed styles of theese values from actual "CSS vars"
+ **/
+export const Colors = {
+	'lightblue': { area: '#3366CC', alpha: 0.45, stroke: '#3366CC' },
+	'magenta'  : { area: '#FF005E' },
+	'yellow'   : { area: '#FF0' },
+	'purple'   : { area: '#732C7B' },
+	'steelblue': { area: '#4682B4' },
+	'red'      : { area: '#F00' },
+	'lime'     : { area: '#9CC222', line: '#566B13' }
+};
+
+const SEC  = 1000;
+const MIN  = SEC * 60;
+const HOUR = MIN * 60;
+const DAY  = HOUR * 24;
+
+/**
+ * Convert a time (millis) to a human readable duration string (%Dd %H:%M'%S")
+ */
+export function formatTime(t) {
+	let d = Math.floor(t / DAY);
+	let h = Math.floor( (t - d * DAY) / HOUR);
+	let m = Math.floor( (t - d * DAY - h * HOUR) / MIN);
+	let s = Math.round( (t - d * DAY - h * HOUR - m * MIN) / SEC);
+	if ( s === 60 ) { m++; s = 0; }
+	if ( m === 60 ) { h++; m = 0; }
+	if ( h === 24 ) { d++; h = 0; }
+	return (d ? d + "d " : '') + h.toString().padStart(2, 0) + ':' + m.toString().padStart(2, 0) + "'" + s.toString().padStart(2, 0) + '"';
+}
+
+/**
+ * Convert a time (millis) to human readable date string (dd-mm-yyyy hh:mm:ss)
+ */
+ export function formatDate(format) {
+	if (!format) {
+		return (time) => (new Date(time)).toLocaleString().replaceAll('/', '-').replaceAll(',', ' ');
+	} else if (format == 'time') {
+		return (time) => (new Date(time)).toLocaleTimeString();
+	} else if (format == 'date') {
+		return (time) => (new Date(time)).toLocaleDateString();
+	}
+	return (time) => format(time);
+}
+
+/**
+ * Generate download data event.
+ */
+ export function saveFile(dataURI, fileName) {
+	let a = create('a', '', { href: dataURI, target: '_new', download: fileName || "", style: "display:none;" });
+	let b = document.body;
+	b.appendChild(a);
+	a.click();
+	b.removeChild(a);
+}
+
+
+/**
+ * Convert SVG Path into Path2D and then update canvas
+ */
+ export function drawCanvas(ctx, path) {
+	path.classed('canvas-path', true);
+
+	ctx.beginPath();
+	ctx.moveTo(0, 0);
+	let p = new Path2D(path.attr('d'));
+
+	ctx.strokeStyle = path.attr('stroke');
+	ctx.fillStyle   = path.attr('fill');
+	ctx.lineWidth   = 1.25;
+	ctx.globalCompositeOperation = 'source-over';
+
+	// stroke opacity
+	ctx.globalAlpha = path.attr('stroke-opacity') || 0.3;
+	ctx.stroke(p);
+
+	// fill opacity
+	ctx.globalAlpha = path.attr('fill-opacity')   || 0.45;
+	ctx.fill(p);
+
+	ctx.globalAlpha = 1;
+
+	ctx.closePath();
+}
+
+/**
+ * Loop and extract GPX Extensions handled by "@tmcw/toGeoJSON" (eg. "coordinateProperties" > "times")
+ */
+export function coordPropsToMeta(coordProps, name, parser) {
+	return coordProps && (({props, point, id, isMulti }) => {
+		if (props) {
+			for (const key of coordProps) {
+				if (key in props) {
+					point.meta[name] = (parser || parseNumeric).call(this, (isMulti ? props[key][isMulti] : props[key]), id);
+					break;
+				}
+			}
+		}
+	});
+}
+
+/**
+ * Extract numeric property (id) from GeoJSON object
+ */
+export const parseNumeric  = (property, id) => parseInt((typeof property === 'object' ? property[id] : property));
+
+/**
+ * Extract datetime property (id) from GeoJSON object
+ */
+export const parseDate = (property, id) => new Date(Date.parse((typeof property === 'object' ? property[id] : property)));
+
+/**
+ * A little bit shorter than L.DomUtil
+ */
+export const addClass      = (n, str)             => n && str.split(" ").every(s => s && L.DomUtil.addClass(n, s));
+export const removeClass   = (n, str)             => n && str.split(" ").every(s => s && L.DomUtil.removeClass(n, s));
+export const toggleClass   = (n, str, cond)       => (cond ? addClass : removeClass)(n, str);
+export const replaceClass  = (n, rem, add)        => (rem && removeClass(n, rem)) || (add && addClass(n, add));
+export const style         = (n, k, v)            => (typeof v === "undefined" && L.DomUtil.getStyle(n, k)) || n.style.setProperty(k, v);
+export const toggleStyle   = (n, k, v, cond)      => style(n, k, cond ? v : '');
+export const setAttributes = (n, attrs)           => { for (let k in attrs) { n.setAttribute(k, attrs[k]); } };
+export const toggleEvent   = (el, e, fn, cond)    => el[cond ? 'on' : 'off'](e, fn);
+export const create        = (tag, str, attrs, n) => { let elem = L.DomUtil.create(tag, str || ""); if (attrs) setAttributes(elem, attrs); if (n) append(n, elem); return elem; };
+export const append        = (n, c)               => n.appendChild(c);
+export const insert        = (n, c, pos)          => n.insertAdjacentElement(pos, c);
+export const select        = (str, n)             => (n || document).querySelector(str);
+export const each          = (obj, fn)            => { for (let i in obj) fn(obj[i], i); };
+export const randomId      = ()                   => Math.random().toString(36).substr(2, 9);
+
+/**
+ * TODO: use generators instead? (ie. "yield")
+ */
+export const iMax = (iVal, max = -Infinity) => (iVal > max ? iVal : max); 
+export const iMin = (iVal, min = +Infinity) => (iVal < min ? iVal : min);
+export const iAvg = (iVal, avg = 0, idx = 1) => (iVal + avg * (idx - 1)) / idx;
+export const iSum = (iVal, sum = 0) => iVal + sum;
+
+/**
+ * Alias for some leaflet core functions
+ */
+export const { on, off }           = L.DomEvent;
+export const { throttle, wrapNum } = L.Util;
+export const { hasClass }          = L.DomUtil;
+
+/**
+ * Limit floating point precision
+ */
+export const round        = L.Util.formatNum;
+
+/**
+ * Limit a number between min / max values
+ */
+export const clamp     = (val, range)           => range ? (val < range[0] ? range[0] : val > range[1] ? range[1] : val) : val;
+
+/**
+ * Limit a delta difference between two values
+ */
 export const wrapDelta = (curr, prev, deltaMax) => Math.abs(curr - prev) > deltaMax ? prev + deltaMax * Math.sign(curr - prev) : curr;