From 5f29780c7d7a06e5059c375c90174534a7c9e606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Stra=C3=9Fburger?= Date: Sun, 13 Nov 2016 05:38:03 +0100 Subject: [PATCH] :books: using the config module in TileSource --- src/TileSource.coffee | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/TileSource.coffee b/src/TileSource.coffee index 2d06df4..360754e 100644 --- a/src/TileSource.coffee +++ b/src/TileSource.coffee @@ -14,6 +14,7 @@ rp = require 'request-promise' fs = require 'fs' Tile = require './Tile' +config = require './config' # https://github.com/mapbox/node-mbtiles has native build dependencies (sqlite3) # To maximize mapscii's compatibility, MBTiles support must be manually added via @@ -24,9 +25,6 @@ catch null module.exports = class TileSource - config: - persistDownloadedTiles: true - cache: {} modes: MBTiles: 1 @@ -39,7 +37,7 @@ module.exports = class TileSource init: (@source) -> if @source.startsWith "http" - @_initPersistence() if @config.persistDownloadedTiles + @_initPersistence() if config.persistDownloadedTiles @mode = @modes.HTTP @@ -76,14 +74,14 @@ module.exports = class TileSource _getHTTP: (z, x, y) -> promise = - if @config.persistDownloadedTiles and tile = @_getPersited z, x, y + if config.persistDownloadedTiles and tile = @_getPersited z, x, y Promise.resolve tile else rp uri: @source+[z,x,y].join("/")+".pbf" encoding: null .then (buffer) => - @_persistTile z, x, y, buffer if @config.persistDownloadedTiles + @_persistTile z, x, y, buffer if config.persistDownloadedTiles buffer promise @@ -105,7 +103,7 @@ module.exports = class TileSource @_createFolder userhome ".mapscii" @_createFolder userhome ".mapscii", "cache" catch error - @config.persistDownloadedTiles = false + config.persistDownloadedTiles = false return _persistTile: (z, x, y, buffer) ->