Skip to content

fix(geo-layers): adapt WMSLayer to @loaders.gl/wms v4.4 API #10013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
charlieforward9 wants to merge 3 commits into from
Closed

fix(geo-layers): adapt WMSLayer to @loaders.gl/wms v4.4 API #10013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bc8484
chore: bump @loaders.gl to v4.4.0-alpha.12
charlieforward9 Feb 18, 2026
7261efe
fix(geo-layers): adapt WMSLayer to @loaders.gl/wms v4.4 API changes
charlieforward9 Feb 18, 2026
edd320b
fix(carto): use StrictLoaderOptions for loader option types
charlieforward9 Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/layer-browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"start-local": "vite --config ../vite.config.local.mjs"
},
"dependencies": {
"@loaders.gl/core": "^4.3.4",
"@loaders.gl/gltf": "^4.3.4",
"@loaders.gl/ply": "^4.3.4",
"@loaders.gl/core": "^4.4.0-alpha.12",
"@loaders.gl/gltf": "^4.4.0-alpha.12",
"@loaders.gl/ply": "^4.4.0-alpha.12",
"@probe.gl/log": "^4.0.9",
"colorbrewer": "^1.0.0",
"d3-request": "^1.0.6",
Expand Down
10 changes: 5 additions & 5 deletions examples/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^4.3.4",
"@loaders.gl/core": "^4.3.4",
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/draco": "^4.3.4",
"@loaders.gl/gltf": "^4.3.4",
"@loaders.gl/3d-tiles": "^4.4.0-alpha.12",
"@loaders.gl/core": "^4.4.0-alpha.12",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@loaders.gl/draco": "^4.4.0-alpha.12",
"@loaders.gl/gltf": "^4.4.0-alpha.12",
"@luma.gl/constants": "^9.2.6",
"deck.gl": "^9.0.0",
"maplibre-gl": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/3d-heatmap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"deck.gl": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/3d-tiles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@loaders.gl/3d-tiles": "^4.3.4",
"@loaders.gl/3d-tiles": "^4.4.0-alpha.12",
"deck.gl": "^9.0.0",
"maplibre-gl": "^5.0.0",
"react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/data-filter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"deck.gl": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/global-grids/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"deck.gl": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/globe/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@types/react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/highway/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@types/d3-scale": "^4.0.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/i3s/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/i3s": "^4.3.4",
"@loaders.gl/i3s": "^4.4.0-alpha.12",
"maplibre-gl": "^5.0.0",
"react-map-gl": "^8.0.0",
"deck.gl": "^9.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mapbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"d3-scale": "^4.0.0",
"deck.gl": "^9.0.0",
"mapbox-gl": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/maplibre/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@types/react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mask-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@types/react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mesh/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/obj": "^4.3.4",
"@loaders.gl/obj": "^4.4.0-alpha.12",
"@math.gl/core": "^4.1.0",
"deck.gl": "^9.0.0",
"react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/point-cloud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/las": "^4.3.4",
"@loaders.gl/las": "^4.4.0-alpha.12",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"deck.gl": "^9.2.0-alpha.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/radio/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@material-ui/core": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.57",
"@types/d3-scale": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/text/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/csv": "^4.4.0-alpha.12",
"@types/d3-scale": "^4.0.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
Expand Down
14 changes: 7 additions & 7 deletions modules/carto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
},
"dependencies": {
"@carto/api-client": "^0.5.19",
"@loaders.gl/compression": "^4.3.4",
"@loaders.gl/gis": "^4.3.4",
"@loaders.gl/loader-utils": "^4.3.4",
"@loaders.gl/mvt": "^4.3.4",
"@loaders.gl/schema": "^4.3.4",
"@loaders.gl/tiles": "^4.3.4",
"@loaders.gl/compression": "^4.4.0-alpha.12",
"@loaders.gl/gis": "^4.4.0-alpha.12",
"@loaders.gl/loader-utils": "^4.4.0-alpha.12",
"@loaders.gl/mvt": "^4.4.0-alpha.12",
"@loaders.gl/schema": "^4.4.0-alpha.12",
"@loaders.gl/tiles": "^4.4.0-alpha.12",
"@luma.gl/core": "^9.2.6",
"@luma.gl/shadertools": "^9.2.6",
"@math.gl/web-mercator": "^4.1.0",
Expand All @@ -72,7 +72,7 @@
"@deck.gl/extensions": "~9.2.0",
"@deck.gl/geo-layers": "~9.2.0",
"@deck.gl/layers": "~9.2.0",
"@loaders.gl/core": "^4.3.4",
"@loaders.gl/core": "^4.4.0-alpha.12",
"@luma.gl/core": "~9.2.6"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
Expand Down
9 changes: 5 additions & 4 deletions modules/carto/src/layers/schema/carto-properties-tile-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors

import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
import type {StrictLoaderOptions} from '@loaders.gl/loader-utils';
import {LoaderWithParser} from '@loaders.gl/loader-utils';

import {Tile, TileReader} from './carto-properties-tile';
import {parsePbf} from './tile-loader-utils';
Expand All @@ -11,13 +12,13 @@ import {getWorkerUrl} from '../../utils';
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
const id = 'cartoPropertiesTile';

type CartoPropertiesTileLoaderOptions = LoaderOptions & {
type CartoPropertiesTileStrictLoaderOptions = StrictLoaderOptions & {
cartoPropertiesTile?: {
workerUrl: string;
};
};

const DEFAULT_OPTIONS: CartoPropertiesTileLoaderOptions = {
const DEFAULT_OPTIONS: CartoPropertiesTileStrictLoaderOptions = {
cartoPropertiesTile: {
workerUrl: getWorkerUrl(id, VERSION)
}
Expand All @@ -37,7 +38,7 @@ const CartoPropertiesTileLoader: LoaderWithParser = {
options: DEFAULT_OPTIONS
};

function parseCartoPropertiesTile(arrayBuffer: ArrayBuffer, options?: LoaderOptions): Tile | null {
function parseCartoPropertiesTile(arrayBuffer: ArrayBuffer, options?: StrictLoaderOptions): Tile | null {
if (!arrayBuffer) return null;
return parsePbf(arrayBuffer, TileReader);
}
Expand Down
11 changes: 6 additions & 5 deletions modules/carto/src/layers/schema/carto-raster-tile-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors

import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
import type {StrictLoaderOptions} from '@loaders.gl/loader-utils';
import {LoaderWithParser} from '@loaders.gl/loader-utils';
import type {RasterMetadata} from '@carto/api-client';

import {TileReader} from './carto-raster-tile';
Expand All @@ -13,14 +14,14 @@ import {NumericProps, Properties} from './spatialjson-utils';
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
const id = 'cartoRasterTile';

type CartoRasterTileLoaderOptions = LoaderOptions & {
type CartoRasterTileStrictLoaderOptions = StrictLoaderOptions & {
cartoRasterTile?: {
metadata: RasterMetadata | null;
workerUrl: string;
};
};

const DEFAULT_OPTIONS: CartoRasterTileLoaderOptions = {
const DEFAULT_OPTIONS: CartoRasterTileStrictLoaderOptions = {
cartoRasterTile: {
metadata: null,
workerUrl: getWorkerUrl(id, VERSION)
Expand All @@ -35,7 +36,7 @@ const CartoRasterTileLoader: LoaderWithParser = {
extensions: ['pbf'],
mimeTypes: ['application/vnd.carto-raster-tile'],
category: 'geometry',
parse: async (arrayBuffer, options?: CartoRasterTileLoaderOptions) =>
parse: async (arrayBuffer, options?: CartoRasterTileStrictLoaderOptions) =>
parseCartoRasterTile(arrayBuffer, options),
parseSync: parseCartoRasterTile,
worker: true,
Expand All @@ -53,7 +54,7 @@ export type Raster = {

function parseCartoRasterTile(
arrayBuffer: ArrayBuffer,
options?: CartoRasterTileLoaderOptions
options?: CartoRasterTileStrictLoaderOptions
): Raster | null {
const metadata = options?.cartoRasterTile?.metadata;
if (!arrayBuffer || !metadata) return null;
Expand Down
11 changes: 6 additions & 5 deletions modules/carto/src/layers/schema/carto-spatial-tile-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors

import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
import type {StrictLoaderOptions} from '@loaders.gl/loader-utils';
import {LoaderWithParser} from '@loaders.gl/loader-utils';

import {Tile, TileReader} from './carto-spatial-tile';
import {parsePbf} from './tile-loader-utils';
Expand All @@ -12,14 +13,14 @@ import {IndexScheme, binaryToSpatialjson, SpatialJson} from './spatialjson-utils
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
const id = 'cartoSpatialTile';

type CartoSpatialTileLoaderOptions = LoaderOptions & {
type CartoSpatialTileStrictLoaderOptions = StrictLoaderOptions & {
cartoSpatialTile?: {
scheme: IndexScheme;
workerUrl: string;
};
};

const DEFAULT_OPTIONS: CartoSpatialTileLoaderOptions = {
const DEFAULT_OPTIONS: CartoSpatialTileStrictLoaderOptions = {
cartoSpatialTile: {
scheme: 'quadbin',
workerUrl: getWorkerUrl(id, VERSION)
Expand All @@ -34,7 +35,7 @@ const CartoSpatialTileLoader: LoaderWithParser = {
extensions: ['pbf'],
mimeTypes: ['application/vnd.carto-spatial-tile'],
category: 'geometry',
parse: async (arrayBuffer, options?: CartoSpatialTileLoaderOptions) =>
parse: async (arrayBuffer, options?: CartoSpatialTileStrictLoaderOptions) =>
parseCartoSpatialTile(arrayBuffer, options),
parseSync: parseCartoSpatialTile,
worker: true,
Expand All @@ -43,7 +44,7 @@ const CartoSpatialTileLoader: LoaderWithParser = {

function parseCartoSpatialTile(
arrayBuffer: ArrayBuffer,
options?: CartoSpatialTileLoaderOptions
options?: CartoSpatialTileStrictLoaderOptions
): SpatialJson | null {
if (!arrayBuffer) return null;
const tile: Tile = parsePbf(arrayBuffer, TileReader);
Expand Down
11 changes: 6 additions & 5 deletions modules/carto/src/layers/schema/carto-vector-tile-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
// Copyright (c) vis.gl contributors

import earcut from 'earcut';
import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
import type {StrictLoaderOptions} from '@loaders.gl/loader-utils';
import {LoaderWithParser} from '@loaders.gl/loader-utils';
import type {BinaryFeatureCollection, BinaryPolygonFeature, TypedArray} from '@loaders.gl/schema';

import {TileReader} from './carto-tile';
Expand All @@ -13,13 +14,13 @@ import {getWorkerUrl} from '../../utils';
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
const id = 'cartoVectorTile';

type CartoVectorTileLoaderOptions = LoaderOptions & {
type CartoVectorTileStrictLoaderOptions = StrictLoaderOptions & {
cartoVectorTile?: {
workerUrl: string;
};
};

const DEFAULT_OPTIONS: CartoVectorTileLoaderOptions = {
const DEFAULT_OPTIONS: CartoVectorTileStrictLoaderOptions = {
cartoVectorTile: {
workerUrl: getWorkerUrl(id, VERSION)
}
Expand All @@ -33,7 +34,7 @@ const CartoVectorTileLoader: LoaderWithParser = {
extensions: ['pbf'],
mimeTypes: ['application/vnd.carto-vector-tile'],
category: 'geometry',
parse: async (arrayBuffer, options?: CartoVectorTileLoaderOptions) =>
parse: async (arrayBuffer, options?: CartoVectorTileStrictLoaderOptions) =>
parseCartoVectorTile(arrayBuffer, options),
parseSync: parseCartoVectorTile,
worker: true,
Expand Down Expand Up @@ -91,7 +92,7 @@ function triangulate(polygons: BinaryPolygonFeature) {

function parseCartoVectorTile(
arrayBuffer: ArrayBuffer,
options?: CartoVectorTileLoaderOptions
options?: CartoVectorTileStrictLoaderOptions
): BinaryFeatureCollection | null {
if (!arrayBuffer) return null;
const tile = parsePbf(arrayBuffer, TileReader);
Expand Down
4 changes: 2 additions & 2 deletions modules/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"prepublishOnly": "npm run build-debugger && npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@loaders.gl/core": "^4.3.4",
"@loaders.gl/images": "^4.3.4",
"@loaders.gl/core": "^4.4.0-alpha.12",
"@loaders.gl/images": "^4.4.0-alpha.12",
"@luma.gl/constants": "^9.2.6",
"@luma.gl/core": "^9.2.6",
"@luma.gl/engine": "^9.2.6",
Expand Down
18 changes: 9 additions & 9 deletions modules/geo-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^4.3.4",
"@loaders.gl/gis": "^4.3.4",
"@loaders.gl/loader-utils": "^4.3.4",
"@loaders.gl/mvt": "^4.3.4",
"@loaders.gl/schema": "^4.3.4",
"@loaders.gl/terrain": "^4.3.4",
"@loaders.gl/tiles": "^4.3.4",
"@loaders.gl/wms": "^4.3.4",
"@loaders.gl/3d-tiles": "^4.4.0-alpha.12",
"@loaders.gl/gis": "^4.4.0-alpha.12",
"@loaders.gl/loader-utils": "^4.4.0-alpha.12",
"@loaders.gl/mvt": "^4.4.0-alpha.12",
"@loaders.gl/schema": "^4.4.0-alpha.12",
"@loaders.gl/terrain": "^4.4.0-alpha.12",
"@loaders.gl/tiles": "^4.4.0-alpha.12",
"@loaders.gl/wms": "^4.4.0-alpha.12",
"@luma.gl/gltf": "^9.2.6",
"@luma.gl/shadertools": "^9.2.6",
"@math.gl/core": "^4.1.0",
Expand All @@ -61,7 +61,7 @@
"@deck.gl/extensions": "~9.2.0",
"@deck.gl/layers": "~9.2.0",
"@deck.gl/mesh-layers": "~9.2.0",
"@loaders.gl/core": "^4.3.4",
"@loaders.gl/core": "^4.4.0-alpha.12",
"@luma.gl/core": "~9.2.6",
"@luma.gl/engine": "~9.2.6"
},
Expand Down
Loading