Bump jsdom from 16.4.0 to 16.7.0 (#118)

Bumps [jsdom](https://github.com/jsdom/jsdom) from 16.4.0 to 16.7.0.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](https://github.com/jsdom/jsdom/compare/16.4.0...16.7.0)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - "8"
-  - "10"
-  - "12"
+  - "14"
+  - "16"
+  - "18"
 
 script:
   - npm run-script lint

AUTHORS

@@ -5,3 +5,4 @@ Christian Paul (https://chrpaul.de)
 Jannis R <mail@jannisr.de>
 Alexander Zhukov (https://github.com/ZhukovAlexander)
 Quincy Morgan (https://github.com/quincylvania)
+lennonhill (https://github.com/lennonhill)

README.md

@@ -36,7 +36,7 @@ npx mapscii
 
 ### With npm
 
-If you haven't already got Node.js >= version 6.14, then [go get it](http://nodejs.org/).
+If you haven't already got Node.js >= version 10, then [go get it](http://nodejs.org/).
 
 ```
 npm install -g mapscii
@@ -91,19 +91,18 @@ If your terminal supports mouse events you can drag the map and use your scroll
 * [`simplify-js`](https://github.com/mourner/simplify-js) for polyline simplifications
 
 #### Handling the flow
-* [`bluebird`](https://github.com/petkaantonov/bluebird) for all the asynchronous [Promise](https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Promise) magic
 * [`node-fetch`](https://github.com/bitinn/node-fetch) for HTTP requests
-* [`userhome`](https://github.com/shama/userhome) to determine where to persist downloaded tiles
+* [`env-paths`](https://github.com/sindresorhus/env-paths) to determine where to persist downloaded tiles
 
 ### TODOs
 * MapSCII
   * [ ] GeoJSON support via [geojson-vt](https://github.com/mapbox/geojson-vt)
   * [ ] CLI support
-    * [ ] startup parameters
-      * [ ] TileSource
-      * [ ] Style
-      * [ ] center position
-      * [ ] zoom
+    * [-] startup parameters
+      * [X] TileSource
+      * [X] Style
+      * [X] center position
+      * [X] zoom
       * [ ] demo mode?
 
   * [ ] mouse control

main.js

@@ -8,9 +8,79 @@
   TODO: params parsing and so on
 #*/
 'use strict';
+const config = require('./src/config');
 const Mapscii = require('./src/Mapscii');
+const argv = require('yargs')
+  .option('latitude', {
+    alias: 'lat',
+    description: 'Latitude of initial centre',
+    default: config.initialLat,
+    type: 'number',
+  })
+  .option('longitude', {
+    alias: 'lon',
+    description: 'Longitude of initial centre',
+    default: config.initialLon,
+    type: 'number',
+  })
+  .option('zoom', {
+    alias: 'z',
+    description: 'Initial zoom',
+    default: config.initialZoom,
+    type: 'number',
+  })
+  .option('width', {
+    alias: 'w',
+    description: 'Fixed width of rendering',
+    type: 'number',
+  })
+  .option('height', {
+    alias: 'h',
+    description: 'Fixed height of rendering',
+    type: 'number',
+  })
+  .option('braille', {
+    alias: 'b',
+    description: 'Activate braille rendering',
+    default: config.useBraille,
+    type: 'boolean',
+  })
+  .option('headless', {
+    alias: 'H',
+    description: 'Activate headless mode',
+    default: config.headless,
+    type: 'boolean',
+  })
+  .option('tile_source', {
+    alias: 'tileSource',
+    description: 'URL or path to osm2vectortiles source',
+    default: config.source,
+    type: 'string',
+  })
+  .option('style_file', {
+    alias: 'style',
+    description: 'path to json style file',
+    default: config.styleFile,
+    type: 'string',
+  })
+  .strict()
+  .argv;
 
-const mapscii = new Mapscii();
+const options = {
+  initialLat: argv.latitude,
+  initialLon: argv.longitude,
+  initialZoom: argv.zoom,
+  size: {
+    width: argv.width,
+    height: argv.height
+  },
+  useBraille: argv.braille,
+  headless: argv.headless,
+  source: argv.tile_source,
+  styleFile: argv.style_file,
+};
+
+const mapscii = new Mapscii(options);
 mapscii.init().catch((err) => {
   console.error('Failed to start MapSCII.');
   console.error(err);

package.json

@@ -5,7 +5,8 @@
   "main": "main.js",
   "scripts": {
     "lint": "eslint src",
-    "start": "node main"
+    "start": "node main",
+    "test": "jest"
   },
   "repository": {
     "type": "git",
@@ -15,7 +16,7 @@
     "mapscii": "./bin/mapscii.sh"
   },
   "engines": {
-    "node": ">=8"
+    "node": ">=10"
   },
   "keywords": [
     "map",
@@ -30,20 +31,22 @@
   "license": "MIT",
   "dependencies": {
     "@mapbox/vector-tile": "^1.3.1",
-    "bluebird": "^3.7.2",
     "bresenham": "0.0.4",
     "earcut": "^2.2.2",
+    "env-paths": "^2.2.0",
     "keypress": "^0.2.1",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^2.6.1",
     "pbf": "^3.2.1",
     "rbush": "^3.0.1",
     "simplify-js": "^1.2.4",
     "string-width": "^4.2.0",
     "term-mouse": "^0.2.2",
-    "userhome": "^1.0.0",
-    "x256": "0.0.2"
+    "x256": "0.0.2",
+    "yargs": "^15.4.1"
   },
   "devDependencies": {
-    "eslint": "^6.8.0"
+    "eslint": "^7.8.1",
+    "eslint-plugin-jest": "^24.0.0",
+    "jest": "^26.4.2"
   }
 }

src/Mapscii.js

@@ -31,17 +31,13 @@ class Mapscii {
     this.renderer = null;
 
     this.zoom = 0;
-    // sf lat: 37.787946, lon: -122.407522
-    // iceland lat: 64.124229, lon: -21.811552
-    // rgbg
-    // lat: 49.019493, lon: 12.098341
-    this.center = {
-      lat: 52.51298,
-      lon: 13.42012,
-    };
-
     this.minZoom = null;
     config = Object.assign(config, options);
+
+    this.center = {
+      lat: config.initialLat,
+      lon: config.initialLon
+    };
   }
 
   async init() {
@@ -97,13 +93,8 @@ class Mapscii {
   }
 
   _resizeRenderer() {
-    if (config.size) {
-      this.width = config.size.width;
-      this.height = config.size.height;
-    } else {
-      this.width = config.output.columns >> 1 << 2;
-      this.height = config.output.rows * 4 - 4;
-    }
+    this.width = config.size && config.size.width ? config.size.width * 2 : config.output.columns >> 1 << 2;
+    this.height = config.size && config.size.height ? config.size.height * 4 : config.output.rows * 4 - 4;
 
     this.minZoom = 4-Math.log(4096/this.width)/Math.LN2;
 

src/Renderer.js

@@ -5,7 +5,6 @@
   The Console Vector Tile renderer - bäm!
 */
 'use strict';
-const Promise = require('bluebird');
 const x256 = require('x256');
 const simplify = require('simplify-js');
 
@@ -30,7 +29,7 @@ class Renderer {
     this.canvas = new Canvas(width, height);
   }
 
-  draw(center, zoom) {
+  async draw(center, zoom) {
     if (this.isDrawing) return Promise.reject();
     this.isDrawing = true;
 
@@ -49,21 +48,20 @@ class Renderer {
 
     this.canvas.clear();
 
-    return Promise.resolve(this._visibleTiles(center, zoom)).map((tile) => {
-      return this._getTile(tile);
-    }).map((tile) => {
-      return this._getTileFeatures(tile, zoom);
-    }).then((tiles) => {
-      this._renderTiles(tiles);
-    }).then(() => {
+    try {
+      let tiles = this._visibleTiles(center, zoom);
+      await Promise.all(tiles.map(async(tile) => {
+        await this._getTile(tile);
+        this._getTileFeatures(tile, zoom);
+      }));
+      await this._renderTiles(tiles);
       return this._getFrame();
-    }).catch((e) => {
-      return console.log(e);
-    }).finally((frame) => {
+    } catch(e) {
+      console.error(e);
+    } finally {
       this.isDrawing = false;
       this.lastDrawAt = Date.now();
-      return frame;
-    });
+    }
   }
 
   _visibleTiles(center, zoom) {
@@ -104,13 +102,9 @@ class Renderer {
     return tiles;
   }
 
-  _getTile(tile) {
-    return this.tileSource
-      .getTile(tile.xyz.z, tile.xyz.x, tile.xyz.y)
-      .then((data) => {
-        tile.data = data;
-        return tile;
-      });
+  async _getTile(tile) {
+    tile.data = await this.tileSource.getTile(tile.xyz.z, tile.xyz.x, tile.xyz.y);
+    return tile;
   }
 
   _getTileFeatures(tile, zoom) {
@@ -140,6 +134,7 @@ class Renderer {
 
   _renderTiles(tiles) {
     const labels = [];
+    if (tiles.length === 0) return;
     
     const drawOrder = this._generateDrawOrder(tiles[0].xyz.z);
     for (const layerId of drawOrder) {

src/TileSource.js

@@ -7,9 +7,11 @@
   * local MBTiles and VectorTiles
 */
 'use strict';
-const userhome = require('userhome');
-const fetch = require('node-fetch');
 const fs = require('fs');
+const path = require('path');
+const fetch = require('node-fetch');
+const envPaths = require('env-paths');
+const paths = envPaths('mapscii');
 
 const Tile = require('./Tile');
 const config = require('./config');
@@ -141,8 +143,7 @@ class TileSource {
 
   _initPersistence() {
     try {
-      this._createFolder(userhome('.mapscii'));
-      this._createFolder(userhome('.mapscii', 'cache'));
+      this._createFolder(paths.cache);
     } catch (error) {
       config.persistDownloadedTiles = false;
     }
@@ -150,14 +151,14 @@ class TileSource {
 
   _persistTile(z, x, y, buffer) {
     const zoom = z.toString();
-    this._createFolder(userhome('.mapscii', 'cache', zoom));
-    const filePath = userhome('.mapscii', 'cache', zoom, `${x}-${y}.pbf`);
+    this._createFolder(path.join(paths.cache, zoom));
+    const filePath = path.join(paths.cache, zoom, `${x}-${y}.pbf`);
     return fs.writeFile(filePath, buffer, () => null);
   }
 
   _getPersited(z, x, y) {
     try {
-      return fs.readFileSync(userhome('.mapscii', 'cache', z.toString(), `${x}-${y}.pbf`));
+      return fs.readFileSync(path.join(paths.cache, z.toString(), `${x}-${y}.pbf`));
     } catch (error) {
       return false;
     }

src/TileSource.spec.js

@@ -6,7 +6,7 @@ describe('TileSource', () => {
     test('sets the mode to 3', async () => {
       const tileSource = new TileSource();
       await tileSource.init('http://mapscii.me/');
-      tileSource.mode = 3;
+      expect(tileSource.mode).toBe(3);
     });
   });
 });

src/config.js

@@ -13,6 +13,13 @@ module.exports = {
   maxZoom: 18,
   zoomStep: 0.2,
 
+  // sf lat: 37.787946, lon: -122.407522
+  // iceland lat: 64.124229, lon: -21.811552
+  // rgbg
+  // lat: 49.019493, lon: 12.098341
+  initialLat: 52.51298,
+  initialLon: 13.42012,
+
   simplifyPolylines: false,
 
   useBraille: true,