@raruto/leaflet-elevation 2.2.3 → 2.2.6

package/src/handlers/slope.js

@@ -1,79 +1,79 @@
-export function Slope() {
-
-	const _ = L.Control.Elevation.Utils;
-
-	let opts  = this.options;
-	let slope = {};
-
-	slope.label          = opts.slopeLabel || '%';
-
-	return {
-		name: 'slope',
-		meta: 'slope',
-		unit: slope.label,
-		deltaMax: this.options.slopedDeltaMax,
-		clampRange: this.options.slopeRange,
-		decimals: 2,
-		pointToAttr: (_, i) => { // slope in % = ( dy / dx ) * 100;
-			let dx    = (this._data[i].dist - this._data[i > 0 ? i - 1 : i].dist) * 1000;
-			let dy    = this._data[i][this.options.yAttr] - this._data[i > 0 ? i - 1 : i][this.options.yAttr];
-			return (!isNaN(dy) && dx !== 0) ? (dy / dx) * 100 : 0; 
-		},
-		onPointAdded: (_, i) => {
-			let dz = this._data[i][this.options.yAttr] - this._data[i > 0 ? i - 1 : i][this.options.yAttr];
-			if (dz > 0)      this.track_info.ascent  = (this.track_info.ascent || 0) + dz;  // Total Ascent
-			else if (dz < 0) this.track_info.descent = (this.track_info.descent || 0) - dz; // Total Descent
-		},
-		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg, },
-		scale: {
-			axis       : "y",
-			position   : "right",
-			scale      : { min: -1, max: +1 },
-			tickPadding: 16,
-			labelX     : 25,
-			labelY     : -8,
-		},
-		path: {
-			label        : 'Slope',
-			yAttr        : 'slope',
-			scaleX       : 'distance',
-			scaleY       : 'slope',
-			color        : '#F00',
-			strokeColor  : '#000',
-			strokeOpacity: "0.5",
-			fillOpacity  : "0.25",
-		},
-		tooltip: {
-			chart: (item) => L._("m: ") + item.slope + slope.label,
-			marker: (item) => Math.round(item.slope) + slope.label,
-			order: 40,
-		},
-		summary: {
-			"minslope": {
-				label: "Min Slope: ",
-				value: (track, unit) => Math.round(track.slope_min || 0) + '&nbsp;' + unit,
-				order: 40
-			},
-			"maxslope": {
-				label: "Max Slope: ",
-				value: (track, unit) => Math.round(track.slope_max || 0) + '&nbsp;' + unit,
-				order: 41
-			},
-			"avgslope": {
-				label: "Avg Slope: ",
-				value: (track, unit) => Math.round(track.slope_avg || 0) + '&nbsp;' + unit,
-				order: 42
-			},
-			"ascent"  : {
-				label: "Total Ascent: ",
-				value: (track, unit) => Math.round(track.ascent || 0) + '&nbsp;' + (this.options.imperial ? 'ft' : 'm'),
-				order: 43
-			},
-			"descent"  : {
-				label: "Total Descent: ",
-				value: (track, unit) => Math.round(track.descent || 0) + '&nbsp;' + (this.options.imperial ? 'ft' : 'm'),
-				order: 45
-			},
-		}
-	};
-}
+export function Slope() {
+
+	const _ = L.Control.Elevation.Utils;
+
+	let opts  = this.options;
+	let slope = {};
+
+	slope.label          = opts.slopeLabel || '%';
+
+	return {
+		name: 'slope',
+		meta: 'slope',
+		unit: slope.label,
+		deltaMax: this.options.slopedDeltaMax,
+		clampRange: this.options.slopeRange,
+		decimals: 2,
+		pointToAttr: (_, i) => { // slope in % = ( dy / dx ) * 100;
+			let dx    = (this._data[i].dist - this._data[i > 0 ? i - 1 : i].dist) * 1000;
+			let dy    = this._data[i][this.options.yAttr] - this._data[i > 0 ? i - 1 : i][this.options.yAttr];
+			return (!isNaN(dy) && dx !== 0) ? (dy / dx) * 100 : 0; 
+		},
+		onPointAdded: (_, i) => {
+			let dz = this._data[i][this.options.yAttr] - this._data[i > 0 ? i - 1 : i][this.options.yAttr];
+			if (dz > 0)      this.track_info.ascent  = (this.track_info.ascent || 0) + dz;  // Total Ascent
+			else if (dz < 0) this.track_info.descent = (this.track_info.descent || 0) - dz; // Total Descent
+		},
+		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg, },
+		scale: {
+			axis       : "y",
+			position   : "right",
+			scale      : { min: -1, max: +1 },
+			tickPadding: 16,
+			labelX     : 25,
+			labelY     : -8,
+		},
+		path: {
+			label        : 'Slope',
+			yAttr        : 'slope',
+			scaleX       : 'distance',
+			scaleY       : 'slope',
+			color        : '#F00',
+			strokeColor  : '#000',
+			strokeOpacity: "0.5",
+			fillOpacity  : "0.25",
+		},
+		tooltip: {
+			chart: (item) => L._("m: ") + item.slope + slope.label,
+			marker: (item) => Math.round(item.slope) + slope.label,
+			order: 40,
+		},
+		summary: {
+			"minslope": {
+				label: "Min Slope: ",
+				value: (track, unit) => Math.round(track.slope_min || 0) + '&nbsp;' + unit,
+				order: 40
+			},
+			"maxslope": {
+				label: "Max Slope: ",
+				value: (track, unit) => Math.round(track.slope_max || 0) + '&nbsp;' + unit,
+				order: 41
+			},
+			"avgslope": {
+				label: "Avg Slope: ",
+				value: (track, unit) => Math.round(track.slope_avg || 0) + '&nbsp;' + unit,
+				order: 42
+			},
+			"ascent"  : {
+				label: "Total Ascent: ",
+				value: (track, unit) => Math.round(track.ascent || 0) + '&nbsp;' + (this.options.imperial ? 'ft' : 'm'),
+				order: 43
+			},
+			"descent"  : {
+				label: "Total Descent: ",
+				value: (track, unit) => Math.round(track.descent || 0) + '&nbsp;' + (this.options.imperial ? 'ft' : 'm'),
+				order: 45
+			},
+		}
+	};
+}

package/src/handlers/speed.js

@@ -1,66 +1,66 @@
-export function Speed() {
-
-	const _ = L.Control.Elevation.Utils;
-
-	let opts = this.options;
-	let speed = {};
-
-	speed.label      = opts.speedLabel  || L._(opts.imperial ? 'mph' : 'km/h');
-	opts.speedFactor = opts.speedFactor || 1;
-
-	return {
-		name: 'speed',
-		required: (this.options.acceleration),
-		unit: speed.label,
-		deltaMax: this.options.speedDeltaMax,
-		clampRange: this.options.speedRange,
-		decimals: 2,
-		pointToAttr: (_, i) => {
-			let dx   = (this._data[i].dist - this._data[i > 0 ? i - 1 : i].dist) * 1000;
-			let dt   = this._data[i].time - this._data[ i > 0 ? i - 1 : i].time;
-			return dt > 0 ? Math.abs((dx / dt) * opts.timeFactor) * opts.speedFactor : 0;
-		},
-		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
-		scale : (this.options.speed && this.options.speed != "summary") && {
-			axis       : "y",
-			position   : "right",
-			scale      : { min : 0, max : +1 },
-			tickPadding: 16,
-			labelX     : 25,
-			labelY     : -8,
-		},
-		path: (this.options.speed && this.options.speed != "summary") && {
-			// name         : 'speed',
-			label        : 'Speed',
-			yAttr        : "speed",
-			scaleX       : 'distance',
-			scaleY       : 'speed',
-			color        : '#03ffff',
-			strokeColor  : '#000',
-			strokeOpacity: "0.5",
-			fillOpacity  : "0.25",
-		},
-		tooltip: (this.options.speed) && {
-			chart: (item) => L._('v: ') + item.speed + " " + speed.label,
-			marker: (item) => Math.round(item.speed) + " " + speed.label,
-			order: 50,
-		},
-		summary: (this.options.speed) && {
-			"minspeed"  : {
-				label: "Min Speed: ",
-				value: (track, unit) => Math.round(track.speed_min || 0) + ' ' + unit,
-				order: 51
-			},
-			"maxspeed"  : {
-				label: "Max Speed: ",
-				value: (track, unit) => Math.round(track.speed_max || 0) + ' ' + unit,
-				order: 51
-			},
-			"avgspeed": {
-				label: "Avg Speed: ",
-				value: (track, unit) => Math.round(track.speed_avg || 0) + ' ' + unit,
-				order: 52
-			},
-		}
-	};
-}
+export function Speed() {
+
+	const _ = L.Control.Elevation.Utils;
+
+	let opts = this.options;
+	let speed = {};
+
+	speed.label      = opts.speedLabel  || L._(opts.imperial ? 'mph' : 'km/h');
+	opts.speedFactor = opts.speedFactor || 1;
+
+	return {
+		name: 'speed',
+		required: (this.options.acceleration),
+		unit: speed.label,
+		deltaMax: this.options.speedDeltaMax,
+		clampRange: this.options.speedRange,
+		decimals: 2,
+		pointToAttr: (_, i) => {
+			let dx   = (this._data[i].dist - this._data[i > 0 ? i - 1 : i].dist) * 1000;
+			let dt   = this._data[i].time - this._data[ i > 0 ? i - 1 : i].time;
+			return dt > 0 ? Math.abs((dx / dt) * opts.timeFactor) * opts.speedFactor : 0;
+		},
+		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
+		scale : (this.options.speed && this.options.speed != "summary") && {
+			axis       : "y",
+			position   : "right",
+			scale      : { min : 0, max : +1 },
+			tickPadding: 16,
+			labelX     : 25,
+			labelY     : -8,
+		},
+		path: (this.options.speed && this.options.speed != "summary") && {
+			// name         : 'speed',
+			label        : 'Speed',
+			yAttr        : "speed",
+			scaleX       : 'distance',
+			scaleY       : 'speed',
+			color        : '#03ffff',
+			strokeColor  : '#000',
+			strokeOpacity: "0.5",
+			fillOpacity  : "0.25",
+		},
+		tooltip: (this.options.speed) && {
+			chart: (item) => L._('v: ') + item.speed + " " + speed.label,
+			marker: (item) => Math.round(item.speed) + " " + speed.label,
+			order: 50,
+		},
+		summary: (this.options.speed) && {
+			"minspeed"  : {
+				label: "Min Speed: ",
+				value: (track, unit) => Math.round(track.speed_min || 0) + ' ' + unit,
+				order: 51
+			},
+			"maxspeed"  : {
+				label: "Max Speed: ",
+				value: (track, unit) => Math.round(track.speed_max || 0) + ' ' + unit,
+				order: 51
+			},
+			"avgspeed": {
+				label: "Avg Speed: ",
+				value: (track, unit) => Math.round(track.speed_avg || 0) + ' ' + unit,
+				order: 52
+			},
+		}
+	};
+}

package/src/handlers/time.js

@@ -1,103 +1,103 @@
-export function Time() {
-
-	const _ = L.Control.Elevation.Utils;
-
-	let opts = this.options;
-	let time = {};
-
-	time.label      = opts.timeLabel  || 't';
-	opts.timeFactor = opts.timeFactor || 3600;
-
-	/**
-	 * Common AVG speeds:
-	 * ----------------------
-	 *  slow walk = 1.8  km/h
-	 *  walking   = 3.6  km/h <-- default: 3.6
-	 *  running   = 10.8 km/h
-	 *  cycling   = 18   km/h
-	 *  driving   = 72   km/h
-	 * ----------------------
-	 */
-	this._timeAVGSpeed = (opts.timeAVGSpeed || 3.6) * (opts.speedFactor || 1);
-
-	if (!opts.timeFormat) {
-		opts.timeFormat = (time) => (new Date(time)).toLocaleString().replaceAll('/', '-').replaceAll(',', ' ');
-	} else if (opts.timeFormat == 'time') {
-		opts.timeFormat = (time) => (new Date(time)).toLocaleTimeString();
-	} else if (opts.timeFormat == 'date') {
-		opts.timeFormat = (time) => (new Date(time)).toLocaleDateString();
-	}
-
-	opts.xTimeFormat = opts.xTimeFormat || ((t) => _.formatTime(t).split("'")[0]);
-
-	return {
-		name: 'time',
-		required: (this.options.speed || this.options.acceleration || this.options.timestamps),
-		coordinateProperties: ["coordTimes", "times", "time"],
-		coordPropsToMeta: _.parseDate,
-		pointToAttr: function(point, i) {
-			// Add missing timestamps (see: options.timeAVGSpeed)
-			if (!point.meta || !point.meta.time) {
-				point.meta = point.meta || {};
-				if(i > 0) {
-					let dx = (this._data[i].dist - this._data[i - 1].dist);
-					let t0 = this._data[i - 1].time.getTime();
-					point.meta.time = new Date(t0 + ( dx / this._timeAVGSpeed) * this.options.timeFactor * 1000);
-				} else {
-					point.meta.time = new Date(Date.now())
-				}
-			}
-			// Handle timezone offset
-			let time = (point.meta.time.getTime() - point.meta.time.getTimezoneOffset() * 60 * 1000 !== 0) ? point.meta.time : 0;
-			// Update duration
-			this._data[i].duration = i > 0 ? (this._data[i - 1].duration || 0) + Math.abs(time - this._data[i - 1].time) : 0;
-			return time;
-		},
-		onPointAdded: (_, i) => this.track_info.time = this._data[i].duration,
-		scale: (opts.time && opts.time != "summary" && !L.Browser.mobile) && {
-			axis       : "x",
-			position   : "top",
-			scale      : {
-				attr       : "duration",
-				min        : 0,
-			},
-			label      : time.label,
-			labelY     : -10,
-			labelX     : () => this._width(),
-			name       : "time",
-			ticks      : () => _.clamp(this._chart._xTicks() / 2, [4, +Infinity]),
-			tickFormat : (d)  => (d == 0 ? '' : opts.xTimeFormat(d)),
-			onAxisMount: axis => {
-				axis.select(".domain")
-					.remove();
-				axis.selectAll("text")
-					.attr('opacity', 0.65)
-					.style('font-family', 'Monospace')
-					.style('font-size', '110%');
-				axis.selectAll(".tick line")
-					.attr('y2', this._height())
-					.attr('stroke-dasharray', 2)
-					.attr('opacity', 0.75);
-				}
-		},
-		tooltips: [
-			(this.options.time) && {
-				name: 'time',
-				chart: (item) => L._("T: ") + _.formatTime(item.duration || 0),
-				order: 20
-			},
-			(this.options.timestamps) && {
-				name: 'date',
-				chart: (item) => L._("t: ") + this.options.timeFormat(item.time),
-				order: 21,
-			}
-		],
-		summary: (this.options.time) && {
-			"tottime"  : {
-				label: "Total Time: ",
-				value: (track) => _.formatTime(track.time || 0),
-				order: 20
-			}
-		}
-	};
+export function Time() {
+
+	const _ = L.Control.Elevation.Utils;
+
+	let opts = this.options;
+	let time = {};
+
+	time.label      = opts.timeLabel  || 't';
+	opts.timeFactor = opts.timeFactor || 3600;
+
+	/**
+	 * Common AVG speeds:
+	 * ----------------------
+	 *  slow walk = 1.8  km/h
+	 *  walking   = 3.6  km/h <-- default: 3.6
+	 *  running   = 10.8 km/h
+	 *  cycling   = 18   km/h
+	 *  driving   = 72   km/h
+	 * ----------------------
+	 */
+	this._timeAVGSpeed = (opts.timeAVGSpeed || 3.6) * (opts.speedFactor || 1);
+
+	if (!opts.timeFormat) {
+		opts.timeFormat = (time) => (new Date(time)).toLocaleString().replaceAll('/', '-').replaceAll(',', ' ');
+	} else if (opts.timeFormat == 'time') {
+		opts.timeFormat = (time) => (new Date(time)).toLocaleTimeString();
+	} else if (opts.timeFormat == 'date') {
+		opts.timeFormat = (time) => (new Date(time)).toLocaleDateString();
+	}
+
+	opts.xTimeFormat = opts.xTimeFormat || ((t) => _.formatTime(t).split("'")[0]);
+
+	return {
+		name: 'time',
+		required: (this.options.speed || this.options.acceleration || this.options.timestamps),
+		coordinateProperties: ["coordTimes", "times", "time"],
+		coordPropsToMeta: _.parseDate,
+		pointToAttr: function(point, i) {
+			// Add missing timestamps (see: options.timeAVGSpeed)
+			if (!point.meta || !point.meta.time) {
+				point.meta = point.meta || {};
+				if(i > 0) {
+					let dx = (this._data[i].dist - this._data[i - 1].dist);
+					let t0 = this._data[i - 1].time.getTime();
+					point.meta.time = new Date(t0 + ( dx / this._timeAVGSpeed) * this.options.timeFactor * 1000);
+				} else {
+					point.meta.time = new Date(Date.now())
+				}
+			}
+			// Handle timezone offset
+			let time = (point.meta.time.getTime() - point.meta.time.getTimezoneOffset() * 60 * 1000 !== 0) ? point.meta.time : 0;
+			// Update duration
+			this._data[i].duration = i > 0 ? (this._data[i - 1].duration || 0) + Math.abs(time - this._data[i - 1].time) : 0;
+			return time;
+		},
+		onPointAdded: (_, i) => this.track_info.time = this._data[i].duration,
+		scale: (opts.time && opts.time != "summary" && !L.Browser.mobile) && {
+			axis       : "x",
+			position   : "top",
+			scale      : {
+				attr       : "duration",
+				min        : 0,
+			},
+			label      : time.label,
+			labelY     : -10,
+			labelX     : () => this._width(),
+			name       : "time",
+			ticks      : () => _.clamp(this._chart._xTicks() / 2, [4, +Infinity]),
+			tickFormat : (d)  => (d == 0 ? '' : opts.xTimeFormat(d)),
+			onAxisMount: axis => {
+				axis.select(".domain")
+					.remove();
+				axis.selectAll("text")
+					.attr('opacity', 0.65)
+					.style('font-family', 'Monospace')
+					.style('font-size', '110%');
+				axis.selectAll(".tick line")
+					.attr('y2', this._height())
+					.attr('stroke-dasharray', 2)
+					.attr('opacity', 0.75);
+				}
+		},
+		tooltips: [
+			(this.options.time) && {
+				name: 'time',
+				chart: (item) => L._("T: ") + _.formatTime(item.duration || 0),
+				order: 20
+			},
+			(this.options.timestamps) && {
+				name: 'date',
+				chart: (item) => L._("t: ") + this.options.timeFormat(item.time),
+				order: 21,
+			}
+		],
+		summary: (this.options.time) && {
+			"tottime"  : {
+				label: "Total Time: ",
+				value: (track) => _.formatTime(track.time || 0),
+				order: 20
+			}
+		}
+	};
 }