diff --git a/CHANGELOG.md b/CHANGELOG.md index b662d825..c588a84f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.10.0] + +- OpenLayers 10.11.0 + ## [3.9.0] 2026-02-11 - OpenLayers 10.8.0 diff --git a/package-lock.json b/package-lock.json index e5473690..35fa7f6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,7 @@ "jsdom-worker": "^0.3.0", "markdown-loader": "^8.0.0", "null-loader": "^4.0.1", - "ol": "=10.8.0", + "ol": "^10.11.0", "ol-mapbox-style": "^13.0.1", "ol-mbtiles": "^3.3.0", "prettier": "2.8.8", @@ -84,7 +84,7 @@ "webpack-dev-server": "^6.0.0" }, "peerDependencies": { - "ol": "=10.8.0", + "ol": "^10.11.0", "react": ">=18", "react-dom": ">=18" } @@ -5612,14 +5612,14 @@ "dev": true }, "node_modules/@zarrita/storage": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@zarrita/storage/-/storage-0.1.4.tgz", - "integrity": "sha512-qURfJAQcQGRfDQ4J9HaCjGaj3jlJKc66bnRk6G/IeLUsM7WKyG7Bzsuf1EZurSXyc0I4LVcu6HaeQQ4d3kZ16g==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@zarrita/storage/-/storage-0.2.0.tgz", + "integrity": "sha512-855ZXqtnds7spnT8vNvD+MXa3QExP1m2GqShe8yt7uZXHnQLgJHgkpVwFjE1B0KDDRO0ki09hmk6OboTaIfPsQ==", "dev": true, "license": "MIT", "dependencies": { "reference-spec-reader": "^0.2.0", - "unzipit": "1.4.3" + "unzipit": "2.0.0" } }, "node_modules/accepts": { @@ -9107,9 +9107,9 @@ } }, "node_modules/fflate": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", - "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz", + "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==", "dev": true, "license": "MIT" }, @@ -9625,13 +9625,13 @@ } }, "node_modules/geotiff": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-3.0.2.tgz", - "integrity": "sha512-KZ+0YK8gW9HWitovPhfHvkyd1gsyXtY9oOrS/OSX+12M8ojAm+NJ6Vl3tUjp7ZMcPO7e7pJoqpWoMdzO0rF8IQ==", + "version": "3.1.0-beta.0", + "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-3.1.0-beta.0.tgz", + "integrity": "sha512-wbVwOaQYuN+ywly5NoMXn37nHslwkQg5EFHqMeUTtjDACrSag0EEVlFsc+2DK3Pzmmp6XzJW2RTZOamPsBM6ng==", "dev": true, "license": "MIT", "dependencies": { - "@petamoriken/float16": "^3.4.7", + "@petamoriken/float16": "^3.9.3", "lerc": "^3.0.0", "pako": "^2.0.4", "parse-headers": "^2.0.2", @@ -14746,18 +14746,18 @@ } }, "node_modules/ol": { - "version": "10.8.0", - "resolved": "https://registry.npmjs.org/ol/-/ol-10.8.0.tgz", - "integrity": "sha512-kLk7jIlJvKyhVMAjORTXKjzlM6YIByZ1H/d0DBx3oq8nSPCG6/gbLr5RxukzPgwbhnAqh+xHNCmrvmFKhVMvoQ==", + "version": "10.11.0", + "resolved": "https://registry.npmjs.org/ol/-/ol-10.11.0.tgz", + "integrity": "sha512-OJ+lrx7kx/1O7Xx18Ff9QkVnwZIEL0OuhJQSy2sYgzzDvyZ2qHvuZEGAajbSstUyBwaS1OtQ4RWnY84tRMDdqg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { "@types/rbush": "4.0.0", "earcut": "^3.0.0", - "geotiff": "^3.0.2", - "pbf": "4.0.1", + "geotiff": "^3.1.0-beta.0", + "pbf": "5.1.2", "rbush": "^4.0.0", - "zarrita": "^0.6.0" + "zarrita": "^0.7.1" }, "funding": { "type": "opencollective", @@ -14797,6 +14797,19 @@ "ol": "^10.4.0" } }, + "node_modules/ol/node_modules/pbf": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-5.1.2.tgz", + "integrity": "sha512-mnvGdvOrIvJOBGUEdGkrVXjN8E/VkIJCkf2eS1DH2yv82ORUlLttmDt0rWY38yYZmVwciZwBUvHM20qxBZf40w==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "resolve-protobuf-schema": "^2.1.0" + }, + "bin": { + "pbf": "bin/pbf" + } + }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -19049,16 +19062,13 @@ } }, "node_modules/unzipit": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unzipit/-/unzipit-1.4.3.tgz", - "integrity": "sha512-gsq2PdJIWWGhx5kcdWStvNWit9FVdTewm4SEG7gFskWs+XCVaULt9+BwuoBtJiRE8eo3L1IPAOrbByNLtLtIlg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unzipit/-/unzipit-2.0.0.tgz", + "integrity": "sha512-DVeVIWUZCAQPNzm5sB0hpsG1GygTTdBnzNtYYEpInkttx5evkyqRgZi6rTczoySqp8hO5jHVKzrH0f23X8FZLg==", "dev": true, "license": "MIT", - "dependencies": { - "uzip-module": "^1.0.2" - }, "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/update-browserslist-db": { @@ -19149,13 +19159,6 @@ "node": ">=6" } }, - "node_modules/uzip-module": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/uzip-module/-/uzip-module-1.0.3.tgz", - "integrity": "sha512-AMqwWZaknLM77G+VPYNZLEruMGWGzyigPK3/Whg99B3S6vGHuqsyl5ZrOv1UUF3paGK1U6PM0cnayioaryg/fA==", - "dev": true, - "license": "MIT" - }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", @@ -20508,13 +20511,13 @@ } }, "node_modules/zarrita": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/zarrita/-/zarrita-0.6.1.tgz", - "integrity": "sha512-YOMTW8FT55Rz+vadTIZeOFZ/F2h4svKizyldvPtMYSxPgSNcRkOzkxCsWpIWlWzB1I/LmISmi0bEekOhLlI+Zw==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/zarrita/-/zarrita-0.7.5.tgz", + "integrity": "sha512-ZriOSEne+Wf2iuM0yjDZvUKpHNlug3dO7qJ6mAxXoOgsYV18DPOkAkwB9e0rf21bHcKcOffFuwoZwn5g6pvUeA==", "dev": true, "license": "MIT", "dependencies": { - "@zarrita/storage": "^0.1.4", + "@zarrita/storage": "^0.2.0", "numcodecs": "^0.3.2" } }, diff --git a/package.json b/package.json index f6e75038..80745366 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "lru-cache": "^11.0.0" }, "peerDependencies": { - "ol": "=10.8.0", + "ol": "=10.11.0", "react": ">=18", "react-dom": ">=18" }, @@ -139,7 +139,7 @@ "jsdom-worker": "^0.3.0", "markdown-loader": "^8.0.0", "null-loader": "^4.0.1", - "ol": "=10.8.0", + "ol": "^10.11.0", "ol-mapbox-style": "^13.0.1", "ol-mbtiles": "^3.3.0", "prettier": "2.8.8", diff --git a/test/RTileWMTS.test.tsx b/test/RTileWMTS.test.tsx index dcfb8b82..5d908e95 100644 --- a/test/RTileWMTS.test.tsx +++ b/test/RTileWMTS.test.tsx @@ -1,15 +1,22 @@ import * as fs from 'fs'; import * as path from 'path'; import React from 'react'; +import proj4 from 'proj4'; import {render, RenderResult} from '@testing-library/react'; import Projection from 'ol/proj/Projection'; import {createXYZ} from 'ol/tilegrid'; import {WMTS} from 'ol/source'; +import {register} from 'ol/proj/proj4'; import {RMap, RLayerTile, RLayerWMTS} from 'rlayers'; import * as common from './common'; describe('', () => { + beforeAll(() => { + proj4.defs('EPSG:25832', '+proj=utm +zone=32 +ellps=GRS80 +units=m +no_defs +type=crs'); + register(proj4); + }); + it('should display a tiled XYZ layer', async () => { const {container} = render( @@ -248,12 +255,12 @@ describe('', () => { ]; it.each([ - ['EPSG:3857', undefined, 'EPSG:3857', 'DE_EPSG_3857_ADV', 'EPSG:3857', undefined, false], + ['EPSG:3857', undefined, 'EPSG:3857', 'DE_EPSG_25832_ADV', 'EPSG:3857', undefined, false], [ 'EPSG:3857', undefined, 'EPSG:3857', - 'DE_EPSG_3857_ADV', + 'DE_EPSG_25832_ADV', 'EPSG:3857', 'GLOBAL_WEBMERCATOR', true diff --git a/test/__snapshots__/RControl.test.tsx.snap b/test/__snapshots__/RControl.test.tsx.snap index 6d036430..b88fa57e 100644 --- a/test/__snapshots__/RControl.test.tsx.snap +++ b/test/__snapshots__/RControl.test.tsx.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing -exports[` should render all the RControls 1`] = `"
     
    "`; +exports[` should render all the RControls 1`] = `"
       
      "`; -exports[` should render all the RControls 2`] = `"
         
        "`; +exports[` should render all the RControls 2`] = `"
           
          "`; exports[` should render the layers RControl with a custom element 1`] = `"
            "`; diff --git a/test/__snapshots__/RTileWMTS.test.tsx.snap b/test/__snapshots__/RTileWMTS.test.tsx.snap index d5a62c78..8ee43a0e 100644 --- a/test/__snapshots__/RTileWMTS.test.tsx.snap +++ b/test/__snapshots__/RTileWMTS.test.tsx.snap @@ -8,9 +8,9 @@ exports[` should update the url by recreating the source 2`] = `" should consider projection EPSG:3857 and matrixSet GLOBAL_WEBMERCATOR to select WMTS source(EPSG:3857, GLOBAL_WEBMERCATOR) 1`] = `"
              "`; -exports[` should consider projection EPSG:3857 and matrixSet undefined to select WMTS source(EPSG:3857, DE_EPSG_3857_ADV) 1`] = `"
                "`; +exports[` should consider projection EPSG:3857 and matrixSet undefined to select WMTS source(EPSG:3857, DE_EPSG_25832_ADV) 1`] = `"
                  "`; -exports[` should consider projection EPSG:3857 and matrixSet undefined to select WMTS source(EPSG:3857, DE_EPSG_3857_ADV) 2`] = `"
                    "`; +exports[` should consider projection EPSG:3857 and matrixSet undefined to select WMTS source(EPSG:3857, DE_EPSG_25832_ADV) 2`] = `"
                      "`; exports[` should display a tiled WMTS layer 1`] = `"
                        "`;