ol 7.0.0-dev.1658257118421 → 7.0.0-dev.1658343947608

package/src/format/KML.js

@@ -4,10 +4,7 @@
 import Feature from '../Feature.js';
 import Fill from '../style/Fill.js';
 import GeometryCollection from '../geom/GeometryCollection.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import Icon from '../style/Icon.js';
-import IconAnchorUnits from '../style/IconAnchorUnits.js';
-import IconOrigin from '../style/IconOrigin.js';
 import ImageState from '../ImageState.js';
 import LineString from '../geom/LineString.js';
 import MultiLineString from '../geom/MultiLineString.js';
@@ -57,10 +54,10 @@ import {transformGeometryWithOptions} from './Feature.js';
 /**
  * @typedef {Object} Vec2
  * @property {number} x X coordinate.
- * @property {import("../style/IconAnchorUnits").default} xunits Units of x.
+ * @property {import("../style/Icon.js").IconAnchorUnits} xunits Units of x.
  * @property {number} y Y coordinate.
- * @property {import("../style/IconAnchorUnits").default} yunits Units of Y.
- * @property {import("../style/IconOrigin.js").default} [origin] Origin.
+ * @property {import("../style/Icon.js").IconAnchorUnits} yunits Units of Y.
+ * @property {import("../style/Icon.js").IconOrigin} [origin] Origin.
  */
 
 /**
@@ -96,12 +93,12 @@ const SCHEMA_LOCATION =
   'https://developers.google.com/kml/schema/kml22gx.xsd';
 
 /**
- * @type {Object<string, import("../style/IconAnchorUnits").default>}
+ * @type {Object<string, import("../style/Icon.js").IconAnchorUnits>}
  */
 const ICON_ANCHOR_UNITS_MAP = {
-  'fraction': IconAnchorUnits.FRACTION,
-  'pixels': IconAnchorUnits.PIXELS,
-  'insetPixels': IconAnchorUnits.PIXELS,
+  'fraction': 'fraction',
+  'pixels': 'pixels',
+  'insetPixels': 'pixels',
 };
 
 /**
@@ -212,12 +209,12 @@ export function getDefaultFillStyle() {
 let DEFAULT_IMAGE_STYLE_ANCHOR;
 
 /**
- * @type {import("../style/IconAnchorUnits").default}
+ * @type {import("../style/Icon.js").IconAnchorUnits}
  */
 let DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS;
 
 /**
- * @type {import("../style/IconAnchorUnits").default}
+ * @type {import("../style/Icon.js").IconAnchorUnits}
  */
 let DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS;
 
@@ -324,9 +321,9 @@ function createStyleDefaults() {
 
   DEFAULT_IMAGE_STYLE_ANCHOR = [20, 2];
 
-  DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS = IconAnchorUnits.PIXELS;
+  DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS = 'pixels';
 
-  DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS = IconAnchorUnits.PIXELS;
+  DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS = 'pixels';
 
   DEFAULT_IMAGE_STYLE_SIZE = [64, 64];
 
@@ -335,7 +332,7 @@ function createStyleDefaults() {
 
   DEFAULT_IMAGE_STYLE = new Icon({
     anchor: DEFAULT_IMAGE_STYLE_ANCHOR,
-    anchorOrigin: IconOrigin.BOTTOM_LEFT,
+    anchorOrigin: 'bottom-left',
     anchorXUnits: DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS,
     anchorYUnits: DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS,
     crossOrigin: 'anonymous',
@@ -1175,18 +1172,19 @@ function readStyleURL(node) {
 function readVec2(node) {
   const xunits = node.getAttribute('xunits');
   const yunits = node.getAttribute('yunits');
+  /** @type {import('../style/Icon.js').IconOrigin} */
   let origin;
   if (xunits !== 'insetPixels') {
     if (yunits !== 'insetPixels') {
-      origin = IconOrigin.BOTTOM_LEFT;
+      origin = 'bottom-left';
     } else {
-      origin = IconOrigin.TOP_LEFT;
+      origin = 'top-left';
     }
   } else {
     if (yunits !== 'insetPixels') {
-      origin = IconOrigin.BOTTOM_RIGHT;
+      origin = 'bottom-right';
     } else {
-      origin = IconOrigin.TOP_RIGHT;
+      origin = 'top-right';
     }
   }
   return {
@@ -1267,7 +1265,8 @@ function iconStyleParser(node, objectStack) {
     src = DEFAULT_IMAGE_STYLE_SRC;
   }
   let anchor, anchorXUnits, anchorYUnits;
-  let anchorOrigin = IconOrigin.BOTTOM_LEFT;
+  /** @type {import('../style/Icon.js').IconOrigin|undefined} */
+  let anchorOrigin = 'bottom-left';
   const hotSpot = /** @type {Vec2|undefined} */ (object['hotSpot']);
   if (hotSpot) {
     anchor = [hotSpot.x, hotSpot.y];
@@ -1327,7 +1326,7 @@ function iconStyleParser(node, objectStack) {
       anchorYUnits: anchorYUnits,
       crossOrigin: this.crossOrigin_,
       offset: offset,
-      offsetOrigin: IconOrigin.BOTTOM_LEFT,
+      offsetOrigin: 'bottom-left',
       rotation: rotation,
       scale: scale,
       size: size,
@@ -1594,7 +1593,7 @@ function readGxTrack(node, objectStack) {
       );
     }
   }
-  return new LineString(flatCoordinates, GeometryLayout.XYZM);
+  return new LineString(flatCoordinates, 'XYZM');
 }
 
 /**
@@ -1677,7 +1676,7 @@ function readLineString(node, objectStack) {
   );
   const flatCoordinates = readFlatCoordinatesFromNode(node, objectStack);
   if (flatCoordinates) {
-    const lineString = new LineString(flatCoordinates, GeometryLayout.XYZ);
+    const lineString = new LineString(flatCoordinates, 'XYZ');
     lineString.setProperties(properties, true);
     return lineString;
   } else {
@@ -1699,7 +1698,7 @@ function readLinearRing(node, objectStack) {
   );
   const flatCoordinates = readFlatCoordinatesFromNode(node, objectStack);
   if (flatCoordinates) {
-    const polygon = new Polygon(flatCoordinates, GeometryLayout.XYZ, [
+    const polygon = new Polygon(flatCoordinates, 'XYZ', [
       flatCoordinates.length,
     ]);
     polygon.setProperties(properties, true);
@@ -1795,7 +1794,7 @@ function readPoint(node, objectStack) {
   );
   const flatCoordinates = readFlatCoordinatesFromNode(node, objectStack);
   if (flatCoordinates) {
-    const point = new Point(flatCoordinates, GeometryLayout.XYZ);
+    const point = new Point(flatCoordinates, 'XYZ');
     point.setProperties(properties, true);
     return point;
   } else {
@@ -1838,7 +1837,7 @@ function readPolygon(node, objectStack) {
       extend(flatCoordinates, flatLinearRings[i]);
       ends.push(flatCoordinates.length);
     }
-    const polygon = new Polygon(flatCoordinates, GeometryLayout.XYZ, ends);
+    const polygon = new Polygon(flatCoordinates, 'XYZ', ends);
     polygon.setProperties(properties, true);
     return polygon;
   } else {
@@ -2338,9 +2337,9 @@ function writeCoordinatesTextNode(node, coordinates, objectStack) {
   const stride = context['stride'];
 
   let dimension;
-  if (layout == GeometryLayout.XY || layout == GeometryLayout.XYM) {
+  if (layout == 'XY' || layout == 'XYM') {
     dimension = 2;
-  } else if (layout == GeometryLayout.XYZ || layout == GeometryLayout.XYZM) {
+  } else if (layout == 'XYZ' || layout == 'XYZM') {
     dimension = 3;
   } else {
     assert(false, 34); // Invalid geometry layout
@@ -2628,9 +2627,9 @@ function writeIconStyle(node, style, objectStack) {
     if (anchor && (anchor[0] !== size[0] / 2 || anchor[1] !== size[1] / 2)) {
       const /** @type {Vec2} */ hotSpot = {
           x: anchor[0],
-          xunits: IconAnchorUnits.PIXELS,
+          xunits: 'pixels',
           y: size[1] - anchor[1],
-          yunits: IconAnchorUnits.PIXELS,
+          yunits: 'pixels',
         };
       properties['hotSpot'] = hotSpot;
     }

package/src/format/MVT.js

@@ -4,7 +4,6 @@
 //FIXME Implement projection handling
 
 import FeatureFormat, {transformGeometryWithOptions} from './Feature.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import LineString from '../geom/LineString.js';
 import MultiLineString from '../geom/MultiLineString.js';
 import MultiPoint from '../geom/MultiPoint.js';
@@ -204,18 +203,18 @@ class MVT extends FeatureFormat {
         const endss = inflateEnds(flatCoordinates, ends);
         geom =
           endss.length > 1
-            ? new MultiPolygon(flatCoordinates, GeometryLayout.XY, endss)
-            : new Polygon(flatCoordinates, GeometryLayout.XY, ends);
+            ? new MultiPolygon(flatCoordinates, 'XY', endss)
+            : new Polygon(flatCoordinates, 'XY', ends);
       } else {
         geom =
           geometryType === 'Point'
-            ? new Point(flatCoordinates, GeometryLayout.XY)
+            ? new Point(flatCoordinates, 'XY')
             : geometryType === 'LineString'
-            ? new LineString(flatCoordinates, GeometryLayout.XY)
+            ? new LineString(flatCoordinates, 'XY')
             : geometryType === 'MultiPoint'
-            ? new MultiPoint(flatCoordinates, GeometryLayout.XY)
+            ? new MultiPoint(flatCoordinates, 'XY')
             : geometryType === 'MultiLineString'
-            ? new MultiLineString(flatCoordinates, GeometryLayout.XY, ends)
+            ? new MultiLineString(flatCoordinates, 'XY', ends)
             : null;
       }
       const ctor = /** @type {typeof import("../Feature.js").default} */ (

package/src/format/OSMXML.js

@@ -3,7 +3,6 @@
  */
 // FIXME add typedef for stack state objects
 import Feature from '../Feature.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import LineString from '../geom/LineString.js';
 import Point from '../geom/Point.js';
 import Polygon from '../geom/Polygon.js';
@@ -88,11 +87,11 @@ class OSMXML extends XMLFeature {
         let geometry;
         if (values.ndrefs[0] == values.ndrefs[values.ndrefs.length - 1]) {
           // closed way
-          geometry = new Polygon(flatCoordinates, GeometryLayout.XY, [
+          geometry = new Polygon(flatCoordinates, 'XY', [
             flatCoordinates.length,
           ]);
         } else {
-          geometry = new LineString(flatCoordinates, GeometryLayout.XY);
+          geometry = new LineString(flatCoordinates, 'XY');
         }
         transformGeometryWithOptions(geometry, false, options);
         const feature = new Feature(geometry);

package/src/format/Polyline.js

@@ -2,7 +2,6 @@
  * @module ol/format/Polyline
  */
 import Feature from '../Feature.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import LineString from '../geom/LineString.js';
 import TextFeature from './TextFeature.js';
 import {assert} from '../asserts.js';
@@ -15,7 +14,7 @@ import {transformGeometryWithOptions} from './Feature.js';
 /**
  * @typedef {Object} Options
  * @property {number} [factor=1e5] The factor by which the coordinates values will be scaled.
- * @property {GeometryLayout} [geometryLayout='XY'] Layout of the
+ * @property {import("../geom/Geometry.js").GeometryLayout} [geometryLayout='XY'] Layout of the
  * feature geometries created by the format reader.
  */
 
@@ -55,11 +54,11 @@ class Polyline extends TextFeature {
 
     /**
      * @private
-     * @type {import("../geom/GeometryLayout").default}
+     * @type {import("../geom/Geometry.js").GeometryLayout}
      */
     this.geometryLayout_ = options.geometryLayout
       ? options.geometryLayout
-      : GeometryLayout.XY;
+      : 'XY';
   }
 
   /**

package/src/format/WKB.js

@@ -4,7 +4,6 @@
 import Feature from '../Feature.js';
 import FeatureFormat, {transformGeometryWithOptions} from './Feature.js';
 import GeometryCollection from '../geom/GeometryCollection.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import LineString from '../geom/LineString.js';
 import MultiLineString from '../geom/MultiLineString.js';
 import MultiPoint from '../geom/MultiPoint.js';
@@ -53,17 +52,50 @@ class WkbReader {
    * @param {DataView} view source to read
    */
   constructor(view) {
+    /** @private */
     this.view_ = view;
+
+    /**
+     * @type {number}
+     * @private
+     */
     this.pos_ = 0;
 
+    /**
+     * @type {boolean}
+     * @private
+     */
     this.initialized_ = false;
+
+    /**
+     * @type {boolean}
+     * @private
+     */
     this.isLittleEndian_ = false;
+
+    /**
+     * @type {boolean}
+     * @private
+     */
     this.hasZ_ = false;
+
+    /**
+     * @type {boolean}
+     * @private
+     */
     this.hasM_ = false;
-    /** @type {number|null} */
+
+    /**
+     * @type {number|null}
+     * @private
+     */
     this.srid_ = null;
 
-    this.layout_ = GeometryLayout.XY;
+    /**
+     * @type {import("../geom/Geometry.js").GeometryLayout}
+     * @private
+     */
+    this.layout_ = 'XY';
   }
 
   /**
@@ -164,7 +196,9 @@ class WkbReader {
       wkbTypeThousandth === 3;
     const hasSRID = Boolean(wkbType & 0x20000000);
     const typeId = (wkbType & 0x0fffffff) % 1000; // Assume 1000 is an upper limit for type ID
-    const layout = ['XY', hasZ ? 'Z' : '', hasM ? 'M' : ''].join('');
+    const layout = /** @type {import("../geom/Geometry.js").GeometryLayout} */ (
+      ['XY', hasZ ? 'Z' : '', hasM ? 'M' : ''].join('')
+    );
 
     const srid = hasSRID ? this.readUint32(isLittleEndian) : null;
 
@@ -415,7 +449,7 @@ class WkbWriter {
 
   /**
    * @param {import('../coordinate.js').Coordinate} coords coords
-   * @param {import("../geom/GeometryLayout").default} layout layout
+   * @param {import("../geom/Geometry.js").GeometryLayout} layout layout
    */
   writePoint(coords, layout) {
     /**
@@ -439,7 +473,7 @@ class WkbWriter {
 
   /**
    * @param {Array<import('../coordinate.js').Coordinate>} coords coords
-   * @param {import("../geom/GeometryLayout").default} layout layout
+   * @param {import("../geom/Geometry.js").GeometryLayout} layout layout
    */
   writeLineString(coords, layout) {
     this.writeUint32(coords.length); // numPoints
@@ -450,7 +484,7 @@ class WkbWriter {
 
   /**
    * @param {Array<Array<import('../coordinate.js').Coordinate>>} rings rings
-   * @param {import("../geom/GeometryLayout").default} layout layout
+   * @param {import("../geom/Geometry.js").GeometryLayout} layout layout
    */
   writePolygon(rings, layout) {
     this.writeUint32(rings.length); // numRings
@@ -484,7 +518,7 @@ class WkbWriter {
 
   /**
    * @param {Array<import('../coordinate.js').Coordinate>} coords coords
-   * @param {string} layout layout
+   * @param {import("../geom/Geometry.js").GeometryLayout} layout layout
    */
   writeMultiPoint(coords, layout) {
     this.writeUint32(coords.length); // numItems
@@ -496,7 +530,7 @@ class WkbWriter {
 
   /**
    * @param {Array<Array<import('../coordinate.js').Coordinate>>} coords coords
-   * @param {string} layout layout
+   * @param {import("../geom/Geometry.js").GeometryLayout} layout layout
    */
   writeMultiLineString(coords, layout) {
     this.writeUint32(coords.length); // numItems
@@ -508,7 +542,7 @@ class WkbWriter {
 
   /**
    * @param {Array<Array<Array<import('../coordinate.js').Coordinate>>>} coords coords
-   * @param {string} layout layout
+   * @param {import("../geom/Geometry.js").GeometryLayout} layout layout
    */
   writeMultiPolygon(coords, layout) {
     this.writeUint32(coords.length); // numItems
@@ -531,31 +565,31 @@ class WkbWriter {
 
   /**
    * @param {import("../geom/Geometry.js").default} geom geometry
-   * @param {import("../geom/GeometryLayout.js").default} [layout] layout
-   * @return {import("../geom/GeometryLayout.js").default} minumum layout made by common axes
+   * @param {import("../geom/Geometry.js").GeometryLayout} [layout] layout
+   * @return {import("../geom/Geometry.js").GeometryLayout} minumum layout made by common axes
    */
-  findMinimumLayout(geom, layout = GeometryLayout.XYZM) {
+  findMinimumLayout(geom, layout = 'XYZM') {
     /**
-     * @param {import("../geom/GeometryLayout.js").default} a A
-     * @param {import("../geom/GeometryLayout.js").default} b B
-     * @return {import("../geom/GeometryLayout.js").default} minumum layout made by common axes
+     * @param {import("../geom/Geometry.js").GeometryLayout} a A
+     * @param {import("../geom/Geometry.js").GeometryLayout} b B
+     * @return {import("../geom/Geometry.js").GeometryLayout} minumum layout made by common axes
      */
     const GeometryLayout_min = (a, b) => {
       if (a === b) {
         return a;
       }
 
-      if (a === GeometryLayout.XYZM) {
+      if (a === 'XYZM') {
         // anything `b` is minimum
         return b;
       }
-      if (b === GeometryLayout.XYZM) {
+      if (b === 'XYZM') {
         // anything `a` is minimum
         return a;
       }
 
       // otherwise, incompatible
-      return GeometryLayout.XY;
+      return 'XY';
     };
 
     if (geom instanceof SimpleGeometry) {
@@ -564,7 +598,7 @@ class WkbWriter {
 
     if (geom instanceof GeometryCollection) {
       const geoms = geom.getGeometriesArray();
-      for (let i = 0; i < geoms.length && layout !== GeometryLayout.XY; i++) {
+      for (let i = 0; i < geoms.length && layout !== 'XY'; i++) {
         layout = this.findMinimumLayout(geoms[i], layout);
       }
     }
@@ -652,7 +686,7 @@ class WkbWriter {
  * @property {boolean} [hex=true] Returns hex string instead of ArrayBuffer for output. This also is used as a hint internally whether it should load contents as text or ArrayBuffer on reading.
  * @property {boolean} [littleEndian=true] Use littleEndian for output.
  * @property {boolean} [ewkb=true] Use EWKB format for output.
- * @property {import("../geom/GeometryLayout").default} [geometryLayout=null] Use specific coordinate layout for output features (null: auto detect)
+ * @property {import("../geom/Geometry.js").GeometryLayout} [geometryLayout=null] Use specific coordinate layout for output features (null: auto detect)
  * @property {number} [nodataZ=0] If the `geometryLayout` doesn't match with geometry to be output, this value is used to fill missing coordinate value of Z.
  * @property {number} [nodataM=0] If the `geometryLayout` doesn't match with geometry to be output, this value is used to fill missing coordinate value of M.
  * @property {number|boolean} [srid=true] SRID for output. Specify integer value to enforce the value as a SRID. Specify `true` to extract from `dataProjection`. `false` to suppress the output. This option only takes effect when `ewkb` is `true`.

package/src/format/WKT.js

@@ -3,7 +3,6 @@
  */
 import Feature from '../Feature.js';
 import GeometryCollection from '../geom/GeometryCollection.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import LineString from '../geom/LineString.js';
 import MultiLineString from '../geom/MultiLineString.js';
 import MultiPoint from '../geom/MultiPoint.js';
@@ -15,7 +14,7 @@ import {transformGeometryWithOptions} from './Feature.js';
 
 /**
  * Geometry constructors
- * @enum {function (new:import("../geom/Geometry.js").default, Array, import("../geom/GeometryLayout.js").default)}
+ * @enum {function (new:import("../geom/Geometry.js").default, Array, import("../geom/Geometry.js").GeometryLayout)}
  */
 const GeometryConstructor = {
   'POINT': Point,
@@ -249,10 +248,10 @@ class Parser {
     };
 
     /**
-     * @type {import("../geom/GeometryLayout.js").default}
+     * @type {import("../geom/Geometry.js").GeometryLayout}
      * @private
      */
-    this.layout_ = GeometryLayout.XY;
+    this.layout_ = 'XY';
   }
 
   /**
@@ -296,22 +295,23 @@ class Parser {
 
   /**
    * Try to parse the dimensional info.
-   * @return {import("../geom/GeometryLayout.js").default} The layout.
+   * @return {import("../geom/Geometry.js").GeometryLayout} The layout.
    * @private
    */
   parseGeometryLayout_() {
-    let layout = GeometryLayout.XY;
+    /** @type {import("../geom/Geometry.js").GeometryLayout} */
+    let layout = 'XY';
     const dimToken = this.token_;
     if (this.isTokenType(TokenType.TEXT)) {
       const dimInfo = dimToken.value;
       if (dimInfo === Z) {
-        layout = GeometryLayout.XYZ;
+        layout = 'XYZ';
       } else if (dimInfo === M) {
-        layout = GeometryLayout.XYM;
+        layout = 'XYM';
       } else if (dimInfo === ZM) {
-        layout = GeometryLayout.XYZM;
+        layout = 'XYZM';
       }
-      if (layout !== GeometryLayout.XY) {
+      if (layout !== 'XY') {
         this.consume_();
       }
     }
@@ -819,10 +819,10 @@ function encodeMultiPolygonGeometry(geom) {
 function encodeGeometryLayout(geom) {
   const layout = geom.getLayout();
   let dimInfo = '';
-  if (layout === GeometryLayout.XYZ || layout === GeometryLayout.XYZM) {
+  if (layout === 'XYZ' || layout === 'XYZM') {
     dimInfo += Z;
   }
-  if (layout === GeometryLayout.XYM || layout === GeometryLayout.XYZM) {
+  if (layout === 'XYM' || layout === 'XYZM') {
     dimInfo += M;
   }
   return dimInfo;

package/src/geom/Circle.js

@@ -18,7 +18,7 @@ class Circle extends SimpleGeometry {
    *     For internal use, flat coordinates in combination with `opt_layout` and no
    *     `opt_radius` are also accepted.
    * @param {number} [opt_radius] Radius.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    */
   constructor(center, opt_radius, opt_layout) {
     super();
@@ -188,7 +188,7 @@ class Circle extends SimpleGeometry {
    * number) of the circle.
    * @param {!import("../coordinate.js").Coordinate} center Center.
    * @param {number} radius Radius.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    * @api
    */
   setCenterAndRadius(center, radius, opt_layout) {

package/src/geom/Geometry.js

@@ -18,6 +18,12 @@ import {get as getProjection, getTransform} from '../proj.js';
 import {memoizeOne} from '../functions.js';
 import {transform2D} from './flat/transform.js';
 
+/**
+ * @typedef {'XY' | 'XYZ' | 'XYM' | 'XYZM'} GeometryLayout
+ * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z')
+ * or measure ('M') coordinate is available.
+ */
+
 /**
  * @typedef {'Point' | 'LineString' | 'LinearRing' | 'Polygon' | 'MultiPoint' | 'MultiLineString' | 'MultiPolygon' | 'GeometryCollection' | 'Circle'} Type
  * The geometry type.  One of `'Point'`, `'LineString'`, `'LinearRing'`,

package/src/geom/LineString.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/geom/LineString
  */
-import GeometryLayout from './GeometryLayout.js';
 import SimpleGeometry from './SimpleGeometry.js';
 import {assignClosestPoint, maxSquaredDelta} from './flat/closest.js';
 import {closestSquaredDistanceXY} from '../extent.js';
@@ -24,7 +23,7 @@ class LineString extends SimpleGeometry {
   /**
    * @param {Array<import("../coordinate.js").Coordinate>|Array<number>} coordinates Coordinates.
    *     For internal use, flat coordinates in combination with `opt_layout` are also accepted.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    */
   constructor(coordinates, opt_layout) {
     super();
@@ -169,10 +168,7 @@ class LineString extends SimpleGeometry {
    * @api
    */
   getCoordinateAtM(m, opt_extrapolate) {
-    if (
-      this.layout != GeometryLayout.XYM &&
-      this.layout != GeometryLayout.XYZM
-    ) {
+    if (this.layout != 'XYM' && this.layout != 'XYZM') {
       return null;
     }
     const extrapolate = opt_extrapolate !== undefined ? opt_extrapolate : false;
@@ -263,7 +259,7 @@ class LineString extends SimpleGeometry {
       simplifiedFlatCoordinates,
       0
     );
-    return new LineString(simplifiedFlatCoordinates, GeometryLayout.XY);
+    return new LineString(simplifiedFlatCoordinates, 'XY');
   }
 
   /**
@@ -294,7 +290,7 @@ class LineString extends SimpleGeometry {
   /**
    * Set the coordinates of the linestring.
    * @param {!Array<import("../coordinate.js").Coordinate>} coordinates Coordinates.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    * @api
    */
   setCoordinates(coordinates, opt_layout) {

package/src/geom/LinearRing.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/geom/LinearRing
  */
-import GeometryLayout from './GeometryLayout.js';
 import SimpleGeometry from './SimpleGeometry.js';
 import {assignClosestPoint, maxSquaredDelta} from './flat/closest.js';
 import {closestSquaredDistanceXY} from '../extent.js';
@@ -21,7 +20,7 @@ class LinearRing extends SimpleGeometry {
   /**
    * @param {Array<import("../coordinate.js").Coordinate>|Array<number>} coordinates Coordinates.
    *     For internal use, flat coordinates in combination with `opt_layout` are also accepted.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    */
   constructor(coordinates, opt_layout) {
     super();
@@ -143,7 +142,7 @@ class LinearRing extends SimpleGeometry {
       simplifiedFlatCoordinates,
       0
     );
-    return new LinearRing(simplifiedFlatCoordinates, GeometryLayout.XY);
+    return new LinearRing(simplifiedFlatCoordinates, 'XY');
   }
 
   /**
@@ -168,7 +167,7 @@ class LinearRing extends SimpleGeometry {
   /**
    * Set the coordinates of the linear ring.
    * @param {!Array<import("../coordinate.js").Coordinate>} coordinates Coordinates.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    * @api
    */
   setCoordinates(coordinates, opt_layout) {