@raruto/leaflet-elevation 1.9.0 → 1.9.3

package/package.json

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

package/src/components.js

@@ -116,9 +116,11 @@ export const PositionMarker = ({
 }) => {
 	return g => {
 
-		let line = g.select('.height-focus.line');
+		g.attr("class", "height-focus-group");
+
+		let line   = g.select('.height-focus.line');
 		let circle = g.select('.height-focus.circle-lower');
-		let text = g.select('.height-focus-label');
+		let text   = g.select('.height-focus-label');
 
 		if (!line.node()) line = g.append('svg:line');
 		if (!circle.node()) circle = g.append('svg:circle');

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.9.0/libs/leaflet-distance-marker.min.js',
+	__LDISTANCEM:  'https://unpkg.com/@raruto/leaflet-elevation@1.9.3/libs/leaflet-distance-marker.min.js',
 
 	/*
 	 * Add data to the diagram either from GPX or GeoJSON and update the axis domain and data
@@ -400,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
 	 */
@@ -754,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;
 				}
@@ -1147,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/marker.js

@@ -10,8 +10,6 @@ export var Marker = L.Class.extend({
 		switch(this.options.marker) {
 			case 'elevation-line':
 				// this._container = d3.create("g").attr("class", "height-focus-group");
-				this._container = d3.select(map.getPane('elevationPane')).select("svg > g")
-					.attr("class", "height-focus-group");
 			break;
 			case 'position-marker':
 				// this._marker   = L.circleMarker([0, 0], { pane: 'overlayPane', radius: 6, fillColor: '#fff', fillOpacity:1, color: '#000', weight:1, interactive: false });
@@ -27,7 +25,7 @@ export var Marker = L.Class.extend({
 	addTo: function(map) {
 		this._map = map;
 		switch(this.options.marker) {
-			case 'elevation-line':  this._container.call(D3.PositionMarker({}));      break;
+			case 'elevation-line':  this._container = d3.select(map.getPane('elevationPane')).select("svg > g").call(D3.PositionMarker({})); break;
 			case 'position-marker': this._marker.addTo(map, { pane: 'overlayPane' }); break;
 		}
 		return this;
@@ -49,18 +47,20 @@ export var Marker = L.Class.extend({
 
 		switch(this.options.marker) {
 			case 'elevation-line':
-				let point   = this._map.latLngToLayerPoint(this._latlng);
-				point = L.extend({}, props.item, this._map._rotate ? this._map.rotatedPointToMapPanePoint(point) : point);
-		
-				this._container.classed("leaflet-hidden", false);
-				this._container.call(D3.PositionMarker({
-					theme : this.options.theme,
-					xCoord: point.x,
-					yCoord: point.y,
-					length: point.y - (this._height() / props.maxElevation * point.z), // normalized Y
-					labels: this._labels,
-					item: point
-				}));
+				if (this._container) {
+					let point = this._map.latLngToLayerPoint(this._latlng);
+					point     = L.extend({}, props.item, this._map._rotate ? this._map.rotatedPointToMapPanePoint(point) : point);
+
+					this._container.classed("leaflet-hidden", false);
+					this._container.call(D3.PositionMarker({
+						theme : this.options.theme,
+						xCoord: point.x,
+						yCoord: point.y,
+						length: point.y - (this._height() / props.maxElevation * point.z), // normalized Y
+						labels: this._labels,
+						item: point
+					}));
+				}
 			break;
 			case 'position-marker':
 				_.removeClass(this._marker.getElement(), 'leaflet-hidden');

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],
 		}),