@raruto/leaflet-elevation 2.4.0 → 2.5.1

package/dist/leaflet-elevation.js

@@ -74,8 +74,8 @@
 		ctx.moveTo(0, 0);
 		let p = new Path2D(path.attr('d'));
 
-		ctx.strokeStyle = path.attr('stroke');
-		ctx.fillStyle   = path.attr('fill');
+		ctx.strokeStyle = path.__strokeStyle || path.attr('stroke');
+		ctx.fillStyle   = path.__fillStyle   || path.attr('fill');
 		ctx.lineWidth   = 1.25;
 		ctx.globalCompositeOperation = 'source-over';
 
@@ -206,7 +206,7 @@
 		}
 	}
 
-	var _ = /*#__PURE__*/Object.freeze({
+	var _ = {
 		__proto__: null,
 		Colors: Colors,
 		addClass: addClass,
@@ -244,7 +244,7 @@
 		toggleStyle: toggleStyle,
 		wrapDelta: wrapDelta,
 		wrapNum: wrapNum
-	});
+	};
 
 	var Options = {
 		autofitBounds: true,
@@ -346,7 +346,7 @@
 		__mileFactor:     0.621371, // 1 km = (0.621371 mi)
 		__footFactor:     3.28084,  // 1 m  = (3.28084 ft)
 		__D3:            'https://unpkg.com/d3@7.8.4/dist/d3.min.js',
-		__TOGEOJSON:     'https://unpkg.com/@tmcw/togeojson@5.6.0/dist/togeojson.umd.js',
+		__TOGEOJSON:     'https://unpkg.com/@tmcw/togeojson@5.6.2/dist/togeojson.umd.js',
 		__LGEOMUTIL:     'https://unpkg.com/leaflet-geometryutil@0.10.1/src/leaflet.geometryutil.js',
 		__LALMOSTOVER:   'https://unpkg.com/leaflet-almostover@1.0.1/src/leaflet.almostover.js',
 		__LHOTLINE:      '../libs/leaflet-hotline.min.js',
@@ -546,6 +546,9 @@
 		 * Javascript scripts downloader (lazy loader)
 		 */
 		import(src, condition) {
+			if (Array.isArray(src)) {
+				return Promise.all(src.map(m => this.import(m)));
+			}
 			switch(src) {
 				case this.__D3:          condition = typeof d3 !== 'object'; break;
 				case this.__TOGEOJSON:   condition = typeof toGeoJSON !== 'object'; break;
@@ -733,38 +736,36 @@
 		 * Initialize "L.AlmostOver" integration
 		 */
 		_initAlmostOverHandler(map, layer) {
-			return (map && this.options.almostOver && !L.Browser.mobile) ? Promise.all([
-				this.import(this.__LGEOMUTIL),
-				this.import(this.__LALMOSTOVER)
-			]).then(() => {
-				map.addHandler('almostOver', L.Handler.AlmostOver);
-				if (L.GeometryUtil && map.almostOver && map.almostOver.enabled()) {
-					map.almostOver.addLayer(layer);
-					map
-						.on('almost:move', this._onMouseMoveLayer, this)
-						.on('almost:out', this._onMouseOut, this);
-					this.once('eledata_clear', () => {
-						map.almostOver.removeLayer(layer);
+			return (map && this.options.almostOver && !L.Browser.mobile) ? this.import([this.__LGEOMUTIL, this.__LALMOSTOVER])
+				.then(() => {
+					map.addHandler('almostOver', L.Handler.AlmostOver);
+					if (L.GeometryUtil && map.almostOver && map.almostOver.enabled()) {
+						map.almostOver.addLayer(layer);
 						map
-						.off('almost:move', this._onMouseMoveLayer, this)
-						.off('almost:out', this._onMouseOut, this);
-					});
-				}
-			}) : Promise.resolve();
+							.on('almost:move', this._onMouseMoveLayer, this)
+							.on('almost:out', this._onMouseOut, this);
+						this.once('eledata_clear', () => {
+							map.almostOver.removeLayer(layer);
+							map
+							.off('almost:move', this._onMouseMoveLayer, this)
+							.off('almost:out', this._onMouseOut, this);
+						});
+					}
+				}) : Promise.resolve();
 		},
 
 		/**
 		 * Initialize "L.DistanceMarkers" integration
 		 */
 		_initDistanceMarkers() {
-			return this.options.distanceMarkers ? Promise.all([this.import(this.__LGEOMUTIL), this.import(this.__LDISTANCEM)]) : Promise.resolve();
+			return this.options.distanceMarkers ? this.import([this.__LGEOMUTIL, this.__LDISTANCEM]) : Promise.resolve();
 		},
 
 		/**
 		 * Initialize "L.Control.EdgeScale" integration
 		 */
 		_initEdgeScale(map) {
-			return this.options.edgeScale ? Promise.all([this.import(this.__LEDGESCALE)])
+			return this.options.edgeScale ? this.import(this.__LEDGESCALE)
 				.then(() => {
 					map.edgeScaleControl = map.edgeScaleControl || L.control.edgeScale('boolean' !== typeof this.options.edgeScale ? this.options.edgeScale : {}).addTo(map);
 				}) : Promise.resolve();
@@ -775,7 +776,7 @@
 			return this.options.hotline ? this.import(this.__LHOTLINE)
 				.then(() => {
 					layer.eachLayer((trkseg) => {
-						if(trkseg.feature.geometry.type != "Point") {
+						if (trkseg.feature.geometry.type != "Point") {
 							let geo = L.geoJson(trkseg.toGeoJSON(), { coordsToLatLng: (coords) => L.latLng(coords[0], coords[1], coords[2] * (this.options.altitudeFactor || 1))});
 							let line = L.hotline(geo.toGeoJSON().features[0].geometry.coordinates, {
 								renderer: L.Hotline.renderer(),
@@ -950,10 +951,9 @@
 				if (opts._maxWidth > clientWidth) opts.width = clientWidth - 30;
 			}
 
-			Promise.all([
-				this.import(this.__D3),
-				this.import(this.__LCHART)
-			]).then((m) => {
+			this
+				.import([this.__D3, this.__LCHART])
+				.then((m) => {
 
 				let chart = this._chart = new (m[1] || Elevation).Chart(opts, this);
 		
@@ -1021,13 +1021,11 @@
 			if (this._renderer) this._renderer.remove();
 			this._renderer               = L.svg({ pane: "elevationPane" }).addTo(this._map); // default leaflet svg renderer
 
-			Promise.all([
-				this.import(this.__D3),
-				this.import(this.__LMARKER)
-			]).then((m) => {
-				this._marker             = new (m[1] || Elevation).Marker(this.options, this);
-				this.fire("elechart_marker");
-			});
+			this.import([this.__D3, this.__LMARKER])
+				.then((m) => {
+					this._marker             = new (m[1] || Elevation).Marker(this.options, this);
+					this.fire("elechart_marker");
+				});
 		},
 
 		/**
@@ -1161,7 +1159,7 @@
 		},
 
 		_onKeyDown({key}) {
-			if(!this.options.detached && key === "Escape"){
+			if (!this.options.detached && key === "Escape"){
 				this._collapse();
 			}	},