Accept flat coordinates in LineString constructor

src/ol/geom/LineString.js

@@ -22,7 +22,9 @@ import {douglasPeucker} from '../geom/flat/simplify.js';
  *
  * @constructor
  * @extends {module:ol/geom/SimpleGeometry}
- * @param {Array.<module:ol/coordinate~Coordinate>} coordinates Coordinates.
+ * @param {Array.<module:ol/coordinate~Coordinate>|Array.<number>} coordinates
+ * Coordinates. (For internal use, flat coordinates in combination with
+ * `opt_layout` are also accepted).
  * @param {module:ol/geom/GeometryLayout=} opt_layout Layout.
  * @api
  */
@@ -54,7 +56,11 @@ const LineString = function(coordinates, opt_layout) {
    */
   this.maxDeltaRevision_ = -1;
 
-  this.setCoordinates(coordinates, opt_layout);
+  if (opt_layout !== undefined && !Array.isArray(coordinates[0])) {
+    this.setFlatCoordinatesInternal(opt_layout, coordinates);
+  } else {
+    this.setCoordinates(coordinates, opt_layout);
+  }
 
 };
 
@@ -83,9 +89,7 @@ LineString.prototype.appendCoordinate = function(coordinate) {
  * @api
  */
 LineString.prototype.clone = function() {
-  const lineString = new LineString(null);
-  lineString.setFlatCoordinates(this.layout, this.flatCoordinates.slice());
-  return lineString;
+  return new LineString(this.flatCoordinates.slice(), this.layout);
 };
 
 
@@ -208,10 +212,7 @@ LineString.prototype.getSimplifiedGeometryInternal = function(squaredTolerance)
   simplifiedFlatCoordinates.length = douglasPeucker(
     this.flatCoordinates, 0, this.flatCoordinates.length, this.stride,
     squaredTolerance, simplifiedFlatCoordinates, 0);
-  const simplifiedLineString = new LineString(null);
-  simplifiedLineString.setFlatCoordinates(
-    GeometryLayout.XY, simplifiedFlatCoordinates);
-  return simplifiedLineString;
+  return new LineString(simplifiedFlatCoordinates, GeometryLayout.XY);
 };
 
 
@@ -237,32 +238,19 @@ LineString.prototype.intersectsExtent = function(extent) {
 
 /**
  * Set the coordinates of the linestring.
- * @param {Array.<module:ol/coordinate~Coordinate>} coordinates Coordinates.
+ * @param {!Array.<module:ol/coordinate~Coordinate>} coordinates Coordinates.
  * @param {module:ol/geom/GeometryLayout=} opt_layout Layout.
  * @override
  * @api
  */
 LineString.prototype.setCoordinates = function(coordinates, opt_layout) {
-  if (!coordinates) {
-    this.setFlatCoordinates(GeometryLayout.XY, null);
-  } else {
-    this.setLayout(opt_layout, coordinates, 1);
-    if (!this.flatCoordinates) {
-      this.flatCoordinates = [];
-    }
-    this.flatCoordinates.length = deflateCoordinates(
-      this.flatCoordinates, 0, coordinates, this.stride);
-    this.changed();
+  this.setLayout(opt_layout, coordinates, 1);
+  if (!this.flatCoordinates) {
+    this.flatCoordinates = [];
   }
-};
-
-
-/**
- * @param {module:ol/geom/GeometryLayout} layout Layout.
- * @param {Array.<number>} flatCoordinates Flat coordinates.
- */
-LineString.prototype.setFlatCoordinates = function(layout, flatCoordinates) {
-  this.setFlatCoordinatesInternal(layout, flatCoordinates);
+  this.flatCoordinates.length = deflateCoordinates(
+    this.flatCoordinates, 0, coordinates, this.stride);
   this.changed();
 };
+
 export default LineString;

src/ol/geom/MultiLineString.js

@@ -167,10 +167,8 @@ MultiLineString.prototype.getLineString = function(index) {
   if (index < 0 || this.ends_.length <= index) {
     return null;
   }
-  const lineString = new LineString(null);
-  lineString.setFlatCoordinates(this.layout, this.flatCoordinates.slice(
-    index === 0 ? 0 : this.ends_[index - 1], this.ends_[index]));
-  return lineString;
+  return new LineString(this.flatCoordinates.slice(
+    index === 0 ? 0 : this.ends_[index - 1], this.ends_[index]), this.layout);
 };
 
 
@@ -188,8 +186,7 @@ MultiLineString.prototype.getLineStrings = function() {
   let offset = 0;
   for (let i = 0, ii = ends.length; i < ii; ++i) {
     const end = ends[i];
-    const lineString = new LineString(null);
-    lineString.setFlatCoordinates(layout, flatCoordinates.slice(offset, end));
+    const lineString = new LineString(flatCoordinates.slice(offset, end), layout);
     lineStrings.push(lineString);
     offset = end;
   }

src/ol/geom/SimpleGeometry.js

@@ -203,8 +203,7 @@ SimpleGeometry.prototype.getStride = function() {
 /**
  * @param {module:ol/geom/GeometryLayout} layout Layout.
  * @param {Array.<number>} flatCoordinates Flat coordinates.
- * @protected
- */
+  */
 SimpleGeometry.prototype.setFlatCoordinatesInternal = function(layout, flatCoordinates) {
   this.stride = getStrideForLayout(layout);
   this.layout = layout;