From 95f10c9ec9f4276a97c50ec1825f423a162b6f60 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Wed, 27 Jun 2018 15:55:03 -0400 Subject: [PATCH] Change the name of renderedZone to renderThreshold. --- src/canvas/textFeature.js | 8 ++++---- src/textFeature.js | 2 +- tests/cases/textFeature.js | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/canvas/textFeature.js b/src/canvas/textFeature.js index dd0aeeda3a..620e6a893a 100644 --- a/src/canvas/textFeature.js +++ b/src/canvas/textFeature.js @@ -99,7 +99,7 @@ var canvas_textFeature = function (arg) { this._renderOnCanvas = function (context2d, map) { var data = m_this.data(), posFunc = m_this.style.get('position'), - renderedZone = m_this.style.get('renderedZone')(data), + renderThreshold = m_this.style.get('renderThreshold')(data), textFunc = m_this.style.get('text'), mapRotation = map.rotation(), mapZoom = map.zoom(), @@ -125,9 +125,9 @@ var canvas_textFeature = function (arg) { * render it, even if the offset of size would be sufficient to make it * appear in the viewport. */ pos = posArray[i]; - if (renderedZone > 0 && ( - pos.x < -renderedZone || pos.x > mapSize.width + renderedZone || - pos.y < -renderedZone || pos.y > mapSize.height + renderedZone)) { + if (renderThreshold > 0 && ( + pos.x < -renderThreshold || pos.x > mapSize.width + renderThreshold || + pos.y < -renderThreshold || pos.y > mapSize.height + renderThreshold)) { return; } visible = m_this.style.get('visible')(d, i); diff --git a/src/textFeature.js b/src/textFeature.js index 750260619f..cddd10cda2 100644 --- a/src/textFeature.js +++ b/src/textFeature.js @@ -60,7 +60,7 @@ var feature = require('./feature'); * stroke color. May include opacity. * @property {geo.geoColor|function} [style.textStrokeWidth=0] Text stroke * width in pixels. - * @property {number|function} [style.renderedZone] If this is a positive + * @property {number|function} [style.renderThreshold] If this is a positive * number, text elements may not be rendered if their base position * (before offset and font effects are applied) is more than this distance * in pixels outside of the current viewport. If it is known that such diff --git a/tests/cases/textFeature.js b/tests/cases/textFeature.js index c56ed9eac0..b9cf4afdef 100644 --- a/tests/cases/textFeature.js +++ b/tests/cases/textFeature.js @@ -198,7 +198,7 @@ describe('geo.textFeature', function () { expect(text.getFontFromStyles(true, text.data()[3], 3)).toBe('italic small-caps bold condensed 40px/60px serif'); expect(text.getFontFromStyles(true, text.data()[11], 11)).toBe('bold 16px/60px sans-serif'); }); - it('renderedZone', function () { + it('renderThreshold', function () { mockAnimationFrame(); logCanvas2D(); map = createMap(); @@ -207,22 +207,22 @@ describe('geo.textFeature', function () { text.draw(); stepAnimationFrame(); var count1 = $.extend({}, window._canvasLog.counts).fillText; - text.style({renderedZone: 0}); + text.style({renderThreshold: 0}); text.draw(); stepAnimationFrame(); var count2 = $.extend({}, window._canvasLog.counts).fillText; expect(count2 - count1).toBe(14); - text.style({renderedZone: 1}); + text.style({renderThreshold: 1}); text.draw(); stepAnimationFrame(); var count3 = $.extend({}, window._canvasLog.counts).fillText; expect(count3 - count2).toBe(6); - text.style({renderedZone: 20}); + text.style({renderThreshold: 20}); text.draw(); stepAnimationFrame(); var count4 = $.extend({}, window._canvasLog.counts).fillText; expect(count4 - count3).toBe(8); - text.style({renderedZone: 0}); + text.style({renderThreshold: 0}); text.draw(); stepAnimationFrame(); var count5 = $.extend({}, window._canvasLog.counts).fillText;