@loaders.gl/wms 4.0.0-alpha.6 → 4.0.0-alpha.8
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/dist/dist.min.js +39 -6
- package/dist/es5/csw-capabilities-loader.js +1 -1
- package/dist/es5/csw-domain-loader.js +1 -1
- package/dist/es5/csw-records-loader.js +1 -1
- package/dist/es5/gml-loader.js +1 -1
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lerc-loader.js +1 -1
- package/dist/es5/lib/parsers/wms/parse-wms-capabilities.js +41 -5
- package/dist/es5/lib/parsers/wms/parse-wms-capabilities.js.map +1 -1
- package/dist/es5/lib/parsers/wms/parse-wms-layer-description.js.map +1 -1
- package/dist/es5/lib/services/ogc/csw-service.js.map +1 -1
- package/dist/es5/lib/services/ogc/wms-service.js +7 -2
- package/dist/es5/lib/services/ogc/wms-service.js.map +1 -1
- package/dist/es5/lib/sources/image-source.js.map +1 -1
- package/dist/es5/wip/wcs-capabilities-loader.js +1 -1
- package/dist/es5/wip/wfs-capabilities-loader.js +1 -1
- package/dist/es5/wip/wms-feature-info-loader.js.map +1 -1
- package/dist/es5/wip/wms-layer-description-loader.js.map +1 -1
- package/dist/es5/wip/wmts-capabilities-loader.js +1 -1
- package/dist/es5/wip/wmts-capabilities-loader.js.map +1 -1
- package/dist/es5/wms-capabilities-loader.js +1 -1
- package/dist/es5/wms-capabilities-loader.js.map +1 -1
- package/dist/es5/wms-error-loader.js +1 -1
- package/dist/esm/csw-capabilities-loader.js +1 -1
- package/dist/esm/csw-domain-loader.js +1 -1
- package/dist/esm/csw-records-loader.js +1 -1
- package/dist/esm/gml-loader.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lerc-loader.js +1 -1
- package/dist/esm/lib/parsers/wms/parse-wms-capabilities.js +41 -5
- package/dist/esm/lib/parsers/wms/parse-wms-capabilities.js.map +1 -1
- package/dist/esm/lib/parsers/wms/parse-wms-layer-description.js.map +1 -1
- package/dist/esm/lib/services/ogc/csw-service.js.map +1 -1
- package/dist/esm/lib/services/ogc/wms-service.js +6 -1
- package/dist/esm/lib/services/ogc/wms-service.js.map +1 -1
- package/dist/esm/lib/sources/image-source.js.map +1 -1
- package/dist/esm/wip/wcs-capabilities-loader.js +1 -1
- package/dist/esm/wip/wfs-capabilities-loader.js +1 -1
- package/dist/esm/wip/wms-feature-info-loader.js.map +1 -1
- package/dist/esm/wip/wms-layer-description-loader.js.map +1 -1
- package/dist/esm/wip/wmts-capabilities-loader.js +1 -1
- package/dist/esm/wip/wmts-capabilities-loader.js.map +1 -1
- package/dist/esm/wms-capabilities-loader.js +1 -1
- package/dist/esm/wms-capabilities-loader.js.map +1 -1
- package/dist/esm/wms-error-loader.js +1 -1
- package/dist/index.d.ts +5 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +0 -4
- package/dist/lib/parsers/wms/parse-wms-capabilities.d.ts +26 -2
- package/dist/lib/parsers/wms/parse-wms-capabilities.d.ts.map +1 -1
- package/dist/lib/parsers/wms/parse-wms-capabilities.js +40 -6
- package/dist/lib/parsers/wms/parse-wms-layer-description.d.ts +2 -1
- package/dist/lib/parsers/wms/parse-wms-layer-description.d.ts.map +1 -1
- package/dist/lib/services/ogc/csw-service.d.ts +5 -3
- package/dist/lib/services/ogc/csw-service.d.ts.map +1 -1
- package/dist/lib/services/ogc/csw-service.js +1 -2
- package/dist/lib/services/ogc/wms-service.d.ts +31 -6
- package/dist/lib/services/ogc/wms-service.d.ts.map +1 -1
- package/dist/lib/services/ogc/wms-service.js +6 -1
- package/dist/lib/sources/image-source.d.ts +13 -4
- package/dist/lib/sources/image-source.d.ts.map +1 -1
- package/dist/wip/wms-feature-info-loader.d.ts +3 -3
- package/dist/wip/wms-feature-info-loader.d.ts.map +1 -1
- package/dist/wip/wms-layer-description-loader.d.ts +3 -3
- package/dist/wip/wms-layer-description-loader.d.ts.map +1 -1
- package/dist/wip/wmts-capabilities-loader.d.ts +3 -2
- package/dist/wip/wmts-capabilities-loader.d.ts.map +1 -1
- package/dist/wip/wmts-capabilities-loader.js +1 -1
- package/dist/wms-capabilities-loader.d.ts +11 -7
- package/dist/wms-capabilities-loader.d.ts.map +1 -1
- package/dist/wms-capabilities-loader.js +6 -2
- package/package.json +6 -6
- package/src/index.ts +11 -4
- package/src/lib/parsers/wms/parse-wms-capabilities.ts +74 -9
- package/src/lib/parsers/wms/parse-wms-layer-description.ts +5 -1
- package/src/lib/services/ogc/csw-service.ts +12 -4
- package/src/lib/services/ogc/wms-service.ts +16 -3
- package/src/lib/sources/image-source.ts +16 -4
- package/src/wip/wms-feature-info-loader.ts +4 -3
- package/src/wip/wms-layer-description-loader.ts +3 -3
- package/src/wip/wmts-capabilities-loader.ts +3 -2
- package/src/wms-capabilities-loader.ts +22 -9
|
@@ -51,6 +51,8 @@ export type WMSLayer = {
|
|
|
51
51
|
crs?: string[];
|
|
52
52
|
/** Bounding boxes in specific CRS:es */
|
|
53
53
|
boundingBoxes?: WMSBoundingBox[];
|
|
54
|
+
/** any extra dimension such as time */
|
|
55
|
+
dimensions?: WMSDimension[];
|
|
54
56
|
/** Whether queries can be performed on the layer */
|
|
55
57
|
queryable?: boolean;
|
|
56
58
|
/** `false` if layer has significant no-data areas that the client can display as transparent. */
|
|
@@ -76,6 +78,28 @@ export type WMSBoundingBox = {
|
|
|
76
78
|
/** Spatial vertical resolution of data in same units as bounding box */
|
|
77
79
|
yResolution?: number;
|
|
78
80
|
};
|
|
81
|
+
/**
|
|
82
|
+
* An optional dimension that can be queried using the `name=...` parameter
|
|
83
|
+
* Note that layers that have at least one dimension without `default` value
|
|
84
|
+
* become unrenderable unless the dimension value is supplied to GetMap requests.
|
|
85
|
+
*/
|
|
86
|
+
export type WMSDimension = {
|
|
87
|
+
/** name of dimension, becomes a valid parameter key for this layer */
|
|
88
|
+
name: string;
|
|
89
|
+
/** Textual units for this dimensional axis */
|
|
90
|
+
units: string;
|
|
91
|
+
/** Unit symbol for this dimensional axis */
|
|
92
|
+
unitSymbol?: string;
|
|
93
|
+
/** Default value if no value is supplied. If dimension lacks defaultValue, requests fail if no value is supplied */
|
|
94
|
+
defaultValue?: string;
|
|
95
|
+
/** Can multiple values of the dimension be requested? */
|
|
96
|
+
multipleValues?: boolean;
|
|
97
|
+
nearestValue?: boolean;
|
|
98
|
+
/** A special value "current" is supported, typically for time dimension */
|
|
99
|
+
current?: boolean;
|
|
100
|
+
/** Text content indicating available values for dimension */
|
|
101
|
+
extent: string;
|
|
102
|
+
};
|
|
79
103
|
/** Metadata about a supported WMS request */
|
|
80
104
|
export type WMSRequest = {
|
|
81
105
|
/** MIMEtypes that can be returned by this request. */
|
|
@@ -85,7 +109,7 @@ export type WMSExceptions = {
|
|
|
85
109
|
/** MIME types for exception response payloads. */
|
|
86
110
|
mimeTypes: string[];
|
|
87
111
|
};
|
|
88
|
-
export type
|
|
112
|
+
export type ParseWMSCapabilitiesOptions = {
|
|
89
113
|
/** Add inherited layer information to sub layers */
|
|
90
114
|
inheritedLayerProps?: boolean;
|
|
91
115
|
/** Include the "raw" JSON (parsed but untyped, unprocessed XML). May contain additional fields */
|
|
@@ -99,5 +123,5 @@ export type parseWMSCapabilitiesOptions = {
|
|
|
99
123
|
* Parses a typed data structure from raw XML for `GetCapabilities` response
|
|
100
124
|
* @note Error handlings is fairly weak
|
|
101
125
|
*/
|
|
102
|
-
export declare function parseWMSCapabilities(xmlText: string, options?:
|
|
126
|
+
export declare function parseWMSCapabilities(xmlText: string, options?: ParseWMSCapabilitiesOptions): WMSCapabilities;
|
|
103
127
|
//# sourceMappingURL=parse-wms-capabilities.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-wms-capabilities.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/wms/parse-wms-capabilities.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"parse-wms-capabilities.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/wms/parse-wms-capabilities.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,8 +89,8 @@ function extractLayer(xmlLayer) {
|
|
|
89
89
|
// All layers must have a title
|
|
90
90
|
title: String(xmlLayer?.Title || ''),
|
|
91
91
|
// Name is required only if renderable
|
|
92
|
-
name: String(xmlLayer?.Name),
|
|
93
|
-
abstract: String(xmlLayer?.Abstract),
|
|
92
|
+
name: xmlLayer?.Name && String(xmlLayer?.Name),
|
|
93
|
+
abstract: xmlLayer?.Name && String(xmlLayer?.Abstract),
|
|
94
94
|
keywords: (0, parse_xml_helpers_1.getXMLStringArray)(xmlLayer.KeywordList?.Keyword)
|
|
95
95
|
};
|
|
96
96
|
// WMS 1.3.0 changes SRS to CRS
|
|
@@ -114,6 +114,12 @@ function extractLayer(xmlLayer) {
|
|
|
114
114
|
if (boundingBoxes && boundingBoxes.length > 0) {
|
|
115
115
|
layer.boundingBoxes = boundingBoxes;
|
|
116
116
|
}
|
|
117
|
+
// Extract dimensions
|
|
118
|
+
const xmlDimensions = (0, parse_xml_helpers_1.getXMLArray)(xmlLayer?.Dimension);
|
|
119
|
+
const dimensions = xmlDimensions.map((xml) => extractDimension(xml));
|
|
120
|
+
if (dimensions.length) {
|
|
121
|
+
layer.dimensions = dimensions;
|
|
122
|
+
}
|
|
117
123
|
if (xmlLayer?.opaque) {
|
|
118
124
|
layer.opaque = (0, parse_xml_helpers_1.getXMLBoolean)(xmlLayer?.opaque);
|
|
119
125
|
}
|
|
@@ -180,19 +186,47 @@ function extractWMSBoundingBox(xmlBoundingBox) {
|
|
|
180
186
|
}
|
|
181
187
|
return boundingBox;
|
|
182
188
|
}
|
|
189
|
+
/**
|
|
190
|
+
* Extracts optional WMS Dimension layer field
|
|
191
|
+
* @param xmlDimension
|
|
192
|
+
* @example <Dimension name="time" units="ISO8601" default="2018-01-01" nearestValue="0">2001-01-01/2018-01-01/P1Y</Dimension>
|
|
193
|
+
* @see https://mapserver.org/ogc/wms_dimension.html
|
|
194
|
+
*/
|
|
195
|
+
function extractDimension(xmlDimension) {
|
|
196
|
+
const { name, units, value: extent } = xmlDimension;
|
|
197
|
+
const dimension = { name, units, extent };
|
|
198
|
+
if (xmlDimension.unitSymbol) {
|
|
199
|
+
dimension.unitSymbol = xmlDimension.unitSymbol;
|
|
200
|
+
}
|
|
201
|
+
if (xmlDimension.default) {
|
|
202
|
+
dimension.defaultValue = xmlDimension.default;
|
|
203
|
+
}
|
|
204
|
+
if (xmlDimension.multipleValues) {
|
|
205
|
+
dimension.multipleValues = (0, parse_xml_helpers_1.getXMLBoolean)(xmlDimension.multipleValues);
|
|
206
|
+
}
|
|
207
|
+
if (xmlDimension.nearestValue) {
|
|
208
|
+
dimension.nearestValue = (0, parse_xml_helpers_1.getXMLBoolean)(xmlDimension.nearestValue);
|
|
209
|
+
}
|
|
210
|
+
if (xmlDimension.current) {
|
|
211
|
+
dimension.current = (0, parse_xml_helpers_1.getXMLBoolean)(xmlDimension.current);
|
|
212
|
+
}
|
|
213
|
+
return dimension;
|
|
214
|
+
}
|
|
183
215
|
/** Traverse layers and inject missing props from parents */
|
|
184
216
|
// eslint-disable-next-line complexity
|
|
185
217
|
function addInheritedLayerProps(layer, parent) {
|
|
186
|
-
if (parent
|
|
218
|
+
if (parent?.geographicBoundingBox && !layer.geographicBoundingBox) {
|
|
187
219
|
layer.geographicBoundingBox = [...parent.geographicBoundingBox];
|
|
188
220
|
}
|
|
189
|
-
if (parent
|
|
221
|
+
if (parent?.crs && !layer.crs) {
|
|
190
222
|
layer.crs = [...parent.crs];
|
|
191
223
|
}
|
|
192
|
-
if (parent
|
|
224
|
+
if (parent?.boundingBoxes && !layer.boundingBoxes) {
|
|
193
225
|
layer.boundingBoxes = [...parent.boundingBoxes];
|
|
194
226
|
}
|
|
195
|
-
|
|
227
|
+
if (parent?.dimensions && !layer.dimensions) {
|
|
228
|
+
layer.dimensions = [...parent.dimensions];
|
|
229
|
+
}
|
|
196
230
|
for (const subLayer of layer.layers || []) {
|
|
197
231
|
addInheritedLayerProps(subLayer, layer);
|
|
198
232
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { XMLLoaderOptions } from '@loaders.gl/xml';
|
|
1
2
|
/** Layer description - response to a WMS `DescribeLayer` request */
|
|
2
3
|
export type WMSLayerDescription = {
|
|
3
4
|
layers: {}[];
|
|
@@ -6,5 +7,5 @@ export type WMSLayerDescription = {
|
|
|
6
7
|
* Parses a typed data structure from raw XML for `GetFeatureInfo` response
|
|
7
8
|
* @note Error handlings is fairly weak
|
|
8
9
|
*/
|
|
9
|
-
export declare function parseWMSLayerDescription(text: string, options
|
|
10
|
+
export declare function parseWMSLayerDescription(text: string, options?: XMLLoaderOptions): WMSLayerDescription;
|
|
10
11
|
//# sourceMappingURL=parse-wms-layer-description.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-wms-layer-description.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/wms/parse-wms-layer-description.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-wms-layer-description.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/wms/parse-wms-layer-description.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAGtD,qEAAqE;AACrE,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,EAAE,EAAE,CAAC;CACd,CAAC;AAEF;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,GACzB,mBAAmB,CAIrB"}
|
|
@@ -7,7 +7,7 @@ type CSWCommonParameters = {
|
|
|
7
7
|
/** In case the endpoint supports multiple services */
|
|
8
8
|
service?: 'CSW';
|
|
9
9
|
/** In case the endpoint supports multiple CSW versions */
|
|
10
|
-
version?: '1.1.1' | '2.0.0' | '2.0.1' | '3.0.0'
|
|
10
|
+
version?: '1.1.1' | '2.0.0' | '2.0.1' | '3.0.0';
|
|
11
11
|
};
|
|
12
12
|
export type CSWGetCapabilitiesParameters = CSWCommonParameters & {
|
|
13
13
|
/** Request type */
|
|
@@ -23,8 +23,11 @@ export type CSWGetDomainParameters = CSWCommonParameters & {
|
|
|
23
23
|
/** Request type */
|
|
24
24
|
request?: 'GetDomain';
|
|
25
25
|
};
|
|
26
|
+
/** Describes a service or resource exposed by the catalog */
|
|
26
27
|
export type Service = {
|
|
28
|
+
/** name of service or resource */
|
|
27
29
|
name: string;
|
|
30
|
+
/** type of service or resource */
|
|
28
31
|
type: string;
|
|
29
32
|
url: string;
|
|
30
33
|
params?: string;
|
|
@@ -34,10 +37,9 @@ export type CSWServiceProps = DataSourceProps & {
|
|
|
34
37
|
url: string;
|
|
35
38
|
};
|
|
36
39
|
/**
|
|
37
|
-
* The CSWService class
|
|
40
|
+
* The CSWService class
|
|
38
41
|
* - provides type safe methods to form URLs to a CSW service
|
|
39
42
|
* - provides type safe methods to query and parse results (and errors) from a CSW service
|
|
40
|
-
* - implements the ImageService interface
|
|
41
43
|
* @note Only the URL parameter conversion is supported. XML posts are not supported.
|
|
42
44
|
*/
|
|
43
45
|
export declare class CSWService extends DataSource<CSWServiceProps> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csw-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/ogc/csw-service.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AAErD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AAGtE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAG5D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAK1D,KAAK,mBAAmB,GAAG;IACzB,sDAAsD;IACtD,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"csw-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/ogc/csw-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,9 @@ const csw_records_loader_1 = require("../../../csw-records-loader");
|
|
|
8
8
|
const csw_domain_loader_1 = require("../../../csw-domain-loader");
|
|
9
9
|
const wms_error_loader_1 = require("../../../wms-error-loader");
|
|
10
10
|
/**
|
|
11
|
-
* The CSWService class
|
|
11
|
+
* The CSWService class
|
|
12
12
|
* - provides type safe methods to form URLs to a CSW service
|
|
13
13
|
* - provides type safe methods to query and parse results (and errors) from a CSW service
|
|
14
|
-
* - implements the ImageService interface
|
|
15
14
|
* @note Only the URL parameter conversion is supported. XML posts are not supported.
|
|
16
15
|
*/
|
|
17
16
|
class CSWService extends data_source_1.DataSource {
|
|
@@ -27,6 +27,10 @@ export type WMSParameters = {
|
|
|
27
27
|
styles?: unknown;
|
|
28
28
|
/** Any additional parameters specific to this WMSService (GetMap) */
|
|
29
29
|
transparent?: boolean;
|
|
30
|
+
/** If layer supports time dimension */
|
|
31
|
+
time?: string;
|
|
32
|
+
/** If layer supports elevation dimension */
|
|
33
|
+
elevation?: string;
|
|
30
34
|
};
|
|
31
35
|
/** Parameters for GetCapabilities */
|
|
32
36
|
export type WMSGetCapabilitiesParameters = {
|
|
@@ -43,6 +47,8 @@ export type WMSGetMapParameters = {
|
|
|
43
47
|
width: number;
|
|
44
48
|
/** pixels */
|
|
45
49
|
height: number;
|
|
50
|
+
/** requested format for the return image. can be provided in service constructor */
|
|
51
|
+
format?: 'image/png';
|
|
46
52
|
/** Layers to render - can be provided in service constructor */
|
|
47
53
|
layers?: string | string[];
|
|
48
54
|
/** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */
|
|
@@ -51,8 +57,10 @@ export type WMSGetMapParameters = {
|
|
|
51
57
|
styles?: unknown;
|
|
52
58
|
/** Don't render background when no data. can be provided in service constructor */
|
|
53
59
|
transparent?: boolean;
|
|
54
|
-
/**
|
|
55
|
-
|
|
60
|
+
/** If layer supports time dimension */
|
|
61
|
+
time?: string;
|
|
62
|
+
/** If layer supports elevation dimension */
|
|
63
|
+
elevation?: string;
|
|
56
64
|
};
|
|
57
65
|
/** GetMap parameters that are specific to the current view */
|
|
58
66
|
export type WMSGetMapViewParameters = {
|
|
@@ -171,12 +179,28 @@ export declare class WMSService extends ImageSource<WMSServiceProps> {
|
|
|
171
179
|
} | {
|
|
172
180
|
id: string;
|
|
173
181
|
name: string;
|
|
174
|
-
parse: (arrayBuffer: ArrayBuffer, options?: import("../../../wms-capabilities-loader").WMSLoaderOptions | undefined) => Promise<WMSFeatureInfo>;
|
|
175
|
-
parseTextSync: (text: string, options?: import("../../../wms-capabilities-loader").WMSLoaderOptions | undefined) => WMSFeatureInfo;
|
|
176
182
|
module: string;
|
|
177
183
|
version: any;
|
|
178
184
|
worker: boolean;
|
|
179
185
|
extensions: string[];
|
|
186
|
+
/** list of layers to query.. (GetFeatureInfo) */
|
|
187
|
+
mimeTypes: string[];
|
|
188
|
+
testText: (text: string) => boolean;
|
|
189
|
+
options: {
|
|
190
|
+
wms: {};
|
|
191
|
+
};
|
|
192
|
+
parse: (arrayBuffer: ArrayBuffer, options?: import("../../../wms-capabilities-loader").WMSCapabilitiesLoaderOptions | undefined) => Promise<WMSCapabilities>;
|
|
193
|
+
parseTextSync: (text: string, options?: import("../../../wms-capabilities-loader").WMSCapabilitiesLoaderOptions | undefined) => WMSCapabilities;
|
|
194
|
+
} | {
|
|
195
|
+
id: string;
|
|
196
|
+
name: string;
|
|
197
|
+
parse: (arrayBuffer: ArrayBuffer, options?: import("@loaders.gl/xml").XMLLoaderOptions | undefined) => Promise<WMSFeatureInfo>;
|
|
198
|
+
parseTextSync: (text: string, options?: import("@loaders.gl/xml").XMLLoaderOptions | undefined) => WMSFeatureInfo;
|
|
199
|
+
module: string;
|
|
200
|
+
version: any;
|
|
201
|
+
worker: boolean;
|
|
202
|
+
extensions: string[];
|
|
203
|
+
/** list of layers to query.. (GetFeatureInfo) */
|
|
180
204
|
mimeTypes: string[];
|
|
181
205
|
testText: (text: string) => boolean;
|
|
182
206
|
options: {
|
|
@@ -185,12 +209,13 @@ export declare class WMSService extends ImageSource<WMSServiceProps> {
|
|
|
185
209
|
} | {
|
|
186
210
|
id: string;
|
|
187
211
|
name: string;
|
|
188
|
-
parse: (arrayBuffer: ArrayBuffer, options?: import("
|
|
189
|
-
parseTextSync: (text: string, options?: import("
|
|
212
|
+
parse: (arrayBuffer: ArrayBuffer, options?: import("@loaders.gl/xml").XMLLoaderOptions | undefined) => Promise<WMSLayerDescription>;
|
|
213
|
+
parseTextSync: (text: string, options?: import("@loaders.gl/xml").XMLLoaderOptions | undefined) => WMSLayerDescription;
|
|
190
214
|
module: string;
|
|
191
215
|
version: any;
|
|
192
216
|
worker: boolean;
|
|
193
217
|
extensions: string[];
|
|
218
|
+
/** list of layers to query.. (GetFeatureInfo) */
|
|
194
219
|
mimeTypes: string[];
|
|
195
220
|
testText: (text: string) => boolean;
|
|
196
221
|
options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wms-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/ogc/wms-service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAIlD,OAAO,KAAK,EAAC,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AACxF,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAEvD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,2CAA2C,CAAC;AAMnF,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAGhE;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,iCAAiC;IACjC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAC5B,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,iDAAiD;IACjD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAExB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,uEAAuE;IACvE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,oEAAoE;IACpE,WAAW,CAAC,EAAE,YAAY,GAAG,qBAAqB,GAAG,yBAAyB,CAAC;IAC/E,kCAAkC;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qEAAqE;IACrE,WAAW,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"wms-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/ogc/wms-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,8 @@ class WMSService extends image_source_1.ImageSource {
|
|
|
44
44
|
format: 'image/png',
|
|
45
45
|
info_format: 'text/plain',
|
|
46
46
|
transparent: undefined,
|
|
47
|
+
time: undefined,
|
|
48
|
+
elevation: undefined,
|
|
47
49
|
...props.wmsParameters
|
|
48
50
|
};
|
|
49
51
|
this.vendorParameters = props.vendorParameters || {};
|
|
@@ -137,6 +139,8 @@ class WMSService extends image_source_1.ImageSource {
|
|
|
137
139
|
version: this.wmsParameters.version,
|
|
138
140
|
format: this.wmsParameters.format,
|
|
139
141
|
transparent: this.wmsParameters.transparent,
|
|
142
|
+
time: this.wmsParameters.time,
|
|
143
|
+
elevation: this.wmsParameters.elevation,
|
|
140
144
|
layers: this.wmsParameters.layers,
|
|
141
145
|
styles: this.wmsParameters.styles,
|
|
142
146
|
crs: this.wmsParameters.crs,
|
|
@@ -212,9 +216,10 @@ class WMSService extends image_source_1.ImageSource {
|
|
|
212
216
|
...vendorParameters
|
|
213
217
|
};
|
|
214
218
|
// Encode the keys
|
|
219
|
+
const IGNORE_EMPTY_KEYS = ['transparent', 'time', 'elevation'];
|
|
215
220
|
for (const [key, value] of Object.entries(allParameters)) {
|
|
216
221
|
// hack to preserve test cases. Not super clear if keys should be included when values are undefined
|
|
217
|
-
if (key
|
|
222
|
+
if (!IGNORE_EMPTY_KEYS.includes(key) || value) {
|
|
218
223
|
url += first ? '?' : '&';
|
|
219
224
|
first = false;
|
|
220
225
|
url += this._getURLParameter(key, value, wmsParameters);
|
|
@@ -4,8 +4,8 @@ import { DataSource } from './data-source';
|
|
|
4
4
|
/**
|
|
5
5
|
* Normalized capabilities of an Image service
|
|
6
6
|
* @example
|
|
7
|
-
* The WMSService will normalize the response to the WMS `GetCapabilities`
|
|
8
|
-
* into an ImageSourceMetadata.
|
|
7
|
+
* The WMSService will normalize the response to the WMS `GetCapabilities`
|
|
8
|
+
* data structure extracted from WMS XML response into an ImageSourceMetadata.
|
|
9
9
|
*/
|
|
10
10
|
export type ImageSourceMetadata = {
|
|
11
11
|
name: string;
|
|
@@ -14,13 +14,22 @@ export type ImageSourceMetadata = {
|
|
|
14
14
|
keywords: string[];
|
|
15
15
|
layers: ImageSourceLayer[];
|
|
16
16
|
};
|
|
17
|
+
/** Description of one data layer in the image source */
|
|
17
18
|
export type ImageSourceLayer = {
|
|
19
|
+
/** Name of this layer */
|
|
18
20
|
name?: string;
|
|
21
|
+
/** Human readable title of this layer */
|
|
19
22
|
title?: string;
|
|
23
|
+
/** Coordinate systems supported by this layer */
|
|
20
24
|
crs?: string[];
|
|
21
|
-
|
|
25
|
+
/** layer limits in unspecified CRS:84-like lng/lat, for quick access w/o CRS calculations. */
|
|
26
|
+
geographicBoundingBox?: [min: [x: number, y: number], max: [x: number, y: number]];
|
|
27
|
+
/** Sub layers of this layer */
|
|
22
28
|
layers?: ImageSourceLayer[];
|
|
29
|
+
/** @deprecated from v3.4: non-vis.gl style bounding box. Use `.geographicBoundingBox` instead */
|
|
30
|
+
boundingBox?: [number, number, number, number];
|
|
23
31
|
};
|
|
32
|
+
/** Generic parameters for requesting an image from an image source */
|
|
24
33
|
export type GetImageParameters = {
|
|
25
34
|
/** Layers to render */
|
|
26
35
|
layers: string | string[];
|
|
@@ -63,7 +72,7 @@ export type ImageSourceProps = DataSourceProps;
|
|
|
63
72
|
* @note
|
|
64
73
|
* - If geospatial, bounding box is expected to be in web mercator coordinates
|
|
65
74
|
*/
|
|
66
|
-
export declare abstract class ImageSource<PropsT extends ImageSourceProps> extends DataSource<PropsT> {
|
|
75
|
+
export declare abstract class ImageSource<PropsT extends ImageSourceProps = ImageSourceProps> extends DataSource<PropsT> {
|
|
67
76
|
abstract getMetadata(): Promise<ImageSourceMetadata>;
|
|
68
77
|
abstract getImage(parameters: GetImageParameters): Promise<ImageType>;
|
|
69
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/image-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,
|
|
1
|
+
{"version":3,"file":"image-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/image-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAEF,wDAAwD;AACxD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,8FAA8F;IAC9F,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACnF,+BAA+B;IAC/B,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAE5B,iGAAiG;IACjG,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAChD,CAAC;AAEF,sEAAsE;AACtE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8CAA8C;IAC9C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAGF,MAAM,MAAM,YAAY,GAAG;IACzB,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,8CAA8C;IAC9C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAE/C;;;;GAIG;AACH,8BAAsB,WAAW,CAC/B,MAAM,SAAS,gBAAgB,GAAG,gBAAgB,CAClD,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IACpD,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;CACtE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { LoaderWithParser } from '@loaders.gl/loader-utils';
|
|
2
|
-
import {
|
|
2
|
+
import type { XMLLoaderOptions } from '@loaders.gl/xml';
|
|
3
3
|
import type { WMSFeatureInfo } from '../lib/parsers/wms/parse-wms-features';
|
|
4
4
|
export { WMSFeatureInfo };
|
|
5
5
|
/**
|
|
@@ -8,8 +8,8 @@ export { WMSFeatureInfo };
|
|
|
8
8
|
export declare const WMSFeatureInfoLoader: {
|
|
9
9
|
id: string;
|
|
10
10
|
name: string;
|
|
11
|
-
parse: (arrayBuffer: ArrayBuffer, options?:
|
|
12
|
-
parseTextSync: (text: string, options?:
|
|
11
|
+
parse: (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) => Promise<WMSFeatureInfo>;
|
|
12
|
+
parseTextSync: (text: string, options?: XMLLoaderOptions) => WMSFeatureInfo;
|
|
13
13
|
module: string;
|
|
14
14
|
version: any;
|
|
15
15
|
worker: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wms-feature-info-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wms-feature-info-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"wms-feature-info-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wms-feature-info-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AAG1E,OAAO,EAAC,cAAc,EAAC,CAAC;AAExB;;GAEG;AACH,eAAO,MAAM,oBAAoB;;;yBAMJ,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;;;;;;;;;;CACzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,gBAAuC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { LoaderWithParser } from '@loaders.gl/loader-utils';
|
|
2
|
-
import type {
|
|
2
|
+
import type { XMLLoaderOptions } from '@loaders.gl/xml';
|
|
3
3
|
import type { WMSLayerDescription } from '../lib/parsers/wms/parse-wms-layer-description';
|
|
4
4
|
export { WMSLayerDescription };
|
|
5
5
|
/**
|
|
@@ -8,8 +8,8 @@ export { WMSLayerDescription };
|
|
|
8
8
|
export declare const WMSLayerDescriptionLoader: {
|
|
9
9
|
id: string;
|
|
10
10
|
name: string;
|
|
11
|
-
parse: (arrayBuffer: ArrayBuffer, options?:
|
|
12
|
-
parseTextSync: (text: string, options?:
|
|
11
|
+
parse: (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) => Promise<WMSLayerDescription>;
|
|
12
|
+
parseTextSync: (text: string, options?: XMLLoaderOptions) => WMSLayerDescription;
|
|
13
13
|
module: string;
|
|
14
14
|
version: any;
|
|
15
15
|
worker: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wms-layer-description-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wms-layer-description-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"wms-layer-description-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wms-layer-description-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,gDAAgD,CAAC;AAGxF,OAAO,EAAC,mBAAmB,EAAC,CAAC;AAE7B;;GAEG;AACH,eAAO,MAAM,yBAAyB;;;yBAMT,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;;;;;;;;;;CACzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,gBAA4C,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type { LoaderWithParser
|
|
2
|
-
|
|
1
|
+
import type { LoaderWithParser } from '@loaders.gl/loader-utils';
|
|
2
|
+
import type { XMLLoaderOptions } from '@loaders.gl/xml';
|
|
3
|
+
export type WMTSLoaderOptions = XMLLoaderOptions & {
|
|
3
4
|
wmts?: {};
|
|
4
5
|
};
|
|
5
6
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wmts-capabilities-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wmts-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"wmts-capabilities-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wmts-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAUtD,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAAG;IACjD,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;yBAaN,WAAW,YAAY,iBAAiB;0BAE7C,MAAM,YAAY,iBAAiB;CAC1D,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,gCAAgC,EAAE,gBAAyC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// loaders.gl, MIT license
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports._typecheckWMTSCapabilitiesLoader = exports.WMTSCapabilitiesLoader = void 0;
|
|
5
|
-
// import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities
|
|
5
|
+
// import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
|
|
6
6
|
const parse_wmts_capabilities_1 = require("./lib/wmts/parse-wmts-capabilities");
|
|
7
7
|
// __VERSION__ is injected by babel-plugin-version-inline
|
|
8
8
|
// @ts-ignore TS2304: Cannot find name '__VERSION__'.
|
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import type { LoaderWithParser
|
|
2
|
-
import type {
|
|
3
|
-
export type { WMSCapabilities };
|
|
4
|
-
export type
|
|
1
|
+
import type { LoaderWithParser } from '@loaders.gl/loader-utils';
|
|
2
|
+
import type { XMLLoaderOptions } from '@loaders.gl/xml';
|
|
3
|
+
export type { WMSCapabilities, WMSLayer, WMSBoundingBox, WMSDimension, WMSRequest, WMSExceptions } from './lib/parsers/wms/parse-wms-capabilities';
|
|
4
|
+
export type WMSCapabilitiesLoaderOptions = XMLLoaderOptions & {
|
|
5
5
|
wms?: {
|
|
6
6
|
/** Add inherited layer information to sub layers */
|
|
7
7
|
inheritedLayerProps?: boolean;
|
|
8
|
-
/**
|
|
8
|
+
/** Include the "raw" JSON (parsed but untyped, unprocessed XML). May contain additional fields */
|
|
9
|
+
includeRawData?: boolean;
|
|
10
|
+
/** Include the original XML document text. May contain additional information. */
|
|
11
|
+
includeXMLText?: boolean;
|
|
12
|
+
/** @deprecated Use options.includeRawData` */
|
|
9
13
|
raw?: boolean;
|
|
10
14
|
};
|
|
11
15
|
};
|
|
@@ -24,8 +28,8 @@ export declare const WMSCapabilitiesLoader: {
|
|
|
24
28
|
options: {
|
|
25
29
|
wms: {};
|
|
26
30
|
};
|
|
27
|
-
parse: (arrayBuffer: ArrayBuffer, options?:
|
|
28
|
-
parseTextSync: (text: string, options?:
|
|
31
|
+
parse: (arrayBuffer: ArrayBuffer, options?: WMSCapabilitiesLoaderOptions) => Promise<import("./lib/parsers/wms/parse-wms-capabilities").WMSCapabilities>;
|
|
32
|
+
parseTextSync: (text: string, options?: WMSCapabilitiesLoaderOptions) => import("./lib/parsers/wms/parse-wms-capabilities").WMSCapabilities;
|
|
29
33
|
};
|
|
30
34
|
declare function testXMLFile(text: string): boolean;
|
|
31
35
|
export declare const _typecheckWMSCapabilitiesLoader: LoaderWithParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wms-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/wms-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"wms-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/wms-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAQtD,YAAY,EACV,eAAe,EACf,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,aAAa,EACd,MAAM,0CAA0C,CAAC;AAElD,MAAM,MAAM,4BAA4B,GAAG,gBAAgB,GAAG;IAC5D,GAAG,CAAC,EAAE;QACJ,oDAAoD;QACpD,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,kGAAkG;QAClG,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,kFAAkF;QAClF,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,8CAA8C;QAC9C,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;yBAaL,WAAW,YAAY,4BAA4B;0BAGxD,MAAM,YAAY,4BAA4B;CAGrE,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,+BAA+B,EAAE,gBAAwC,CAAC"}
|
|
@@ -21,8 +21,12 @@ exports.WMSCapabilitiesLoader = {
|
|
|
21
21
|
options: {
|
|
22
22
|
wms: {}
|
|
23
23
|
},
|
|
24
|
-
parse: async (arrayBuffer, options) =>
|
|
25
|
-
|
|
24
|
+
parse: async (arrayBuffer, options) =>
|
|
25
|
+
// TODO pass in XML options
|
|
26
|
+
(0, parse_wms_capabilities_1.parseWMSCapabilities)(new TextDecoder().decode(arrayBuffer), options?.wms),
|
|
27
|
+
parseTextSync: (text, options) =>
|
|
28
|
+
// TODO pass in XML options
|
|
29
|
+
(0, parse_wms_capabilities_1.parseWMSCapabilities)(text, options?.wms)
|
|
26
30
|
};
|
|
27
31
|
function testXMLFile(text) {
|
|
28
32
|
// TODO - There could be space first.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/wms",
|
|
3
|
-
"version": "4.0.0-alpha.
|
|
3
|
+
"version": "4.0.0-alpha.8",
|
|
4
4
|
"description": "Framework-independent loaders for the WMS (Web Map Service) standard",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -39,10 +39,10 @@
|
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"@babel/runtime": "^7.3.1",
|
|
42
|
-
"@loaders.gl/images": "4.0.0-alpha.
|
|
43
|
-
"@loaders.gl/loader-utils": "4.0.0-alpha.
|
|
44
|
-
"@loaders.gl/schema": "4.0.0-alpha.
|
|
45
|
-
"@loaders.gl/xml": "4.0.0-alpha.
|
|
42
|
+
"@loaders.gl/images": "4.0.0-alpha.8",
|
|
43
|
+
"@loaders.gl/loader-utils": "4.0.0-alpha.8",
|
|
44
|
+
"@loaders.gl/schema": "4.0.0-alpha.8",
|
|
45
|
+
"@loaders.gl/xml": "4.0.0-alpha.8",
|
|
46
46
|
"@turf/rewind": "^5.1.5",
|
|
47
47
|
"deep-strict-equal": "^0.2.0",
|
|
48
48
|
"lerc": "^4.0.1"
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"xmldom": "0.6.0"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "c35d6640c8d26deab99e277a8e698b5174233789"
|
|
54
54
|
}
|
package/src/index.ts
CHANGED
|
@@ -17,9 +17,13 @@ export {CSWRecordsLoader} from './csw-records-loader';
|
|
|
17
17
|
|
|
18
18
|
export {WMSErrorLoader} from './wms-error-loader';
|
|
19
19
|
|
|
20
|
-
export type {
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
export type {
|
|
21
|
+
WMSCapabilities,
|
|
22
|
+
WMSLayer,
|
|
23
|
+
WMSBoundingBox,
|
|
24
|
+
WMSDimension
|
|
25
|
+
} from './wms-capabilities-loader';
|
|
26
|
+
export type {WMSCapabilitiesLoaderOptions} from './wms-capabilities-loader';
|
|
23
27
|
export {WMSCapabilitiesLoader} from './wms-capabilities-loader';
|
|
24
28
|
|
|
25
29
|
export type {WMSFeatureInfo as _WMSFeatureInfo} from './wip/wms-feature-info-loader';
|
|
@@ -49,8 +53,8 @@ export {GMLLoader as _GMLLoader} from './gml-loader';
|
|
|
49
53
|
|
|
50
54
|
// EXPERIMENTAL: DATA SOURCES
|
|
51
55
|
|
|
52
|
-
export type {ImageSourceMetadata} from './lib/sources/image-source';
|
|
53
56
|
export type {ImageType} from '@loaders.gl/images';
|
|
57
|
+
export type {ImageSourceProps, ImageSourceMetadata} from './lib/sources/image-source';
|
|
54
58
|
export {ImageSource} from './lib/sources/image-source';
|
|
55
59
|
|
|
56
60
|
export type {ImageServiceType} from './lib/create-image-source';
|
|
@@ -75,3 +79,6 @@ export {ArcGISImageServer as _ArcGISImageServer} from './lib/services/arcgis/arc
|
|
|
75
79
|
// TODO - restore once esbuild bundling issues have been resolved
|
|
76
80
|
// export type {LERCData} from './lib/lerc/lerc-types';
|
|
77
81
|
// export {LERCLoader} from './lerc-loader';
|
|
82
|
+
|
|
83
|
+
/** @deprecated Use WMSCapabilitiesLoaderOptions */
|
|
84
|
+
export type {WMSCapabilitiesLoaderOptions as WMSLoaderOptions} from './wms-capabilities-loader';
|