fixes after rebase

src/ol/render/webgl/BatchRenderer.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/render/webgl/BatchRenderer
  */
-import GeometryType from '../../geom/GeometryType.js';
 import {WebGLWorkerMessageType} from './constants.js';
 import {abstract} from '../../util.js';
 import {
@@ -72,7 +71,7 @@ class AbstractBatchRenderer {
    * Note: this is a costly operation.
    * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
    * @param {import("../../PluggableMap").FrameState} frameState Frame state.
-   * @param {import("../../geom/GeometryType.js").default} geometryType Geometry type
+   * @param {import("../../geom/Geometry.js").Type} geometryType Geometry type
    * @param {function(): void} callback Function called once the render buffers are updated
    */
   rebuild(batch, frameState, geometryType, callback) {
@@ -123,7 +122,7 @@ class AbstractBatchRenderer {
    * Rebuild internal webgl buffers for rendering based on the current rendering instructions;
    * This is asynchronous: webgl buffers wil _not_ be updated right away
    * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
-   * @param {import("../../geom/GeometryType.js").default} geometryType Geometry type
+   * @param {import("../../geom/Geometry.js").Type} geometryType Geometry type
    * @param {function(): void} callback Function called once the render buffers are updated
    * @private
    */
@@ -132,13 +131,13 @@ class AbstractBatchRenderer {
 
     let messageType;
     switch (geometryType) {
-      case GeometryType.POLYGON:
+      case 'Polygon':
         messageType = WebGLWorkerMessageType.GENERATE_POLYGON_BUFFERS;
         break;
-      case GeometryType.POINT:
+      case 'Point':
         messageType = WebGLWorkerMessageType.GENERATE_POINT_BUFFERS;
         break;
-      case GeometryType.LINE_STRING:
+      case 'LineString':
         messageType = WebGLWorkerMessageType.GENERATE_LINE_STRING_BUFFERS;
         break;
       default:

src/ol/render/webgl/MixedGeometryBatch.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/render/webgl/MixedGeometryBatch
  */
-import GeometryType from '../../geom/GeometryType.js';
 import WebGLArrayBuffer from '../../webgl/Buffer.js';
 import {ARRAY_BUFFER, DYNAMIC_DRAW, ELEMENT_ARRAY_BUFFER} from '../../webgl.js';
 import {create as createTransform} from '../../transform.js';
@@ -261,27 +260,27 @@ class MixedGeometryBatch {
     let verticesCount;
     let batchEntry;
     switch (type) {
-      case GeometryType.GEOMETRY_COLLECTION:
+      case 'GeometryCollection':
         /** @type {import("../../geom").GeometryCollection} */ (geometry)
           .getGeometries()
           .map((geom) => this.addGeometry_(geom, feature));
         break;
-      case GeometryType.MULTI_POLYGON:
+      case 'MultiPolygon':
         /** @type {import("../../geom").MultiPolygon} */ (geometry)
           .getPolygons()
           .map((polygon) => this.addGeometry_(polygon, feature));
         break;
-      case GeometryType.MULTI_LINE_STRING:
+      case 'MultiLineString':
         /** @type {import("../../geom").MultiLineString} */ (geometry)
           .getLineStrings()
           .map((line) => this.addGeometry_(line, feature));
         break;
-      case GeometryType.MULTI_POINT:
+      case 'MultiPoint':
         /** @type {import("../../geom").MultiPoint} */ (geometry)
           .getPoints()
           .map((point) => this.addGeometry_(point, feature));
         break;
-      case GeometryType.POLYGON:
+      case 'Polygon':
         const polygonGeom = /** @type {import("../../geom").Polygon} */ (
           geometry
         );
@@ -305,15 +304,15 @@ class MixedGeometryBatch {
           .getLinearRings()
           .map((ring) => this.addGeometry_(ring, feature));
         break;
-      case GeometryType.POINT:
+      case 'Point':
         const pointGeom = /** @type {import("../../geom").Point} */ (geometry);
         batchEntry = this.addFeatureEntryInPointBatch_(feature);
         flatCoords = pointGeom.getFlatCoordinates();
         this.pointBatch.geometriesCount++;
         batchEntry.flatCoordss.push(flatCoords);
         break;
-      case GeometryType.LINE_STRING:
-      case GeometryType.LINEAR_RING:
+      case 'LineString':
+      case 'LinearRing':
         const lineGeom = /** @type {import("../../geom").LineString} */ (
           geometry
         );

src/ol/renderer/webgl/VectorLayer.js

@@ -2,7 +2,6 @@
  * @module ol/renderer/webgl/VectorLayer
  */
 import BaseVector from '../../layer/BaseVector.js';
-import GeometryType from '../../geom/GeometryType.js';
 import LineStringBatchRenderer from '../../render/webgl/LineStringBatchRenderer.js';
 import MixedGeometryBatch from '../../render/webgl/MixedGeometryBatch.js';
 import PointBatchRenderer from '../../render/webgl/PointBatchRenderer.js';
@@ -345,19 +344,19 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
       this.polygonRenderer_.rebuild(
         this.batch_.polygonBatch,
         frameState,
-        GeometryType.POLYGON,
+        'Polygon',
         rebuildCb
       );
       this.lineStringRenderer_.rebuild(
         this.batch_.lineStringBatch,
         frameState,
-        GeometryType.LINE_STRING,
+        'LineString',
         rebuildCb
       );
       this.pointRenderer_.rebuild(
         this.batch_.pointBatch,
         frameState,
-        GeometryType.POINT,
+        'Point',
         rebuildCb
       );
       this.previousExtent_ = frameState.extent.slice();

test/browser/spec/ol/render/webgl/batchrenderer.test.js

@@ -1,5 +1,4 @@
 import Feature from '../../../../../../src/ol/Feature.js';
-import GeometryType from '../../../../../../src/ol/geom/GeometryType.js';
 import LineString from '../../../../../../src/ol/geom/LineString.js';
 import LineStringBatchRenderer from '../../../../../../src/ol/render/webgl/LineStringBatchRenderer.js';
 import MixedGeometryBatch from '../../../../../../src/ol/render/webgl/MixedGeometryBatch.js';
@@ -105,7 +104,7 @@ describe('Batch renderers', function () {
         batchRenderer.rebuild(
           mixedBatch.pointBatch,
           SAMPLE_FRAMESTATE,
-          GeometryType.POINT,
+          'Point',
           rebuildCb
         );
         // wait for worker response for our specific message
@@ -209,7 +208,7 @@ describe('Batch renderers', function () {
         batchRenderer.rebuild(
           mixedBatch.lineStringBatch,
           SAMPLE_FRAMESTATE,
-          GeometryType.LINE_STRING,
+          'LineString',
           rebuildCb
         );
         // wait for worker response for our specific message
@@ -272,7 +271,7 @@ describe('Batch renderers', function () {
         batchRenderer.rebuild(
           mixedBatch.polygonBatch,
           SAMPLE_FRAMESTATE,
-          GeometryType.POLYGON,
+          'Polygon',
           rebuildCb
         );
         // wait for worker response for our specific message