extern/mapscii
1
0
Fork 0
mirror of https://github.com/rastapasta/mapscii.git synced 2025-06-25 03:51:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up Renderer (still uses bluejay)

Browse Source
This commit is contained in:
Christian Paul 2017-12-22 22:40:02 -08:00
parent f236f95383
commit bf8ebfd3df
1 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Renderer.js
View File

@ -12,7 +12,6 @@ const simplify = require('simplify-js');
const Canvas = require('./Canvas'); const Canvas = require('./Canvas');
const LabelBuffer = require('./LabelBuffer'); const LabelBuffer = require('./LabelBuffer');
const Styler = require('./Styler'); const Styler = require('./Styler');
const Tile = require('./Tile');
const utils = require('./utils'); const utils = require('./utils');
const config = require('./config'); const config = require('./config');
@ -143,8 +142,7 @@ class Renderer {
} }
_renderTiles(tiles) { _renderTiles(tiles) {
var drawn, feature, i, j, k, l, label, labels, layer, layerId, len, len1, len2, len3, ref, ref1, tile; var feature, i, j, k, labels, layer, layerId, len, len1, len2, ref, ref1, tile;
drawn = {};
labels = []; labels = [];
ref = this._generateDrawOrder(tiles[0].xyz.z); ref = this._generateDrawOrder(tiles[0].xyz.z);
for (i = 0, len = ref.length; i < len; i++) { for (i = 0, len = ref.length; i < len; i++) {
@ -204,7 +202,7 @@ class Renderer {
} }
switch (feature.style.type) { switch (feature.style.type) {
case 'line': case 'line': {
let width = feature.style.paint['line-width']; let width = feature.style.paint['line-width'];
if (width instanceof Object) { if (width instanceof Object) {
// TODO: apply the correct zoom based value // TODO: apply the correct zoom based value
@ -215,13 +213,15 @@ class Renderer {
this.canvas.polyline(points, feature.color, width); this.canvas.polyline(points, feature.color, width);
} }
break; break;
case 'fill': }
case 'fill': {
points = feature.points.map((p) => { points = feature.points.map((p) => {
return this._scaleAndReduce(tile, feature, p, scale, false); return this._scaleAndReduce(tile, feature, p, scale, false);
}); });
this.canvas.polygon(points, feature.color); this.canvas.polygon(points, feature.color);
break; break;
case 'symbol': }
case 'symbol': {
const text = feature.label || (genericSymbol = config.poiMarker); const text = feature.label || (genericSymbol = config.poiMarker);
if (this._seen[text] && !genericSymbol) { if (this._seen[text] && !genericSymbol) {
@ -247,6 +247,8 @@ class Renderer {
if (placed) { if (placed) {
this._seen[text] = true; this._seen[text] = true;
} }
break;
}
} }
return true; return true;
} }