@raruto/leaflet-elevation 1.8.9 → 1.9.2

package/package.json

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

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.9/libs/leaflet-distance-marker.min.js',
+	__LDISTANCEM:  'https://unpkg.com/@raruto/leaflet-elevation@1.9.2/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 && 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
 			}
 
@@ -396,17 +400,6 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		if (marker) this._markers.addLayer(marker)
 	},
 
-	_bindPopup: function(marker) {
-		let popup = marker._popup;
-		if (popup) {
-			popup.options.className = 'elevation-popup';
-			if (popup._content) {
-				popup._content = decodeURI(popup._content);
-				popup.bindTooltip(popup._content, { direction: 'auto', sticky: true, opacity: 1, className: 'elevation-tooltip' }).openTooltip();
-			}
-		}
-	},
-
 	/**
 	 * Initialize "L.AlmostOver" integration
 	 */
@@ -750,10 +743,11 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 					}
 					let marker = L.marker(latlng, { icon: wptIcons[sym] });
 					if ([true, 'markers'].includes(wptLabels) && (name || desc)) {
-						marker.bindPopup("<b>" + name + "</b>" + (desc.length > 0 ? '<br>' + desc : '')).openPopup();
+						let content = decodeURI("<b>" + name + "</b>" + (desc.length > 0 ? '<br>' + desc : ''));
+						marker.bindPopup(content, { className: 'elevation-popup', keepInView: true }).openPopup();
+						marker.bindTooltip(content, { className: 'elevation-tooltip', direction: 'auto', sticky: true, opacity: 1 }).openTooltip();
 					}
 					control._addMarker(marker);
-					control._bindPopup(marker);
 					control.fire('waypoint_added', { point: marker, element: latlng, properties: prop });
 					return marker;
 				}
@@ -1143,12 +1137,13 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			this._summary._container.innerHTML += '<span class="download"><a href="#">' + L._('Download') + '</a></span>'
 			_.select('.download a', this._summary._container).onclick = (e) => {
 				e.preventDefault();
-				if (e.downloadLink == 'modal' && typeof CustomEvent === "function") {
-					document.dispatchEvent(new CustomEvent("eletrack_download", { detail: e }));
-				} else if (e.downloadLink == 'link' || e.downloadLink === true) {
-					e.confirm();
+				let event = { downloadLink: this.options.downloadLink, confirm: _.saveFile.bind(this, this._downloadURL) };
+				if (this.options.downloadLink == 'modal' && typeof CustomEvent === "function") {
+					document.dispatchEvent(new CustomEvent("eletrack_download", { detail: event }));
+				} else if (this.options.downloadLink == 'link' || this.options.downloadLink === true) {
+					event.confirm();
 				}
-				this._fireEvt('eletrack_download', { downloadLink: this.options.downloadLink, confirm: _.saveFile.bind(this, this._downloadURL) });
+				this._fireEvt('eletrack_download', event);
 			};
 		};
 	},

package/src/options.js

@@ -69,7 +69,7 @@ export var Options = {
 	wptIcons: {
 		'': L.divIcon({
 			className: 'elevation-waypoint-marker',
-			html: '<i class="elevation-waypoint-icon"></i>',
+			html: '<i class="elevation-waypoint-icon default"></i>',
 			iconSize: [30, 30],
 			iconAnchor: [8, 30],
 		}),