@raruto/leaflet-elevation 2.0.1 → 2.0.4

package/src/control.js

@@ -7,8 +7,8 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	includes: L.Evented ? L.Evented.prototype : L.Mixin.Events,
 
 	options: Options,
-	__mileFactor: 0.621371, // 1 km = (0.621371 mi)
-	__footFactor: 3.28084,  // 1 m  = (3.28084 ft)
+	__mileFactor:     0.621371, // 1 km = (0.621371 mi)
+	__footFactor:     3.28084,  // 1 m  = (3.28084 ft)
 	__D3:            'https://unpkg.com/d3@6.5.0/dist/d3.min.js',
 	__TOGEOJSON:     'https://unpkg.com/@tmcw/togeojson@4.6.0/dist/togeojson.umd.js',
 	__LGEOMUTIL:     'https://unpkg.com/leaflet-geometryutil@0.9.3/src/leaflet.geometryutil.js',
@@ -25,9 +25,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	addData: function(d, layer) {
 		this.import(this.__D3)
 			.then(() => {
-				if (typeof layer === "undefined" && d.on) {
-					layer = d;
-				}
+				layer = layer ?? (d.on && d);
 				this._addData(d);
 				this._addLayer(layer);
 				this._fireEvt("eledata_added", { data: d, layer: layer, track_info: this.track_info });
@@ -39,9 +37,9 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 */
 	addTo: function(map) {
 		if (this.options.detached) {
-			let eleDiv = this._initElevationDiv();
-			if (!eleDiv.isConnected) _.insert(map.getContainer(), eleDiv, 'afterend');
-			_.append(eleDiv, this.onAdd(map));
+			let parent = _.select(this.options.elevationDiv);
+			let eleDiv = this.onAdd(map);
+			parent ? _.append(parent, eleDiv) : _.insert(map.getContainer(), eleDiv, 'afterend');
 		} else {
 			L.Control.prototype.addTo.call(this, map);
 		}
@@ -223,7 +221,9 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	onAdd: function(map) {
 		this._map = map;
 
-		let container = this._container = _.create("div", "elevation-control elevation " + this.options.theme + " " + (this.options.detached ? '' : 'leaflet-control'));
+		let container = this._container = _.create("div", "elevation-control " + this.options.theme + " " + (this.options.detached ? 'elevation-detached' : 'leaflet-control'), this.options.detached ? { id: 'elevation-' + _.randomId() } : {});
+
+		if (!this.eleDiv) this.eleDiv = container;
 
 		let modules = [
 			"Distance",
@@ -296,51 +296,44 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			return;
 		}
 
-		/**
-		 * Standard GeoJSON --> doesn't handle "time", "heart", …
-		 */
-		let geom = d.geometry;
-		if (geom) {
-			switch (geom.type) {
-				case 'LineString':
-					this._addGeoJSONData(geom.coordinates);
-					break;
-
-				case 'MultiLineString':
-					_.each(geom.coordinates, coords => this._addGeoJSONData(coords));
-					break;
-
-				default:
-					return console.warn('Unsopperted GeoJSON feature geometry type:' + geom.type);
+		// Standard GeoJSON
+		if (d.type === "FeatureCollection" ) {
+			return _.each(d.features, feature => this._addData(feature));
+		} else if (d.type === "Feature") {
+			let geom = d.geometry;
+			if (geom) {
+				switch (geom.type) {
+					case 'LineString':		return this._addGeoJSONData(geom.coordinates, d.properties);
+					case 'MultiLineString': return _.each(geom.coordinates, (coords, i) => this._addGeoJSONData(coords, d.properties, i));
+					case 'Point':
+					default:				return console.warn('Unsopperted GeoJSON feature geometry type:' + geom.type);
+				}
 			}
 		}
-		if (d.type === "FeatureCollection") {
-			_.each(d.features, feature => this._addData(feature));
-		}
 
-		/**
-		 * Extended GeoJSON --> rely on leaflet implementation
-		 */
+		// Fallback for leaflet layers (eg. L.Gpx)
 		if (d._latlngs) {
-			this._addGeoJSONData(d._latlngs, d.feature && d.feature.properties);
+			return this._addGeoJSONData(d._latlngs, d.feature && d.feature.properties);
 		}
+
 	},
 
 	/*
 	 * Parsing of GeoJSON data lines and their elevation in z-coordinate
 	 */
-	_addGeoJSONData: function(coords, properties) {
+	_addGeoJSONData: function(coords, properties, nestingLevel) {
+
+		// "coordinateProperties" property is generated inside "@tmcw/toGeoJSON"
+		let props  = (properties && properties.coordinateProperties) || properties;
+
 		coords.forEach((point, i) => {
 
 			// GARMIN_EXTENSIONS = ["hr", "cad", "atemp", "wtemp", "depth", "course", "bearing"];
 			point.meta = point.meta ?? { time: null, ele: null };
 			
-			// "coordinateProperties" property is generated inside "@tmcw/toGeoJSON"
-			let props  = (properties && properties.coordinateProperties) || properties;
-
 			point.prev = (attr) => (attr ? this._data[i > 0 ? i - 1 : 0][attr] : this._data[i > 0 ? i - 1 : 0]);
 
-			this.fire("elepoint_init", { point: point, props: props, id: i });
+			this.fire("elepoint_init", { point: point, props: props, id: i, isMulti: nestingLevel });
 
 			this._addPoint(
 				point.lat ?? point[1], 
@@ -380,10 +373,12 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		if (layer && this.options.distanceMarkers && this.options.distanceMarkers.lazy) {
 			layer.on('add remove', ({target, type}) => L.DistanceMarkers && target instanceof L.Polyline && target[type + 'DistanceMarkers']());
 		}
+		return layer;
 	},
 
 	_addMarker: function(marker) {
 		if (marker) this._markers.addLayer(marker)
+		return marker;
 	},
 
 	/**
@@ -420,21 +415,6 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		}
 	},
 
-	/**
-	 * Adds the control to the given "detached" div.
-	 */
-	_initElevationDiv: function() {
-		let eleDiv = _.select(this.options.elevationDiv);
-		if (!eleDiv) {
-			this.options.elevationDiv = '#elevation-div_' + _.randomId();
-			eleDiv                    = _.create('div', 'leaflet-control elevation elevation-div', { id: this.options.elevationDiv.substr(1) });
-		}
-		if (this.options.detached) {
-			_.replaceClass(eleDiv, 'leaflet-control', 'elevation-detached');
-		}
-		return this.eleDiv = eleDiv;
-	},
-
 	/**
 	 * Initialize "L.AlmostOver" and "L.DistanceMarkers"
 	 */
@@ -453,6 +433,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			} else if (control.options.polyline) {
 				layer.addTo(map);
 			}
+			map.invalidateSize();
 		} else {
 			console.warn("Undefined elevation map object");;
 		}
@@ -479,7 +460,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		let oldProto = L.Canvas.prototype._fillStroke;
 		let control  = this;
 
-		let theme      = this.options.theme.replace('-theme', '');
+		let theme      = this.options.theme.split(' ')[0].replace('-theme', '');
 		let color      = _.Colors[theme] || {};
 
 		L.Canvas.include({
@@ -600,10 +581,6 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 				.on('margins_updated', this._resizeChart,    this);
 	
 	
-			this.fire("elechart_axis");
-	
-			if (this.options.legend) this.fire("elechart_legend");
-	
 			this.fire("elechart_init");
 
 			map
@@ -668,23 +645,19 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 				.disableScrollPropagation(container);
 		}
 
-		if (!this.options.detached) {
-			let link = this._button = _.create('a', "elevation-toggle elevation-toggle-icon" + (this.options.autohide ? "" : " close-button"), { href: '#', title: L._('Elevation') }, container);
-
-			if (this.options.collapsed) {
-				this._collapse();
-				if (this.options.autohide) {
-					_.on(container, 'mouseover', this._expand,   this);
-					_.on(container, 'mouseout',  this._collapse, this);
-				} else {
-					_.on(link, 'click', L.DomEvent.stop);
-					_.on(link, 'click', this._toggle, this);
-				}
+		this.options.collapsed ? this._collapse() : this._expand();
 
-				_.on(link, 'focus', this._toggle, this);
+		if (this.options.autohide) {
+			_.on(container, 'mouseover', this._expand,   this);
+			_.on(container, 'mouseout',  this._collapse, this);
+			this._map.on('click', this._collapse, this);
+		}
 
-				this._map.on('click', this._collapse, this);
-			}
+		if (this.options.closeBtn) {
+			let link = this._button = _.create('a', "elevation-toggle-icon", { href: '#', title: L._('Elevation'), }, container);
+			_.on(link, 'click', L.DomEvent.stop);
+			_.on(link, 'click', this._toggle, this);
+			_.on(link, 'focus', this._toggle, this);
 		}
 	},
 
@@ -716,7 +689,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 */
 	_loadModules: function(handlers) {
 		// First map known classnames (eg. "Altitude" --> L.Control.Elevation.Altitude)
-		handlers = handlers.map((h) => typeof h === 'string' && typeof L.Control.Elevation[h] !== "undefined" ? L.Control.Elevation[h] : h);
+		handlers = handlers.map((h) => typeof h === 'string' && typeof Elevation[h] !== "undefined" ? Elevation[h] : h);
 		// Then load optional classes and custom imports (eg. "Cadence" --> import('../src/handlers/cadence.js'))
 		Promise.
 			all(
@@ -727,8 +700,8 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			.then((m) => {
 				_.each(m, (exported) => {
 					let fn = Object.keys(exported)[0];
-					if (fn && typeof L.Control.Elevation[fn] === "undefined" ) {
-						handlers[fn] = L.Control.Elevation[fn] = exported[fn];
+					if (fn && typeof Elevation[fn] === "undefined" ) {
+						handlers[fn] = Elevation[fn] = exported[fn];
 						
 					}
 				});
@@ -740,65 +713,48 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 * Simple GeoJSON data loader (L.GeoJSON).
 	 */
 	_loadLayer: function(geojson) {
-		let control = this;
+		let { polyline, theme, waypoints, wptIcons, wptLabels, distanceMarkers } = this.options;
+		let style = L.extend({}, polyline);
+
+		if (theme) {
+			style.className += ' ' + theme;
+		}
 
-		let { wptIcons, wptLabels } = control.options;
+		if (geojson.name) {
+			this.track_info.name = geojson.name;
+		}
 
 		let layer = L.geoJson(geojson, {
-			distanceMarkers: control.options.distanceMarkers,
-			style: (feature) => {
-				let style = L.extend({}, control.options.polyline);
-				if (control.options.theme) {
-					style.className += ' ' + control.options.theme;
-				}
-				return style;
-			},
+			distanceMarkers: distanceMarkers,
+			style: style,
 			pointToLayer: (feature, latlng) => {
-				if (!control.options.waypoints) return;
-
-				let prop   = feature.properties;
-				let desc   = prop.desc ?? '';
-				let name   = prop.name ?? '';
-				let sym    = (prop.sym ?? name).replace(' ', '-').replace('"', '').replace("'", '').toLowerCase();
-
-				// Handle chart waypoints (dots)
-				if ([true, 'dots'].includes(control.options.waypoints)) {
-					control._registerCheckPoint({
-						latlng: latlng,
-						label: ([true, 'dots'].includes(wptLabels) ? name : '')
-					});
-				}
-
-				// Handle map waypoints (markers)
-				if ([true, 'markers'].includes(control.options.waypoints) && wptIcons != false) {
-					// generate and cache appropriate icon symbol
-					if (!wptIcons.hasOwnProperty(sym)) {
-						wptIcons[sym] = L.divIcon(
-							L.extend({}, wptIcons[""].options, { html: '<i class="elevation-waypoint-icon ' + sym + '"></i>' } )
-						);
+				if (waypoints) {
+					let { desc, name, sym } = feature.properties;
+					desc = desc || '';
+					name = name || '';
+					// Handle chart waypoints (dots)
+					if ([true, 'dots'].includes(waypoints)) {
+						this._registerCheckPoint({
+							latlng: latlng,
+							label : ([true, 'dots'].includes(wptLabels) ? name : '')
+						});
 					}
-					let marker = L.marker(latlng, { icon: wptIcons[sym] });
-					if ([true, 'markers'].includes(wptLabels) && (name || desc)) {
-						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();
+					// Handle map waypoints (markers)
+					if ([true, 'markers'].includes(waypoints) && wptIcons != false) {
+						return this._registerMarker({
+							latlng : latlng,
+							sym    : (sym ?? name).replace(' ', '-').replace('"', '').replace("'", '').toLowerCase(),
+							content: [true, 'markers'].includes(wptLabels) && (name || desc) && decodeURI("<b>" + name + "</b>" + (desc.length > 0 ? '<br>' + desc : ''))
+						});
 					}
-					control._addMarker(marker);
-					control.fire('waypoint_added', { point: marker, element: latlng, properties: prop });
-					return marker;
 				}
 			},
-			onEachFeature: (feature, layer) => {
-				if (feature.geometry && feature.geometry.type != 'Point') {
-					control.addData(layer);
-					control.track_info = L.extend({}, control.track_info, { name: geojson.name });
-				} 
-			},
+			onEachFeature: (feature, layer) => feature.geometry && feature.geometry.type != 'Point' && this.addData(feature, layer),
 		});
 
-		control.import(control.__D3).then(() => {
-			control._initMapIntegrations(control, layer);
-			control._fireEvt("eledata_loaded", { data: geojson, layer: layer, name: control.track_info.name, track_info: control.track_info });
+		this.import(this.__D3).then(() => {
+			this._initMapIntegrations(this, layer);
+			this._fireEvt("eledata_loaded", { data: geojson, layer: layer, name: this.track_info.name, track_info: this.track_info });
 		});
 
 		return layer;
@@ -929,8 +885,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 					geojson = this._parseFromGeoJSONString(data.toString());
 				}
 				if (geojson) {
-					geojson = this._prepareMultiLineStrings(geojson);
-					geojson = this._prepareAdditionalProperties(geojson);
+					geojson.name = geojson.name || (this._downloadURL || '').split('/').pop().split('#')[0].split('?')[0];
 				}
 				resolve(geojson);
 			})
@@ -958,37 +913,6 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		return geojson;
 	},
 
-	/**
-	 * Extend GeoJSON properties (name, time, ...)
-	 */
-	 _prepareAdditionalProperties: function(geojson) {
-		if (!geojson.name && this._downloadURL) {
-			geojson.name = this._downloadURL.split('/').pop().split('#')[0].split('?')[0];
-		}
-		return geojson;
-	},
-
-	/**
-	 * Just a temporary fix for MultiLineString data (trk > trkseg + trkseg),
-	 * just split them into seperate LineStrings (trk > trkseg, trk > trkseg)
-	 * 
-	 * @link https://github.com/Raruto/leaflet-elevation/issues/56
-	 */
-	_prepareMultiLineStrings: function(geojson) {
-		geojson.features.forEach(feauture => {
-			if (feauture.geometry.type == "MultiLineString") {
-				feauture.geometry.coordinates.forEach(coords => {
-					geojson.features.push({
-						geometry: { type: 'LineString', coordinates: coords },
-						properties: feauture.properties,
-						type: 'Feature'
-					});
-				});
-			} 
-		});
-		return geojson.features.filter(feauture => feauture.geometry.type != "MultiLineString");
-	},
-
 	/**
 	 * Add chart profile to diagram
 	 */
@@ -1106,60 +1030,79 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			return this._registerHandler(props.call(this));
 		}
 
+		let {
+			name,
+			attr,
+			required,
+			skipNull,
+			deltaMax,
+			clampRange,
+			decimals,
+			meta,
+			unit,
+			coordinateProperties,
+			coordPropsToMeta,
+			pointToAttr,
+			onPointAdded,
+			stats,
+			statsName,
+			grid,
+			scale,
+			path,
+			tooltip,
+			summary
+		} = props;
+
 		// eg. "altitude" == true
-		if (this.options[props.name] || props.required) {
+		if (this.options[name] || required) {
 
 			this._registerDataAttribute({
-				name: props.name,
-				attr: props.attr,
-				skipNull: props.skipNull,
-				deltaMax: props.deltaMax,
-				clampRange: props.clampRange,
-				decimals: props.decimals,
-				coordPropsToMeta: _.coordPropsToMeta(props.coordinateProperties, props.meta || props.name, props.coordPropsToMeta),
-				pointToAttr: props.pointToAttr,
-				onPointAdded: props.onPointAdded,
-				stats: props.stats,
-				statsName: props.statsName,
+				name,
+				attr,
+				skipNull,
+				deltaMax,
+				clampRange,
+				decimals,
+				coordPropsToMeta: _.coordPropsToMeta(coordinateProperties, meta || name, coordPropsToMeta),
+				pointToAttr,
+				onPointAdded,
+				stats,
+				statsName,
 			});
 
-			if (props.grid) {
-				props.grid.name = props.grid.name || props.name;
-				this._registerAxisGrid(props.grid);
+			if (grid) {
+				this._registerAxisGrid(L.extend({ name }, grid));
 			}
 
-			if (this.options[props.name] !== "summary") {
-				if (props.scale) {
-					props.scale.name = props.scale.name || props.name;
-					props.scale.label = props.scale.label || props.unit;
-					this._registerAxisScale(props.scale);
-				}
-				if (props.path) {
-					props.path.name = props.path.name || props.name;
-					this._registerAreaPath(props.path);
-				}
+			if (this.options[name] !== "summary") {
+				if (scale) this._registerAxisScale(L.extend({ name, label: unit }, scale));
+				if (path)  this._registerAreaPath(L.extend({ name }, path));
 			}
 
-			if (props.tooltips) {
-				_.each(props.tooltips, t => {
-					if (t) {
-						t.name = t.name || props.name;
-						this._registerTooltip(t)
-					}
-				});
-			} else if (props.tooltip) {
-				props.tooltip.name = props.tooltip.name || props.name;
-				this._registerTooltip(props.tooltip)
+			if (tooltip || props.tooltips) {
+				_.each([tooltip, ...(props.tooltips || [])], t => t && this._registerTooltip(L.extend({ name }, t)));
 			}
 
-			if (props.summary) {
-				for (const key in props.summary) {
-					props.summary[key].unit = props.summary[key].unit || props.unit;
-				}
-				this._registerSummary(props.summary);
+			if (summary) {
+				_.each(summary, (s, k) => summary[k] = L.extend({ unit }, s));
+				this._registerSummary(summary);
 			}
 		}
 	},
+
+	_registerMarker({latlng, sym, content}) {
+		let { wptIcons } = this.options;
+		// generate and cache appropriate icon symbol
+		if (!wptIcons.hasOwnProperty(sym)) {
+			wptIcons[sym] = L.divIcon(L.extend({}, wptIcons[""].options, { html: '<i class="elevation-waypoint-icon ' + sym + '"></i>' } ));
+		}
+		let marker = L.marker(latlng, { icon: wptIcons[sym] });
+		if (content) {
+			marker.bindPopup(content, { className: 'elevation-popup', keepInView: true }).openPopup();
+			marker.bindTooltip(content, { className: 'elevation-tooltip', direction: 'auto', sticky: true, opacity: 1 }).openTooltip();
+		}
+		return this._addMarker(marker)
+	},
 	
 	/**
 	 * Add chart or marker tooltip info
@@ -1242,7 +1185,6 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	_updateChart: function() {
 		if (this._chart && this._container) {
 			this.fire("elechart_axis");
-			this.fire("elechart_area");
 	
 			this._chart.update({ data: this._data, options: this.options });
 	
@@ -1290,27 +1232,26 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 * Update chart summary.
 	 */
 	_updateSummary: function() {
-		if (!this._summary) return;
-
-		this._summary.reset();
-
-		if (this.options.summary) {
-			this.fire("elechart_summary");
-			this._summary.update();
+		if (this._summary) {
+			this._summary.reset();
+			if (this.options.summary) {
+				this.fire("elechart_summary");
+				this._summary.update();
+			}
+			if (this.options.downloadLink && this._downloadURL) { // TODO: generate dynamically file content instead of using static file urls.
+				this._summary._container.innerHTML += '<span class="download"><a href="#">' + L._('Download') + '</a></span>'
+				_.select('.download a', this._summary._container).onclick = ({preventDefault}) => {
+					preventDefault();
+					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.fire('eletrack_download', event);
+				};
+			}
 		}
-		if (this.options.downloadLink && this._downloadURL) { // TODO: generate dynamically file content instead of using static file urls.
-			this._summary._container.innerHTML += '<span class="download"><a href="#">' + L._('Download') + '</a></span>'
-			_.select('.download a', this._summary._container).onclick = ({preventDefault}) => {
-				preventDefault();
-				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.fire('eletrack_download', event);
-			};
-		};
 	},
 
 

package/src/handlers/altitude.js

@@ -5,7 +5,7 @@ export function Altitude() {
 	let opts       = this.options;
 	let altitude   = {};
 
-	let theme           = opts.theme.replace('-theme', '');
+	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)
@@ -24,7 +24,10 @@ export function Altitude() {
 		// 	// "alt" property is generated inside "leaflet"
 		// 	if ("alt" in point) point.meta.ele = point.alt;
 		// },
-		pointToAttr: (_, i) => this._data[i].z * opts.altitudeFactor,
+		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",

package/src/handlers/heart.js

@@ -13,8 +13,8 @@ export function Heart() {
             axis       : "y",
             position   : "left",
             scale      : { min: -1, max: +1 },
-            tickPadding: 16,
-            labelX     : -18,
+            tickPadding: 25,
+            labelX     : -30,
             labelY     : -8,
         },
         path: {