Merge pull request #7 from derhuerst/fetch

request-promise -> node-fetch
This commit is contained in:
Michael Straßburger 2017-04-27 00:36:55 +02:00 committed by GitHub
commit 1e545aa85a
3 changed files with 5 additions and 8 deletions

View File

@ -64,7 +64,7 @@ If your terminal supports mouse events you can drag the map and use your scroll
#### 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
* [`request-promise`](https://github.com/request/request-promise) for promisified HTTP request handling
* [`node-fetch`](https://github.com/bitinn/node-fetch) for HTTP requests
* [`userhome`](https://github.com/shama/userhome) to determine where to persist downloaded tiles
### TODOs

View File

@ -34,10 +34,9 @@
"coffee-script": "^1.10.0",
"earcut": "^2.1.1",
"keypress": "^0.2.1",
"node-fetch": "^1.6.3",
"pbf": "^3.0.0",
"rbush": "^2.0.1",
"request": "^2.76.0",
"request-promise": "^4.1.1",
"simplify-js": "^1.2.1",
"term-mouse": "^0.1.1",
"userhome": "^1.0.0",

View File

@ -9,8 +9,7 @@
Promise = require 'bluebird'
userhome = require 'userhome'
request = require 'request'
rp = require 'request-promise'
fetch = require 'node-fetch'
fs = require 'fs'
Tile = require './Tile'
@ -77,9 +76,8 @@ module.exports = class TileSource
if config.persistDownloadedTiles and tile = @_getPersited z, x, y
Promise.resolve tile
else
rp
uri: @source+[z,x,y].join("/")+".pbf"
encoding: null
fetch @source+[z,x,y].join("/")+".pbf"
.then (res) => res.buffer()
.then (buffer) =>
@_persistTile z, x, y, buffer if config.persistDownloadedTiles
buffer