Simplify method signature for appendFlatPointCoordinates
This commit is contained in:
@@ -146,18 +146,16 @@ class CanvasBuilder extends VectorContext {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {Array<number>} flatCoordinates Flat coordinates.
|
* @param {Array<number>} flatCoordinates Flat coordinates.
|
||||||
* @param {number} offset Offset.
|
|
||||||
* @param {number} end End.
|
|
||||||
* @param {number} stride Stride.
|
* @param {number} stride Stride.
|
||||||
* @protected
|
* @protected
|
||||||
* @return {number} My end
|
* @return {number} My end
|
||||||
*/
|
*/
|
||||||
appendFlatPointCoordinates(flatCoordinates, offset, end, stride) {
|
appendFlatPointCoordinates(flatCoordinates, stride) {
|
||||||
const extent = this.getBufferedMaxExtent();
|
const extent = this.getBufferedMaxExtent();
|
||||||
const tmpCoord = this.tmpCoordinate_;
|
const tmpCoord = this.tmpCoordinate_;
|
||||||
const coordinates = this.coordinates;
|
const coordinates = this.coordinates;
|
||||||
let myEnd = coordinates.length;
|
let myEnd = coordinates.length;
|
||||||
for (let i = offset; i < end; i += stride) {
|
for (let i = 0, ii = flatCoordinates.length; i < ii; i += stride) {
|
||||||
tmpCoord[0] = flatCoordinates[i];
|
tmpCoord[0] = flatCoordinates[i];
|
||||||
tmpCoord[1] = flatCoordinates[i + 1];
|
tmpCoord[1] = flatCoordinates[i + 1];
|
||||||
if (containsCoordinate(extent, tmpCoord)) {
|
if (containsCoordinate(extent, tmpCoord)) {
|
||||||
@@ -335,12 +333,7 @@ class CanvasBuilder extends VectorContext {
|
|||||||
]);
|
]);
|
||||||
} else if (type == GeometryType.MULTI_POINT) {
|
} else if (type == GeometryType.MULTI_POINT) {
|
||||||
flatCoordinates = geometry.getFlatCoordinates();
|
flatCoordinates = geometry.getFlatCoordinates();
|
||||||
builderEnd = this.appendFlatPointCoordinates(
|
builderEnd = this.appendFlatPointCoordinates(flatCoordinates, stride);
|
||||||
flatCoordinates,
|
|
||||||
0,
|
|
||||||
flatCoordinates.length,
|
|
||||||
stride
|
|
||||||
);
|
|
||||||
if (builderEnd > builderBegin) {
|
if (builderEnd > builderBegin) {
|
||||||
this.instructions.push([
|
this.instructions.push([
|
||||||
CanvasInstruction.CUSTOM,
|
CanvasInstruction.CUSTOM,
|
||||||
|
|||||||
@@ -111,12 +111,7 @@ class CanvasImageBuilder extends CanvasBuilder {
|
|||||||
const flatCoordinates = pointGeometry.getFlatCoordinates();
|
const flatCoordinates = pointGeometry.getFlatCoordinates();
|
||||||
const stride = pointGeometry.getStride();
|
const stride = pointGeometry.getStride();
|
||||||
const myBegin = this.coordinates.length;
|
const myBegin = this.coordinates.length;
|
||||||
const myEnd = this.appendFlatPointCoordinates(
|
const myEnd = this.appendFlatPointCoordinates(flatCoordinates, stride);
|
||||||
flatCoordinates,
|
|
||||||
0,
|
|
||||||
flatCoordinates.length,
|
|
||||||
stride
|
|
||||||
);
|
|
||||||
this.instructions.push([
|
this.instructions.push([
|
||||||
CanvasInstruction.DRAW_IMAGE,
|
CanvasInstruction.DRAW_IMAGE,
|
||||||
myBegin,
|
myBegin,
|
||||||
@@ -171,12 +166,7 @@ class CanvasImageBuilder extends CanvasBuilder {
|
|||||||
const flatCoordinates = multiPointGeometry.getFlatCoordinates();
|
const flatCoordinates = multiPointGeometry.getFlatCoordinates();
|
||||||
const stride = multiPointGeometry.getStride();
|
const stride = multiPointGeometry.getStride();
|
||||||
const myBegin = this.coordinates.length;
|
const myBegin = this.coordinates.length;
|
||||||
const myEnd = this.appendFlatPointCoordinates(
|
const myEnd = this.appendFlatPointCoordinates(flatCoordinates, stride);
|
||||||
flatCoordinates,
|
|
||||||
0,
|
|
||||||
flatCoordinates.length,
|
|
||||||
stride
|
|
||||||
);
|
|
||||||
this.instructions.push([
|
this.instructions.push([
|
||||||
CanvasInstruction.DRAW_IMAGE,
|
CanvasInstruction.DRAW_IMAGE,
|
||||||
myBegin,
|
myBegin,
|
||||||
|
|||||||
@@ -269,12 +269,7 @@ class CanvasTextBuilder extends CanvasBuilder {
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
const end = this.appendFlatPointCoordinates(
|
const end = this.appendFlatPointCoordinates(flatCoordinates, stride);
|
||||||
flatCoordinates,
|
|
||||||
0,
|
|
||||||
flatCoordinates.length,
|
|
||||||
stride
|
|
||||||
);
|
|
||||||
if (end === begin) {
|
if (end === begin) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user