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

package/src/geom/MultiLineString.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/geom/MultiLineString
  */
-import GeometryLayout from './GeometryLayout.js';
 import LineString from './LineString.js';
 import SimpleGeometry from './SimpleGeometry.js';
 import {arrayMaxSquaredDelta, assignClosestArrayPoint} from './flat/closest.js';
@@ -27,7 +26,7 @@ class MultiLineString extends SimpleGeometry {
    * @param {Array<Array<import("../coordinate.js").Coordinate>|LineString>|Array<number>} coordinates
    *     Coordinates or LineString geometries. (For internal use, flat coordinates in
    *     combination with `opt_layout` and `opt_ends` are also accepted.)
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    * @param {Array<number>} [opt_ends] Flat coordinate ends for internal use.
    */
   constructor(coordinates, opt_layout, opt_ends) {
@@ -173,8 +172,7 @@ class MultiLineString extends SimpleGeometry {
    */
   getCoordinateAtM(m, opt_extrapolate, opt_interpolate) {
     if (
-      (this.layout != GeometryLayout.XYM &&
-        this.layout != GeometryLayout.XYZM) ||
+      (this.layout != 'XYM' && this.layout != 'XYZM') ||
       this.flatCoordinates.length === 0
     ) {
       return null;
@@ -298,11 +296,7 @@ class MultiLineString extends SimpleGeometry {
       0,
       simplifiedEnds
     );
-    return new MultiLineString(
-      simplifiedFlatCoordinates,
-      GeometryLayout.XY,
-      simplifiedEnds
-    );
+    return new MultiLineString(simplifiedFlatCoordinates, 'XY', simplifiedEnds);
   }
 
   /**
@@ -333,7 +327,7 @@ class MultiLineString extends SimpleGeometry {
   /**
    * Set the coordinates of the multilinestring.
    * @param {!Array<Array<import("../coordinate.js").Coordinate>>} coordinates Coordinates.
-   * @param {GeometryLayout} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    * @api
    */
   setCoordinates(coordinates, opt_layout) {

package/src/geom/MultiPoint.js

@@ -19,7 +19,7 @@ class MultiPoint 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();
@@ -182,7 +182,7 @@ class MultiPoint extends SimpleGeometry {
   /**
    * Set the coordinates of the multipoint.
    * @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/MultiPolygon.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/geom/MultiPolygon
  */
-import GeometryLayout from './GeometryLayout.js';
 import MultiPoint from './MultiPoint.js';
 import Polygon from './Polygon.js';
 import SimpleGeometry from './SimpleGeometry.js';
@@ -34,7 +33,7 @@ class MultiPolygon extends SimpleGeometry {
   /**
    * @param {Array<Array<Array<import("../coordinate.js").Coordinate>>|Polygon>|Array<number>} coordinates Coordinates.
    *     For internal use, flat coordinates in combination with `opt_layout` and `opt_endss` are also accepted.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    * @param {Array<Array<number>>} [opt_endss] Array of ends for internal use with flat coordinates.
    */
   constructor(coordinates, opt_layout, opt_endss) {
@@ -306,10 +305,7 @@ class MultiPolygon extends SimpleGeometry {
    * @api
    */
   getInteriorPoints() {
-    return new MultiPoint(
-      this.getFlatInteriorPoints().slice(),
-      GeometryLayout.XYM
-    );
+    return new MultiPoint(this.getFlatInteriorPoints().slice(), 'XYM');
   }
 
   /**
@@ -354,11 +350,7 @@ class MultiPolygon extends SimpleGeometry {
       0,
       simplifiedEndss
     );
-    return new MultiPolygon(
-      simplifiedFlatCoordinates,
-      GeometryLayout.XY,
-      simplifiedEndss
-    );
+    return new MultiPolygon(simplifiedFlatCoordinates, 'XY', simplifiedEndss);
   }
 
   /**
@@ -450,7 +442,7 @@ class MultiPolygon extends SimpleGeometry {
   /**
    * Set the coordinates of the multipolygon.
    * @param {!Array<Array<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/Point.js

@@ -15,7 +15,7 @@ import {squaredDistance as squaredDx} from '../math.js';
 class Point extends SimpleGeometry {
   /**
    * @param {import("../coordinate.js").Coordinate} coordinates Coordinates.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    */
   constructor(coordinates, opt_layout) {
     super();
@@ -99,7 +99,7 @@ class Point extends SimpleGeometry {
 
   /**
    * @param {!Array<*>} 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/Polygon.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/geom/Polygon
  */
-import GeometryLayout from './GeometryLayout.js';
 import LinearRing from './LinearRing.js';
 import Point from './Point.js';
 import SimpleGeometry from './SimpleGeometry.js';
@@ -34,7 +33,7 @@ class Polygon extends SimpleGeometry {
    *     an array of vertices' coordinates where the first coordinate and the last are
    *     equivalent. (For internal use, flat coordinates in combination with
    *     `opt_layout` and `opt_ends` are also accepted.)
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    * @param {Array<number>} [opt_ends] Ends (for internal use with flat coordinates).
    */
   constructor(coordinates, opt_layout, opt_ends) {
@@ -253,7 +252,7 @@ class Polygon extends SimpleGeometry {
    * @api
    */
   getInteriorPoint() {
-    return new Point(this.getFlatInteriorPoint(), GeometryLayout.XYM);
+    return new Point(this.getFlatInteriorPoint(), 'XYM');
   }
 
   /**
@@ -353,11 +352,7 @@ class Polygon extends SimpleGeometry {
       0,
       simplifiedEnds
     );
-    return new Polygon(
-      simplifiedFlatCoordinates,
-      GeometryLayout.XY,
-      simplifiedEnds
-    );
+    return new Polygon(simplifiedFlatCoordinates, 'XY', simplifiedEnds);
   }
 
   /**
@@ -388,7 +383,7 @@ class Polygon extends SimpleGeometry {
   /**
    * Set the coordinates of the polygon.
    * @param {!Array<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) {
@@ -433,9 +428,7 @@ export function circular(center, radius, opt_n, opt_sphereRadius) {
     );
   }
   flatCoordinates.push(flatCoordinates[0], flatCoordinates[1]);
-  return new Polygon(flatCoordinates, GeometryLayout.XY, [
-    flatCoordinates.length,
-  ]);
+  return new Polygon(flatCoordinates, 'XY', [flatCoordinates.length]);
 }
 
 /**
@@ -461,9 +454,7 @@ export function fromExtent(extent) {
     minX,
     minY,
   ];
-  return new Polygon(flatCoordinates, GeometryLayout.XY, [
-    flatCoordinates.length,
-  ]);
+  return new Polygon(flatCoordinates, 'XY', [flatCoordinates.length]);
 }
 
 /**

package/src/geom/SimpleGeometry.js

@@ -2,7 +2,6 @@
  * @module ol/geom/SimpleGeometry
  */
 import Geometry from './Geometry.js';
-import GeometryLayout from './GeometryLayout.js';
 import {abstract} from '../util.js';
 import {createOrUpdateFromFlatCoordinates, getCenter} from '../extent.js';
 import {rotate, scale, transform2D, translate} from './flat/transform.js';
@@ -21,9 +20,9 @@ class SimpleGeometry extends Geometry {
 
     /**
      * @protected
-     * @type {import("./GeometryLayout.js").default}
+     * @type {import("./Geometry.js").GeometryLayout}
      */
-    this.layout = GeometryLayout.XY;
+    this.layout = 'XY';
 
     /**
      * @protected
@@ -89,8 +88,8 @@ class SimpleGeometry extends Geometry {
   }
 
   /**
-   * Return the {@link module:ol/geom/GeometryLayout layout} of the geometry.
-   * @return {import("./GeometryLayout.js").default} Layout.
+   * Return the {@link import("./Geometry.js").GeometryLayout layout} of the geometry.
+   * @return {import("./Geometry.js").GeometryLayout} Layout.
    * @api
    */
   getLayout() {
@@ -151,7 +150,7 @@ class SimpleGeometry extends Geometry {
   }
 
   /**
-   * @param {import("./GeometryLayout.js").default} layout Layout.
+   * @param {import("./Geometry.js").GeometryLayout} layout Layout.
    * @param {Array<number>} flatCoordinates Flat coordinates.
    */
   setFlatCoordinates(layout, flatCoordinates) {
@@ -163,14 +162,14 @@ class SimpleGeometry extends Geometry {
   /**
    * @abstract
    * @param {!Array<*>} coordinates Coordinates.
-   * @param {import("./GeometryLayout.js").default} [opt_layout] Layout.
+   * @param {import("./Geometry.js").GeometryLayout} [opt_layout] Layout.
    */
   setCoordinates(coordinates, opt_layout) {
     abstract();
   }
 
   /**
-   * @param {import("./GeometryLayout.js").default|undefined} layout Layout.
+   * @param {import("./Geometry.js").GeometryLayout|undefined} layout Layout.
    * @param {Array<*>} coordinates Coordinates.
    * @param {number} nesting Nesting.
    * @protected
@@ -183,7 +182,7 @@ class SimpleGeometry extends Geometry {
     } else {
       for (let i = 0; i < nesting; ++i) {
         if (coordinates.length === 0) {
-          this.layout = GeometryLayout.XY;
+          this.layout = 'XY';
           this.stride = 2;
           return;
         } else {
@@ -299,31 +298,31 @@ class SimpleGeometry extends Geometry {
 
 /**
  * @param {number} stride Stride.
- * @return {import("./GeometryLayout.js").default} layout Layout.
+ * @return {import("./Geometry.js").GeometryLayout} layout Layout.
  */
 function getLayoutForStride(stride) {
   let layout;
   if (stride == 2) {
-    layout = GeometryLayout.XY;
+    layout = 'XY';
   } else if (stride == 3) {
-    layout = GeometryLayout.XYZ;
+    layout = 'XYZ';
   } else if (stride == 4) {
-    layout = GeometryLayout.XYZM;
+    layout = 'XYZM';
   }
-  return /** @type {import("./GeometryLayout.js").default} */ (layout);
+  return /** @type {import("./Geometry.js").GeometryLayout} */ (layout);
 }
 
 /**
- * @param {import("./GeometryLayout.js").default} layout Layout.
+ * @param {import("./Geometry.js").GeometryLayout} layout Layout.
  * @return {number} Stride.
  */
 export function getStrideForLayout(layout) {
   let stride;
-  if (layout == GeometryLayout.XY) {
+  if (layout == 'XY') {
     stride = 2;
-  } else if (layout == GeometryLayout.XYZ || layout == GeometryLayout.XYM) {
+  } else if (layout == 'XYZ' || layout == 'XYM') {
     stride = 3;
-  } else if (layout == GeometryLayout.XYZM) {
+  } else if (layout == 'XYZM') {
     stride = 4;
   }
   return /** @type {number} */ (stride);

package/src/interaction/Draw.js

@@ -5,7 +5,6 @@ import Circle from '../geom/Circle.js';
 import Event from '../events/Event.js';
 import EventType from '../events/EventType.js';
 import Feature from '../Feature.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import InteractionProperty from './Property.js';
 import LineString from '../geom/LineString.js';
 import MapBrowserEvent from '../MapBrowserEvent.js';
@@ -83,7 +82,7 @@ import {squaredDistance as squaredCoordinateDistance} from '../coordinate.js';
  * Shift key activates freehand drawing.
  * @property {boolean} [wrapX=false] Wrap the world horizontally on the sketch
  * overlay.
- * @property {GeometryLayout} [geometryLayout='XY'] Layout of the
+ * @property {import("../geom/Geometry.js").GeometryLayout} [geometryLayout='XY'] Layout of the
  * feature geometries created by the draw interaction.
  */
 
@@ -118,16 +117,10 @@ import {squaredDistance as squaredCoordinateDistance} from '../coordinate.js';
  */
 
 /**
+ * @typedef {'Point' | 'LineString' | 'Polygon' | 'Circle'} Mode
  * Draw mode.  This collapses multi-part geometry types with their single-part
  * cousins.
- * @enum {string}
  */
-const Mode = {
-  POINT: 'Point',
-  LINE_STRING: 'LineString',
-  POLYGON: 'Polygon',
-  CIRCLE: 'Circle',
-};
 
 /**
  * @enum {string}
@@ -312,7 +305,7 @@ class Draw extends PointerInteraction {
      */
     this.minPoints_ = options.minPoints
       ? options.minPoints
-      : this.mode_ === Mode.POLYGON
+      : this.mode_ === 'Polygon'
       ? 3
       : 2;
 
@@ -323,7 +316,7 @@ class Draw extends PointerInteraction {
      * @private
      */
     this.maxPoints_ =
-      this.mode_ === Mode.CIRCLE
+      this.mode_ === 'Circle'
         ? 2
         : options.maxPoints
         ? options.maxPoints
@@ -340,16 +333,16 @@ class Draw extends PointerInteraction {
 
     /**
      * @private
-     * @type {import("../geom/GeometryLayout").default}
+     * @type {import("../geom/Geometry.js").GeometryLayout}
      */
     this.geometryLayout_ = options.geometryLayout
       ? options.geometryLayout
-      : GeometryLayout.XY;
+      : 'XY';
 
     let geometryFunction = options.geometryFunction;
     if (!geometryFunction) {
       const mode = this.mode_;
-      if (mode === Mode.CIRCLE) {
+      if (mode === 'Circle') {
         /**
          * @param {!LineCoordType} coordinates The coordinates.
          * @param {import("../geom/SimpleGeometry.js").default|undefined} geometry Optional geometry.
@@ -378,11 +371,11 @@ class Draw extends PointerInteraction {
         };
       } else {
         let Constructor;
-        if (mode === Mode.POINT) {
+        if (mode === 'Point') {
           Constructor = Point;
-        } else if (mode === Mode.LINE_STRING) {
+        } else if (mode === 'LineString') {
           Constructor = LineString;
-        } else if (mode === Mode.POLYGON) {
+        } else if (mode === 'Polygon') {
           Constructor = Polygon;
         }
         /**
@@ -393,7 +386,7 @@ class Draw extends PointerInteraction {
          */
         geometryFunction = function (coordinates, geometry, projection) {
           if (geometry) {
-            if (mode === Mode.POLYGON) {
+            if (mode === 'Polygon') {
               if (coordinates[0].length) {
                 // Add a closing coordinate to match the first
                 geometry.setCoordinates(
@@ -555,8 +548,7 @@ class Draw extends PointerInteraction {
       // Avoid context menu for long taps when drawing on mobile
       event.originalEvent.preventDefault();
     }
-    this.freehand_ =
-      this.mode_ !== Mode.POINT && this.freehandCondition_(event);
+    this.freehand_ = this.mode_ !== 'Point' && this.freehandCondition_(event);
     let move = event.type === MapBrowserEventType.POINTERMOVE;
     let pass = true;
     if (
@@ -674,7 +666,7 @@ class Draw extends PointerInteraction {
           this.finishDrawing();
         } else if (
           !this.freehand_ &&
-          (!startingToDraw || this.mode_ === Mode.POINT)
+          (!startingToDraw || this.mode_ === 'Point')
         ) {
           if (this.atFinish_(event.pixel)) {
             if (this.finishCondition_(event)) {
@@ -740,13 +732,13 @@ class Draw extends PointerInteraction {
       let potentiallyDone = false;
       let potentiallyFinishCoordinates = [this.finishCoordinate_];
       const mode = this.mode_;
-      if (mode === Mode.POINT) {
+      if (mode === 'Point') {
         at = true;
-      } else if (mode === Mode.CIRCLE) {
+      } else if (mode === 'Circle') {
         at = this.sketchCoords_.length === 2;
-      } else if (mode === Mode.LINE_STRING) {
+      } else if (mode === 'LineString') {
         potentiallyDone = this.sketchCoords_.length > this.minPoints_;
-      } else if (mode === Mode.POLYGON) {
+      } else if (mode === 'Polygon') {
         const sketchCoords = /** @type {PolyCoordType} */ (this.sketchCoords_);
         potentiallyDone = sketchCoords[0].length > this.minPoints_;
         potentiallyFinishCoordinates = [
@@ -824,9 +816,9 @@ class Draw extends PointerInteraction {
       start.push(0);
     }
     this.finishCoordinate_ = start;
-    if (this.mode_ === Mode.POINT) {
+    if (this.mode_ === 'Point') {
       this.sketchCoords_ = start.slice();
-    } else if (this.mode_ === Mode.POLYGON) {
+    } else if (this.mode_ === 'Polygon') {
       this.sketchCoords_ = [[start.slice(), start.slice()]];
       this.sketchLineCoords_ = this.sketchCoords_[0];
     } else {
@@ -865,9 +857,9 @@ class Draw extends PointerInteraction {
     while (coordinate.length < stride) {
       coordinate.push(0);
     }
-    if (this.mode_ === Mode.POINT) {
+    if (this.mode_ === 'Point') {
       last = this.sketchCoords_;
-    } else if (this.mode_ === Mode.POLYGON) {
+    } else if (this.mode_ === 'Polygon') {
       coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
       last = coordinates[coordinates.length - 1];
       if (this.atFinish_(map.getPixelFromCoordinate(coordinate))) {
@@ -889,7 +881,7 @@ class Draw extends PointerInteraction {
       const sketchPointGeom = this.sketchPoint_.getGeometry();
       sketchPointGeom.setCoordinates(coordinate);
     }
-    if (geometry.getType() === 'Polygon' && this.mode_ !== Mode.POLYGON) {
+    if (geometry.getType() === 'Polygon' && this.mode_ !== 'Polygon') {
       this.createOrUpdateCustomSketchLine_(/** @type {Polygon} */ (geometry));
     } else if (this.sketchLineCoords_) {
       const sketchLineGeom = this.sketchLine_.getGeometry();
@@ -909,7 +901,7 @@ class Draw extends PointerInteraction {
     let done;
     let coordinates;
     const mode = this.mode_;
-    if (mode === Mode.LINE_STRING || mode === Mode.CIRCLE) {
+    if (mode === 'LineString' || mode === 'Circle') {
       this.finishCoordinate_ = coordinate.slice();
       coordinates = /** @type {LineCoordType} */ (this.sketchCoords_);
       if (coordinates.length >= this.maxPoints_) {
@@ -921,7 +913,7 @@ class Draw extends PointerInteraction {
       }
       coordinates.push(coordinate.slice());
       this.geometryFunction_(coordinates, geometry, projection);
-    } else if (mode === Mode.POLYGON) {
+    } else if (mode === 'Polygon') {
       coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
       if (coordinates.length >= this.maxPoints_) {
         if (this.freehand_) {
@@ -956,7 +948,7 @@ class Draw extends PointerInteraction {
     const projection = this.getMap().getView().getProjection();
     let coordinates;
     const mode = this.mode_;
-    if (mode === Mode.LINE_STRING || mode === Mode.CIRCLE) {
+    if (mode === 'LineString' || mode === 'Circle') {
       coordinates = /** @type {LineCoordType} */ (this.sketchCoords_);
       coordinates.splice(-2, 1);
       if (coordinates.length >= 2) {
@@ -969,7 +961,7 @@ class Draw extends PointerInteraction {
       if (geometry.getType() === 'Polygon' && this.sketchLine_) {
         this.createOrUpdateCustomSketchLine_(/** @type {Polygon} */ (geometry));
       }
-    } else if (mode === Mode.POLYGON) {
+    } else if (mode === 'Polygon') {
       coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
       coordinates.splice(-2, 1);
       const sketchLineGeom = this.sketchLine_.getGeometry();
@@ -1003,11 +995,11 @@ class Draw extends PointerInteraction {
     let coordinates = this.sketchCoords_;
     const geometry = sketchFeature.getGeometry();
     const projection = this.getMap().getView().getProjection();
-    if (this.mode_ === Mode.LINE_STRING) {
+    if (this.mode_ === 'LineString') {
       // remove the redundant last point
       coordinates.pop();
       this.geometryFunction_(coordinates, geometry, projection);
-    } else if (this.mode_ === Mode.POLYGON) {
+    } else if (this.mode_ === 'Polygon') {
       // remove the redundant last point in ring
       /** @type {PolyCoordType} */ (coordinates)[0].pop();
       this.geometryFunction_(coordinates, geometry, projection);
@@ -1084,9 +1076,9 @@ class Draw extends PointerInteraction {
     }
     /** @type {LineCoordType} */
     let sketchCoords;
-    if (mode === Mode.LINE_STRING || mode === Mode.CIRCLE) {
+    if (mode === 'LineString' || mode === 'Circle') {
       sketchCoords = /** @type {LineCoordType} */ (this.sketchCoords_);
-    } else if (mode === Mode.POLYGON) {
+    } else if (mode === 'Polygon') {
       sketchCoords =
         this.sketchCoords_ && this.sketchCoords_.length
           ? /** @type {PolyCoordType} */ (this.sketchCoords_)[0]
@@ -1277,15 +1269,15 @@ function getMode(type) {
   switch (type) {
     case 'Point':
     case 'MultiPoint':
-      return Mode.POINT;
+      return 'Point';
     case 'LineString':
     case 'MultiLineString':
-      return Mode.LINE_STRING;
+      return 'LineString';
     case 'Polygon':
     case 'MultiPolygon':
-      return Mode.POLYGON;
+      return 'Polygon';
     case 'Circle':
-      return Mode.CIRCLE;
+      return 'Circle';
     default:
       throw new Error('Invalid type: ' + type);
   }

package/src/layer/Graticule.js

@@ -5,7 +5,6 @@ import Collection from '../Collection.js';
 import EventType from '../render/EventType.js';
 import Feature from '../Feature.js';
 import Fill from '../style/Fill.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import LineString from '../geom/LineString.js';
 import Point from '../geom/Point.js';
 import Stroke from '../style/Stroke.js';
@@ -1037,10 +1036,10 @@ class Graticule extends VectorLayer {
     );
     let lineString = this.meridians_[index];
     if (!lineString) {
-      lineString = new LineString(flatCoordinates, GeometryLayout.XY);
+      lineString = new LineString(flatCoordinates, 'XY');
       this.meridians_[index] = lineString;
     } else {
-      lineString.setFlatCoordinates(GeometryLayout.XY, flatCoordinates);
+      lineString.setFlatCoordinates('XY', flatCoordinates);
       lineString.changed();
     }
     return lineString;
@@ -1107,9 +1106,9 @@ class Graticule extends VectorLayer {
     );
     let lineString = this.parallels_[index];
     if (!lineString) {
-      lineString = new LineString(flatCoordinates, GeometryLayout.XY);
+      lineString = new LineString(flatCoordinates, 'XY');
     } else {
-      lineString.setFlatCoordinates(GeometryLayout.XY, flatCoordinates);
+      lineString.setFlatCoordinates('XY', flatCoordinates);
       lineString.changed();
     }
     return lineString;

package/src/render/Feature.js

@@ -2,7 +2,6 @@
  * @module ol/render/Feature
  */
 import Feature from '../Feature.js';
-import GeometryLayout from '../geom/GeometryLayout.js';
 import {
   LineString,
   MultiLineString,
@@ -350,19 +349,13 @@ export function toGeometry(renderFeature) {
     case 'Point':
       return new Point(renderFeature.getFlatCoordinates());
     case 'MultiPoint':
-      return new MultiPoint(
-        renderFeature.getFlatCoordinates(),
-        GeometryLayout.XY
-      );
+      return new MultiPoint(renderFeature.getFlatCoordinates(), 'XY');
     case 'LineString':
-      return new LineString(
-        renderFeature.getFlatCoordinates(),
-        GeometryLayout.XY
-      );
+      return new LineString(renderFeature.getFlatCoordinates(), 'XY');
     case 'MultiLineString':
       return new MultiLineString(
         renderFeature.getFlatCoordinates(),
-        GeometryLayout.XY,
+        'XY',
         /** @type {Array<number>} */ (renderFeature.getEnds())
       );
     case 'Polygon':
@@ -370,8 +363,8 @@ export function toGeometry(renderFeature) {
       const ends = /** @type {Array<number>} */ (renderFeature.getEnds());
       const endss = inflateEnds(flatCoordinates, ends);
       return 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);
     default:
       throw new Error('Invalid geometry type:' + geometryType);
   }

package/src/render/canvas/TextBuilder.js

@@ -3,7 +3,6 @@
  */
 import CanvasBuilder from './Builder.js';
 import CanvasInstruction from './Instruction.js';
-import TextPlacement from '../../style/TextPlacement.js';
 import {asColorLike} from '../../colorlike.js';
 import {
   defaultFillStyle,
@@ -177,7 +176,7 @@ class CanvasTextBuilder extends CanvasBuilder {
     let stride = geometry.getStride();
 
     if (
-      textState.placement === TextPlacement.LINE &&
+      textState.placement === 'line' &&
       (geometryType == 'LineString' ||
         geometryType == 'MultiLineString' ||
         geometryType == 'Polygon' ||

package/src/render/canvas/hitdetect.js

@@ -3,7 +3,6 @@
  */
 
 import CanvasImmediateRenderer from './Immediate.js';
-import IconAnchorUnits from '../../style/IconAnchorUnits.js';
 import {Icon} from '../../style.js';
 import {clamp} from '../../math.js';
 import {createCanvasContext2D} from '../../dom.js';
@@ -104,8 +103,8 @@ export function createHitDetectionImageData(
             img: img,
             imgSize: imgSize,
             anchor: image.getAnchor(),
-            anchorXUnits: IconAnchorUnits.PIXELS,
-            anchorYUnits: IconAnchorUnits.PIXELS,
+            anchorXUnits: 'pixels',
+            anchorYUnits: 'pixels',
             offset: image.getOrigin(),
             opacity: 1,
             size: image.getSize(),