@loaders.gl/ogc 5.0.0-beta.1 → 5.0.0-beta.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -5
- package/dist/{wms/gml-loader.cjs → gml-loader.cjs} +2790 -3807
- package/dist/gml-loader.cjs.map +6 -0
- package/dist/gml-loader.d.ts +2 -0
- package/dist/gml-loader.d.ts.map +1 -0
- package/dist/gml-loader.js +2 -0
- package/dist/gml-loader.js.map +1 -0
- package/dist/index.cjs +346 -4378
- package/dist/index.cjs.map +3 -3
- package/dist/stac/index.cjs +22 -1044
- package/dist/stac/index.cjs.map +3 -3
- package/dist/stac/index.d.ts +2 -2
- package/dist/stac/index.d.ts.map +1 -1
- package/dist/stac/index.js +1 -1
- package/dist/stac/index.js.map +1 -1
- package/dist/stac/{stac-source-loader-types.d.ts → stac-loader-types.d.ts} +6 -6
- package/dist/stac/stac-loader-types.d.ts.map +1 -0
- package/dist/stac/{stac-source-loader-types.js → stac-loader-types.js} +8 -8
- package/dist/stac/stac-loader-types.js.map +1 -0
- package/dist/stac/{stac-source.d.ts → stac-loader.d.ts} +8 -8
- package/dist/stac/stac-loader.d.ts.map +1 -0
- package/dist/stac/{stac-source.js → stac-loader.js} +7 -7
- package/dist/stac/stac-loader.js.map +1 -0
- package/dist/{stac/stac-source.cjs → stac-loader.cjs} +288 -791
- package/dist/stac-loader.cjs.map +6 -0
- package/dist/stac-loader.d.ts +2 -0
- package/dist/stac-loader.d.ts.map +1 -0
- package/dist/stac-loader.js +2 -0
- package/dist/stac-loader.js.map +1 -0
- package/dist/wms/bundled.cjs +2614 -3545
- package/dist/wms/bundled.cjs.map +3 -3
- package/dist/wms/bundled.d.ts +3 -3
- package/dist/wms/bundled.d.ts.map +1 -1
- package/dist/wms/bundled.js.map +1 -1
- package/dist/wms/csw-capabilities-loader-with-parser.d.ts +5 -4
- package/dist/wms/csw-capabilities-loader-with-parser.d.ts.map +1 -1
- package/dist/wms/csw-capabilities-loader-with-parser.js.map +1 -1
- package/dist/wms/csw-capabilities-loader.d.ts +6 -4
- package/dist/wms/csw-capabilities-loader.d.ts.map +1 -1
- package/dist/wms/csw-capabilities-loader.js +1 -1
- package/dist/wms/csw-capabilities-loader.js.map +1 -1
- package/dist/wms/csw-domain-loader-with-parser.d.ts +5 -4
- package/dist/wms/csw-domain-loader-with-parser.d.ts.map +1 -1
- package/dist/wms/csw-domain-loader-with-parser.js.map +1 -1
- package/dist/wms/csw-domain-loader.d.ts +6 -4
- package/dist/wms/csw-domain-loader.d.ts.map +1 -1
- package/dist/wms/csw-domain-loader.js +1 -1
- package/dist/wms/csw-domain-loader.js.map +1 -1
- package/dist/wms/{csw-source-loader.d.ts → csw-loader.d.ts} +15 -13
- package/dist/wms/csw-loader.d.ts.map +1 -0
- package/dist/wms/{csw-source-loader.js → csw-loader.js} +5 -5
- package/dist/wms/csw-loader.js.map +1 -0
- package/dist/wms/csw-records-loader-with-parser.d.ts +5 -4
- package/dist/wms/csw-records-loader-with-parser.d.ts.map +1 -1
- package/dist/wms/csw-records-loader-with-parser.js.map +1 -1
- package/dist/wms/csw-records-loader.d.ts +6 -4
- package/dist/wms/csw-records-loader.d.ts.map +1 -1
- package/dist/wms/csw-records-loader.js +1 -1
- package/dist/wms/csw-records-loader.js.map +1 -1
- package/dist/wms/gml-loader-types.d.ts +17 -11
- package/dist/wms/gml-loader-types.d.ts.map +1 -1
- package/dist/wms/gml-loader-types.js +5 -3
- package/dist/wms/gml-loader-types.js.map +1 -1
- package/dist/wms/gml-loader.d.ts +11 -9
- package/dist/wms/gml-loader.d.ts.map +1 -1
- package/dist/wms/gml-loader.js +20 -14
- package/dist/wms/gml-loader.js.map +1 -1
- package/dist/wms/index.cjs +3227 -4264
- package/dist/wms/index.cjs.map +3 -3
- package/dist/wms/index.d.ts +21 -21
- package/dist/wms/index.d.ts.map +1 -1
- package/dist/wms/index.js +10 -12
- package/dist/wms/index.js.map +1 -1
- package/dist/wms/lib/deprecated/image-source-compatibility.d.ts +1 -1
- package/dist/wms/lib/deprecated/image-source-compatibility.js +1 -1
- package/dist/wms/lib/parsers/csw/parse-csw-capabilities.d.ts +1 -1
- package/dist/wms/lib/parsers/csw/parse-csw-capabilities.d.ts.map +1 -1
- package/dist/wms/lib/parsers/csw/parse-csw-domain.d.ts +1 -1
- package/dist/wms/lib/parsers/csw/parse-csw-domain.d.ts.map +1 -1
- package/dist/wms/lib/parsers/csw/parse-csw-records.d.ts +1 -1
- package/dist/wms/lib/parsers/csw/parse-csw-records.d.ts.map +1 -1
- package/dist/wms/lib/parsers/csw/parse-csw-records.js +2 -5
- package/dist/wms/lib/parsers/csw/parse-csw-records.js.map +1 -1
- package/dist/wms/lib/parsers/csw/parse-exception-report.js +2 -2
- package/dist/wms/lib/parsers/csw/parse-exception-report.js.map +1 -1
- package/dist/wms/lib/parsers/wms/parse-wms-error.d.ts.map +1 -1
- package/dist/wms/lib/parsers/wms/parse-wms-error.js +3 -1
- package/dist/wms/lib/parsers/wms/parse-wms-error.js.map +1 -1
- package/dist/wms/lib/parsers/wms/parse-wms-layer-description.d.ts +1 -1
- package/dist/wms/lib/parsers/wms/parse-wms-layer-description.d.ts.map +1 -1
- package/dist/wms/lib/parsers/wmts/parse-wmts-capabilities.js +1 -1
- package/dist/wms/lib/parsers/wmts/parse-wmts-capabilities.js.map +1 -1
- package/dist/wms/lib/parsers/xml/parse-xml-text.d.ts +1 -1
- package/dist/wms/lib/parsers/xml/parse-xml-text.d.ts.map +1 -1
- package/dist/wms/lib/parsers/xml/parse-xml-text.js +2 -1
- package/dist/wms/lib/parsers/xml/parse-xml-text.js.map +1 -1
- package/dist/wms/managed-vector-source.js +1 -1
- package/dist/wms/managed-vector-source.js.map +1 -1
- package/dist/wms/{ogc-api-coverages-source-loader.d.ts → ogc-api-coverages-loader.d.ts} +7 -7
- package/dist/wms/ogc-api-coverages-loader.d.ts.map +1 -0
- package/dist/wms/{ogc-api-coverages-source-loader.js → ogc-api-coverages-loader.js} +4 -4
- package/dist/wms/ogc-api-coverages-loader.js.map +1 -0
- package/dist/wms/{ogc-api-edr-source-loader.d.ts → ogc-api-edr-loader.d.ts} +7 -7
- package/dist/wms/ogc-api-edr-loader.d.ts.map +1 -0
- package/dist/wms/{ogc-api-edr-source-loader.js → ogc-api-edr-loader.js} +4 -4
- package/dist/wms/ogc-api-edr-loader.js.map +1 -0
- package/dist/wms/{ogc-api-source-loader.d.ts → ogc-api-loaders.d.ts} +11 -11
- package/dist/wms/ogc-api-loaders.d.ts.map +1 -0
- package/dist/wms/{ogc-api-source-loader.js → ogc-api-loaders.js} +7 -7
- package/dist/wms/ogc-api-loaders.js.map +1 -0
- package/dist/wms/service-runtime.js +18 -18
- package/dist/wms/service-runtime.js.map +1 -1
- package/dist/wms/unbundled.cjs +319 -3334
- package/dist/wms/unbundled.cjs.map +3 -3
- package/dist/wms/unbundled.d.ts +3 -3
- package/dist/wms/unbundled.d.ts.map +1 -1
- package/dist/wms/{wcs-source-loader.d.ts → wcs-coverage-loader.d.ts} +6 -6
- package/dist/wms/wcs-coverage-loader.d.ts.map +1 -0
- package/dist/wms/{wcs-source-loader.js → wcs-coverage-loader.js} +5 -5
- package/dist/wms/wcs-coverage-loader.js.map +1 -0
- package/dist/wms/wfs-capabilities-loader-with-parser.d.ts +4 -3
- package/dist/wms/wfs-capabilities-loader-with-parser.d.ts.map +1 -1
- package/dist/wms/wfs-capabilities-loader-with-parser.js.map +1 -1
- package/dist/wms/wfs-capabilities-loader.d.ts +5 -3
- package/dist/wms/wfs-capabilities-loader.d.ts.map +1 -1
- package/dist/wms/wfs-capabilities-loader.js +1 -1
- package/dist/wms/wfs-capabilities-loader.js.map +1 -1
- package/dist/wms/{wfs-source-loader.d.ts → wfs-loader.d.ts} +10 -39
- package/dist/wms/wfs-loader.d.ts.map +1 -0
- package/dist/wms/{wfs-source-loader.js → wfs-loader.js} +5 -36
- package/dist/wms/wfs-loader.js.map +1 -0
- package/dist/wms/wip/wcs-capabilities-loader.js +1 -1
- package/dist/wms/wip/wcs-capabilities-loader.js.map +1 -1
- package/dist/wms/wip/wmts-capabilities-loader-with-parser.d.ts +2 -2
- package/dist/wms/wip/wmts-capabilities-loader-with-parser.d.ts.map +1 -1
- package/dist/wms/wip/wmts-capabilities-loader-with-parser.js.map +1 -1
- package/dist/wms/wip/wmts-capabilities-loader.d.ts +2 -2
- package/dist/wms/wip/wmts-capabilities-loader.d.ts.map +1 -1
- package/dist/wms/wip/wmts-capabilities-loader.js +1 -1
- package/dist/wms/wip/wmts-capabilities-loader.js.map +1 -1
- package/dist/wms/wms-capabilities-loader-with-parser.d.ts +2 -1
- package/dist/wms/wms-capabilities-loader-with-parser.d.ts.map +1 -1
- package/dist/wms/wms-capabilities-loader.d.ts +3 -1
- package/dist/wms/wms-capabilities-loader.d.ts.map +1 -1
- package/dist/wms/wms-capabilities-loader.js +1 -1
- package/dist/wms/wms-capabilities-loader.js.map +1 -1
- package/dist/wms/wms-error-loader-with-parser.d.ts +5 -4
- package/dist/wms/wms-error-loader-with-parser.d.ts.map +1 -1
- package/dist/wms/wms-error-loader-with-parser.js.map +1 -1
- package/dist/wms/wms-error-loader.d.ts +6 -4
- package/dist/wms/wms-error-loader.d.ts.map +1 -1
- package/dist/wms/wms-error-loader.js +1 -1
- package/dist/wms/wms-error-loader.js.map +1 -1
- package/dist/wms/{wms-source-loader.d.ts → wms-loader.d.ts} +8 -10
- package/dist/wms/wms-loader.d.ts.map +1 -0
- package/dist/wms/{wms-source-loader.js → wms-loader.js} +8 -8
- package/dist/wms/wms-loader.js.map +1 -0
- package/dist/wms/wmts-capabilities-loader.d.ts +1 -1
- package/dist/wms/wmts-capabilities-loader.d.ts.map +1 -1
- package/dist/wms/wmts-capabilities-loader.js +1 -1
- package/dist/wms/wmts-capabilities-loader.js.map +1 -1
- package/dist/wms/{wmts-source-loader.d.ts → wmts-loader.d.ts} +9 -9
- package/dist/wms/wmts-loader.d.ts.map +1 -0
- package/dist/wms/{wmts-source-loader.js → wmts-loader.js} +5 -5
- package/dist/wms/wmts-loader.js.map +1 -0
- package/dist/{wms/wmts-capabilities-loader-with-parser.cjs → wmts-capabilities-loader-with-parser.cjs} +227 -179
- package/dist/wmts-capabilities-loader-with-parser.cjs.map +6 -0
- package/dist/wmts-capabilities-loader-with-parser.d.ts +2 -0
- package/dist/wmts-capabilities-loader-with-parser.d.ts.map +1 -0
- package/dist/wmts-capabilities-loader-with-parser.js +3 -0
- package/dist/wmts-capabilities-loader-with-parser.js.map +1 -0
- package/package.json +29 -21
- package/src/gml-loader.ts +1 -0
- package/src/stac/index.ts +2 -2
- package/src/stac/{stac-source-loader-types.ts → stac-loader-types.ts} +9 -9
- package/src/stac/{stac-source.ts → stac-loader.ts} +10 -10
- package/src/stac-loader.ts +1 -0
- package/src/wms/bundled.ts +6 -3
- package/src/wms/csw-capabilities-loader-with-parser.ts +6 -5
- package/src/wms/csw-capabilities-loader.ts +3 -3
- package/src/wms/csw-domain-loader-with-parser.ts +5 -5
- package/src/wms/csw-domain-loader.ts +3 -3
- package/src/wms/{csw-source-loader.ts → csw-loader.ts} +11 -11
- package/src/wms/csw-records-loader-with-parser.ts +5 -5
- package/src/wms/csw-records-loader.ts +3 -3
- package/src/wms/gml-loader-types.ts +10 -8
- package/src/wms/gml-loader.ts +32 -18
- package/src/wms/index.ts +35 -31
- package/src/wms/lib/deprecated/image-source-compatibility.ts +1 -1
- package/src/wms/lib/parsers/csw/parse-csw-capabilities.ts +1 -1
- package/src/wms/lib/parsers/csw/parse-csw-domain.ts +1 -1
- package/src/wms/lib/parsers/csw/parse-csw-records.ts +3 -6
- package/src/wms/lib/parsers/csw/parse-exception-report.ts +2 -2
- package/src/wms/lib/parsers/wms/parse-wms-error.ts +3 -1
- package/src/wms/lib/parsers/wms/parse-wms-layer-description.ts +1 -1
- package/src/wms/lib/parsers/wmts/parse-wmts-capabilities.ts +1 -1
- package/src/wms/lib/parsers/xml/parse-xml-text.ts +3 -2
- package/src/wms/managed-vector-source.ts +1 -1
- package/src/wms/{ogc-api-coverages-source-loader.ts → ogc-api-coverages-loader.ts} +11 -8
- package/src/wms/{ogc-api-edr-source-loader.ts → ogc-api-edr-loader.ts} +7 -7
- package/src/wms/{ogc-api-source-loader.ts → ogc-api-loaders.ts} +12 -12
- package/src/wms/service-runtime.ts +18 -18
- package/src/wms/unbundled.ts +3 -3
- package/src/wms/{wcs-source-loader.ts → wcs-coverage-loader.ts} +7 -7
- package/src/wms/wfs-capabilities-loader-with-parser.ts +5 -4
- package/src/wms/wfs-capabilities-loader.ts +2 -2
- package/src/wms/{wfs-source-loader.ts → wfs-loader.ts} +13 -43
- package/src/wms/wip/wms-feature-info-loader-with-parser.ts +1 -1
- package/src/wms/wip/wms-feature-info-loader.ts +1 -1
- package/src/wms/wip/wms-layer-description-loader-with-parser.ts +1 -1
- package/src/wms/wip/wms-layer-description-loader.ts +1 -1
- package/src/wms/wip/wmts-capabilities-loader-with-parser.ts +5 -5
- package/src/wms/wip/wmts-capabilities-loader.ts +3 -3
- package/src/wms/wms-capabilities-loader-with-parser.ts +1 -1
- package/src/wms/wms-capabilities-loader.ts +1 -1
- package/src/wms/wms-error-loader-with-parser.ts +8 -7
- package/src/wms/wms-error-loader.ts +2 -2
- package/src/wms/{wms-source-loader.ts → wms-loader.ts} +15 -28
- package/src/wms/wmts-capabilities-loader.ts +3 -3
- package/src/wms/{wmts-source-loader.ts → wmts-loader.ts} +11 -11
- package/src/wmts-capabilities-loader-with-parser.ts +2 -0
- package/dist/stac/stac-source-loader-types.d.ts.map +0 -1
- package/dist/stac/stac-source-loader-types.js.map +0 -1
- package/dist/stac/stac-source.cjs.map +0 -6
- package/dist/stac/stac-source.d.ts.map +0 -1
- package/dist/stac/stac-source.js.map +0 -1
- package/dist/wms/csw-source-loader.d.ts.map +0 -1
- package/dist/wms/csw-source-loader.js.map +0 -1
- package/dist/wms/gml-loader.cjs.map +0 -6
- package/dist/wms/lib/deprecated/create-image-source.d.ts +0 -27
- package/dist/wms/lib/deprecated/create-image-source.d.ts.map +0 -1
- package/dist/wms/lib/deprecated/create-image-source.js +0 -44
- package/dist/wms/lib/deprecated/create-image-source.js.map +0 -1
- package/dist/wms/ogc-api-coverages-source-loader.d.ts.map +0 -1
- package/dist/wms/ogc-api-coverages-source-loader.js.map +0 -1
- package/dist/wms/ogc-api-edr-source-loader.d.ts.map +0 -1
- package/dist/wms/ogc-api-edr-source-loader.js.map +0 -1
- package/dist/wms/ogc-api-source-loader.d.ts.map +0 -1
- package/dist/wms/ogc-api-source-loader.js.map +0 -1
- package/dist/wms/wcs-source-loader.d.ts.map +0 -1
- package/dist/wms/wcs-source-loader.js.map +0 -1
- package/dist/wms/wfs-source-loader.d.ts.map +0 -1
- package/dist/wms/wfs-source-loader.js.map +0 -1
- package/dist/wms/wms-source-loader.d.ts.map +0 -1
- package/dist/wms/wms-source-loader.js.map +0 -1
- package/dist/wms/wmts-capabilities-loader-with-parser.cjs.map +0 -6
- package/dist/wms/wmts-source-loader.d.ts.map +0 -1
- package/dist/wms/wmts-source-loader.js.map +0 -1
- package/src/wms/lib/deprecated/create-image-source.ts +0 -75
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
5
|
import type {Loader, LoaderOptions} from '@loaders.gl/core/loader-utils';
|
|
6
|
-
import type {
|
|
6
|
+
import type {Table, RecordBatch} from 'apache-arrow';
|
|
7
7
|
import type {GMLFeatureCollection, Geometry, ParseGMLOptions} from './lib/parsers/gml/parse-gml';
|
|
8
8
|
|
|
9
9
|
import {GMLFormat} from './wms-format';
|
|
@@ -16,7 +16,7 @@ export type GMLLoaderOptions = LoaderOptions & {
|
|
|
16
16
|
/** GML parser and output options. */
|
|
17
17
|
gml?: ParseGMLOptions & {
|
|
18
18
|
/** Arrow feature table by default; geojson preserves the legacy geometry/collection. */
|
|
19
|
-
shape?: 'arrow
|
|
19
|
+
shape?: 'arrow' | 'geojson';
|
|
20
20
|
/** Number of feature members emitted in each streaming batch. */
|
|
21
21
|
batchSize?: number;
|
|
22
22
|
};
|
|
@@ -24,15 +24,17 @@ export type GMLLoaderOptions = LoaderOptions & {
|
|
|
24
24
|
|
|
25
25
|
/** Preloads the parser-bearing GML loader implementation. */
|
|
26
26
|
async function preload() {
|
|
27
|
-
const {GMLLoaderWithParser} = await import('@loaders.gl/ogc/
|
|
27
|
+
const {GMLLoaderWithParser} = await import('@loaders.gl/ogc/gml-loader');
|
|
28
28
|
return GMLLoaderWithParser;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
/** Metadata-only loader for GML geometry responses. */
|
|
32
32
|
export const GMLLoader = {
|
|
33
33
|
...GMLFormat,
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
defaultShape: 'arrow',
|
|
35
|
+
supportsNativeArrow: true,
|
|
36
|
+
dataType: null as unknown as Table | Geometry | GMLFeatureCollection | null,
|
|
37
|
+
batchType: null as unknown as RecordBatch | GMLFeatureCollection,
|
|
36
38
|
|
|
37
39
|
name: 'GML',
|
|
38
40
|
id: 'gml',
|
|
@@ -47,12 +49,12 @@ export const GMLLoader = {
|
|
|
47
49
|
mimeTypes: ['application/vnd.ogc.gml', 'application/xml', 'text/xml'],
|
|
48
50
|
testText: testXMLFile,
|
|
49
51
|
options: {
|
|
50
|
-
gml: {shape: 'arrow
|
|
52
|
+
gml: {shape: 'arrow'}
|
|
51
53
|
},
|
|
52
54
|
preload
|
|
53
55
|
} as const satisfies Loader<
|
|
54
|
-
|
|
55
|
-
|
|
56
|
+
Table | Geometry | GMLFeatureCollection | null,
|
|
57
|
+
RecordBatch | GMLFeatureCollection,
|
|
56
58
|
GMLLoaderOptions
|
|
57
59
|
>;
|
|
58
60
|
|
package/src/wms/gml-loader.ts
CHANGED
|
@@ -2,8 +2,13 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import {
|
|
6
|
-
|
|
5
|
+
import {
|
|
6
|
+
paceBatchIterator,
|
|
7
|
+
type LoaderContext,
|
|
8
|
+
type LoaderWithParser
|
|
9
|
+
} from '@loaders.gl/core/loader-utils';
|
|
10
|
+
import type {Table, RecordBatch} from 'apache-arrow';
|
|
11
|
+
import type {Feature} from '@loaders.gl/core/schema';
|
|
7
12
|
import {convertFeaturesToWKBArrowTable} from '@loaders.gl/core/arrow-geometry/feature-collection-to-arrow';
|
|
8
13
|
import {getGeoMetadata, setGeoMetadata} from '@loaders.gl/core/schema';
|
|
9
14
|
import type {GMLFeatureCollection, Geometry} from './lib/parsers/gml/parse-gml';
|
|
@@ -20,10 +25,15 @@ export const GMLLoaderWithParser = {
|
|
|
20
25
|
parse: async (arrayBuffer: ArrayBuffer, options?: GMLLoaderOptions) =>
|
|
21
26
|
parseGMLText(new TextDecoder().decode(arrayBuffer), options),
|
|
22
27
|
parseTextSync: parseGMLText,
|
|
23
|
-
parseInBatches:
|
|
28
|
+
parseInBatches: (iterator, options?: GMLLoaderOptions, context?: LoaderContext) =>
|
|
29
|
+
paceBatchIterator(parseGMLInRequestedShape(iterator, options), {
|
|
30
|
+
batchMaxRowsPerSecond: options?.core?.batchMaxRowsPerSecond,
|
|
31
|
+
getRowCount: batch => ('numRows' in batch ? batch.numRows : batch.features.length),
|
|
32
|
+
signal: options?.signal ?? context?.signal
|
|
33
|
+
})
|
|
24
34
|
} as const satisfies LoaderWithParser<
|
|
25
|
-
|
|
26
|
-
|
|
35
|
+
Table | Geometry | GMLFeatureCollection | null,
|
|
36
|
+
RecordBatch | GMLFeatureCollection,
|
|
27
37
|
GMLLoaderOptions
|
|
28
38
|
>;
|
|
29
39
|
|
|
@@ -41,7 +51,7 @@ function parseGMLText(text: string, options?: GMLLoaderOptions) {
|
|
|
41
51
|
}
|
|
42
52
|
|
|
43
53
|
/** Keeps GML coordinates unchanged without incorrectly declaring the GeoParquet CRS84 default. */
|
|
44
|
-
function makeGMLArrowTable(features: GMLFeatureCollection['features']):
|
|
54
|
+
function makeGMLArrowTable(features: GMLFeatureCollection['features']): Table {
|
|
45
55
|
const hasFeatureIds = features.some(feature => feature.id !== undefined);
|
|
46
56
|
for (const feature of features) {
|
|
47
57
|
if (
|
|
@@ -55,16 +65,11 @@ function makeGMLArrowTable(features: GMLFeatureCollection['features']): ArrowTab
|
|
|
55
65
|
}
|
|
56
66
|
// The shared encoder supports null geometry although the GeoJSON Feature type excludes it.
|
|
57
67
|
const table = convertFeaturesToWKBArrowTable(features as Feature[]);
|
|
58
|
-
const geoMetadata = getGeoMetadata(table.
|
|
68
|
+
const geoMetadata = getGeoMetadata(table.schema.metadata)!;
|
|
59
69
|
geoMetadata.columns.geometry.crs = null;
|
|
60
|
-
setGeoMetadata(table.
|
|
61
|
-
const geometryField = table.
|
|
70
|
+
setGeoMetadata(table.schema.metadata, geoMetadata);
|
|
71
|
+
const geometryField = table.schema.fields.find(field => field.name === 'geometry');
|
|
62
72
|
geometryField?.metadata.set('ARROW:extension:metadata', JSON.stringify({crs: null}));
|
|
63
|
-
if (table.schema) {
|
|
64
|
-
table.schema.metadata = Object.fromEntries(table.data.schema.metadata);
|
|
65
|
-
const field = table.schema.fields.find(field => field.name === 'geometry');
|
|
66
|
-
if (field) field.metadata = Object.fromEntries(geometryField!.metadata);
|
|
67
|
-
}
|
|
68
73
|
return table;
|
|
69
74
|
}
|
|
70
75
|
|
|
@@ -74,13 +79,13 @@ async function* parseGMLInRequestedShape(
|
|
|
74
79
|
| AsyncIterable<ArrayBufferLike | ArrayBufferView>
|
|
75
80
|
| Iterable<ArrayBufferLike | ArrayBufferView>,
|
|
76
81
|
options?: GMLLoaderOptions
|
|
77
|
-
): AsyncIterable<
|
|
82
|
+
): AsyncIterable<RecordBatch | GMLFeatureCollection> {
|
|
78
83
|
for await (const collection of parseGMLInBatches(iterator, options)) {
|
|
79
84
|
if (options?.gml?.shape === 'geojson') {
|
|
80
85
|
yield collection;
|
|
81
86
|
} else {
|
|
82
87
|
const table = makeGMLArrowTable(collection.features);
|
|
83
|
-
yield
|
|
88
|
+
yield* table.batches;
|
|
84
89
|
}
|
|
85
90
|
}
|
|
86
91
|
}
|
|
@@ -95,7 +100,13 @@ async function* parseGMLInBatches(
|
|
|
95
100
|
const decoder = new TextDecoder();
|
|
96
101
|
const parser = new GMLFeatureStreamParser();
|
|
97
102
|
let features: GMLFeatureCollection['features'] = [];
|
|
98
|
-
const batchSize =
|
|
103
|
+
const batchSize =
|
|
104
|
+
(typeof options?.core?.batchSize === 'number'
|
|
105
|
+
? options.core.batchSize
|
|
106
|
+
: options?.gml?.batchSize) ?? 1000;
|
|
107
|
+
if (!Number.isSafeInteger(batchSize) || batchSize < 1) {
|
|
108
|
+
throw new RangeError('GMLLoader batch size must be a positive integer');
|
|
109
|
+
}
|
|
99
110
|
|
|
100
111
|
for await (const chunk of iterator) {
|
|
101
112
|
const fragments = parser.push(
|
|
@@ -106,7 +117,7 @@ async function* parseGMLInBatches(
|
|
|
106
117
|
for (const fragment of fragments) {
|
|
107
118
|
const parsed = parseGMLFeatureFragment(fragment, {...options, ...options?.gml});
|
|
108
119
|
if (parsed && parsed.type === 'FeatureCollection') features.push(...parsed.features);
|
|
109
|
-
|
|
120
|
+
while (features.length >= batchSize) {
|
|
110
121
|
yield {type: 'FeatureCollection', features: features.splice(0, batchSize)};
|
|
111
122
|
}
|
|
112
123
|
}
|
|
@@ -115,6 +126,9 @@ async function* parseGMLInBatches(
|
|
|
115
126
|
const parsed = parseGMLFeatureFragment(fragment, {...options, ...options?.gml});
|
|
116
127
|
if (parsed && parsed.type === 'FeatureCollection') features.push(...parsed.features);
|
|
117
128
|
}
|
|
129
|
+
while (features.length >= batchSize) {
|
|
130
|
+
yield {type: 'FeatureCollection', features: features.splice(0, batchSize)};
|
|
131
|
+
}
|
|
118
132
|
if (features.length) yield {type: 'FeatureCollection', features};
|
|
119
133
|
}
|
|
120
134
|
|
package/src/wms/index.ts
CHANGED
|
@@ -18,7 +18,7 @@ export {
|
|
|
18
18
|
WMTSCapabilitiesFormat
|
|
19
19
|
} from './wms-format';
|
|
20
20
|
|
|
21
|
-
export type {
|
|
21
|
+
export type {CSWCapabilitiesLoaderOptions} from './csw-capabilities-loader';
|
|
22
22
|
|
|
23
23
|
export type {CSWCapabilities} from './csw-capabilities-loader';
|
|
24
24
|
export {CSWCapabilitiesLoader} from './csw-capabilities-loader';
|
|
@@ -50,7 +50,7 @@ export {WMSLayerDescriptionLoader as _WMSLayerDescriptionLoader} from './wip/wms
|
|
|
50
50
|
|
|
51
51
|
// WMTS - Web Map Tile Service
|
|
52
52
|
|
|
53
|
-
export type {
|
|
53
|
+
export type {WMTSCapabilitiesLoaderOptions} from './wmts-capabilities-loader';
|
|
54
54
|
export type {
|
|
55
55
|
WMTSCapabilities,
|
|
56
56
|
WMTSLayer,
|
|
@@ -64,7 +64,7 @@ export {WMTSCapabilitiesLoader} from './wmts-capabilities-loader';
|
|
|
64
64
|
|
|
65
65
|
// WFS - Web Feature Service
|
|
66
66
|
|
|
67
|
-
export type {
|
|
67
|
+
export type {WFSCapabilitiesLoaderOptions as _WFSLoaderOptions} from './wfs-capabilities-loader';
|
|
68
68
|
export type {WFSCapabilities as _WFSCapabilities} from './wfs-capabilities-loader';
|
|
69
69
|
export {WFSCapabilitiesLoader as _WFSCapabilitiesLoader} from './wfs-capabilities-loader';
|
|
70
70
|
|
|
@@ -81,12 +81,16 @@ export {GMLLoader, GMLLoader as _GMLLoader} from './gml-loader-types';
|
|
|
81
81
|
export type {
|
|
82
82
|
CSWCatalogQuery,
|
|
83
83
|
CSWRecord,
|
|
84
|
-
|
|
85
|
-
} from './csw-
|
|
86
|
-
export {CSWCatalogSource,
|
|
87
|
-
export {
|
|
88
|
-
export
|
|
89
|
-
export {
|
|
84
|
+
CSWLoaderOptions
|
|
85
|
+
} from './csw-loader';
|
|
86
|
+
export {CSWCatalogSource, CSWLoader} from './csw-loader';
|
|
87
|
+
export type {WMSLoaderOptions} from './wms-loader';
|
|
88
|
+
export {WMSLoader, WMSImageSource} from './wms-loader';
|
|
89
|
+
export type {WMTSLoaderOptions, WMTSGetFeatureInfoParameters} from './wmts-loader';
|
|
90
|
+
export {
|
|
91
|
+
WMTSLoader,
|
|
92
|
+
WMTSImageTileSource
|
|
93
|
+
} from './wmts-loader';
|
|
90
94
|
export type {
|
|
91
95
|
OGCTileMatrixSet,
|
|
92
96
|
OGCTileMatrix,
|
|
@@ -103,43 +107,46 @@ export {
|
|
|
103
107
|
getServiceCRSAxisOrder
|
|
104
108
|
} from './crs-utils';
|
|
105
109
|
export type {FeaturePaginationOptions} from './feature-pagination';
|
|
106
|
-
export {
|
|
107
|
-
export type {WFSVersion, WFSGetFeatureParameters,
|
|
110
|
+
export {WFSLoader, WFSVectorSource} from './wfs-loader';
|
|
111
|
+
export type {WFSVersion, WFSGetFeatureParameters, WFSLoaderOptions} from './wfs-loader';
|
|
108
112
|
export type {WFSFeatureType} from './lib/parsers/wfs/parse-wfs-capabilities';
|
|
109
113
|
export type {
|
|
110
114
|
OGCAPICollection,
|
|
111
115
|
OGCAPILandingPage,
|
|
112
116
|
OGCAPILink,
|
|
113
|
-
|
|
117
|
+
OGCAPILoaderOptions,
|
|
114
118
|
OGCAPITileMatrixSetSummary,
|
|
115
119
|
OGCAPITileset
|
|
116
|
-
} from './ogc-api-
|
|
120
|
+
} from './ogc-api-loaders';
|
|
117
121
|
export {
|
|
118
122
|
OGCAPIFeaturesSource,
|
|
119
|
-
|
|
123
|
+
OGCAPIFeaturesLoader,
|
|
120
124
|
OGCAPITilesSource,
|
|
121
|
-
|
|
122
|
-
} from './ogc-api-
|
|
123
|
-
export type {OGCAPIEDRQueryParameters,
|
|
125
|
+
OGCAPITilesLoader
|
|
126
|
+
} from './ogc-api-loaders';
|
|
127
|
+
export type {OGCAPIEDRQueryParameters, OGCAPIEDRLoaderOptions} from './ogc-api-edr-loader';
|
|
124
128
|
export {
|
|
125
129
|
OGCAPIEDRSource,
|
|
126
|
-
|
|
127
|
-
} from './ogc-api-edr-
|
|
130
|
+
OGCAPIEDRLoader
|
|
131
|
+
} from './ogc-api-edr-loader';
|
|
128
132
|
export type {
|
|
129
133
|
OGCAPICoveragesQueryParameters,
|
|
130
|
-
|
|
131
|
-
} from './ogc-api-coverages-
|
|
134
|
+
OGCAPICoveragesLoaderOptions
|
|
135
|
+
} from './ogc-api-coverages-loader';
|
|
132
136
|
export {
|
|
133
137
|
OGCAPICoveragesSource,
|
|
134
|
-
|
|
135
|
-
} from './ogc-api-coverages-
|
|
138
|
+
OGCAPICoveragesLoader
|
|
139
|
+
} from './ogc-api-coverages-loader';
|
|
136
140
|
export type {
|
|
137
141
|
WCSCoverage,
|
|
138
142
|
WCSCoverageMetadata,
|
|
139
143
|
WCSGetCoverageParameters,
|
|
140
|
-
|
|
141
|
-
} from './wcs-
|
|
142
|
-
export {
|
|
144
|
+
WCSCoverageLoaderOptions
|
|
145
|
+
} from './wcs-coverage-loader';
|
|
146
|
+
export {
|
|
147
|
+
WCSCoverageSource,
|
|
148
|
+
WCSCoverageLoader
|
|
149
|
+
} from './wcs-coverage-loader';
|
|
143
150
|
|
|
144
151
|
export type {GeoServiceType, ServiceCapabilities} from './service-capabilities';
|
|
145
152
|
export {
|
|
@@ -160,12 +167,9 @@ export type {ServiceEndpoint, ServiceEndpointPreferences} from './capability-gra
|
|
|
160
167
|
export {CapabilityGraph, discoverServiceGraph} from './capability-graph';
|
|
161
168
|
|
|
162
169
|
export {ImageSource} from './lib/deprecated/image-source-compatibility';
|
|
170
|
+
/** @deprecated Compatibility alias for deck.gl 10.0.0-alpha.1. Use WMSLoader. */
|
|
171
|
+
export {WMSLoader as WMSSource} from './wms-loader';
|
|
163
172
|
export type {ImageType} from '@loaders.gl/images';
|
|
164
|
-
export {createImageSource} from './lib/deprecated/create-image-source';
|
|
165
|
-
|
|
166
|
-
// DEPRECATED EXPORTS
|
|
167
|
-
/** @deprecated Use `WMSSourceLoader`. Kept for deck.gl compatibility. */
|
|
168
|
-
export {WMSSourceLoader as WMSSource} from './wms-source-loader';
|
|
169
173
|
|
|
170
174
|
export {ManagedVectorSource} from './managed-vector-source';
|
|
171
175
|
export type {ManagedVectorSourceOptions} from './managed-vector-source';
|
|
@@ -8,7 +8,7 @@ import type {ImageSource as ImageSourceContract} from '@loaders.gl/core/loader-u
|
|
|
8
8
|
export type ImageSource = ImageSourceContract;
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
|
-
* Structural compatibility guard for deck.gl
|
|
11
|
+
* Structural compatibility guard for deck.gl 10.0.0-alpha.1 `instanceof ImageSource` checks.
|
|
12
12
|
*
|
|
13
13
|
* @deprecated `ImageSource` is a type-only capability contract. Do not construct or extend this
|
|
14
14
|
* value; use it only for compatibility with deck.gl versions that still perform the legacy check.
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import type {XMLLoaderOptions} from '@loaders.gl/
|
|
5
|
+
import type {XMLLoaderOptions} from '@loaders.gl/documents';
|
|
6
6
|
import {parseExceptionReport} from './parse-exception-report';
|
|
7
7
|
import {parseXMLTextSync} from '../xml/parse-xml-text';
|
|
8
8
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import type {XMLLoaderOptions} from '@loaders.gl/
|
|
5
|
+
import type {XMLLoaderOptions} from '@loaders.gl/documents';
|
|
6
6
|
import {parseExceptionReport} from './parse-exception-report';
|
|
7
7
|
import {parseXMLTextSync} from '../xml/parse-xml-text';
|
|
8
8
|
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import type {XMLLoaderOptions} from '@loaders.gl/
|
|
5
|
+
import type {XMLLoaderOptions} from '@loaders.gl/documents';
|
|
6
6
|
import type {CRSIdentifier} from '@math.gl/geospatial/crs';
|
|
7
|
-
import {convertXMLFieldToArrayInPlace} from '@loaders.gl/xml';
|
|
7
|
+
import {convertXMLFieldToArrayInPlace} from '@loaders.gl/documents/xml-utils';
|
|
8
8
|
import {parseExceptionReport} from './parse-exception-report';
|
|
9
9
|
import {parseXMLTextSync} from '../xml/parse-xml-text';
|
|
10
10
|
|
|
@@ -46,10 +46,7 @@ export function parseCSWRecords(text: string, options?: XMLLoaderOptions): CSWRe
|
|
|
46
46
|
removeNSPrefix: true,
|
|
47
47
|
uncapitalizeKeys: true,
|
|
48
48
|
arrayPaths: [],
|
|
49
|
-
|
|
50
|
-
...options?.xml?._fastXML,
|
|
51
|
-
parseAttributeValue: true
|
|
52
|
-
}
|
|
49
|
+
parseAttributeValue: true
|
|
53
50
|
}
|
|
54
51
|
});
|
|
55
52
|
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
// import type {XMLLoaderOptions} from '@loaders.gl/
|
|
6
|
-
// import {XMLLoader} from '@loaders.gl/
|
|
5
|
+
// import type {XMLLoaderOptions} from '@loaders.gl/documents';
|
|
6
|
+
// import {XMLLoader} from '@loaders.gl/documents';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Parses a typed data structure from raw XML for `GetDomain` response
|
|
@@ -11,7 +11,9 @@ import {parseXMLTextSync} from '../xml/parse-xml-text';
|
|
|
11
11
|
* @returns a string with a human readable message
|
|
12
12
|
*/
|
|
13
13
|
export function parseWMSError(text: string, options): string {
|
|
14
|
-
const
|
|
14
|
+
const trimmed = text.trim();
|
|
15
|
+
const xml = trimmed.startsWith('"<') && trimmed.endsWith('>"') ? trimmed.slice(1, -1) : text;
|
|
16
|
+
const parsedXML = parseXMLTextSync(xml, options);
|
|
15
17
|
const serviceExceptionXML =
|
|
16
18
|
parsedXML?.ServiceExceptionReport?.ServiceException ||
|
|
17
19
|
parsedXML?.['ogc:ServiceExceptionReport']?.['ogc:ServiceException'];
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import type {XMLLoaderOptions} from '@loaders.gl/
|
|
5
|
+
import type {XMLLoaderOptions} from '@loaders.gl/documents';
|
|
6
6
|
import {parseXMLTextSync} from '../xml/parse-xml-text';
|
|
7
7
|
|
|
8
8
|
/** Layer description - response to a WMS `DescribeLayer` request */
|
|
@@ -100,7 +100,7 @@ export function parseWMTSCapabilities(text: string, options?: unknown): WMTSCapa
|
|
|
100
100
|
...((options as any)?.xml || {}),
|
|
101
101
|
_parser: 'internal',
|
|
102
102
|
textNodeName: '#text',
|
|
103
|
-
|
|
103
|
+
parseTagValue: false,
|
|
104
104
|
removeNSPrefix: true,
|
|
105
105
|
uncapitalizeKeys: true
|
|
106
106
|
}
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import type {XMLLoaderOptions} from '@loaders.gl/
|
|
6
|
-
import {parseXMLSync
|
|
5
|
+
import type {XMLLoaderOptions} from '@loaders.gl/documents';
|
|
6
|
+
import {parseXMLSync} from '@loaders.gl/documents/xml-parser';
|
|
7
|
+
import {XMLLoader} from '@loaders.gl/documents';
|
|
7
8
|
|
|
8
9
|
/** Parses XML text with XMLLoader defaults without requiring a parser-bearing loader object. */
|
|
9
10
|
export function parseXMLTextSync(text: string, options?: XMLLoaderOptions): any {
|
|
@@ -206,7 +206,7 @@ export class ManagedVectorSource implements VectorSource {
|
|
|
206
206
|
const table = await this.source.getFeatures(request);
|
|
207
207
|
throwIfAborted(controller.signal);
|
|
208
208
|
const revision = ++this.responseRevision;
|
|
209
|
-
if (table.shape !== 'geojson-table')
|
|
209
|
+
if (!('shape' in table) || table.shape !== 'geojson-table')
|
|
210
210
|
throw new Error('ManagedVectorSource requires GeoJSON responses');
|
|
211
211
|
if (
|
|
212
212
|
generation === this.generation &&
|
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
|
|
5
5
|
import type {CoreAPI, DataSourceOptions, SourceLoader} from '@loaders.gl/core/loader-utils';
|
|
6
6
|
import {DataSource} from '@loaders.gl/core/loader-utils';
|
|
7
|
-
import type {OGCAPILandingPage, OGCAPICollection} from './ogc-api-
|
|
7
|
+
import type {OGCAPILandingPage, OGCAPICollection} from './ogc-api-loaders';
|
|
8
8
|
|
|
9
9
|
/** Options for an OGC API Coverages source. */
|
|
10
|
-
export type
|
|
10
|
+
export type OGCAPICoveragesLoaderOptions = DataSourceOptions & {
|
|
11
11
|
/** Coverage request defaults. */
|
|
12
12
|
'ogc-api-coverages'?: {collectionId?: string; parameters?: Record<string, string>};
|
|
13
13
|
};
|
|
@@ -31,10 +31,10 @@ export type OGCAPICoveragesQueryParameters = {
|
|
|
31
31
|
};
|
|
32
32
|
|
|
33
33
|
/** Minimal OGC API Coverages source for discovery and coverage retrieval. */
|
|
34
|
-
export class OGCAPICoveragesSource extends DataSource<string,
|
|
34
|
+
export class OGCAPICoveragesSource extends DataSource<string, OGCAPICoveragesLoaderOptions> {
|
|
35
35
|
/** Creates an OGC API Coverages source. */
|
|
36
|
-
constructor(url: string, options:
|
|
37
|
-
super(url.replace(/\/$/, ''), options,
|
|
36
|
+
constructor(url: string, options: OGCAPICoveragesLoaderOptions = {}, coreApi?: CoreAPI) {
|
|
37
|
+
super(url.replace(/\/$/, ''), options, OGCAPICoveragesLoader.defaultOptions, coreApi);
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
/** Returns the OGC API landing page. */
|
|
@@ -88,7 +88,7 @@ export class OGCAPICoveragesSource extends DataSource<string, OGCAPICoveragesSou
|
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
/** Source loader for minimal OGC API Coverages support. */
|
|
91
|
-
export const
|
|
91
|
+
export const OGCAPICoveragesLoader = {
|
|
92
92
|
dataType: null as unknown as OGCAPICoveragesSource,
|
|
93
93
|
batchType: null as never,
|
|
94
94
|
name: 'OGC API Coverages',
|
|
@@ -104,6 +104,9 @@ export const OGCAPICoveragesSourceLoader = {
|
|
|
104
104
|
defaultOptions: {'ogc-api-coverages': {}},
|
|
105
105
|
testURL: (url: string): boolean =>
|
|
106
106
|
/(?:\/coverage(?:s)?(?:\/|$)|ogc[/-]?api[/-]?coverages)/i.test(url),
|
|
107
|
-
|
|
108
|
-
|
|
107
|
+
createDataSourceSync: (
|
|
108
|
+
url: string,
|
|
109
|
+
options: OGCAPICoveragesLoaderOptions = {},
|
|
110
|
+
coreApi?: CoreAPI
|
|
111
|
+
) => new OGCAPICoveragesSource(url, options, coreApi)
|
|
109
112
|
} as const satisfies SourceLoader<OGCAPICoveragesSource>;
|
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
|
|
5
5
|
import type {CoreAPI, DataSourceOptions, SourceLoader} from '@loaders.gl/core/loader-utils';
|
|
6
6
|
import {DataSource} from '@loaders.gl/core/loader-utils';
|
|
7
|
-
import type {OGCAPILandingPage, OGCAPICollection} from './ogc-api-
|
|
7
|
+
import type {OGCAPILandingPage, OGCAPICollection} from './ogc-api-loaders';
|
|
8
8
|
|
|
9
9
|
/** Options for an OGC API EDR source. */
|
|
10
|
-
export type
|
|
10
|
+
export type OGCAPIEDRLoaderOptions = DataSourceOptions & {
|
|
11
11
|
/** EDR request defaults. */
|
|
12
12
|
'ogc-api-edr'?: {collectionId?: string; parameters?: Record<string, string>};
|
|
13
13
|
};
|
|
@@ -39,10 +39,10 @@ export type OGCAPIEDRQueryParameters = {
|
|
|
39
39
|
};
|
|
40
40
|
|
|
41
41
|
/** Minimal OGC API EDR source for discovery and spatiotemporal queries. */
|
|
42
|
-
export class OGCAPIEDRSource extends DataSource<string,
|
|
42
|
+
export class OGCAPIEDRSource extends DataSource<string, OGCAPIEDRLoaderOptions> {
|
|
43
43
|
/** Creates an EDR source. */
|
|
44
|
-
constructor(url: string, options:
|
|
45
|
-
super(url.replace(/\/$/, ''), options,
|
|
44
|
+
constructor(url: string, options: OGCAPIEDRLoaderOptions = {}, coreApi?: CoreAPI) {
|
|
45
|
+
super(url.replace(/\/$/, ''), options, OGCAPIEDRLoader.defaultOptions, coreApi);
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
/** Returns the EDR landing page. */
|
|
@@ -98,7 +98,7 @@ export class OGCAPIEDRSource extends DataSource<string, OGCAPIEDRSourceOptions>
|
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
/** Source loader for OGC API EDR services. */
|
|
101
|
-
export const
|
|
101
|
+
export const OGCAPIEDRLoader = {
|
|
102
102
|
dataType: null as unknown as OGCAPIEDRSource,
|
|
103
103
|
batchType: null as never,
|
|
104
104
|
name: 'OGC API EDR',
|
|
@@ -116,7 +116,7 @@ export const OGCAPIEDRSourceLoader = {
|
|
|
116
116
|
/(?:\/edr(?:\/|$)|ogc[/-]?api[/-]?edr|\/collections\/[^/]+\/(?:position|radius|area|cube|trajectory|corridor|locations)(?:\/|$))/i.test(
|
|
117
117
|
url
|
|
118
118
|
),
|
|
119
|
-
|
|
119
|
+
createDataSourceSync: (url: string, options: OGCAPIEDRLoaderOptions = {}, coreApi?: CoreAPI) =>
|
|
120
120
|
new OGCAPIEDRSource(url, options, coreApi)
|
|
121
121
|
} as const satisfies SourceLoader<OGCAPIEDRSource>;
|
|
122
122
|
|
|
@@ -39,7 +39,7 @@ import {
|
|
|
39
39
|
} from './feature-pagination';
|
|
40
40
|
|
|
41
41
|
/** Options shared by the minimal OGC API source adapters. */
|
|
42
|
-
export type
|
|
42
|
+
export type OGCAPILoaderOptions = DataSourceOptions & {
|
|
43
43
|
/** Optional collection identifier for an OGC API Features source. */
|
|
44
44
|
'ogc-api'?: {
|
|
45
45
|
/** Collection to query. */
|
|
@@ -114,12 +114,12 @@ export type OGCAPILandingPage = {
|
|
|
114
114
|
|
|
115
115
|
/** Minimal OGC API Features source. */
|
|
116
116
|
export class OGCAPIFeaturesSource
|
|
117
|
-
extends DataSource<string,
|
|
117
|
+
extends DataSource<string, OGCAPILoaderOptions>
|
|
118
118
|
implements VectorSource
|
|
119
119
|
{
|
|
120
120
|
/** Creates an OGC API Features source. */
|
|
121
|
-
constructor(url: string, options:
|
|
122
|
-
super(url.replace(/\/$/, ''), options,
|
|
121
|
+
constructor(url: string, options: OGCAPILoaderOptions = {}, coreApi?: CoreAPI) {
|
|
122
|
+
super(url.replace(/\/$/, ''), options, OGCAPIFeaturesLoader.defaultOptions, coreApi);
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
/** Returns the landing page metadata. */
|
|
@@ -265,7 +265,7 @@ export class OGCAPIFeaturesSource
|
|
|
265
265
|
}
|
|
266
266
|
|
|
267
267
|
/** Source loader for minimal OGC API Features support. */
|
|
268
|
-
export const
|
|
268
|
+
export const OGCAPIFeaturesLoader = {
|
|
269
269
|
dataType: null as unknown as OGCAPIFeaturesSource,
|
|
270
270
|
batchType: null as never,
|
|
271
271
|
name: 'OGC API Features',
|
|
@@ -280,13 +280,13 @@ export const OGCAPIFeaturesSourceLoader = {
|
|
|
280
280
|
options: {'ogc-api': {}},
|
|
281
281
|
defaultOptions: {'ogc-api': {}},
|
|
282
282
|
testURL: (url: string): boolean => /\/collections(?:\/|$)|ogc[/-]?api[/-]features/i.test(url),
|
|
283
|
-
|
|
283
|
+
createDataSourceSync: (url: string, options: OGCAPILoaderOptions = {}, coreApi?: CoreAPI) =>
|
|
284
284
|
new OGCAPIFeaturesSource(url, options, coreApi)
|
|
285
285
|
} as const satisfies SourceLoader<OGCAPIFeaturesSource>;
|
|
286
286
|
|
|
287
287
|
/** Minimal OGC API Tiles source that follows a discovered tile template. */
|
|
288
288
|
export class OGCAPITilesSource
|
|
289
|
-
extends DataSource<string,
|
|
289
|
+
extends DataSource<string, OGCAPILoaderOptions>
|
|
290
290
|
implements TileSource
|
|
291
291
|
{
|
|
292
292
|
/** Converted tile matrix set and the options it was loaded or discovered with. */
|
|
@@ -306,13 +306,13 @@ export class OGCAPITilesSource
|
|
|
306
306
|
} | null = null;
|
|
307
307
|
|
|
308
308
|
/** Creates an OGC API Tiles source. */
|
|
309
|
-
constructor(url: string, options:
|
|
310
|
-
super(url.replace(/\/$/, ''), options,
|
|
309
|
+
constructor(url: string, options: OGCAPILoaderOptions = {}, coreApi?: CoreAPI) {
|
|
310
|
+
super(url.replace(/\/$/, ''), options, OGCAPITilesLoader.defaultOptions, coreApi);
|
|
311
311
|
validateMetersPerUnit(options['ogc-api']?.metersPerUnit, 'OGC API Tiles');
|
|
312
312
|
}
|
|
313
313
|
|
|
314
314
|
/** Updates options. A new `tileMatrixSet` document replaces the old one instead of merging. */
|
|
315
|
-
override setProps(options:
|
|
315
|
+
override setProps(options: OGCAPILoaderOptions): void {
|
|
316
316
|
super.setProps(options);
|
|
317
317
|
const ogcAPIOptions = options['ogc-api'];
|
|
318
318
|
if (ogcAPIOptions && 'tileMatrixSet' in ogcAPIOptions) {
|
|
@@ -577,7 +577,7 @@ export class OGCAPITilesSource
|
|
|
577
577
|
}
|
|
578
578
|
|
|
579
579
|
/** Source loader for minimal OGC API Tiles support. */
|
|
580
|
-
export const
|
|
580
|
+
export const OGCAPITilesLoader = {
|
|
581
581
|
dataType: null as unknown as OGCAPITilesSource,
|
|
582
582
|
batchType: null as never,
|
|
583
583
|
name: 'OGC API Tiles',
|
|
@@ -592,7 +592,7 @@ export const OGCAPITilesSourceLoader = {
|
|
|
592
592
|
options: {},
|
|
593
593
|
defaultOptions: {},
|
|
594
594
|
testURL: (url: string): boolean => /\/tiles(?:\/|$)|ogc[/-]?api[/-]tiles/i.test(url),
|
|
595
|
-
|
|
595
|
+
createDataSourceSync: (url: string, options: OGCAPILoaderOptions = {}, coreApi?: CoreAPI) =>
|
|
596
596
|
new OGCAPITilesSource(url, options, coreApi)
|
|
597
597
|
} as const satisfies SourceLoader<OGCAPITilesSource>;
|
|
598
598
|
|
|
@@ -11,14 +11,14 @@ import type {
|
|
|
11
11
|
SourceLoader
|
|
12
12
|
} from '@loaders.gl/core/loader-utils';
|
|
13
13
|
import {createAuthenticatedFetch, redactCredentialURL} from '@loaders.gl/core/loader-utils';
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
20
|
-
import {
|
|
21
|
-
import {
|
|
14
|
+
import {CSWLoader} from './csw-loader';
|
|
15
|
+
import {WMSLoader} from './wms-loader';
|
|
16
|
+
import {WMTSLoader} from './wmts-loader';
|
|
17
|
+
import {WFSLoader} from './wfs-loader';
|
|
18
|
+
import {OGCAPIEDRLoader} from './ogc-api-edr-loader';
|
|
19
|
+
import {OGCAPICoveragesLoader} from './ogc-api-coverages-loader';
|
|
20
|
+
import {OGCAPIFeaturesLoader, OGCAPITilesLoader} from './ogc-api-loaders';
|
|
21
|
+
import {WCSCoverageLoader} from './wcs-coverage-loader';
|
|
22
22
|
|
|
23
23
|
/** A source loader that can be selected by the universal service runtime. */
|
|
24
24
|
export type ServiceSourceLoader = SourceLoader;
|
|
@@ -81,15 +81,15 @@ export class ServiceRequestError extends Error {
|
|
|
81
81
|
|
|
82
82
|
/** Default source set spanning the OGC service families implemented by WMS. */
|
|
83
83
|
export const DEFAULT_SERVICE_LOADERS: readonly ServiceSourceLoader[] = [
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
84
|
+
WMTSLoader,
|
|
85
|
+
WMSLoader,
|
|
86
|
+
WFSLoader,
|
|
87
|
+
WCSCoverageLoader,
|
|
88
|
+
OGCAPITilesLoader,
|
|
89
|
+
OGCAPICoveragesLoader,
|
|
90
|
+
OGCAPIEDRLoader,
|
|
91
|
+
OGCAPIFeaturesLoader,
|
|
92
|
+
CSWLoader
|
|
93
93
|
];
|
|
94
94
|
|
|
95
95
|
type CachedSource = {source: DataSource<unknown, DataSourceOptions>; expires: number};
|
|
@@ -121,7 +121,7 @@ export class ServiceRuntime {
|
|
|
121
121
|
const loader = this.options.loaders.find(candidate => candidate.testURL(url));
|
|
122
122
|
if (!loader) throw new Error(`No geospatial service loader recognized URL: ${url}`);
|
|
123
123
|
const sourceOptions = this._getSourceOptions(options);
|
|
124
|
-
const source = loader.
|
|
124
|
+
const source = loader.createDataSourceSync(url, sourceOptions, this.options.coreApi);
|
|
125
125
|
this._sources.set(url, {source, expires: Date.now() + this.options.cacheTTL});
|
|
126
126
|
return source;
|
|
127
127
|
}
|