@raruto/leaflet-elevation 2.1.0 → 2.2.1

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/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