:globe_with_meridians: adding global config file, centralizing options

3 files changed, 64 insertions, 70 deletions

diff --git a/src/Renderer.coffee b/src/Renderer.coffee
index a5025fe..706aad8 100644
--- a/src/Renderer.coffee
+++ b/src/Renderer.coffee
@@ -13,27 +13,9 @@ LabelBuffer = require './LabelBuffer'
 Styler = require './Styler'
 Tile = require './Tile'
 utils = require './utils'
+config = require './config'
 
 module.exports = class Renderer
-  config:
-    language: 'en'
-
-    labelMargin: 5
-
-    tileSize: 4096
-    projectSize: 256
-    maxZoom: 14
-
-    layers:
-      housenum_label:
-        margin: 4
-      poi_label:
-        margin: 5
-        cluster: true
-
-      place_label: cluster: true
-      state_label: cluster: true
-
   terminal:
     CLEAR: "\x1B[2J"
     MOVE: "\x1B[?6h"
@@ -84,12 +66,12 @@ module.exports = class Renderer
       frame
 
   _visibleTiles: (center, zoom) ->
-    z = Math.min @config.maxZoom, Math.max 0, Math.floor zoom
+    z = Math.min config.tileRange, Math.max 0, Math.floor zoom
     center = utils.ll2tile center.lon, center.lat, z
 
     tiles = []
     scale = @_scaleAtZoom zoom
-    tileSize = @config.tileSize / scale
+    tileSize = config.tileSize / scale
 
     for y in [Math.floor(center.y)-1..Math.floor(center.y)+1]
       for x in [Math.floor(center.x)-1..Math.floor(center.x)+1]
@@ -167,8 +149,8 @@ module.exports = class Renderer
     @labelBuffer.featuresAt x, y
 
   _scaleAtZoom: (zoom) ->
-    baseZoom = Math.min @config.maxZoom, Math.floor Math.max 0, zoom
-    @config.tileSize / @config.projectSize / Math.pow(2, zoom-baseZoom)
+    baseZoom = Math.min config.tileRange, Math.floor Math.max 0, zoom
+    config.tileSize / config.projectSize / Math.pow(2, zoom-baseZoom)
 
   _drawFeature: (tile, feature) ->
     if feature.style.minzoom and tile.zoom < feature.style.minzoom
@@ -192,7 +174,7 @@ module.exports = class Renderer
         true
 
       when "symbol"
-        text = feature.properties["name_"+@config.language] or
+        text = feature.properties["name_"+config.language] or
           feature.properties["name_en"] or
           feature.properties["name"] or
           feature.properties.house_num or
@@ -203,14 +185,14 @@ module.exports = class Renderer
         placed = false
         for point in @_scaleAndReduce tile, feature, feature.points
           x = point.x - text.length
-          margin = @config.layers[feature.layer]?.margin or @config.labelMargin
+          margin = config.layers[feature.layer]?.margin or config.labelMargin
 
           if @labelBuffer.writeIfPossible text, x, point.y, feature, margin
             @canvas.text text, x, point.y, feature.color
             placed = true
             break
 
-          else if @config.layers[feature.layer]?.cluster and
+          else if config.layers[feature.layer]?.cluster and
           @labelBuffer.writeIfPossible "◉", point.x, point.y, feature, 3
             @canvas.text "◉", point.x, point.y, feature.color
             placed = true
@@ -244,7 +226,7 @@ module.exports = class Renderer
         else
           if outside
             outside = null
-            scaled.push [lastX, lastY]
+            scaled.push x: lastX, y: lastY
 
       scaled.push x: x, y: y
 
diff --git a/src/Termap.coffee b/src/Termap.coffee
index fd4a06d..5a314ff 100644
--- a/src/Termap.coffee
+++ b/src/Termap.coffee
@@ -12,24 +12,9 @@ Promise = require 'bluebird'
 Renderer = require './Renderer'
 TileSource = require './TileSource'
 utils = require './utils'
+config = require './config'
 
 module.exports = class Termap
-  config:
-    input: process.stdin
-    output: process.stdout
-
-    source: "http://nachbar.io/data/osm2vectortiles/"
-    #source: __dirname+"/../mbtiles/regensburg.mbtiles"
-    styleFile: __dirname+"/../styles/dark.json"
-
-    initialZoom: null
-    maxZoom: 18
-    zoomStep: 0.2
-    headless: false
-
-    # size:
-    #   width: 40*2
-    #   height: 10*4
 
   width: null
   height: null
@@ -53,13 +38,13 @@ module.exports = class Termap
   minZoom: null
 
   constructor: (options) ->
-    @config[key] = val for key, val of options
+    config[key] = val for key, val of options
 
   init: ->
     Promise
     .resolve()
     .then =>
-      unless @config.headless
+      unless config.headless
         @_initKeyboard()
         @_initMouse()
 
@@ -73,17 +58,17 @@ module.exports = class Termap
 
   _initTileSource: ->
     @tileSource = new TileSource()
-    @tileSource.init @config.source
+    @tileSource.init config.source
 
   _initKeyboard: ->
-    keypress @config.input
-    @config.input.setRawMode true
-    @config.input.resume()
+    keypress config.input
+    config.input.setRawMode true
+    config.input.resume()
 
-    @config.input.on 'keypress', (ch, key) => @_onKey key
+    config.input.on 'keypress', (ch, key) => @_onKey key
 
   _initMouse: ->
-    @mouse = TermMouse input: @config.input, output: @config.output
+    @mouse = TermMouse input: config.input, output: config.output
     @mouse.start()
 
     @mouse.on 'click', (event) => @_onClick event
@@ -91,23 +76,23 @@ module.exports = class Termap
     @mouse.on 'move', (event) => @_onMouseMove event
 
   _initRenderer: ->
-    @renderer = new Renderer @config.output, @tileSource
-    @renderer.loadStyleFile @config.styleFile
+    @renderer = new Renderer config.output, @tileSource
+    @renderer.loadStyleFile config.styleFile
 
-    @config.output.on 'resize', =>
+    config.output.on 'resize', =>
       @_resizeRenderer()
       @_draw()
 
     @_resizeRenderer()
-    @zoom = if @config.initialZoom isnt null then @config.initialZoom else @minZoom
+    @zoom = if config.initialZoom isnt null then config.initialZoom else @minZoom
 
   _resizeRenderer: (cb) ->
-    if @config.size
-      @width = @config.size.width
-      @height = @config.size.height
+    if config.size
+      @width = config.size.width
+      @height = config.size.height
     else
-      @width = @config.output.columns >> 1 << 2
-      @height = @config.output.rows * 4 - 4
+      @width = config.output.columns >> 1 << 2
+      @height = config.output.rows * 4 - 4
 
     @minZoom = 4-Math.log(4096/@width)/Math.LN2
 
@@ -124,12 +109,12 @@ module.exports = class Termap
 
   _onMouseScroll: (event) ->
     # TODO: handle .x/y for directed zoom
-    @zoomBy @config.zoomStep * if event.button is "up" then -1 else 1
+    @zoomBy config.zoomStep * if event.button is "up" then -1 else 1
     @_draw()
 
   _onMouseMove: (event) ->
     # only continue if x/y are valid
-    return unless event.x <= @config.output.columns and event.y <= @config.output.rows
+    return unless event.x <= config.output.columns and event.y <= config.output.rows
 
     # start dragging
     if event.button is "left"
@@ -157,8 +142,8 @@ module.exports = class Termap
       when "w" then @zoomy = 1
       when "s" then @zoomy = -1
 
-      when "a" then @zoomBy @config.zoomStep
-      when "z" then @zoomBy -@config.zoomStep
+      when "a" then @zoomBy config.zoomStep
+      when "z" then @zoomBy -config.zoomStep
 
       when "left" then @moveBy 0, -8/Math.pow(2, @zoom)
       when "right" then @moveBy 0, 8/Math.pow(2, @zoom)
@@ -184,8 +169,8 @@ module.exports = class Termap
       @notify "renderer is busy"
     .then =>
       if @zoomy
-        if (@zoomy > 0 and @zoom < @config.maxZoom) or (@zoomy < 0 and @zoom > @minZoom)
-          @zoom += @zoomy * @config.zoomStep
+        if (@zoomy > 0 and @zoom < config.maxZoom) or (@zoomy < 0 and @zoom > @minZoom)
+          @zoom += @zoomy * config.zoomStep
         else
           @zoomy *= -1
         setImmediate => @_draw()
@@ -196,17 +181,17 @@ module.exports = class Termap
 
     "center: #{utils.digits @center.lat, 3}, #{utils.digits @center.lon, 3}   "+
     "zoom: #{utils.digits @zoom, 2}   "+
-    "mouse: #{@mousePosition.x} #{@mousePosition.y}   "+
+    "mouse: #{@mousePosition.x*2-@width/2} #{@mousePosition.y}   "
 
   notify: (text) ->
-    @_write "\r\x1B[K"+text unless @config.headless
+    @_write "\r\x1B[K"+text unless config.headless
 
   _write: (output) ->
-    @config.output.write output
+    config.output.write output
 
   zoomBy: (step) ->
     return @zoom = @minZoom if @zoom+step < @minZoom
-    return @zoom = @config.maxZoom if @zoom+step > @config.maxZoom
+    return @zoom = config.maxZoom if @zoom+step > config.maxZoom
 
     @zoom += step
 
diff --git a/src/config.coffee b/src/config.coffee
new file mode 100644
index 0000000..19ac610
--- /dev/null
+++ b/src/config.coffee
@@ -0,0 +1,27 @@
+module.exports =
+    language: "en"
+
+    source: "http://nachbar.io/data/osm2vectortiles/"
+    #source: __dirname+"/../mbtiles/regensburg.mbtiles"
+    styleFile: __dirname+"/../styles/dark.json"
+
+    initialZoom: false
+    maxZoom: 18
+    zoomStep: 0.2
+
+    tileSize: 4096
+    tileRange: 14
+    projectSize: 256
+
+    labelMargin: 5
+
+    layers:
+      housenum_label: margin: 4
+      poi_label: cluster: true, margin: 5
+      place_label: cluster: true
+      state_label: cluster: true
+
+    input: process.stdin
+    output: process.stdout
+
+    headless: false