@raruto/leaflet-elevation 2.3.2 → 2.3.4

package/src/control.js

@@ -29,7 +29,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Add data to the diagram either from GPX or GeoJSON and update the axis domain and data
 	 */
-	addData: function(d, layer) {
+	addData(d, layer) {
 		this.import(this.__D3)
 			.then(() => {
 				if (this._modulesLoaded) {
@@ -46,7 +46,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Adds the control to the given map.
 	 */
-	addTo: function(map) {
+	addTo(map) {
 		if (this.options.detached) {
 			let parent = _.select(this.options.elevationDiv);
 			let eleDiv = this.onAdd(map);
@@ -60,12 +60,13 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Reset data and display
 	 */
-	clear: function() {
+	clear() {
 		if (this._marker)        this._marker.remove();
 		if (this._chart)         this._clearChart();
 		if (this._layers)        this._clearLayers(this._layers);
 		if (this._markers)       this._clearLayers(this._markers);
 		if (this._circleMarkers) this._circleMarkers.remove();
+		if (this._hotline)       this._hotline.eachLayer(l => l.options.renderer.remove()); // hotfix for: https://github.com/Raruto/leaflet-elevation/issues/233
 		if (this._hotline)       this._clearLayers(this._hotline);
 
 		this._data      = [];
@@ -76,7 +77,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		this._updateChart();
 	},
 
-	_clearChart: function() {
+	_clearChart() {
 		if (this._events && this._events.elechart_updated) {
 			this._events.elechart_updated.forEach(({fn, ctx}) => this.off('elechart_updated', fn, ctx));
 		}
@@ -86,7 +87,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		}
 	},
 
-	_clearLayers: function(l) {
+	_clearLayers(l) {
 		l = l || this._layers;
 		if (l && l.eachLayer) {
 			l.eachLayer(f => f.remove())
@@ -113,7 +114,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Disable chart brushing.
 	 */
-	disableBrush: function() {
+	disableBrush() {
 		this._chart._brushEnabled = false;
 		this._resetDrag();
 	},
@@ -121,14 +122,14 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Enable chart brushing.
 	 */
-	enableBrush: function() {
+	enableBrush() {
 		this._chart._brushEnabled = true;
 	},
 
 	/**
 	 * Disable chart zooming.
 	 */
-	disableZoom: function() {
+	disableZoom() {
 		this._chart._zoomEnabled = false;
 		this._chart._resetZoom();
 	},
@@ -136,40 +137,40 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Enable chart zooming.
 	 */
-	enableZoom: function() {
+	enableZoom() {
 		this._chart._zoomEnabled = true;
 	},
 
 	/**
 	 * Sets a map view that contains the given geographical bounds.
 	 */
-	fitBounds: function(bounds) {
+	fitBounds(bounds) {
 		bounds = bounds || this.getBounds();
 		if (this._map && bounds.isValid()) this._map.fitBounds(bounds);
 	},
 
-	getBounds: function(data) {
+	getBounds(data) {
 		return L.latLngBounds((data || this._data).map((d) => d.latlng));
 	},
 
 	/**
 	 * Get default zoom level (followMarker: true).
 	 */
-	getZFollow: function() {
+	getZFollow() {
 		return this.options.zFollow;
 	},
 
 	/**
 	 * Hide current elevation chart profile.
 	 */
-	hide: function() {
+	hide() {
 		_.style(this._container, "display", "none");
 	},
 
 	/**
 	 * Initialize chart control "options" and "container".
 	 */
-	initialize: function(opts) {
+	initialize(opts) {
 
 		// opts = L.setOptions(this, opts);
 
@@ -212,7 +213,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Javascript scripts downloader (lazy loader)
 	 */
-	import: function(src, condition) {
+	import(src, condition) {
 		switch(src) {
 			case this.__D3:          condition = typeof d3 !== 'object'; break;
 			case this.__TOGEOJSON:   condition = typeof toGeoJSON !== 'object'; break;
@@ -228,7 +229,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Load elevation data (GPX, GeoJSON, KML or TCX).
 	 */
-	load: function(data) {
+	load(data) {
 		this._parseFromString(data).then( geojson => geojson ? this._loadLayer(geojson) : this._loadFile(data));
 	},
 
@@ -236,7 +237,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 * Create container DOM element and related event listeners.
 	 * Called on control.addTo(map).
 	 */
-	onAdd: function(map) {
+	onAdd(map) {
 		this._map = map;
 
 		let container = this._container = _.create("div", "elevation-control " + this.options.theme + " " + (this.options.detached ? 'elevation-detached' : 'leaflet-control'), this.options.detached ? { id: 'elevation-' + _.randomId() } : {});
@@ -262,7 +263,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 * Clean up control code and related event listeners.
 	 * Called on control.remove().
 	 */
-	onRemove: function(map) {
+	onRemove(map) {
 		this._container = null;
 
 		map
@@ -285,28 +286,28 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Redraws the chart control. Sometimes useful after screen resize.
 	 */
-	redraw: function() {
+	redraw() {
 		this._resizeChart();
 	},
 
 	/**
 	 * Set default zoom level (followMarker: true).
 	 */
-	setZFollow: function(zoom) {
+	setZFollow(zoom) {
 		this.options.zFollow = zoom;
 	},
 
 	/**
 	 * Hide current elevation chart profile.
 	 */
-	show: function() {
+	show() {
 		_.style(this._container, "display", "block");
 	},
 
 	/*
 	 * Parsing data either from GPX or GeoJSON and update the diagram data
 	 */
-	_addData: function(d) {
+	_addData(d) {
 		if (!d) {
 			return;
 		}
@@ -336,7 +337,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Parsing of GeoJSON data lines and their elevation in z-coordinate
 	 */
-	_addGeoJSONData: function(coords, properties, nestingLevel) {
+	_addGeoJSONData(coords, properties, nestingLevel) {
 
 		// "coordinateProperties" property is generated inside "@tmcw/toGeoJSON"
 		let props  = (properties && properties.coordinateProperties) || properties;
@@ -367,7 +368,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Parse and push a single (x, y, z) point to current elevation profile.
 	 */
-	_addPoint: function(x, y, z) {
+	_addPoint(x, y, z) {
 		if (this.options.reverseCoords) {
 			[x, y] = [y, x];
 		}
@@ -382,7 +383,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		this.fire("eledata_updated", { index: this._data.length - 1 });
 	},
 
-	_addLayer: function(layer) {
+	_addLayer(layer) {
 		if (layer) this._layers.addLayer(layer)
 		// Postpone adding the distance markers (lazy: true)
 		if (layer && this.options.distanceMarkers && this.options.distanceMarkers.lazy) {
@@ -391,7 +392,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		return layer;
 	},
 
-	_addMarker: function(marker) {
+	_addMarker(marker) {
 		if (marker) this._markers.addLayer(marker)
 		return marker;
 	},
@@ -399,7 +400,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Initialize "L.AlmostOver" integration
 	 */
-	_initAlmostOverHandler: function(map, layer) {
+	_initAlmostOverHandler(map, layer) {
 		return (map && this.options.almostOver && !L.Browser.mobile) ? Promise.all([
 			this.import(this.__LGEOMUTIL),
 			this.import(this.__LALMOSTOVER)
@@ -408,8 +409,14 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			if (L.GeometryUtil && map.almostOver && map.almostOver.enabled()) {
 				map.almostOver.addLayer(layer);
 				map
-					.on('almost:move', (e) => this._onMouseMoveLayer(e))
-					.on('almost:out',  (e) => this._onMouseOut(e));
+					.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();
 	},
@@ -417,21 +424,21 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Initialize "L.DistanceMarkers" integration
 	 */
-	_initDistanceMarkers: function() {
+	_initDistanceMarkers() {
 		return this.options.distanceMarkers ? Promise.all([this.import(this.__LGEOMUTIL), this.import(this.__LDISTANCEM)]) : Promise.resolve();
 	},
 
 	/**
 	 * Initialize "L.Control.EdgeScale" integration
 	 */
-	_initEdgeScale: function(map) {
+	_initEdgeScale(map) {
 		return this.options.edgeScale ? Promise.all([this.import(this.__LEDGESCALE)])
 			.then(() => {
 				map.edgeScaleControl = map.edgeScaleControl || L.control.edgeScale('boolean' !== typeof this.options.edgeScale ? this.options.edgeScale : {}).addTo(map);
 			}) : Promise.resolve();
 	},
 
-	_initHotLine: function(layer) {
+	_initHotLine(layer) {
 		let prop = typeof this.options.hotline == 'string' ? this.options.hotline : 'elevation';
 		return this.options.hotline ? this.import(this.__LHOTLINE)
 			.then(() => {
@@ -465,7 +472,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Initialize "L.AlmostOver" and "L.DistanceMarkers"
 	 */
-	_initMapIntegrations: function(layer) {
+	_initMapIntegrations(layer) {
 		let map = this._map;
 		if (map) {
 			if (this._data.length) {
@@ -478,8 +485,8 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 				this._initDistanceMarkers(),
 				this._initEdgeScale(map),
 			]).then(() => {
-				if	(this.options.polyline) {
-					layer.addTo(map);
+				if (this.options.polyline) {
+					this._layers.addLayer(layer.addTo(map)); // hotfix for: https://github.com/Raruto/leaflet-elevation/issues/233
 					this._circleMarkers.addTo(map);
 				}
 				if (this.options.autofitBounds) {
@@ -495,7 +502,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Collapse current chart control.
 	 */
-	_collapse: function() {
+	_collapse() {
 		_.replaceClass(this._container, 'elevation-expanded', 'elevation-collapsed');
 		if (this._map) this._map.invalidateSize();
 	},
@@ -503,7 +510,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Expand current chart control.
 	 */
-	_expand: function() {
+	_expand() {
 		_.replaceClass(this._container, 'elevation-collapsed', 'elevation-expanded');
 		if (this._map) this._map.invalidateSize();
 	},
@@ -511,7 +518,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Add some basic colors to leaflet canvas renderer (preferCanvas: true).
 	 */
-	_fixCanvasPaths: function() {
+	_fixCanvasPaths() {
 		let oldProto = L.Canvas.prototype._fillStroke;
 		let control  = this;
 
@@ -519,7 +526,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		let color      = _.Colors[theme] || {};
 
 		L.Canvas.include({
-			_fillStroke: function(ctx, layer) {
+			_fillStroke(ctx, layer) {
 				if (control._layers.hasLayer(layer)) {
 
 					let options    = layer.options;
@@ -550,7 +557,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	 * 
 	 * @link https://github.com/Raruto/leaflet-elevation/issues/81#issuecomment-713477050
 	 */
-	_fixTooltipSize: function() {
+	_fixTooltipSize() {
 		this.on('elechart_init', () =>
 			this.once('elechart_change elechart_hover', ({data, xCoord}) => {
 				if (this._chartEnabled) {
@@ -565,21 +572,21 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Finds a data entry for the given LatLng
 	 */
-	_findItemForLatLng: function(latlng) {
+	_findItemForLatLng(latlng) {
 		return this._data[this._chart._findIndexForLatLng(latlng)];
 	},
 
 	/*
 	 * Finds a data entry for the given xDiagCoord
 	 */
-	_findItemForX: function(x) {
+	_findItemForX(x) {
 		return this._data[this._chart._findIndexForXCoord(x)];
 	},
 
 	/**
 	 * Fires an event of the specified type.
 	 */
-	_fireEvt: function(type, data, propagate) {
+	_fireEvt(type, data, propagate) {
 		if (this.fire) this.fire(type, data, propagate);
 		if (this._map) this._map.fire(type, data, propagate);
 	},
@@ -587,7 +594,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Hides the position/height indicator marker drawn onto the map
 	 */
-	_hideMarker: function() {
+	_hideMarker() {
 		if (this.options.autohideMarker) {
 			this._marker.remove();
 		}
@@ -596,7 +603,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Generate "svg" chart (DOM element).
 	 */
-	_initChart: function(container) {
+	_initChart(container) {
 		let opts = this.options;
 		let map  = this._map;
 
@@ -661,7 +668,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 
 	},
 
-	_initLayer: function() {
+	_initLayer() {
 		this._layers
 			.on('layeradd layerremove', ({layer, type}) => {
 				let node  = layer.getElement && layer.getElement();
@@ -671,7 +678,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 			});
 	},
 
-	_initMarker: function(map) {
+	_initMarker(map) {
 		let pane                     = map.getPane('elevationPane');
 		if (!pane) {
 			pane = this._pane        = map.createPane('elevationPane', map.getPane('norotatePane') || map.getPane('mapPane'));
@@ -694,7 +701,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Inspired by L.Control.Layers
 	 */
-	_initButton: function(container) {
+	_initButton(container) {
 		L.DomEvent
 			.disableClickPropagation(container)
 			.disableScrollPropagation(container);
@@ -716,7 +723,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		}
 	},
 
-	_initSummary: function(container) {
+	_initSummary(container) {
 		this.import(this.__LSUMMARY).then((m)=>{
 			this._summary = new (m || Elevation).Summary({ summary: this.options.summary }, this);
 
@@ -729,7 +736,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Retrieve data from a remote url (HTTP).
 	 */
-	_loadFile: function(url) {
+	_loadFile(url) {
 		fetch(url)
 			.then((response) => response.text())
 			.then((data)     => {
@@ -742,7 +749,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Dynamically import only required javascript modules (code splitting)
 	 */
-	_loadModules: function(handlers) {
+	_loadModules(handlers) {
 		// 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'))
@@ -761,7 +768,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Simple GeoJSON data loader (L.GeoJSON).
 	 */
-	_loadLayer: function(geojson) {
+	_loadLayer(geojson) {
 		let { polyline, theme, waypoints, wptIcons, wptLabels, distanceMarkers } = this.options;
 		let style = L.extend({}, polyline);
 
@@ -809,14 +816,14 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 		return layer;
 	},
 
-	_onDragEnd: function({ dragstart, dragend}) {
+	_onDragEnd({ dragstart, dragend}) {
 		this._hideMarker();
 		this.fitBounds(L.latLngBounds([dragstart.latlng, dragend.latlng]));
 
 		this.fire("elechart_dragged");
 	},
 
-	_onKeyDown: function({key}) {
+	_onKeyDown({key}) {
 		if(!this.options.detached && key === "Escape"){
 			this._collapse()
 		};
@@ -825,14 +832,14 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Trigger mouseenter event.
 	 */
-	_onMouseEnter: function() {
+	_onMouseEnter() {
 		this.fire('elechart_enter');
 	},
 
 	/*
 	 * Handles the moueseover the chart and displays distance and altitude level.
 	 */
-	_onMouseMove: function({xCoord}) {
+	_onMouseMove({xCoord}) {
 		if (this._chartEnabled && this._data.length) {
 			let item = this._findItemForX(xCoord);
 			if (item) {
@@ -854,7 +861,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Handles mouseover events of the data layers on the map.
 	 */
-	_onMouseMoveLayer: function({latlng}) {
+	_onMouseMoveLayer({latlng}) {
 		if (this._data.length) {
 			let item = this._findItemForLatLng(latlng);
 			if (item) {
@@ -872,7 +879,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Handles the moueseout over the chart.
 	 */
-	_onMouseOut: function() {
+	_onMouseOut() {
 		if (!this.options.detached) {
 			this._hideMarker();
 			this._chart._hideDiagramIndicator();
@@ -888,14 +895,14 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Handles the drag event over the ruler filter.
 	 */
-	_onRulerFilter: function({coords}) {
+	_onRulerFilter({coords}) {
 		this._updateMapSegments(coords);
 	},
 
 	/**
 	 * Toggle chart data on legend click
 	 */
-	_onToggleChart: function({ name, enabled }) {
+	_onToggleChart({ name, enabled }) {
 
 		this._chartEnabled = this._chart._hasActiveLayers();
 
@@ -915,7 +922,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Simple GeoJSON Parser
 	 */
-	_parseFromGeoJSONString: function(data) {
+	_parseFromGeoJSONString(data) {
 		try {
 			return JSON.parse(data);
 		} catch (e) { }
@@ -924,7 +931,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Attempt to parse raw response data (GeoJSON or XML > GeoJSON)
 	 */
-	_parseFromString: function(data) {
+	_parseFromString(data) {
 		return new Promise(resolve =>
 			this.import(this.__TOGEOJSON).then(() => {
 				let geojson;
@@ -944,7 +951,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Simple XML Parser (GPX, KML, TCX)
 	 */
-	_parseFromXMLString: function(data) {
+	_parseFromXMLString(data) {
 		if (data.indexOf("<") != 0) {
 			throw 'Invalid XML';
 		}
@@ -965,36 +972,38 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Add chart profile to diagram
 	 */
-	_registerAreaPath: function(props) {
+	_registerAreaPath(props) {
 		this.on("elechart_init", () => this._chart._registerAreaPath(props));
 	},
 
 	/**
 	 * Add chart grid to diagram
 	 */
-	_registerAxisGrid: function(props) {
+	_registerAxisGrid(props) {
 		this.on("elechart_axis", () => this._chart._registerAxisGrid(props));
 	},
 
 	/**
 	 * Add chart axis to diagram
 	 */
-	_registerAxisScale: function(props) {
+	_registerAxisScale(props) {
 		this.on("elechart_axis", () => this._chart._registerAxisScale(props));
 	},
 
 	/**
 	 * Add a point of interest over the diagram
 	 */
-	_registerCheckPoint: function(props) {
-		this.on("elechart_updated", () => this._chart._registerCheckPoint(props));
+	_registerCheckPoint(props) {
+		const cb = () => this._chart._registerCheckPoint(props);
+		this
+			.on("elechart_updated", cb)
+			.once("eledata_clear", () => this.off("elechart_updated", cb));
 	},
 
-
 	/**
 	 * Base handler for iterative track statistics (dist, time, z, slope, speed, acceleration, ...)
 	 */
-	 _registerDataAttribute: function(props) {
+	 _registerDataAttribute(props) {
 
 		// parse of "coordinateProperties" for later usage
 		if (props.coordPropsToMeta) {
@@ -1071,7 +1080,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Parse a module definition and attach related function listeners
 	 */
-	_registerHandler: function(props) {
+	_registerHandler(props) {
 
 		// eg. L.Control.Altitude
 		if (typeof props === "function") {
@@ -1154,7 +1163,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Add chart or marker tooltip info
 	 */
-	_registerTooltip: function(props) {
+	_registerTooltip(props) {
 		props.chart  && this.on("elechart_init",   () => this._chart._registerTooltip(L.extend({}, props, { value: props.chart })));
 		props.marker && this.on("elechart_marker", () => this._marker._registerTooltip(L.extend({}, props, { value: props.marker })));
 	},
@@ -1162,14 +1171,14 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Add summary info to diagram
 	 */
-	_registerSummary: function(props) {
+	_registerSummary(props) {
 		this.on('elechart_summary',  () => this._summary._registerSummary(props));
 	},
 
 	/*
 	 * Removes the drag rectangle and zoms back to the total extent of the data.
 	 */
-	_resetDrag: function() {
+	_resetDrag() {
 		this._chart._resetDrag();
 		this._hideMarker();
 	},
@@ -1177,7 +1186,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Resets drag, marker and bounds.
 	 */
-	_resetView: function() {
+	_resetView() {
 		if (this._map && this._map._isFullscreen) return;
 		this._resetDrag();
 		this._hideMarker();
@@ -1189,7 +1198,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Hacky way for handling chart resize. Deletes it and redraw chart.
 	 */
-	_resizeChart: function() {
+	_resizeChart() {
 		if (this._container && _.style(this._container, "display") != "none") {
 			let opts = this.options;
 			let newWidth = opts.detached ? (this.eleDiv || this._container).offsetWidth : _.clamp(opts._maxWidth, [0, this._map.getContainer().clientWidth - 30]);
@@ -1207,14 +1216,14 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Collapse or Expand chart control.
 	 */
-	_toggle: function() {
+	_toggle() {
 		_.hasClass(this._container, "elevation-expanded") ? this._collapse() : this._expand();
 	},
 
 	/**
 	 * Update map center and zoom (followMarker: true)
 	 */
-	_setMapView: function(item) {
+	_setMapView(item) {
 		if (this._map && this.options.followMarker) {
 			let zoom = this._map.getZoom();
 			let z    = this.options.zFollow;
@@ -1229,7 +1238,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Calculates [x, y] domain and then update chart.
 	 */
-	_updateChart: function() {
+	_updateChart() {
 		if (this._chart && this._container) {
 			this.fire("elechart_axis");
 	
@@ -1245,7 +1254,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/*
 	 * Update the position/height indicator marker drawn onto the map
 	 */
-	_updateMarker: function(item) {
+	_updateMarker(item) {
 		if (this._marker) {
 			this._marker.update({
 				map         : this._map,
@@ -1259,7 +1268,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Fix marker rotation on rotated maps
 	 */
-	_rotateMarker: function() {
+	_rotateMarker() {
 		if (this._marker) {
 			this._marker.update();
 		}
@@ -1268,7 +1277,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Highlight track segments on the map.
 	 */
-	_updateMapSegments: function(coords) {
+	_updateMapSegments(coords) {
 		this._markedSegments.setLatLngs(coords || []);
 		if (coords && this._map && !this._map.hasLayer(this._markedSegments)) {
 			this._markedSegments.addTo(this._map);
@@ -1278,7 +1287,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Update chart summary.
 	 */
-	_updateSummary: function() {
+	_updateSummary() {
 		if (this._summary) {
 			this._summary.reset();
 			if (this.options.summary) {
@@ -1305,7 +1314,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Calculates chart width.
 	 */
-	_width: function() {
+	_width() {
 		if (this._chart) return this._chart._width();
 		const { width, margins } = this.options;
 		return width - margins.left - margins.right;
@@ -1314,7 +1323,7 @@ export const Elevation = L.Control.Elevation = L.Control.extend({
 	/**
 	 * Calculates chart height.
 	 */
-	_height: function() {
+	_height() {
 		if (this._chart) return this._chart._height();
 		const { height, margins } = this.options;
 		return height - margins.top - margins.bottom;