@raruto/leaflet-elevation 1.8.7 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@raruto/leaflet-elevation",
-	"version": "1.8.7",
+	"version": "1.9.0",
 	"description": "A Leaflet plugin that allows to add elevation profiles using d3js",
 	"main": "dist/leaflet-elevation.min.js",
 	"module": "src/index.js",

package/src/components.js

@@ -496,8 +496,8 @@ export const Chart = ({
 	const panes = {
 		grid   : g.append("g").attr("class", "grid"),
 		area   : g.append('g').attr("class", "area"),
-		point  : g.append('g').attr("class", "point"),
 		axis   : g.append('g').attr("class", "axis"),
+		point  : g.append('g').attr("class", "point"),
 		brush  : g.append("g").attr("class", "brush"),
 		tooltip: g.append("g").attr("class", "tooltip").attr('display', 'none'),
 		ruler  : g.append('g').attr('class', 'ruler'),

package/src/control.js

@@ -17,7 +17,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	__TOGEOJSON:   'https://unpkg.com/@tmcw/togeojson@4.5.0/dist/togeojson.umd.js',
 	__LGEOMUTIL:   'https://unpkg.com/leaflet-geometryutil@0.9.3/src/leaflet.geometryutil.js',
 	__LALMOSTOVER: 'https://unpkg.com/leaflet-almostover@1.0.1/src/leaflet.almostover.js',
-	__LDISTANCEM:  'https://unpkg.com/@raruto/leaflet-elevation@1.8.7/libs/leaflet-distance-marker.min.js',
+	__LDISTANCEM:  'https://unpkg.com/@raruto/leaflet-elevation@1.9.0/libs/leaflet-distance-marker.min.js',
 
 	/*
 	 * Add data to the diagram either from GPX or GeoJSON and update the axis domain and data
@@ -345,12 +345,16 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			
 			// "alt" property is generated inside "leaflet"
 			if ("alt" in point) point.meta.ele = point.alt;
-			
+
 			// "coordinateProperties" property is generated inside "@tmcw/toGeoJSON"
-			if (properties.coordinateProperties) {
-				let props = properties.coordinateProperties;
-				if("times" in props) point.meta.time = new Date(Date.parse(props.times[i]));
-				if("heart" in props) point.meta.hr = parseInt(props.heart[i]);
+			let props = (properties && properties.coordinateProperties) || properties;
+			if (props) {
+				if("coordTimes" in props)     point.meta.time = new Date(Date.parse(props.coordTimes[i]));
+				else if("times" in props)     point.meta.time = new Date(Date.parse(props.times[i]));
+				else if("time" in props)      point.meta.time = new Date(Date.parse((typeof props.time === 'object' ? props.time[i] : props.time)));
+				if ("heartRates" in props)    point.meta.hr   = parseInt(props.heartRates[i]);
+				else if("heartRate" in props) point.meta.hr   = parseInt((typeof props.heartRate === 'object' ? props.heartRate[i] : props.heartRate));
+				else if("heart" in props)     point.meta.hr   = parseInt((typeof props.heart === 'object' ? props.heart[i] : props.heart));
 				// TODO: ask to "@tmcw/toGeoJSON" for "cadence" and "temperature" implementation
 			}
 
@@ -1063,16 +1067,12 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 * Toggle chart data on legend click
 	 */
 	_toggleChartHandler: function(e) {
-		let { path, name, enabled } = e;
+		let { name, enabled } = e;
 
 		this._chartEnabled = this._chart._hasActiveLayers();
 
 		// toggle layer visibility on empty chart
-		this._layers.eachLayer(layer => {
-			let node = layer.getElement && layer.getElement();
-			_.toggleClass(node, this.options.polyline.className + ' ' + this.options.theme, this._chartEnabled);
-			}
-		);
+		this._layers.eachLayer(layer => _.toggleClass(layer.getElement && layer.getElement(), this.options.polyline.className + ' ' + this.options.theme, this._chartEnabled));
 
 		// toggle option value (eg. altitude = { 'disabled' || 'disabled' })
 		this.options[name] = !enabled && this.options[name] == 'disabled' ? 'enabled' : 'disabled';

package/libs/extended-ui.js

@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2020, GPL-3.0+ Project, Gérald Niel, Raruto
- *
- *  This file is free software: you may copy, redistribute and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation, either version 2 of the License, or (at your
- *  option) any later version.
- *
- *  This file is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see .
- */
-
-L.Control.Elevation.addInitHook(function() {
-
-	this.on("eledata_updated", function(e) {
-		let data = this._data;
-		let i = e.index;
-		let z = data[i].z;
-
-		let curr = data[i].latlng;
-		let prev = i > 0 ? data[i - 1].latlng : curr;
-
-		let delta = curr.distanceTo(prev) * this._distanceFactor;
-
-		// Slope / Gain
-		let tAsc = this._tAsc || 0; // Total Ascent
-		let tDes = this._tDes || 0; // Total Descent
-		let sMax = this._sMax || 0; // Slope Max
-		let sMin = this._sMin || 0; // Slope Min
-		let diff = 0;
-		let slope = 0;
-
-		if (!isNaN(z)) {
-			// diff height between actual and previous point
-			diff = i > 0 ? z - data[i - 1].z : 0;
-			if (diff > 0) tAsc += diff;
-			if (diff < 0) tDes -= diff;
-			// slope in % = ( height / length ) * 100
-			slope = delta !== 0 ? Math.round((diff / delta) * 10000) / 100 : 0;
-			// apply slope to the previous point because we will
-			// ascent or desent, so the slope is in the fist point
-			if (i > 0) data[i - 1].slope = slope;
-			sMax = slope > sMax ? slope : sMax;
-			sMin = slope < sMin ? slope : sMin;
-		}
-
-		data[i].slope = slope;
-
-		this.track_info = this.track_info || {};
-		this.track_info.ascent = this._tAsc = tAsc;
-		this.track_info.descent = this._tDes = tDes;
-		this.track_info.slope_max = this._sMax = sMax;
-		this.track_info.slope_min = this._sMin = sMin;
-	});
-
-	if (!this.options.extendedUI) return;
-
-	this.on("elechart_change", function(e) {
-		let item = e.data;
-		let xCoordinate = e.xCoord;
-
-		if (!this._focuslabelSlope || !this._focuslabelSlope.property('isConnected')) {
-			this._focuslabelSlope = this._focuslabeltext.insert("svg:tspan", ".mouse-focus-label-x")
-				.attr("class", "mouse-focus-label-slope")
-				.attr("dy", "1.5em");
-		}
-
-		this._focuslabelSlope.text(item.slope + "%");
-
-		if (!this._mouseSlopeFocusLabel) {
-			this._mouseSlopeFocusLabel = this._mouseHeightFocusLabel.append("svg:tspan")
-				.attr("class", "height-focus-slope ");
-		}
-
-		this._mouseHeightFocusLabelY
-			.attr("dy", "-1.5em");
-		this._focuslabelX
-			.attr("dy", "1.5em");
-
-		this._mouseSlopeFocusLabel
-			.attr("dy", "1.5em")
-			.text(Math.round(item.slope) + "%");
-
-	});
-
-	this.on("elechart_summary", function() {
-		this.summaryDiv.querySelector('.minele').insertAdjacentHTML('afterend', '<span class="ascent"><span class="summarylabel">' + L._("Total Ascent: ") + '</span><span class="summaryvalue">' + Math.round(this.track_info.ascent) + '&nbsp;' +
-			this._yLabel +
-			'</span></span>' + '<span class="descent"><span class="summarylabel">' + L._("Total Descent: ") + '</span><span class="summaryvalue">' + Math.round(this.track_info.descent) + '&nbsp;' + this._yLabel +
-			'</span></span>' + '<span class="minslope"><span class="summarylabel">' + L._("Min Slope: ") + '</span><span class="summaryvalue">' + this.track_info.slope_min + '&nbsp;' + '%' +
-			'</span></span>' + '<span class="maxslope"><span class="summarylabel">' + L._("Max Slope: ") + '</span><span class="summaryvalue">' + this.track_info.slope_max + '&nbsp;' + '%' +
-			'</span></span>');
-	});
-
-	this.on("eledata_clear", function() {
-		this._sMax = null;
-		this._sMin = null;
-		this._tAsc = null;
-		this._tDes = null;
-	});
-
-});

package/libs/extended-ui.min.js

@@ -1,5 +0,0 @@
-'use strict';L.Control.Elevation.addInitHook(function(){this.on("eledata_updated",function(e){let data=this._data;let i=e.index;let z=data[i].z;let curr=data[i].latlng;let prev=i>0?data[i-1].latlng:curr;let delta=curr.distanceTo(prev)*this._distanceFactor;let tAsc=this._tAsc||0;let tDes=this._tDes||0;let sMax=this._sMax||0;let sMin=this._sMin||0;let diff=0;let slope=0;if(!isNaN(z)){diff=i>0?z-data[i-1].z:0;if(diff>0)tAsc+=diff;if(diff<0)tDes-=diff;slope=delta!==0?Math.round(diff/delta*1E4)/100:0;
-if(i>0)data[i-1].slope=slope;sMax=slope>sMax?slope:sMax;sMin=slope<sMin?slope:sMin}data[i].slope=slope;this.track_info=this.track_info||{};this.track_info.ascent=this._tAsc=tAsc;this.track_info.descent=this._tDes=tDes;this.track_info.slope_max=this._sMax=sMax;this.track_info.slope_min=this._sMin=sMin});if(!this.options.extendedUI)return;this.on("elechart_change",function(e){let item=e.data;let xCoordinate=e.xCoord;if(!this._focuslabelSlope||!this._focuslabelSlope.property("isConnected"))this._focuslabelSlope=
-this._focuslabeltext.insert("svg:tspan",".mouse-focus-label-x").attr("class","mouse-focus-label-slope").attr("dy","1.5em");this._focuslabelSlope.text(item.slope+"%");if(!this._mouseSlopeFocusLabel)this._mouseSlopeFocusLabel=this._mouseHeightFocusLabel.append("svg:tspan").attr("class","height-focus-slope ");this._mouseHeightFocusLabelY.attr("dy","-1.5em");this._focuslabelX.attr("dy","1.5em");this._mouseSlopeFocusLabel.attr("dy","1.5em").text(Math.round(item.slope)+"%")});this.on("elechart_summary",
-function(){this.summaryDiv.querySelector(".minele").insertAdjacentHTML("afterend",'<span class="ascent"><span class="summarylabel">'+L._("Total Ascent: ")+'</span><span class="summaryvalue">'+Math.round(this.track_info.ascent)+"&nbsp;"+this._yLabel+"</span></span>"+'<span class="descent"><span class="summarylabel">'+L._("Total Descent: ")+'</span><span class="summaryvalue">'+Math.round(this.track_info.descent)+"&nbsp;"+this._yLabel+"</span></span>"+'<span class="minslope"><span class="summarylabel">'+
-L._("Min Slope: ")+'</span><span class="summaryvalue">'+this.track_info.slope_min+"&nbsp;"+"%"+"</span></span>"+'<span class="maxslope"><span class="summarylabel">'+L._("Max Slope: ")+'</span><span class="summaryvalue">'+this.track_info.slope_max+"&nbsp;"+"%"+"</span></span>")});this.on("eledata_clear",function(){this._sMax=null;this._sMin=null;this._tAsc=null;this._tDes=null})});