@raruto/leaflet-elevation 2.1.0 → 2.2.1

package/README.md

@@ -23,9 +23,10 @@ _For a working example see one of the following demos:_
 - [loading individual .gpx tracks](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_toggable-tracks.html)
 - [loading multiple .gpx tracks (hover to toggle)](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_hoverable-tracks.html)
 - [loading multiple .gpx tracks (click to toggle)](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_toggable-charts.html)
+- [loading multiple maps](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_multiple-maps.html)
 - [translating plugin labels](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_i18n-strings.html)
 - [using custom colors](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_custom-theme.html)
-- [using .gpx extensions (cadence + heart)](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_extended-ui.html)
+- [using .gpx extensions (cadence, heart, pace)](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_extended-ui.html)
 - [using .gpx waypoint icons](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_gpx-waypoints.html)
 - [using .geojson waypoint icons](https://raruto.github.io/leaflet-elevation/examples/leaflet-elevation_geojson-waypoints.html)
 
@@ -62,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.4/dist/leaflet-ui.js"></script>
+    <script src="https://unpkg.com/leaflet-ui@0.5.5/dist/leaflet-ui.js"></script>
 
     <!-- leaflet-elevation -->
     <link rel="stylesheet" href="https://unpkg.com/@raruto/leaflet-elevation/dist/leaflet-elevation.css" />
@@ -123,15 +124,15 @@ _For a working example see one of the following demos:_
         // Speed chart profile: true || "summary" || "disabled" || false
         speed: false,
 
+        // Altitude chart profile: true || "summary" || "disabled" || false
+        altitude: true,
+
         // Display time info: true || "summary" || false
-        time: false,
+        time: true,
 
-        // Display distance info: true || "summary"
+        // Display distance info: true || "summary" || false
         distance: true,
 
-        // Display altitude info: true || "summary"
-        altitude: true,
-
         // Summary track info style: "inline" || "multiline" || false
         summary: 'multiline',
 
@@ -186,6 +187,22 @@ _For a working example see one of the following demos:_
     </script>
     ```
 
+### Build Guide
+
+For those wishing to try cloning this repository into a local development folder (eg. /var/www):
+
+```shell
+git clone git@github.com:Raruto/leaflet-elevation.git
+cd ./leaflet-elevation
+
+npm i         # install dependencies
+npm run watch # auto-generate "dist" files
+npm run build # generate "dist" files (once)
+npm run test  # test "spec" files (once)
+```
+
+After that you can start developing inside the `src` and `test` folders (eg. open "http://localhost/leaflet-elevation/test" in your browser to preview changes). Check also [CONTRIBUTING.md](.github/CONTRIBUTING.md) file for some information about it.
+
 ### FAQ
 
 <details>
@@ -247,6 +264,10 @@ var map = L.map('map', {
 
 _Related: [Leaflet-UI presets](https://github.com/raruto/leaflet-ui), [QGIS Integration](https://github.com/faunalia/trackprofile2web)_
 
+### Changelog
+
+All notable changes to this project are documented in the [releases](https://github.com/Raruto/leaflet-elevation/releases) page.
+
 ---
 
 **Compatibile with:**
@@ -261,4 +282,4 @@ _Related: [Leaflet-UI presets](https://github.com/raruto/leaflet-ui), [QGIS Inte
 
 ---
 
-Check out [CONTRIBUTING.md](.github/CONTRIBUTING.md) file for more information on supporting the development of this library.
+**License:** GPL-3.0+

package/dist/leaflet-elevation.js

@@ -97,7 +97,7 @@
 			if (props) {
 				for (const key of coordProps) {
 					if (key in props) {
-						point.meta[name] = (parser || parseInt).call(this, (isMulti ? props[key][isMulti] : props[key]), id);
+						point.meta[name] = (parser || parseNumeric).call(this, (isMulti ? props[key][isMulti] : props[key]), id);
 						break;
 					}
 				}
@@ -108,7 +108,7 @@
 	/**
 	 * Extract numeric property (id) from GeoJSON object
 	 */
-	const parseInt  = (property, id) => window.parseInt((typeof property === 'object' ? property[id] : property));
+	const parseNumeric  = (property, id) => parseInt((typeof property === 'object' ? property[id] : property));
 
 	/**
 	 * Extract datetime property (id) from GeoJSON object
@@ -136,10 +136,10 @@
 	/**
 	 * TODO: use generators instead? (ie. "yield")
 	 */
-	const iMax = (iVal, max) => (iVal > max ? iVal : max) || -Infinity; 
-	const iMin = (iVal, min) => (iVal < min ? iVal : min) || +Infinity;
-	const iAvg = (iVal, avg) => (iVal + (avg || 0)) / 2.0;
-	const iSum = (iVal, sum) => iVal + (sum || 0);
+	const iMax = (iVal, max = -Infinity) => (iVal > max ? iVal : max); 
+	const iMin = (iVal, min = +Infinity) => (iVal < min ? iVal : min);
+	const iAvg = (iVal, avg = 0, idx = 1) => (iVal + avg * (idx - 1)) / idx;
+	const iSum = (iVal, sum = 0) => iVal + sum;
 
 	/**
 	 * Alias for some leaflet core functions
@@ -171,7 +171,7 @@
 		saveFile: saveFile,
 		drawCanvas: drawCanvas,
 		coordPropsToMeta: coordPropsToMeta,
-		parseInt: parseInt,
+		parseNumeric: parseNumeric,
 		parseDate: parseDate,
 		addClass: addClass,
 		removeClass: removeClass,
@@ -218,7 +218,7 @@
 		followMarker: true,
 		imperial: false,
 		legend: true,
-		handlers: [],
+		handlers: ["Distance", "Time", "Altitude", "Slope", "Speed", "Acceleration"],
 		hotline: 'elevation',
 		marker: 'elevation-line',
 		markerIcon: L.divIcon({
@@ -247,7 +247,7 @@
 		summary: 'inline',
 		slope: false,
 		speed: false,
-		time: false,
+		time: true,
 		timeFactor: 3600,
 		timestamps: false,
 		trkStart: L.circleMarker([0,0], { className: 'start-marker', radius: 6, weight: 2, color: '#fff', fillColor: '#00d800', fillOpacity: 1, interactive: false }),
@@ -516,17 +516,7 @@
 
 			if (!this.eleDiv) this.eleDiv = container;
 
-			let modules = [
-				"Distance",
-				"Time",
-				"Altitude",
-				"Slope",
-				"Speed",
-				"Acceleration",
-				...this.options.handlers
-			].filter(m => false !== this.options[typeof m == "string" && m.toLowerCase()]);
-
-			this._loadModules(modules).then(() => { // Inject here required modules (data handlers)
+			this._loadModules(this.options.handlers).then(() => { // Inject here required modules (data handlers)
 				this._initChart(container);
 				this._initButton(container);
 				this._initSummary(container);
@@ -866,14 +856,15 @@
 		 * Generate "svg" chart (DOM element).
 		 */
 		_initChart: function(container) {
-			let opts    = this.options;
+			let opts = this.options;
+			let map  = this._map;
 
 			if (opts.detached) {
 				let { offsetWidth, offsetHeight}             = this.eleDiv;
 				if (offsetWidth > 0)             opts.width  = offsetWidth;
 				if (offsetHeight > 20)           opts.height = offsetHeight - 20; // 20 = horizontal scrollbar size.
 			} else {
-				let { clientWidth }                          = this._map.getContainer();
+				let { clientWidth }                          = map.getContainer();
 				opts._maxWidth                               = opts._maxWidth > opts.width ? opts._maxWidth : opts.width;
 				this._container.style.maxWidth               = opts._maxWidth + 'px';
 				if (opts._maxWidth > clientWidth) opts.width = clientWidth - 30;
@@ -1013,22 +1004,16 @@
 			// First map known classnames (eg. "Altitude" --> L.Control.Elevation.Altitude)
 			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'))
-			return Promise.
-				all(
-					handlers
-						.filter(h => typeof h === 'string' || h instanceof Promise)
-						.map(file => file instanceof Promise ? file : this.import(this.__modulesFolder + file.toLowerCase() + '.js'))
-				)
-				.then((m) => {
-					each(m, (exported) => {
-						let fn = Object.keys(exported)[0];
-						if (fn && typeof Elevation[fn] === "undefined" ) {
-							handlers[fn] = Elevation[fn] = exported[fn];
-							
-						}
-					});
-					each(handlers, h => this._registerHandler(h));
+			let modules = handlers.map(file => (typeof file === 'string' && this.import(this.__modulesFolder + file.toLowerCase() + '.js')) || (file instanceof Promise && file) || Promise.resolve());
+			return Promise.all(modules).then((m) => {
+				each(m, (exported, i) => {
+					let fn = exported && Object.keys(exported)[0];
+					if (fn) {
+						handlers[i] = Elevation[fn] = (Elevation[fn] ?? exported[fn]);
+					}
 				});
+				each(handlers, h => ["function", "object"].includes(typeof h) && this._registerHandler(h));
+			});
 		},
 
 		/**
@@ -1317,7 +1302,7 @@
 				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.track_info[sname + key] = props.stats[key].call(this, curr[attr], this.track_info[sname + key], this._data.length);
 					}
 				}