From fd28d5bb3d85f973e0c5e4278da7c9f8c9fe9c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= <maxi_kroeg@web.de>
Date: Sat, 12 Sep 2020 18:26:36 +0200
Subject: [PATCH] Simplify method signature for appendFlatPointCoordinates

---
 src/ol/render/canvas/Builder.js      | 13 +++----------
 src/ol/render/canvas/ImageBuilder.js | 14 ++------------
 src/ol/render/canvas/TextBuilder.js  |  7 +------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/ol/render/canvas/Builder.js b/src/ol/render/canvas/Builder.js
index c8522547cf..9d40e8e2b6 100644
--- a/src/ol/render/canvas/Builder.js
+++ b/src/ol/render/canvas/Builder.js
@@ -146,18 +146,16 @@ class CanvasBuilder extends VectorContext {
 
   /**
    * @param {Array<number>} flatCoordinates Flat coordinates.
-   * @param {number} offset Offset.
-   * @param {number} end End.
    * @param {number} stride Stride.
    * @protected
    * @return {number} My end
    */
-  appendFlatPointCoordinates(flatCoordinates, offset, end, stride) {
+  appendFlatPointCoordinates(flatCoordinates, stride) {
     const extent = this.getBufferedMaxExtent();
     const tmpCoord = this.tmpCoordinate_;
     const coordinates = this.coordinates;
     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[1] = flatCoordinates[i + 1];
       if (containsCoordinate(extent, tmpCoord)) {
@@ -335,12 +333,7 @@ class CanvasBuilder extends VectorContext {
       ]);
     } else if (type == GeometryType.MULTI_POINT) {
       flatCoordinates = geometry.getFlatCoordinates();
-      builderEnd = this.appendFlatPointCoordinates(
-        flatCoordinates,
-        0,
-        flatCoordinates.length,
-        stride
-      );
+      builderEnd = this.appendFlatPointCoordinates(flatCoordinates, stride);
       if (builderEnd > builderBegin) {
         this.instructions.push([
           CanvasInstruction.CUSTOM,
diff --git a/src/ol/render/canvas/ImageBuilder.js b/src/ol/render/canvas/ImageBuilder.js
index 9f87197a66..e50f2c88a7 100644
--- a/src/ol/render/canvas/ImageBuilder.js
+++ b/src/ol/render/canvas/ImageBuilder.js
@@ -111,12 +111,7 @@ class CanvasImageBuilder extends CanvasBuilder {
     const flatCoordinates = pointGeometry.getFlatCoordinates();
     const stride = pointGeometry.getStride();
     const myBegin = this.coordinates.length;
-    const myEnd = this.appendFlatPointCoordinates(
-      flatCoordinates,
-      0,
-      flatCoordinates.length,
-      stride
-    );
+    const myEnd = this.appendFlatPointCoordinates(flatCoordinates, stride);
     this.instructions.push([
       CanvasInstruction.DRAW_IMAGE,
       myBegin,
@@ -171,12 +166,7 @@ class CanvasImageBuilder extends CanvasBuilder {
     const flatCoordinates = multiPointGeometry.getFlatCoordinates();
     const stride = multiPointGeometry.getStride();
     const myBegin = this.coordinates.length;
-    const myEnd = this.appendFlatPointCoordinates(
-      flatCoordinates,
-      0,
-      flatCoordinates.length,
-      stride
-    );
+    const myEnd = this.appendFlatPointCoordinates(flatCoordinates, stride);
     this.instructions.push([
       CanvasInstruction.DRAW_IMAGE,
       myBegin,
diff --git a/src/ol/render/canvas/TextBuilder.js b/src/ol/render/canvas/TextBuilder.js
index cd439dc281..b04a542d50 100644
--- a/src/ol/render/canvas/TextBuilder.js
+++ b/src/ol/render/canvas/TextBuilder.js
@@ -269,12 +269,7 @@ class CanvasTextBuilder extends CanvasBuilder {
           break;
         default:
       }
-      const end = this.appendFlatPointCoordinates(
-        flatCoordinates,
-        0,
-        flatCoordinates.length,
-        stride
-      );
+      const end = this.appendFlatPointCoordinates(flatCoordinates, stride);
       if (end === begin) {
         return;
       }