@raruto/leaflet-elevation 2.2.7 → 2.2.8

package/src/control.js

@@ -990,10 +990,10 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		}
 
 		// prevent excessive variabile instanstations
-		let i, curr, prev, attr;
+		let i, curr, prev, attr = props.attr || props.name;
 
 		// save here a reference to last used point
-		let lastValid = null; 
+		let lastValid = {};
 
 		// iteration
 		this.on("elepoint_added", ({index, point}) => {
@@ -1001,42 +1001,33 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 
 			prev = curr ?? this._data[i]; // same as: this._data[i > 0 ? i - 1 : i]
 			curr = this._data[i];
-			attr = props.attr || props.name;
+
+			// retrieve point value
+			curr[attr] = props.pointToAttr.call(this, point, i);
 
 			// check and fix missing data on last added point
-			if (props.skipNull === false) {
-				let curr = this._data[i][attr];
-				if(i > 0) {
-					let prev = this._data[i - 1][attr];
-					if (isNaN(prev)) {
-						if (!isNaN(lastValid) && !isNaN(curr)) {
-							prev   = (lastValid + curr) / 2;
-						} else if (!isNaN(lastValid)) {
-							prev   = lastValid;
-						} else if (!isNaN(curr)) {
-							prev   = curr;
-						}
-						if (!isNaN(prev)) return this._data.splice(i - 1, 1);
-						this._data[i - 1][attr] = prev;
-					}
+			if (i > 0 && isNaN(prev[attr])) {
+				if (!isNaN(lastValid[attr]) && !isNaN(curr[attr])) {
+					prev[attr]   = (lastValid[attr] + curr[attr]) / 2;
+				} else if (!isNaN(lastValid[attr])) {
+					prev[attr]   = lastValid[attr];
+				} else if (!isNaN(curr[attr])) {
+					prev[attr]   = curr[attr];
 				}
-				// update reference to last used point (ie. if it has data)
-				if (!isNaN(curr)) {
-					lastValid = curr;
+				// update "yAttr" and "xAttr"
+				if (props.meta) {
+					prev[props.meta] = prev[attr];
 				}
 			}
 
-			// retrieve point value
-			curr[attr] = props.pointToAttr.call(this, point, i);
-
-			// update "track_info" stats (min, max, avg, ...)
-			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._data.length);
-				}
+			// skip to next iteration for invalid or missing data (eg. i == 0)
+			if (isNaN(curr[attr])) {
+				return;
 			}
 
+			// update reference to last used point
+			lastValid[attr] = curr[attr];
+
 			// Limit "crazy" delta values.
 			if (props.deltaMax) {
 				curr[attr] =_.wrapDelta(curr[attr], prev[attr], props.deltaMax);
@@ -1052,8 +1043,16 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 				curr[attr] = _.round(curr[attr], props.decimals);
 			}
 
+			// update "track_info" stats (min, max, avg, ...)
+			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._data.length);
+				}
+			}
+
 			// update here some mixins (eg. complex "track_info" stuff)
-			if(props.onPointAdded) props.onPointAdded.call(this, curr[attr], i, point);
+			if (props.onPointAdded) props.onPointAdded.call(this, curr[attr], i, point);
 		});
 	},
 
@@ -1071,7 +1070,6 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			name,
 			attr,
 			required,
-			skipNull,
 			deltaMax,
 			clampRange,
 			decimals,
@@ -1096,7 +1094,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			this._registerDataAttribute({
 				name,
 				attr,
-				skipNull,
+				meta,
 				deltaMax,
 				clampRange,
 				decimals,

package/src/handlers/acceleration.js

@@ -17,7 +17,7 @@ export function Acceleration() {
 		pointToAttr: (_, i) => {
 			let dv     = (this._data[i].speed - this._data[i > 0 ? i - 1 : i].speed) * (1000 / opts.timeFactor);
 			let dt     = (this._data[i].time - this._data[i > 0 ? i - 1 : i].time) / 1000;
-			return dt > 0 ? Math.abs((dv / dt)) * opts.accelerationFactor : 0;
+			return dt > 0 ? Math.abs((dv / dt)) * opts.accelerationFactor : NaN;
 		},
 		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
 		scale: {

package/src/handlers/altitude.js

@@ -17,7 +17,6 @@ export function Altitude() {
 		meta: 'z',
 		unit: altitude.label,
 		statsName: 'elevation',
-		skipNull: this.options.skipNullZCoords,
 		deltaMax: this.options.altitudeDeltaMax,
 		clampRange: this.options.altitudeRange,
 		// init: ({point}) => {

package/src/handlers/pace.js

@@ -17,7 +17,7 @@ export function Pace() {
 		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;
+			return dx > 0 ? Math.abs((dt / dx) / opts.paceFactor) : NaN;
 		},
 		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
 		scale : (this.options.pace && this.options.pace != "summary") && {

package/src/handlers/slope.js

@@ -17,7 +17,7 @@ export function Slope() {
 		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; 
+			return dx !== 0 ? (dy / dx) * 100 : NaN; 
 		},
 		onPointAdded: (_, i) => {
 			let dz = this._data[i][this.options.yAttr] - this._data[i > 0 ? i - 1 : i][this.options.yAttr];

package/src/handlers/speed.js

@@ -18,7 +18,7 @@ export function Speed() {
 		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;
+			return dt > 0 ? Math.abs((dx / dt) * opts.timeFactor) * opts.speedFactor : NaN;
 		},
 		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
 		scale : (this.options.speed && this.options.speed != "summary") && {

package/src/options.js

@@ -79,7 +79,6 @@ export var Options = {
 	decimalsY: 0,
 	forceAxisBounds: false,
 	interpolation: "curveLinear",
-	skipNullZCoords: false,
 	yAxisMax: undefined,
 	yAxisMin: undefined,
 };