@raruto/leaflet-elevation 1.8.4 → 1.8.5

package/src/index.css

@@ -211,7 +211,7 @@
 }
 
 .elevation-control.elevation.elevation-expanded .elevation-toggle-icon.close-button {
-  background: transparent url(../images/remove.svg) no-repeat center center;
+  background: transparent;
   position: absolute;
   right: 5px;
   top: 5px;
@@ -219,6 +219,21 @@
   width: 20px;
 }
 
+.elevation-control.elevation.elevation-expanded .elevation-toggle-icon.close-button:before {
+  content: '\2716';
+  display: inline-block;
+  color: #000;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  line-height: 20px;
+  text-align: center;
+  font-weight: bold;
+  font-size: 15px;
+}
+
 .elevation-control.elevation g.area > foreignObject {
   pointer-events: none;
 }

package/src/index.js

@@ -61,4 +61,16 @@ Elevation.Chart = Chart;
 	};
 })();
 
+// Alias deprecated functions
+ Elevation.addInitHook(function() {
+	this.enableDragging  = this.enableBrush;
+	this.disableDragging = this.disableBrush;
+	this.loadChart       = this.addTo;
+	this.loadData        = this.load;
+	this.loadGPX         = this.load;
+	this.loadGeoJSON     = this.load;
+	this.loadXML         = this.load;
+	this.loadFile        = this.load;
+});
+
 L.control.elevation = (options) => new Elevation(options);

package/src/utils.js

@@ -1,27 +1,3 @@
-/**
- * Recursive deep merge objects.
- * Alternative to L.Util.setOptions(this, options).
- */
-export function deepMerge(target, ...sources) {
-	if (!sources.length) return target;
-	const source = sources.shift();
-	if (isObject(target) && isObject(source)) {
-		for (const key in source) {
-			if (isObject(source[key])) {
-				if (!target[key]) Object.assign(target, {
-					[key]: {}
-				});
-				deepMerge(target[key], source[key]);
-			} else {
-				Object.assign(target, {
-					[key]: source[key]
-				});
-			}
-		}
-	}
-	return deepMerge(target, ...sources);
-}
-
 const SEC  = 1000;
 const MIN  = SEC * 60;
 const HOUR = MIN * 60;
@@ -41,169 +17,6 @@ export function formatTime(t) {
 	return (d ? d + "d " : '') + h.toString().padStart(2, 0) + ':' + m.toString().padStart(2, 0) + "'" + s.toString().padStart(2, 0) + '"';
 }
 
-/**
- * Simple GeoJSON data loader.
- */
-export function GeoJSONLoader(data, control) {
-	if (typeof data === "string") {
-		data = JSON.parse(data);
-	}
-	control = control || this;
-
-	let distanceMarkers = (
-			control.options.distanceMarkers === true
-				? { lazy: true }
-				: L.extend({ lazy: true }, control.options.distanceMarkers)
-	);
-
-	let { wptIcons, wptLabels } = control.options;
-
-	// Partially fix MultiLineStrings (trk > trkseg + trkseg) splitting them into seperate LineStrings (trk > trkseg, trk > trkseg)
-	data.features.forEach(d => {
-		if(d.type == 'Feature' && d.geometry.type == "MultiLineString") {
-			d.geometry.coordinates.forEach(coords => {
-				data.features.push({
-					type: 'Feature',
-					geometry: {
-						type: 'LineString',
-						coordinates: coords,
-					},
-					properties: d.properties
-				});
-			});
-		} 
-	});
-	data.features = data.features.filter(d=> d.type && d.geometry.type != "MultiLineString");
-
-	let layer = L.geoJson(data, {
-		distanceMarkers: distanceMarkers,
-		style: (feature) => {
-			let style = L.extend({}, control.options.polyline);
-			if (control.options.theme) {
-				style.className += ' ' + control.options.theme;
-			}
-			return 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 : '')
-					},
-					true
-				);
-			}
-
-			// 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>' } )
-					);
-				}
-				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();
-				}
-				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') return;
-
-			// Standard GeoJSON
-			// control.addData(feature, layer);  // NB uses "_addGeoJSONData"
-
-			// Extended GeoJSON
-			layer._latlngs.forEach((point, i, data) => {
-				// same properties as L.GPX layer
-				point.meta = { time: null, ele: null, hr: null, cad: null, atemp: null };
-				if("alt" in point) point.meta.ele = point.alt;
-				if(feature.properties) {
-					let prop = feature.properties;
-					if("coordTimes" in prop) point.meta.time = new Date(Date.parse(prop.coordTimes[i]));
-					else if("times" in prop) point.meta.time = new Date(Date.parse(prop.times[i]));
-					else if("time" in prop) point.meta.time = new Date(Date.parse((typeof prop.time === 'object' ? prop.time[i] : prop.time)));
-					if("heartRates" in prop) point.meta.hr = parseInt(prop.heartRates[i]);
-					else if("heartRate" in prop) point.meta.hr = parseInt((typeof prop.heartRate === 'object' ? prop.heartRate[i] : prop.heartRate));
-					// TODO: cadence, temperature
-				}
-			});
-			control.addData(layer); // NB uses "_addGPXData"
-
-			// Postpone adding the distance markers (lazy: true)
-			if(control.options.distanceMarkers && distanceMarkers.lazy) {
-				layer.on('add remove', (e) => {
-					let path = e.target;
-					if (L.DistanceMarkers && path instanceof L.Polyline) {
-						path[e.type + 'DistanceMarkers']();
-					}
-				});
-			}
-
-			control.track_info = L.extend({}, control.track_info, { type: "geojson", name: data.name });
-		},
-	});
-
-	L.Control.Elevation._d3LazyLoader.then(() => {
-		control._fireEvt("eledata_loaded", { data: data, layer: layer, name: control.track_info.name, track_info: control.track_info })
-	});
-
-	return layer;
-}
-
-/**
- * Check object type.
- */
-export function isObject(item) {
-	return (item && typeof item === 'object' && !Array.isArray(item));
-}
-
-/**
- * Check JSON object type.
- */
-export function isJSONDoc(doc, lazy) {
-	lazy = typeof lazy === "undefined" ? true : lazy;
-	if (typeof doc === "string" && lazy) {
-		doc = doc.trim();
-		return doc.indexOf("{") == 0 || doc.indexOf("[") == 0;
-	} else {
-		try {
-			JSON.parse(doc.toString());
-		} catch (e) {
-			if (typeof doc === "object" && lazy) return true;
-			console.warn(e);
-			return false;
-		}
-		return true;
-	}
-}
-
-/**
- * Check XML object type.
- */
-export function isXMLDoc(doc, lazy) {
-	lazy = typeof lazy === "undefined" ? true : lazy;
-	if (typeof doc === "string" && lazy) {
-		doc = doc.trim();
-		return doc.indexOf("<") == 0;
-	} else {
-		let documentElement = (doc ? doc.ownerDocument || doc : 0).documentElement;
-		return documentElement ? documentElement.nodeName !== "HTML" : false;
-	}
-}
-
 /**
  * Generate download data event.
  */
@@ -233,37 +46,6 @@ export function lazyLoader(url, skip, loader) {
 	});
 }
 
-export function lazyLoad(src, control) {
-	if (!control.options.lazyLoadJS) return Promise.resolve();
-
-	const Elevation = L.Control.Elevation;
-	let loader      = '';
-	let condition = false;
-
-	switch(src) {
-		case control.__D3:
-			loader    = '_d3LazyLoader';
-			condition = typeof d3 !== 'object';
-		break;
-		case control.__TOGEOJSON:
-			loader    = '_togeojsonLazyLoader';
-			condition = typeof toGeoJSON !== 'object';
-		break;
-		case control.__LGEOMUTIL:
-			loader    = '_geomutilLazyLoader';
-			condition = typeof L.GeometryUtil !== 'object';
-		case control.__LALMOSTOVER:
-			loader    = '_almostoverLazyLoader';
-			condition = typeof L.Handler.AlmostOver  !== 'function ';
-		break;
-		case control.__LDISTANCEM:
-			loader    = '_distanceMarkersLazyLoader';
-			condition = typeof L.DistanceMarkers  !== 'function';
-		break;
-	}
-	return Elevation[loader] = lazyLoader(src, condition, Elevation[loader]);
-}
-
 /**
  * Convert SVG Path into Path2D and then update canvas
  */

package/images/remove.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 1792 1792"><defs/><path d="M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z"/></svg>