From f5a8c60ef9a8f1b5b06c9d974611d4b0d9c7e0a7 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Mon, 3 Feb 2025 15:33:50 +0100 Subject: [PATCH] Update tests for ol@10.4 --- package-lock.json | 26 ++++++++++++++++++++++++++ package.json | 1 + test/apply.test.js | 31 +++++++++++++++---------------- 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index e145a8b1..90b30639 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,6 +40,7 @@ "mocha": "^11.1.0", "nanoassert": "^2.0.0", "pmtiles-protocol": "^1.0.1", + "proj4": "^2.15.0", "puppeteer": "^23.10.4", "rollup": "^2.70.2", "rollup-plugin-terser": "^7.0.2", @@ -6869,6 +6870,13 @@ "node": ">= 0.6" } }, + "node_modules/mgrs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mgrs/-/mgrs-1.0.0.tgz", + "integrity": "sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA==", + "dev": true, + "license": "MIT" + }, "node_modules/micromatch": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", @@ -8107,6 +8115,17 @@ "node": ">=0.4.0" } }, + "node_modules/proj4": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.15.0.tgz", + "integrity": "sha512-LqCNEcPdI03BrCHxPLj29vsd5afsm+0sV1H/O3nTDKrv8/LA01ea1z4QADDMjUqxSXWnrmmQDjqFm1J/uZ5RLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mgrs": "1.0.0", + "wkt-parser": "^1.4.0" + } + }, "node_modules/protocol-buffers-schema": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz", @@ -10782,6 +10801,13 @@ "dev": true, "license": "MIT" }, + "node_modules/wkt-parser": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.4.0.tgz", + "integrity": "sha512-qpwO7Ihds/YYDTi1aADFTI1Sm9YC/tTe3SHD24EeIlZxy7Ik6a1b4HOz7jAi0xdUAw487duqpo8OGu+Tf4nwlQ==", + "dev": true, + "license": "MIT" + }, "node_modules/workerpool": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", diff --git a/package.json b/package.json index c2606f63..c4e0404a 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "mocha": "^11.1.0", "nanoassert": "^2.0.0", "pmtiles-protocol": "^1.0.1", + "proj4": "^2.15.0", "puppeteer": "^23.10.4", "rollup": "^2.70.2", "rollup-plugin-terser": "^7.0.2", diff --git a/test/apply.test.js b/test/apply.test.js index cbd4a124..cd7fdbf8 100644 --- a/test/apply.test.js +++ b/test/apply.test.js @@ -7,17 +7,13 @@ import Point from 'ol/geom/Point.js'; import LayerGroup from 'ol/layer/Group.js'; import VectorLayer from 'ol/layer/Vector.js'; import VectorTileLayer from 'ol/layer/VectorTile.js'; -import { - METERS_PER_UNIT, - Projection, - addProjection, - get as getProjection, - toLonLat, -} from 'ol/proj.js'; +import {register} from 'ol/proj/proj4.js'; +import {METERS_PER_UNIT, get as getProjection, toLonLat} from 'ol/proj.js'; import RasterSource from 'ol/source/Raster.js'; import TileSource from 'ol/source/Tile.js'; import VectorSource from 'ol/source/Vector.js'; import VectorTileSource from 'ol/source/VectorTile.js'; +import proj4 from 'proj4'; import should from 'should'; import { apply, @@ -31,6 +27,14 @@ import backgroundStyle from './fixtures/background.json'; delete brightV9.sprite; describe('ol-mapbox-style', function () { + before(function () { + proj4.defs( + 'EPSG:31287', + 'PROJCS["MGI / Austria Lambert",GEOGCS["MGI",DATUM["Militar-Geographische_Institut",SPHEROID["Bessel 1841",6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],AUTHORITY["EPSG","6312"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4312"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["latitude_of_origin",47.5],PARAMETER["central_meridian",13.3333333333333],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",46],PARAMETER["false_easting",400000],PARAMETER["false_northing",400000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Northing",NORTH],AXIS["Easting",EAST],AUTHORITY["EPSG","31287"]]', + ); + register(proj4); + }); + describe('apply', function () { let target; @@ -305,15 +309,10 @@ describe('ol-mapbox-style', function () { }); it('sets the correct GeoJON data projection for custom projections', function (done) { - const epsg31287 = new Projection({ - code: 'EPSG:31287', - extent: [ - 121983.868598955, 285075.189779654, 694938.749394035, - 575854.254725608, - ], - units: 'm', - }); - addProjection(epsg31287); + const epsg31287 = getProjection('EPSG:31287'); + epsg31287.setExtent([ + 121983.868598955, 285075.189779654, 694938.749394035, 575854.254725608, + ]); const geojson = { 'type': 'FeatureCollection', 'features': [