From f3efbae8ba21ecb40672aaaf07349e3d0aaf6431 Mon Sep 17 00:00:00 2001 From: Christian Paul Date: Sat, 23 Dec 2017 01:33:57 -0800 Subject: [PATCH] Decaffeinate remaining methods of the Renderer class --- src/Renderer.coffee | 267 -------------------------------------------- src/Renderer.js | 27 ++--- 2 files changed, 12 insertions(+), 282 deletions(-) delete mode 100644 src/Renderer.coffee diff --git a/src/Renderer.coffee b/src/Renderer.coffee deleted file mode 100644 index bb58bde..0000000 --- a/src/Renderer.coffee +++ /dev/null @@ -1,267 +0,0 @@ -### - termap - Terminal Map Viewer - by Michael Strassburger - - The Console Vector Tile renderer - bäm! -### -Promise = require 'bluebird' -x256 = require 'x256' -simplify = require 'simplify-js' - -Canvas = require './Canvas' -LabelBuffer = require './LabelBuffer' -Styler = require './Styler' -Tile = require './Tile' -utils = require './utils' -config = require './config' - -module.exports = class Renderer - terminal: - CLEAR: "\x1B[2J" - MOVE: "\x1B[?6h" - - isDrawing: false - lastDrawAt: 0 - - labelBuffer: null - tileSource: null - tilePadding: 64 - - constructor: (@output, @tileSource) -> - @labelBuffer = new LabelBuffer() - - loadStyleFile: (file) -> - @styler = new Styler file - @tileSource.useStyler @styler - - setSize: (@width, @height) -> - @canvas = new Canvas @width, @height - - draw: (center, zoom) -> - return Promise.reject() if @isDrawing - @isDrawing = true - - @labelBuffer.clear() - @_seen = {} - - if color = @styler.styleById['background']?.paint['background-color'] - @canvas.setBackground x256 utils.hex2rgb color - - @canvas.clear() - - Promise - .resolve @_visibleTiles center, zoom - .map (tile) => @_getTile tile - .map (tile) => @_getTileFeatures tile, zoom - .then (tiles) => @_renderTiles tiles - .then => @_getFrame() - - .catch (e) -> - console.log e - - .finally (frame) => - @isDrawing = false - @lastDrawAt = Date.now() - - frame - - _visibleTiles: (center, zoom) -> - z = utils.baseZoom zoom - center = utils.ll2tile center.lon, center.lat, z - - tiles = [] - tileSize = utils.tilesizeAtZoom zoom - - 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] - tile = x: x, y: y, z: z - - position = - x: @width/2-(center.x-tile.x)*tileSize - y: @height/2-(center.y-tile.y)*tileSize - - gridSize = Math.pow 2, z - - tile.x %= gridSize - if tile.x < 0 - tile.x = if z is 0 then 0 else tile.x+gridSize - - if tile.y < 0 or - tile.y >= gridSize or - position.x+tileSize < 0 or - position.y+tileSize < 0 or - position.x>@width or - position.y>@height - continue - - tiles.push xyz: tile, zoom: zoom, position: position, size: tileSize - - tiles - - _getTile: (tile) -> - @tileSource - .getTile tile.xyz.z, tile.xyz.x, tile.xyz.y - .then (data) => - tile.data = data - tile - - _getTileFeatures: (tile, zoom) -> - position = tile.position - layers = {} - - for layerId in @_generateDrawOrder zoom - continue unless layer = tile.data.layers?[layerId] - - scale = layer.extent / utils.tilesizeAtZoom zoom - layers[layerId] = - scale: scale - features: layer.tree.search - minX: -position.x*scale - minY: -position.y*scale - maxX: (@width-position.x)*scale - maxY: (@height-position.y)*scale - - tile.layers = layers - tile - - _renderTiles: (tiles) -> - drawn = {} - labels = [] - - for layerId in @_generateDrawOrder tiles[0].xyz.z - for tile in tiles - continue unless layer = tile.layers[layerId] - for feature in layer.features - # continue if feature.id and drawn[feature.id] - # drawn[feature.id] = true - if layerId.match /label/ - labels.push tile: tile, feature: feature, scale: layer.scale - else - @_drawFeature tile, feature, layer.scale - - labels.sort (a, b) -> - a.feature.sorty-b.feature.sort - - for label in labels - @_drawFeature label.tile, label.feature, label.scale - - _getFrame: -> - frame = "" - frame += @terminal.CLEAR unless @lastDrawAt - frame += @terminal.MOVE - frame += @canvas.frame() - frame - - featuresAt: (x, y) -> - @labelBuffer.featuresAt x, y - - _drawFeature: (tile, feature, scale) -> - if feature.style.minzoom and tile.zoom < feature.style.minzoom - return false - else if feature.style.maxzoom and tile.zoom > feature.style.maxzoom - return false - - switch feature.style.type - when "line" - width = feature.style.paint['line-width'] - # TODO: apply the correct zoom based value - width = width.stops[0][1] if width instanceof Object - - points = @_scaleAndReduce tile, feature, feature.points, scale - @canvas.polyline points, feature.color, width if points.length - - when "fill" - points = (@_scaleAndReduce tile, feature, p, scale, false for p in feature.points) - @canvas.polygon points, feature.color - - when "symbol" - text = feature.label or - genericSymbol = config.poiMarker - - return false if @_seen[text] and not genericSymbol - - placed = false - for point in @_scaleAndReduce tile, feature, feature.points, scale - x = point.x - text.length - 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 - @labelBuffer.writeIfPossible config.poiMarker, point.x, point.y, feature, 3 - @canvas.text config.poiMarker, point.x, point.y, feature.color - placed = true - break - - @_seen[text] = true if placed - - true - - _scaleAndReduce: (tile, feature, points, scale, filter = true) -> - lastX = lastY = outside = null - scaled = [] - - minX = minY = -@tilePadding - maxX = @width+@tilePadding - maxY = @height+@tilePadding - - for point in points - x = Math.floor tile.position.x+(point.x/scale) - y = Math.floor tile.position.y+(point.y/scale) - - continue if lastX is x and lastY is y - - lastY = y - lastX = x - - if filter - if x < minX or x > maxX or y < minY or y > maxY - continue if outside - outside = true - else - if outside - outside = null - scaled.push x: lastX, y: lastY - - scaled.push x: x, y: y - - if feature.style.type isnt "symbol" - if scaled.length < 2 - return [] - - if config.simplifyPolylines - simplify scaled, .5, true - else - scaled - else - scaled - - _generateDrawOrder: (zoom) -> - if zoom < 2 - [ - "admin" - "water" - "country_label" - "marine_label" - ] - else - [ - "landuse" - "water" - "marine_label" - "building" - "road" - "admin" - - "country_label" - "state_label" - "water_label" - "place_label" - "rail_station_label" - "poi_label" - "road_label" - "housenum_label" - ] diff --git a/src/Renderer.js b/src/Renderer.js index c1d1b6f..40d4884 100644 --- a/src/Renderer.js +++ b/src/Renderer.js @@ -142,25 +142,20 @@ class Renderer { } _renderTiles(tiles) { - var feature, i, j, k, labels, layer, layerId, len, len1, len2, ref, ref1, tile; - labels = []; - ref = this._generateDrawOrder(tiles[0].xyz.z); - for (i = 0, len = ref.length; i < len; i++) { - layerId = ref[i]; - for (j = 0, len1 = tiles.length; j < len1; j++) { - tile = tiles[j]; - if (!(layer = tile.layers[layerId])) { - continue; - } - ref1 = layer.features; - for (k = 0, len2 = ref1.length; k < len2; k++) { - feature = ref1[k]; + const labels = []; + + const drawOrder = this._generateDrawOrder(tiles[0].xyz.z); + for (const layerId in drawOrder) { + for (const tile in tiles) { + const layer = tile.layers[layerId]; + if (!layer) continue; + for (const feature of layer.features) { // continue if feature.id and drawn[feature.id] - // drawn[feature.id] = true + // drawn[feature.id] = true; if (layerId.match(/label/)) { labels.push({ tile, - feature: feature, + feature, scale: layer.scale }); } else { @@ -169,9 +164,11 @@ class Renderer { } } } + labels.sort((a, b) => { return a.feature.sorty - b.feature.sort; }); + for (const label of labels) { this._drawFeature(label.tile, label.feature, label.scale); }