@raruto/leaflet-elevation 2.2.6 → 2.2.8

package/README.md

@@ -63,7 +63,7 @@ _For a working example see one of the following demos:_
 
     <!-- leaflet-ui -->
     <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"></script>
-    <script src="https://unpkg.com/leaflet-ui@0.5.6/dist/leaflet-ui.js"></script>
+    <script src="https://unpkg.com/leaflet-ui@0.5.9/dist/leaflet-ui.js"></script>
 
     <!-- leaflet-elevation -->
     <link rel="stylesheet" href="https://unpkg.com/@raruto/leaflet-elevation/dist/leaflet-elevation.css" />

package/dist/leaflet-elevation.js

@@ -280,7 +280,6 @@
 		decimalsY: 0,
 		forceAxisBounds: false,
 		interpolation: "curveLinear",
-		skipNullZCoords: false,
 		yAxisMax: undefined,
 		yAxisMin: undefined,
 	};
@@ -310,7 +309,7 @@
 		__LMARKER:       '../src/components/marker.js',
 		__LSUMMARY:      '../src/components/summary.js',
 		__modulesFolder: '../src/handlers/',
-		__btnIcon:       '../images/elevation.svg',
+		__btnIcon:       baseURL + '../images/elevation.svg',
 
 		/*
 		 * Add data to the diagram either from GPX or GeoJSON and update the axis domain and data
@@ -1273,10 +1272,10 @@
 			}
 
 			// 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}) => {
@@ -1284,42 +1283,33 @@
 
 				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);
@@ -1335,8 +1325,16 @@
 					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);
 			});
 		},
 
@@ -1354,7 +1352,6 @@
 				name,
 				attr,
 				required,
-				skipNull,
 				deltaMax,
 				clampRange,
 				decimals,
@@ -1379,7 +1376,7 @@
 				this._registerDataAttribute({
 					name,
 					attr,
-					skipNull,
+					meta,
 					deltaMax,
 					clampRange,
 					decimals,