nakarte

commit a9c81ac145d508fbc606b8c25dbcbf76e3c9ee46
parent 53453b13004faff0ea5e2e62fb9fc99a903b554e
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Sun, 26 Jan 2020 00:10:19 +0100

fix lint errors (prefer-object-spread)

Diffstat:
M
src/config.js
 | 
5
+++--
M
src/lib/leaflet.control.coordinates/index.js
 | 
7
+++----
M
src/lib/leaflet.control.printPages/decoration.scale.js
 | 
2
+-
M
src/lib/leaflet.control.printPages/map-render.js
 | 
2
+-
M
src/lib/leaflet.layer.wikimapia/wikimapia-loader.js
 | 
2
+-
M
src/lib/logging/index.js
 | 
5
+++--
M
src/lib/tiled-data-loader/index.js
 | 
2
+-

7 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/config.js b/src/config.js
@@ -1,6 +1,6 @@
 import secrets from './secrets';
 
-export default Object.assign({
+export default {
     caption: `
         <a href="https://docs.nakarte.me">Documentation</a> |
         <a href="https://about.nakarte.me">News</a> |
@@ -12,4 +12,5 @@ export default Object.assign({
     wikimediaCommonsCoverageUrl: 'https://tiles.nakarte.me/wikimedia_commons_images/{z}/{x}/{y}',
     geocachingSuUrl: 'https://nakarte.me/geocachingSu/geocaching_su2.json',
     tracksStorageServer: 'https://tracks.nakarte.me',
-}, secrets);
+    ...secrets
+};
diff --git a/src/lib/leaflet.control.coordinates/index.js b/src/lib/leaflet.control.coordinates/index.js
@@ -137,10 +137,9 @@ L.Control.Coordinates = L.Control.extend({
                 const {lat, lng} = formats.formatLatLng(e.latlng.wrap(), format);
                 const coordinates = `${lat} ${lng}`;
 
-                return Object.assign({
-                    text: `${coordinates} <span class="leaflet-coordinates-menu-fmt">${format.label}</span>`,
-                    callback: () => copyToClipboard(coordinates, e.originalEvent)
-                }, options);
+                return {text: `${coordinates} <span class="leaflet-coordinates-menu-fmt">${format.label}</span>`,
+                    callback: () => copyToClipboard(coordinates, e.originalEvent),
+                    ...options};
             }
 
             const header = createItem(this.format(), {
diff --git a/src/lib/leaflet.control.printPages/decoration.scale.js b/src/lib/leaflet.control.printPages/decoration.scale.js
@@ -20,7 +20,7 @@ function formatScale(nominalScale, scaleRange) {
         Math.abs(nominalScale - scaleRange.max) / nominalScale > threshold
     ) {
         let unit;
-        scaleRange = Object.assign({}, scaleRange);
+        scaleRange = {...scaleRange};
         if (scaleRange.min >= 1000) {
             scaleRange.min /= 1000;
             scaleRange.max /= 1000;
diff --git a/src/lib/leaflet.control.printPages/map-render.js b/src/lib/leaflet.control.printPages/map-render.js
@@ -228,7 +228,7 @@ async function* iterateLayersTiles(
             layerPromises.push(tilePromise.tilePromise);
             let progressInc = (layer._printProgressWeight || 1) / count;
             tilePromise.tilePromise =
-                tilePromise.tilePromise.then((tileInfo) => Object.assign({zoom, progressInc, layer}, tileInfo));
+                tilePromise.tilePromise.then((tileInfo) => ({zoom, progressInc, layer, ...tileInfo}));
             doStop = yield tilePromise;
             if (doStop) {
                 tilePromise.abortLoading();
diff --git a/src/lib/leaflet.layer.wikimapia/wikimapia-loader.js b/src/lib/leaflet.layer.wikimapia/wikimapia-loader.js
@@ -13,7 +13,7 @@ class WikimapiaLoader extends TiledDataLoader {
     }
 
     getFromCache(dataTileCoords) {
-        dataTileCoords = Object.assign({}, dataTileCoords);
+        dataTileCoords = {...dataTileCoords};
         let exactMatch = true;
         while (dataTileCoords.z >= 0) {
             let key = this.makeTileKey(dataTileCoords);
diff --git a/src/lib/logging/index.js b/src/lib/logging/index.js
@@ -36,11 +36,12 @@ function logEvent(eventName, extra) {
     const url = 'https://nakarte.me/event';
 
     const data = {event: eventName.toString()};
-    data.data = Object.assign({}, extra, {
+    data.data = {
+        ...extra,
         beacon: true,
         session: sessionId,
         address: window.location.toString()
-    });
+    };
     let s = JSON.stringify(data);
     try {
         navigator.sendBeacon(url, s);
diff --git a/src/lib/tiled-data-loader/index.js b/src/lib/tiled-data-loader/index.js
@@ -20,7 +20,7 @@ class TiledDataLoader {
     }
 
     layerTileToDataTileCoords(layerTileCoords) {
-        return Object.assign({}, layerTileCoords);
+        return {...layerTileCoords};
     }
 
     makeRequestData(_unused_dataTileCoords) {