nakarte

Source code of https://map.sikmir.ru (fork)
git clone git://git.sikmir.ru/nakarte
Log | Files | Refs | LICENSE

commit 30d75f89e41d4c167bee136c54da8ef692ab933c
parent 4ec8544bad03b8cf14fe91e1f601ffa34e64b7ce
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Sat, 25 Jan 2020 18:50:25 +0100

fix lint errors (arrow-body-style)

Diffstat:
Msrc/lib/leaflet.control.coordinates/index.js | 4+---
Msrc/lib/leaflet.control.panoramas/lib/wikimedia/index.js | 5+----
Msrc/lib/leaflet.control.printPages/control.js | 18++++++------------
Msrc/lib/leaflet.control.track-list/lib/services/endomondo.js | 7++-----
Msrc/lib/leaflet.control.track-list/lib/services/nakarte/index.js | 4+---
Msrc/lib/leaflet.control.track-list/track-list.js | 6+++---
Msrc/lib/leaflet.layer.geocaching-su/index.js | 6++----
Msrc/lib/leaflet.layer.rasterize/TileLayer.js | 5+----
Msrc/lib/leaflet.layer.soviet-topomaps-grid/index.js | 10++--------
Msrc/lib/leaflet.layer.wikimapia/wikimapia-loader.js | 7++-----
Msrc/lib/leaflet.layer.wikimapia/wm-utils.js | 5+----
Msrc/lib/tiled-data-loader/index.js | 7++-----
12 files changed, 24 insertions(+), 60 deletions(-)

diff --git a/src/lib/leaflet.control.coordinates/index.js b/src/lib/leaflet.control.coordinates/index.js @@ -50,9 +50,7 @@ L.Control.Coordinates = L.Control.extend({ return UNKNOWN_COORDINATES; }, this); - this.wrapperClass = ko.pureComputed(() => { - return this.format().wrapperClass; - }, this); + this.wrapperClass = ko.pureComputed(() => this.format().wrapperClass, this); this.formatCode.subscribe(this.saveStateToStorage, this); }, diff --git a/src/lib/leaflet.control.panoramas/lib/wikimedia/index.js b/src/lib/leaflet.control.panoramas/lib/wikimedia/index.js @@ -267,10 +267,7 @@ const Viewer = L.Evented.extend({ const image = this.images[this._imageIdx]; this.fire('change', { latlng: L.latLng(image.lat, image.lng), - latlngs: this.images.map((image) => { - return L.latLng(image.lat, image.lng); - }) - + latlngs: this.images.map((image) => L.latLng(image.lat, image.lng)) } ); } diff --git a/src/lib/leaflet.control.printPages/control.js b/src/lib/leaflet.control.printPages/control.js @@ -199,14 +199,11 @@ L.Control.PrintPages = L.Control.extend({ this.downloadProgressRange(1000); this.downloadProgressDone(undefined); this.makingPdf(true); - const pages = this.pages.map((page) => { - return { + const pages = this.pages.map((page) => ({ latLngBounds: page.getLatLngBounds(), printSize: page.getPrintSize(), label: page.getLabel() - }; - } - ); + })); const resolution = this.resolution(); const decorationLayers = []; if (this.gridOn()) { @@ -366,10 +363,7 @@ L.Control.PrintPages = L.Control.extend({ resolution = this.resolution(); let referenceLat; if (this.pages.length > 0) { - let absLats = this.pages.map((page) => { - return Math.abs(page.getLatLngBounds().getCenter().lat); - } - ); + let absLats = this.pages.map((page) => Math.abs(page.getLatLngBounds().getCenter().lat)); referenceLat = Math.min(...absLats); } else { if (!this._map) { @@ -533,9 +527,9 @@ L.Control.PrintPages = L.Control.extend({ fileName += `${scale}m`; - const currentPageSize = this.pageSizes.find((pageSize) => { - return (width === pageSize.width) && (height === pageSize.height); - }); + const currentPageSize = this.pageSizes.find( + (pageSize) => width === pageSize.width && height === pageSize.height + ); if (currentPageSize) { fileName += `_${currentPageSize.name}`; diff --git a/src/lib/leaflet.control.track-list/lib/services/endomondo.js b/src/lib/leaflet.control.track-list/lib/services/endomondo.js @@ -48,13 +48,10 @@ class Endomondo extends BaseService { const track = data.points.points .filter((p) => p.latitude) - .map((p) => { - return { + .map((p) => ({ lat: p.latitude, lng: p.longitude - }; - } - ); + })); if (track.length === 0) { return [{error: 'Endomondo user disabled viewing this workout track'}]; } diff --git a/src/lib/leaflet.control.track-list/lib/services/nakarte/index.js b/src/lib/leaflet.control.track-list/lib/services/nakarte/index.js @@ -108,9 +108,7 @@ class NakarteUrl { } async geoData() { - const promises = this._params.map(([paramName, value]) => { - return new NakarteUrlLoader().geoData(paramName, value); - }); + const promises = this._params.map(([paramName, value]) => new NakarteUrlLoader().geoData(paramName, value)); return flattenArray(await Promise.all(promises)); } } diff --git a/src/lib/leaflet.control.track-list/track-list.js b/src/lib/leaflet.control.track-list/track-list.js @@ -473,9 +473,9 @@ L.Control.TrackList = L.Control.extend({ }, duplicateTrack: function(track) { - const segments = this.getTrackPolylines(track).map((line) => { - return line.getLatLngs().map((latlng) => [latlng.lat, latlng.lng]); - }); + const segments = this.getTrackPolylines(track).map((line) => + line.getLatLngs().map((latlng) => [latlng.lat, latlng.lng]) + ); const points = this.getTrackPoints(track) .map((point) => ({lat: point.latlng.lat, lng: point.latlng.lng, name: point.label})); this.addTrack({name: track.name(), tracks: segments, points}); diff --git a/src/lib/leaflet.layer.geocaching-su/index.js b/src/lib/leaflet.layer.geocaching-su/index.js @@ -56,14 +56,12 @@ const GeocachingSu = L.Layer.CanvasMarkers.extend({ return zoom >= 10 ? marker._label : null; } - const markers = data.map(([label, cacheId, lat, lng]) => { - return { + const markers = data.map(([label, cacheId, lat, lng]) => ({ latlng: {lat, lng}, _label: label, label: getLabel, icon, cacheId - }; - }); + })); this.addMarkers(markers); this._dataLoaded = true; this.fire('data-loaded'); diff --git a/src/lib/leaflet.layer.rasterize/TileLayer.js b/src/lib/leaflet.layer.rasterize/TileLayer.js @@ -40,10 +40,7 @@ const GridLayerGrabMixin = { let {tilePromise, abortLoading} = this.tileImagePromiseFromCoords( this._wrapCoords(coords), printOptions); yield { - tilePromise: tilePromise.then((image) => { - return {image, tilePos, tileSize, latLngBounds}; - } - ), + tilePromise: tilePromise.then((image) => ({image, tilePos, tileSize, latLngBounds})), abortLoading }; } diff --git a/src/lib/leaflet.layer.soviet-topomaps-grid/index.js b/src/lib/leaflet.layer.soviet-topomaps-grid/index.js @@ -55,10 +55,7 @@ var Nomenclature = { } const names = [name1 + name2]; for (let replacer of bigLetterReplacers) { - let name3 = name2.replace(/\b[1-4]\b/gu, (s) => { - return replacer[s]; - } - ); + let name3 = name2.replace(/\b[1-4]\b/gu, (s) => replacer[s]); names.push(name1 + name3); } return names; @@ -93,10 +90,7 @@ var Nomenclature = { } const names = [name1 + name2]; for (let replacer of bigLetterReplacers) { - let name3 = name2.replace(/\b[1-4]\b/gu, (s) => { - return replacer[s]; - } - ); + let name3 = name2.replace(/\b[1-4]\b/gu, (s) => replacer[s]); names.push(name1 + name3); } return names; diff --git a/src/lib/leaflet.layer.wikimapia/wikimapia-loader.js b/src/lib/leaflet.layer.wikimapia/wikimapia-loader.js @@ -67,13 +67,10 @@ class WikimapiaLoader extends TiledDataLoader { processResponse(xhr) { return wmUtils.parseTile(xhr.response, this._projectObj) - .then((tileData) => { - return { + .then((tileData) => ({ tileData, coords: tileData.coords - }; - } - ); + })); } diff --git a/src/lib/leaflet.layer.wikimapia/wm-utils.js b/src/lib/leaflet.layer.wikimapia/wm-utils.js @@ -190,10 +190,7 @@ async function parseTile(s, projectObj) { if (!bounds) { throw new Error('Invalid place bounds'); } - place.boundsWESN = bounds.slice(1).map((x) => { - return parseInt(x, 10) / 1e7; - } - ); + place.boundsWESN = bounds.slice(1).map((x) => parseInt(x, 10) / 1e7); let coords = fields.slice(7).join('|'); diff --git a/src/lib/tiled-data-loader/index.js b/src/lib/tiled-data-loader/index.js @@ -109,14 +109,11 @@ class TiledDataLoader { return { - dataPromise: pendingRequest.dataPromise.then((data) => { - return { + dataPromise: pendingRequest.dataPromise.then((data) => ({ coords: data.coords, tileData: data.tileData, adjustment: this.calcAdjustment(layerTileCoords, data.coords) - }; - } - ), + })), abortLoading: () => pendingRequest.abortLoading() };