@raruto/leaflet-elevation 2.2.4 → 2.2.5

package/src/handlers/altitude.js

@@ -1,79 +1,79 @@
-export function Altitude() {
-	
-	const _  = L.Control.Elevation.Utils;
-
-	let opts       = this.options;
-	let altitude   = {};
-
-	let theme           = opts.theme.split(' ')[0].replace('-theme', '');
-	let color           = _.Colors[theme] || {};
-
-	opts.altitudeFactor = opts.imperial ? this.__footFactor : (opts.altitudeFactor || 1); // 1 m = (1 m)
-	altitude.label      = opts.imperial ? "ft" : opts.yLabel;
-
-	return {
-		name: 'altitude',
-		required: this.options.slope,
-		meta: 'z',
-		unit: altitude.label,
-		statsName: 'elevation',
-		skipNull: this.options.skipNullZCoords,
-		deltaMax: this.options.altitudeDeltaMax,
-		clampRange: this.options.altitudeRange,
-		// init: ({point}) => {
-		// 	// "alt" property is generated inside "leaflet"
-		// 	if ("alt" in point) point.meta.ele = point.alt;
-		// },
-		pointToAttr: (point, i) => {
-			if ("alt" in point) point.meta.ele = point.alt; // "alt" property is generated inside "leaflet"
-			return this._data[i].z * opts.altitudeFactor;
-		},
-		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
-		grid: {
-			axis      : "y",
-			position  : "left",
-			scale     : "y" // this._chart._y,
-		},
-		scale: {
-			axis    : "y",
-			position: "left",
-			scale   : "y", // this._chart._y,
-			labelX  : -3,
-			labelY  : -8,
-		},
-		path: {
-			label        : 'Altitude',
-			scaleX       : 'distance',
-			scaleY       : 'altitude',
-			className    : 'area',
-			color        : color.area || theme,
-			strokeColor  : opts.detached ? color.stroke : '#000',
-			strokeOpacity: "1",
-			fillOpacity  : opts.detached ? (color.alpha || '0.8') : 1,
-			preferCanvas : opts.preferCanvas,
-		},
-		tooltip: {
-			name: 'y',
-			chart: (item) => L._("y: ") + _.round(item[opts.yAttr], opts.decimalsY) + " " + altitude.label,
-			marker: (item) => _.round(item[opts.yAttr], opts.decimalsY) + " " + altitude.label,
-			order: 10,
-		},
-		summary: {
-			"minele"  : {
-				label: "Min Elevation: ",
-				value: (track, unit) => (track.elevation_min || 0).toFixed(2) + ' ' + unit,
-				order: 30,
-			},
-			"maxele"  : {
-				label: "Max Elevation: ",
-				value: (track, unit) => (track.elevation_max || 0).toFixed(2) + ' ' + unit,
-				order: 31,
-			},
-			"avgele"  : {
-				label: "Avg Elevation: ",
-				value: (track, unit) => (track.elevation_avg || 0).toFixed(2) + ' ' + unit,
-				order: 32,
-			},
-		}
-	};
-}
+export function Altitude() {
+	
+	const _  = L.Control.Elevation.Utils;
+
+	let opts       = this.options;
+	let altitude   = {};
+
+	let theme           = opts.theme.split(' ')[0].replace('-theme', '');
+	let color           = _.Colors[theme] || {};
+
+	opts.altitudeFactor = opts.imperial ? this.__footFactor : (opts.altitudeFactor || 1); // 1 m = (1 m)
+	altitude.label      = opts.imperial ? "ft" : opts.yLabel;
+
+	return {
+		name: 'altitude',
+		required: this.options.slope,
+		meta: 'z',
+		unit: altitude.label,
+		statsName: 'elevation',
+		skipNull: this.options.skipNullZCoords,
+		deltaMax: this.options.altitudeDeltaMax,
+		clampRange: this.options.altitudeRange,
+		// init: ({point}) => {
+		// 	// "alt" property is generated inside "leaflet"
+		// 	if ("alt" in point) point.meta.ele = point.alt;
+		// },
+		pointToAttr: (point, i) => {
+			if ("alt" in point) point.meta.ele = point.alt; // "alt" property is generated inside "leaflet"
+			return this._data[i].z *= opts.altitudeFactor;
+		},
+		stats: { max: _.iMax, min: _.iMin, avg: _.iAvg },
+		grid: {
+			axis      : "y",
+			position  : "left",
+			scale     : "y" // this._chart._y,
+		},
+		scale: {
+			axis    : "y",
+			position: "left",
+			scale   : "y", // this._chart._y,
+			labelX  : -3,
+			labelY  : -8,
+		},
+		path: {
+			label        : 'Altitude',
+			scaleX       : 'distance',
+			scaleY       : 'altitude',
+			className    : 'area',
+			color        : color.area || theme,
+			strokeColor  : opts.detached ? color.stroke : '#000',
+			strokeOpacity: "1",
+			fillOpacity  : opts.detached ? (color.alpha || '0.8') : 1,
+			preferCanvas : opts.preferCanvas,
+		},
+		tooltip: {
+			name: 'y',
+			chart: (item) => L._("y: ") + _.round(item[opts.yAttr], opts.decimalsY) + " " + altitude.label,
+			marker: (item) => _.round(item[opts.yAttr], opts.decimalsY) + " " + altitude.label,
+			order: 10,
+		},
+		summary: {
+			"minele"  : {
+				label: "Min Elevation: ",
+				value: (track, unit) => (track.elevation_min || 0).toFixed(2) + ' ' + unit,
+				order: 30,
+			},
+			"maxele"  : {
+				label: "Max Elevation: ",
+				value: (track, unit) => (track.elevation_max || 0).toFixed(2) + ' ' + unit,
+				order: 31,
+			},
+			"avgele"  : {
+				label: "Avg Elevation: ",
+				value: (track, unit) => (track.elevation_avg || 0).toFixed(2) + ' ' + unit,
+				order: 32,
+			},
+		}
+	};
+}

package/src/handlers/distance.js

@@ -1,45 +1,46 @@
-export function Distance() {
-
-	const _ = L.Control.Elevation.Utils;
-
-	let opts     = this.options;
-	let distance = {};
-
-	opts.distanceFactor = opts.imperial ? this.__mileFactor : (opts.distanceFactor || 1); // 1 km = (1000 m)
-	distance.label      = opts.imperial ? "mi" : opts.xLabel;
-
-	return {
-		name: 'distance',
-		attr: 'dist',
-		unit: distance.label,
-		decimals: 5,
-		pointToAttr: (_, i) => (i > 0 ? this._data[i - 1].dist : 0) + (this._data[i].latlng.distanceTo(this._data[i > 0 ? i - 1 : i].latlng) * opts.distanceFactor) / 1000, // convert back km to meters
-		// stats: { total: _.iSum },
-		onPointAdded: (distance, i) => this.track_info.distance = distance,
-		scale: {
-			axis    : "x",
-			position: "bottom",
-			scale   : "x", // this._chart._x,
-			labelY  : 25,
-			labelX  : () => this._width() + 6,
-			ticks   : () => _.clamp(this._chart._xTicks() / 2, [4, +Infinity]),
-		},
-		grid: {
-			axis      : "x",
-			position  : "bottom",
-			scale     : "x" // this._chart._x,
-		},
-		tooltip: {
-			name: 'x',
-			chart: (item) => L._("x: ") + _.round(item[opts.xAttr], opts.decimalsX) + " " + distance.label,
-			order: 20
-		},
-		summary: {
-			"totlen"  : {
-				label: "Total Length: ",
-				value: (track) => (track.distance || 0).toFixed(2) + ' ' + distance.label,
-				order: 10
-			}
-		}
-	};
-}
+export function Distance() {
+
+	const _ = L.Control.Elevation.Utils;
+
+	let opts     = this.options;
+	let distance = {};
+
+	opts.distanceFactor = opts.imperial ? this.__mileFactor : (opts.distanceFactor || 1); // 1 km = (1000 m)
+	distance.label      = opts.imperial ? "mi" : opts.xLabel;
+
+	return {
+		name: 'distance',
+		required: true,
+		attr: 'dist',
+		unit: distance.label,
+		decimals: 5,
+		pointToAttr: (_, i) => (i > 0 ? this._data[i - 1].dist : 0) + (this._data[i].latlng.distanceTo(this._data[i > 0 ? i - 1 : i].latlng) * opts.distanceFactor) / 1000, // convert back km to meters
+		// stats: { total: _.iSum },
+		onPointAdded: (distance, i) => this.track_info.distance = distance,
+		scale: opts.distance && {
+			axis    : "x",
+			position: "bottom",
+			scale   : "x", // this._chart._x,
+			labelY  : 25,
+			labelX  : () => this._width() + 6,
+			ticks   : () => _.clamp(this._chart._xTicks() / 2, [4, +Infinity]),
+		},
+		grid: opts.distance && {
+			axis      : "x",
+			position  : "bottom",
+			scale     : "x" // this._chart._x,
+		},
+		tooltip: opts.distance && {
+			name: 'x',
+			chart: (item) => L._("x: ") + _.round(item[opts.xAttr], opts.decimalsX) + " " + distance.label,
+			order: 20
+		},
+		summary: opts.distance && {
+			"totlen"  : {
+				label: "Total Length: ",
+				value: (track) => (track.distance || 0).toFixed(2) + ' ' + distance.label,
+				order: 10
+			}
+		}
+	};
+}