ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_render_canvas_TextReplay_ to CanvasTextReplay

Browse Source
This commit is contained in:
Frederic Junod
2018-01-15 10:07:22 +01:00
parent e0f910a7ba
commit c890db50b9
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/render/canvas/ReplayGroup.js
View File

@@ -13,7 +13,7 @@ import CanvasReplay from '../canvas/Replay.js';
import CanvasImageReplay from '../canvas/ImageReplay.js';
import _ol_render_canvas_LineStringReplay_ from '../canvas/LineStringReplay.js';
import _ol_render_canvas_PolygonReplay_ from '../canvas/PolygonReplay.js';
import _ol_render_canvas_TextReplay_ from '../canvas/TextReplay.js';
import CanvasTextReplay from '../canvas/TextReplay.js';
import _ol_render_replay_ from '../replay.js';
import _ol_transform_ from '../../transform.js';
@@ -502,6 +502,6 @@ CanvasReplayGroup.BATCH_CONSTRUCTORS_ = {
'Image': CanvasImageReplay,
'LineString': _ol_render_canvas_LineStringReplay_,
'Polygon': _ol_render_canvas_PolygonReplay_,
'Text': _ol_render_canvas_TextReplay_
'Text': CanvasTextReplay
};
export default CanvasReplayGroup;

20
src/ol/render/canvas/TextReplay.js
View File

@@ -25,7 +25,7 @@ import TextPlacement from '../../style/TextPlacement.js';
* @param {?} declutterTree Declutter tree.
* @struct
*/
const _ol_render_canvas_TextReplay_ = function(
const CanvasTextReplay = function(
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
CanvasReplay.call(this,
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
@@ -134,7 +134,7 @@ const _ol_render_canvas_TextReplay_ = function(
};
inherits(_ol_render_canvas_TextReplay_, CanvasReplay);
inherits(CanvasTextReplay, CanvasReplay);
/**
@@ -144,7 +144,7 @@ inherits(_ol_render_canvas_TextReplay_, CanvasReplay);
* each line.
* @return {number} Width of the whole text.
*/
_ol_render_canvas_TextReplay_.measureTextWidths = function(font, lines, widths) {
CanvasTextReplay.measureTextWidths = function(font, lines, widths) {
const numLines = lines.length;
let width = 0;
let currentWidth, i;
@@ -160,7 +160,7 @@ _ol_render_canvas_TextReplay_.measureTextWidths = function(font, lines, widths)
/**
* @inheritDoc
*/
_ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) {
CanvasTextReplay.prototype.drawText = function(geometry, feature) {
const fillState = this.textFillState_;
const strokeState = this.textStrokeState_;
const textState = this.textState_;
@@ -282,7 +282,7 @@ _ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) {
* @param {string} strokeKey Stroke style key.
* @return {HTMLCanvasElement} Image.
*/
_ol_render_canvas_TextReplay_.prototype.getImage = function(text, textKey, fillKey, strokeKey) {
CanvasTextReplay.prototype.getImage = function(text, textKey, fillKey, strokeKey) {
let label;
const key = strokeKey + textKey + text + fillKey + this.pixelRatio;
@@ -299,7 +299,7 @@ _ol_render_canvas_TextReplay_.prototype.getImage = function(text, textKey, fillK
const lines = text.split('\n');
const numLines = lines.length;
const widths = [];
const width = _ol_render_canvas_TextReplay_.measureTextWidths(textState.font, lines, widths);
const width = CanvasTextReplay.measureTextWidths(textState.font, lines, widths);
const lineHeight = _ol_render_canvas_.measureTextHeight(textState.font);
const height = lineHeight * numLines;
const renderWidth = (width + strokeWidth);
@@ -352,7 +352,7 @@ _ol_render_canvas_TextReplay_.prototype.getImage = function(text, textKey, fillK
* @param {number} begin Begin.
* @param {number} end End.
*/
_ol_render_canvas_TextReplay_.prototype.drawTextImage_ = function(label, begin, end) {
CanvasTextReplay.prototype.drawTextImage_ = function(label, begin, end) {
const textState = this.textState_;
const strokeState = this.textStrokeState_;
const pixelRatio = this.pixelRatio;
@@ -387,7 +387,7 @@ _ol_render_canvas_TextReplay_.prototype.drawTextImage_ = function(label, begin,
* @param {number} end End.
* @param {ol.DeclutterGroup} declutterGroup Declutter group.
*/
_ol_render_canvas_TextReplay_.prototype.drawChars_ = function(begin, end, declutterGroup) {
CanvasTextReplay.prototype.drawChars_ = function(begin, end, declutterGroup) {
const strokeState = this.textStrokeState_;
const textState = this.textState_;
const fillState = this.textFillState_;
@@ -465,7 +465,7 @@ _ol_render_canvas_TextReplay_.prototype.drawChars_ = function(begin, end, declut
/**
* @inheritDoc
*/
_ol_render_canvas_TextReplay_.prototype.setTextStyle = function(textStyle, declutterGroup) {
CanvasTextReplay.prototype.setTextStyle = function(textStyle, declutterGroup) {
let textState, fillState, strokeState;
if (!textStyle) {
this.text_ = '';
@@ -545,4 +545,4 @@ _ol_render_canvas_TextReplay_.prototype.setTextStyle = function(textStyle, declu
'';
}
};
export default _ol_render_canvas_TextReplay_;
export default CanvasTextReplay;

6
test/spec/ol/render/canvas/textreplay.test.js
View File

@@ -1,13 +1,13 @@
import Feature from '../../../../../src/ol/Feature.js';
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js';
import _ol_render_canvas_TextReplay_ from '../../../../../src/ol/render/canvas/TextReplay.js';
import CanvasTextReplay from '../../../../../src/ol/render/canvas/TextReplay.js';
import Text from '../../../../../src/ol/style/Text.js';
describe('ol.render.canvas.TextReplay', function() {
it('renders polygon labels only when they fit', function() {
const replay = new _ol_render_canvas_TextReplay_(1, [-180, -90, 180, 90], 0.02, 1, true);
const replay = new CanvasTextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
const geometry = new Polygon([[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]);
const feature = new Feature(geometry);
@@ -25,7 +25,7 @@ describe('ol.render.canvas.TextReplay', function() {
});
it('renders multipolygon labels only when they fit', function() {
const replay = new _ol_render_canvas_TextReplay_(1, [-180, -90, 180, 90], 0.02, 1, true);
const replay = new CanvasTextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
const geometry = new MultiPolygon([
[[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]],
[[[1, 1], [1, 2], [2, 2], [2, 1], [1, 1]]]