@raruto/leaflet-elevation 2.0.8 → 2.2.0

package/src/control.js

@@ -1,7 +1,11 @@
-import 'leaflet-i18n';
 import * as _      from './utils';
 import { Options } from './options';
 
+// "leaflet-i18n" fallback
+if (!L._ || !L.i18n) {
+	L._ = L.i18n = (string, data) => string;
+}
+
 export const Elevation = L.Control.Elevation = L.Control.extend({
 
 	includes: L.Evented ? L.Evented.prototype : L.Mixin.Events,
@@ -228,17 +232,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 
 		if (!this.eleDiv) this.eleDiv = container;
 
-		let modules = [
-			"Distance",
-			"Time",
-			"Altitude",
-			"Slope",
-			"Speed",
-			"Acceleration",
-			...this.options.handlers
-		].filter(m => false !== this.options[typeof m == "string" && m.toLowerCase()]);
-
-		this._loadModules(modules).then(() => { // Inject here required modules (data handlers)
+		this._loadModules(this.options.handlers).then(() => { // Inject here required modules (data handlers)
 			this._initChart(container);
 			this._initButton(container);
 			this._initSummary(container);
@@ -578,14 +572,15 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 * Generate "svg" chart (DOM element).
 	 */
 	_initChart: function(container) {
-		let opts    = this.options;
+		let opts = this.options;
+		let map  = this._map;
 
 		if (opts.detached) {
 			let { offsetWidth, offsetHeight}             = this.eleDiv;
 			if (offsetWidth > 0)             opts.width  = offsetWidth;
 			if (offsetHeight > 20)           opts.height = offsetHeight - 20; // 20 = horizontal scrollbar size.
 		} else {
-			let { clientWidth }                          = this._map.getContainer();
+			let { clientWidth }                          = map.getContainer();
 			opts._maxWidth                               = opts._maxWidth > opts.width ? opts._maxWidth : opts.width;
 			this._container.style.maxWidth               = opts._maxWidth + 'px';
 			if (opts._maxWidth > clientWidth) opts.width = clientWidth - 30;
@@ -725,22 +720,16 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		// First map known classnames (eg. "Altitude" --> L.Control.Elevation.Altitude)
 		handlers = handlers.map((h) => typeof h === 'string' && typeof Elevation[h] !== "undefined" ? Elevation[h] : h);
 		// Then load optional classes and custom imports (eg. "Cadence" --> import('../src/handlers/cadence.js'))
-		return Promise.
-			all(
-				handlers
-					.filter(h => typeof h === 'string' || h instanceof Promise)
-					.map(file => file instanceof Promise ? file : this.import(this.__modulesFolder + file.toLowerCase() + '.js'))
-			)
-			.then((m) => {
-				_.each(m, (exported) => {
-					let fn = Object.keys(exported)[0];
-					if (fn && typeof Elevation[fn] === "undefined" ) {
-						handlers[fn] = Elevation[fn] = exported[fn];
-						
-					}
-				});
-				_.each(handlers, h => this._registerHandler(h));
+		let modules = handlers.map(file => (typeof file === 'string' && this.import(this.__modulesFolder + file.toLowerCase() + '.js')) || (file instanceof Promise && file) || Promise.resolve());
+		return Promise.all(modules).then((m) => {
+			_.each(m, (exported, i) => {
+				let fn = exported && Object.keys(exported)[0];
+				if (fn) {
+					handlers[i] = Elevation[fn] = (Elevation[fn] ?? exported[fn]);
+				}
 			});
+			_.each(handlers, h => ["function", "object"].includes(typeof h) && this._registerHandler(h));
+		});
 	},
 
 	/**
@@ -1030,7 +1019,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			if (props.stats) {
 				for (const key in props.stats) {
 					let sname = (props.statsName || attr) + (key != '' ? '_' : '');
-					this.track_info[sname + key] = props.stats[key].call(this, curr[attr], this.track_info[sname + key]);
+					this.track_info[sname + key] = props.stats[key].call(this, curr[attr], this.track_info[sname + key], index);
 				}
 			}
 

package/src/handlers/heart.js

@@ -1,53 +1,53 @@
-export function Heart() {
-
-    const _ = L.Control.Elevation.Utils;
-
-    return {
-        name: 'heart',      // <-- Your custom option name (eg. "heart: true")
-        unit: 'bpm',
-        meta: 'hr',         // <-- point.meta.hr
-        coordinateProperties: ["heart", "heartRates", "heartRate"], // List of GPX Extensions ("coordinateProperties") to be handled by "@tmcw/toGeoJSON"
-        pointToAttr: (point, i) => (point.hr ?? point.meta.hr ?? point.prev('heart')) || 0,
-		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
-        scale: {
-            axis       : "y",
-            position   : "left",
-            scale      : { min: -1, max: +1 },
-            tickPadding: 25,
-            labelX     : -30,
-            labelY     : -8,
-        },
-        path: {
-            label        : 'ECG',
-            yAttr        : 'heart',
-            scaleX       : 'distance',
-            scaleY       : 'heart',
-            color        : 'white',
-            strokeColor  : 'red',
-            strokeOpacity: "0.85",
-            fillOpacity  : "0.1",
-        },
-        tooltip: {
-            chart: (item) => L._("hr: ") + item.heart + " " + 'bpm',
-            marker: (item) => Math.round(item.heart) + " " + 'bpm',
-            order: 1
-        },
-        summary: {
-            "minbpm": {
-                label: "Min BPM: ",
-                value: (track, unit) => Math.round(track.heart_min || 0) + '&nbsp;' + unit,
-                // order: 30
-            },
-            "maxbpm": {
-                label: "Max BPM: ",
-                value: (track, unit) => Math.round(track.heart_min || 0) + '&nbsp;' + unit,
-                // order: 30
-            },
-            "avgbpm": {
-                label: "Avg BPM: ",
-                value: (track, unit) => Math.round(track.heart_avg || 0) + '&nbsp;' + unit,
-                // order: 20
-            },
-        }
-    };
+export function Heart() {
+
+    const _ = L.Control.Elevation.Utils;
+
+    return {
+        name: 'heart',      // <-- Your custom option name (eg. "heart: true")
+        unit: 'bpm',
+        meta: 'hr',         // <-- point.meta.hr
+        coordinateProperties: ["heart", "heartRates", "heartRate"], // List of GPX Extensions ("coordinateProperties") to be handled by "@tmcw/toGeoJSON"
+        pointToAttr: (point, i) => (point.hr ?? point.meta.hr ?? point.prev('heart')) || 0,
+		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
+        scale: {
+            axis       : "y",
+            position   : "left",
+            scale      : { min: -1, max: +1 },
+            tickPadding: 25,
+            labelX     : -30,
+            labelY     : -8,
+        },
+        path: {
+            label        : 'ECG',
+            yAttr        : 'heart',
+            scaleX       : 'distance',
+            scaleY       : 'heart',
+            color        : 'white',
+            strokeColor  : 'red',
+            strokeOpacity: "0.85",
+            fillOpacity  : "0.1",
+        },
+        tooltip: {
+            chart: (item) => L._("hr: ") + item.heart + " " + 'bpm',
+            marker: (item) => Math.round(item.heart) + " " + 'bpm',
+            order: 1
+        },
+        summary: {
+            "minbpm": {
+                label: "Min BPM: ",
+                value: (track, unit) => Math.round(track.heart_min || 0) + '&nbsp;' + unit,
+                // order: 30
+            },
+            "maxbpm": {
+                label: "Max BPM: ",
+                value: (track, unit) => Math.round(track.heart_max || 0) + '&nbsp;' + unit,
+                // order: 30
+            },
+            "avgbpm": {
+                label: "Avg BPM: ",
+                value: (track, unit) => Math.round(track.heart_avg || 0) + '&nbsp;' + unit,
+                // order: 20
+            },
+        }
+    };
 };

package/src/handlers/pace.js

@@ -0,0 +1,65 @@
+export function Pace() {
+
+	const _ = L.Control.Elevation.Utils;
+
+	let opts = this.options;
+	let pace = {};
+
+	pace.label      = opts.paceLabel  || L._(opts.imperial ? 'min/mi' : 'min/km');
+	opts.paceFactor = opts.paceFactor || 60; // 1 min = 60 sec
+
+	return {
+		name: 'pace',
+		unit: pace.label,
+		deltaMax: this.options.paceDeltaMax,
+		clampRange: this.options.paceRange,
+		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 dx > 0 ? Math.abs((dt / dx) / opts.paceFactor) : 0;
+		},
+		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
+		scale : (this.options.pace && this.options.pace != "summary") && {
+			axis       : "y",
+			position   : "right",
+			scale      : { min : 0, max : +1 },
+			tickPadding: 16,
+			labelX     : 25,
+			labelY     : -8,
+		},
+		path: (this.options.pace && this.options.pace != "summary") && {
+			// name         : 'pace',
+			label        : 'Pace',
+			yAttr        : "pace",
+			scaleX       : 'distance',
+			scaleY       : 'pace',
+			color        : '#03ffff',
+			strokeColor  : '#000',
+			strokeOpacity: "0.5",
+			fillOpacity  : "0.25",
+		},
+		tooltip: (this.options.pace) && {
+			chart: (item) => L._('pace: ') + item.pace + " " + pace.label,
+			marker: (item) => Math.round(item.pace) + " " + pace.label,
+			order: 50,
+		},
+		summary: (this.options.pace) && {
+			"minpace"  : {
+				label: "Min Pace: ",
+				value: (track, unit) => Math.round(track.pace_min || 0) + ' ' + unit,
+				order: 51
+			},
+			"maxpace"  : {
+				label: "Max Pace: ",
+				value: (track, unit) => Math.round(track.pace_max || 0) + ' ' + unit,
+				order: 51
+			},
+			"avgpace": {
+				label: "Avg Pace: ",
+				value: (track, unit) => Math.round(track.pace_avg || 0) + ' ' + unit,
+				order: 52
+			},
+		}
+	};
+}

package/src/index.js

@@ -34,21 +34,9 @@
  *     CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-import 'leaflet-i18n';
 import * as _ from './utils';
 import { Elevation } from './control';
 
 Elevation.Utils = _;
 
-/* Temporary fix for empty values evaluated as false (leaflet-i18n v0.3.1) */
-(function(){
-	let proto = L.i18n.bind({});
-	L.i18n = L._ = (string, data) => {
-		if (L.locale && L.locales[L.locale] && L.locales[L.locale][string] == "") {
-			L.locales[L.locale][string] = "\u200B";
-		}
-		return proto.call(null, string, data);
-	};
-})();
-
 L.control.elevation = (options) => new Elevation(options);

package/src/options.js

@@ -17,7 +17,7 @@ export var Options = {
 	followMarker: true,
 	imperial: false,
 	legend: true,
-	handlers: [],
+	handlers: ["Distance", "Time", "Altitude", "Slope", "Speed", "Acceleration"],
 	hotline: 'elevation',
 	marker: 'elevation-line',
 	markerIcon: L.divIcon({
@@ -46,7 +46,7 @@ export var Options = {
 	summary: 'inline',
 	slope: false,
 	speed: false,
-	time: 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 }),

package/src/utils.js

@@ -92,7 +92,7 @@ export function coordPropsToMeta(coordProps, name, parser) {
 		if (props) {
 			for (const key of coordProps) {
 				if (key in props) {
-					point.meta[name] = (parser || parseInt).call(this, (isMulti ? props[key][isMulti] : props[key]), id);
+					point.meta[name] = (parser || parseNumeric).call(this, (isMulti ? props[key][isMulti] : props[key]), id);
 					break;
 				}
 			}
@@ -103,7 +103,7 @@ export function coordPropsToMeta(coordProps, name, parser) {
 /**
  * Extract numeric property (id) from GeoJSON object
  */
-export const parseInt  = (property, id) => window.parseInt((typeof property === 'object' ? property[id] : property));
+export const parseNumeric  = (property, id) => parseInt((typeof property === 'object' ? property[id] : property));
 
 /**
  * Extract datetime property (id) from GeoJSON object
@@ -131,10 +131,10 @@ export const randomId      = ()                   => Math.random().toString(36).
 /**
  * TODO: use generators instead? (ie. "yield")
  */
-export const iMax = (iVal, max) => (iVal > max ? iVal : max) || -Infinity; 
-export const iMin = (iVal, min) => (iVal < min ? iVal : min) || +Infinity;
-export const iAvg = (iVal, avg) => (iVal + (avg || 0)) / 2.0;
-export const iSum = (iVal, sum) => iVal + (sum || 0);
+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