From 9dcf71d411eaa3b3d8a8d6fe56518d4630bda871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Stra=C3=9Fburger?= <codepoet@cpan.org>
Date: Sun, 18 Sep 2016 21:15:21 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=93=20adding=20layer.minZoom=20display?=
 =?UTF-8?q?=20control?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md     | 15 ++++++++-------
 termap.coffee | 29 +++++++++++++++++++----------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 569abe1..acb4443 100644
--- a/README.md
+++ b/README.md
@@ -3,24 +3,28 @@
 Discover the world in your console! termap allows you to render and navigate
 VectorTile based maps in your console.
 
-* No native dependencies, 100% JavaScript/CoffeeScript
+* No native dependencies, 100% Coffee-/JavaScript
+* Use your mouse or keyboard to navigate the map
 * Use tile servers or local MBTiles and VectorTiles
 
-## How to install it?
+## How to get it?
 
 `npm install -g termap`
 
 ## Behind the scenes
 
 ### Libraries
-* [`pbf`](https://github.com/mapbox/pbf) for Protobuf parsing
+* [`pbf`](https://github.com/mapbox/pbf) for Protobuf decoding
 * [`vector-tile`](https://github.com/mapbox/vector-tile-js) for [VectorTile](https://github.com/mapbox/vector-tile-spec/tree/master/2.1) parsing
 * [`term-mouse`](https://github.com/CoderPuppy/term-mouse) for mouse handling
 * [`keypress`](https://github.com/TooTallNate/keypress) for input handling
 * [`node-drawille`](https://github.com/madbence/node-drawille/) for braille rendering (to be replaced)
 
 
-## TODOs
+## Wishlist
+* node-gyp binding to [libdrawille](https://github.com/Huulivoide/libdrawille) for speed refactor possibilities + filled polygons
+
+### TODOs
 * [ ] mapping of view to tiles to show
 * [ ] tile request system
   * [ ] from local mbtiles
@@ -34,6 +38,3 @@ VectorTile based maps in your console.
   * [ ] setZoom
 * [x] accurate mouse drag&drop
 * [x] handle console resize
-
-## Wishlist
-* node-gyp binding to [libdrawille](https://github.com/Huulivoide/libdrawille) for speed refactor possibilities + filled polygons
diff --git a/termap.coffee b/termap.coffee
index 9970045..8a29f02 100644
--- a/termap.coffee
+++ b/termap.coffee
@@ -8,7 +8,7 @@ TermMouse = require('term-mouse')
 
 class Termap
   config:
-    drawOrder: ["admin", "water", "landuse", "building", "road", "poi_label"]
+    drawOrder: ["admin", "water", "landuse", "building", "road", "housenum_label"]
 
     icons:
       car: "🚗"
@@ -22,7 +22,7 @@ class Termap
       laundry: "👚"
       bus: "🚌"
       restaurant: "🍛"
-      lodging: "🛏"
+      lodging: "🛏."
       'fire-station': "🚒"
       shop: "🛍"
       pharmacy: "💊"
@@ -30,18 +30,22 @@ class Termap
       cinema: "🎦"
 
     layers:
-      poi_label:
-        color: "red"
+      housenum_label:
+        minZoom: 4
+        color: 8
+      building:
+        minZoom: 12
+        color: 8
+
       road:
         color: "white"
+
       landuse:
         color: "green"
       water:
         color: "blue"
       admin:
         color: "red"
-      building:
-        color: 8
 
   mouse: null
   width: null
@@ -117,8 +121,8 @@ class Termap
       when "q"
         process.exit 0
 
-      when "a" then @zoomBy(.5)
-      when "z" then @zoomBy(-.5)
+      when "z" then @zoomBy(.5)
+      when "a" then @zoomBy(-.5)
       when "left" then @view[0] += 5
       when "right" then @view[0] -= 5
       when "up" then @view[1]+= 5
@@ -167,6 +171,10 @@ class Termap
     for layer in @config.drawOrder
       continue unless @features?[layer]
 
+      if @config.layers[layer].minZoom and @scale > @config.layers[layer].minZoom
+        continue
+
+
       @canvas.strokeStyle = @canvas.fillStyle = @config.layers[layer].color
 
       for feature in @features[layer]
@@ -192,7 +200,8 @@ class Termap
               @canvas.stroke()
 
             when "point"
-              @canvas.fillText (@config.icons[feature.properties.maki] or "X"), point... for point in points
+              text = feature.properties.house_num or @config.icons[feature.properties.maki] or "◉"
+              @canvas.fillText text, point... for point in points
 
     @canvas.restore()
 
@@ -205,7 +214,7 @@ class Termap
     process.stdout.write text
 
   _getFooter: ->
-    "TerMap up and running!"
+    "scale: #{Math.floor(@scale*1000)/1000}"
 
   notify: ->
     return if @isDrawing