fix support for OpenLayers 10.3.1

mmomtchev · Jan 10, 2025 · b741a4f · b741a4f
1 parent 77a5927
commit b741a4f
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 15 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -19,15 +19,15 @@ module.exports = {
         ]
     },
     transformIgnorePatterns: [
-        '/node_modules/(?!(ol|txml|geotiff|quick-lru|color-|rbush|earcut|pbf|quickselect))'
+        '/node_modules/(?!(ol|txml|geotiff|quick-lru|color-|rbush|earcut|pbf|quickselect|node-fetch|data-uri-to-buffer|fetch-blob|formdata-polyfill))'
     ],
     moduleNameMapper: {
         '^rlayers$': '<rootDir>/src',
         '^rlayers/(.*)$': '<rootDir>/src/$1',
         '\\.(css|less)$': '<rootDir>/test/css.js',
         '^txml/txml$': '<rootDir>/node_modules/txml/dist/txml'
     },
-    setupFiles: ['jest-canvas-mock'],
+    setupFiles: ['jest-canvas-mock', 'jsdom-worker'],
     setupFilesAfterEnv: ['@testing-library/jest-dom', './test/setup_mocks.ts'],
     testRegex: '/test/.*\\.test\\.tsx?$',
     moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -136,9 +136,10 @@
     "jest": "^29.4.3",
     "jest-canvas-mock": "^2.4.0",
     "jest-environment-jsdom": "^29.4.3",
+    "jsdom-worker": "^0.3.0",
     "markdown-loader": "^8.0.0",
     "null-loader": "^4.0.1",
-    "ol": "^10.2.0",
+    "ol": "^10.3.1",
     "ol-mapbox-style": "^12.3.5",
     "ol-mbtiles": "^3.2.0",
     "prettier": "2.8.8",

diff --git a/src/layer/RLayerVectorImage.tsx b/src/layer/RLayerVectorImage.tsx
@@ -24,7 +24,7 @@ export default class RLayerVectorImage extends RLayerBaseVector<
     Feature,
     RLayerBaseVectorProps<Feature>
 > {
-    ol: LayerVectorImage<Feature>;
+    ol: LayerVectorImage<SourceVector<Feature>>;
     source: SourceVector<Feature>;
 
     protected createSource(props: Readonly<RLayerBaseVectorProps<Feature>>): BaseObject[] {

diff --git a/test/setup_mocks.ts b/test/setup_mocks.ts
@@ -1,9 +1,12 @@
 import proj4 from 'proj4';
 import {register} from 'ol/proj/proj4';
+import {TextEncoder, TextDecoder} from 'util';
 
 import ResizeObserver from 'resize-observer-polyfill';
 window.ResizeObserver = ResizeObserver;
 
+Object.assign(global, {TextDecoder, TextEncoder});
+
 proj4.defs(
     'EPSG:27700',
     '+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 ' +

diff --git a/worker.mjs b/worker.mjs
@@ -0,0 +1,3 @@
+import WebWorker from 'web-worker';
+
+console.log(WebWorker);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import WebWorker from 'web-worker';

		console.log(WebWorker);