npm - @loaders.gl/wms - Versions diffs - 3.4.0-alpha.3 → 3.4.0-alpha.5 - Mend

@loaders.gl/wms 3.4.0-alpha.3 → 3.4.0-alpha.5

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.

Files changed (139) hide show

package/dist/lib/parsers/wms/parse-wms-capabilities.d.ts.map CHANGED Viewed

	@@ -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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"}

package/dist/lib/parsers/wms/parse-wms-capabilities.js CHANGED Viewed

@@ -114,6 +114,12 @@ function extractLayer(xmlLayer) {
     if (boundingBoxes && boundingBoxes.length > 0) {
         layer.boundingBoxes = boundingBoxes;
     }
+    // Extract dimensions
+    const xmlDimensions = (0, parse_xml_helpers_1.getXMLArray)(xmlLayer?.Dimension);
+    const dimensions = xmlDimensions.map((xml) => extractDimension(xml));
+    if (dimensions.length) {
+        layer.dimensions = dimensions;
+    }
     if (xmlLayer?.opaque) {
         layer.opaque = (0, parse_xml_helpers_1.getXMLBoolean)(xmlLayer?.opaque);
     }
@@ -180,7 +186,34 @@ function extractWMSBoundingBox(xmlBoundingBox) {
     }
     return boundingBox;
 }
+/**
+ * Extracts optional WMS Dimension layer field
+ * @param xmlDimension
+ * @example <Dimension name="time" units="ISO8601" default="2018-01-01" nearestValue="0">2001-01-01/2018-01-01/P1Y</Dimension>
+ * @see https://mapserver.org/ogc/wms_dimension.html
+ */
+function extractDimension(xmlDimension) {
+    const { name, units, value: extent } = xmlDimension;
+    const dimension = { name, units, extent };
+    if (xmlDimension.unitSymbol) {
+        dimension.unitSymbol = xmlDimension.unitSymbol;
+    }
+    if (xmlDimension.default) {
+        dimension.defaultValue = xmlDimension.default;
+    }
+    if (xmlDimension.multipleValues) {
+        dimension.multipleValues = (0, parse_xml_helpers_1.getXMLBoolean)(xmlDimension.multipleValues);
+    }
+    if (xmlDimension.nearestValue) {
+        dimension.nearestValue = (0, parse_xml_helpers_1.getXMLBoolean)(xmlDimension.nearestValue);
+    }
+    if (xmlDimension.current) {
+        dimension.current = (0, parse_xml_helpers_1.getXMLBoolean)(xmlDimension.current);
+    }
+    return dimension;
+}
 /** Traverse layers and inject missing props from parents */
+// eslint-disable-next-line complexity
 function addInheritedLayerProps(layer, parent) {
     if (parent && parent.geographicBoundingBox && !layer.geographicBoundingBox) {
         layer.geographicBoundingBox = [...parent.geographicBoundingBox];

package/dist/lib/services/arcgis/arcgis-image-service.d.ts CHANGED Viewed

@@ -10,10 +10,9 @@ export type ArcGISImageServerProps = ImageSourceProps & {
  * Note - exports a big API, that could be exposed here if there is a use case
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/image-service.htm
  */
-export declare class ArcGISImageServer extends ImageSource {
+export declare class ArcGISImageServer extends ImageSource<ArcGISImageServerProps> {
     static type: 'arcgis-image-server';
     static testURL: (url: string) => boolean;
-    props: ArcGISImageServerProps;
     constructor(props: ArcGISImageServerProps);
     getMetadata(): Promise<ImageSourceMetadata>;
     getImage(parameters: GetImageParameters): Promise<ImageType>;

package/dist/lib/services/arcgis/arcgis-image-service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"arcgis-image-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/arcgis/arcgis-image-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAC7C,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,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;~~IAChD~~,MAAM,CAAC,IAAI,EAAE,qBAAqB,CAAyB;IAC3D,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAA8C;~~IAErF~~,KAAK,EAAE,sBAAsB~~,CAAC~~;~~gBAElB~~,~~KAAK,EAAE,sBAAsB;IAOnC,~~WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK3C,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAQ5D,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAMlC;;;OAGG;IACH,WAAW,CAAC,OAAO,EAAE;QACnB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,CAAC;QACb,MAAM,CAAC,EAAE,QAAQ,CAAC;QAClB,SAAS,CAAC,EAAE,IAAI,CAAC;QACjB,MAAM,CAAC,EAAE,KAAK,CAAC;QACf,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;QAC5C,aAAa,CAAC,EAAE,sBAAsB,CAAC;QACvC,WAAW,CAAC,EAAE,KAAK,CAAC;QACpB,kBAAkB,CAAC,EAAE,KAAK,CAAC;QAC3B,OAAO,CAAC,EAAE,KAAK,CAAC;QAChB,UAAU,CAAC,EAAE,KAAK,CAAC;QACnB,aAAa,CAAC,EAAE,KAAK,CAAC;QACtB,CAAC,CAAC,EAAE,OAAO,CAAC;KACb,GAAG,OAAO,CAAC,SAAS,CAAC;IAOtB,WAAW,CAAC,OAAO,EAAE;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAC,GAAG,MAAM;IAIpE;;;;;;;;OAQG;IACH,cAAc,CAAC,OAAO,EAAE;QACtB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACvC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,CAAC;QACb,MAAM,CAAC,EAAE,QAAQ,CAAC;QAClB,SAAS,CAAC,EAAE,IAAI,CAAC;QACjB,MAAM,CAAC,EAAE,KAAK,CAAC;QACf,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;QAC5C,aAAa,CAAC,EAAE,sBAAsB,CAAC;QACvC,WAAW,CAAC,EAAE,KAAK,CAAC;QACpB,kBAAkB,CAAC,EAAE,KAAK,CAAC;QAC3B,OAAO,CAAC,EAAE,KAAK,CAAC;QAChB,UAAU,CAAC,EAAE,KAAK,CAAC;QACnB,aAAa,CAAC,EAAE,KAAK,CAAC;QACtB,CAAC,CAAC,EAAE,OAAO,CAAC;KACb,GAAG,MAAM;IAaV;;;SAGK;IACL,SAAS,CAAC,MAAM,CACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,MAAM;IAeT,qFAAqF;cACrE,aAAa,CAAC,QAAQ,EAAE,QAAQ;CAQjD"}
1	+ {"version":3,"file":"arcgis-image-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/arcgis/arcgis-image-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/arcgis/arcgis-image-service.js CHANGED Viewed

@@ -11,7 +11,6 @@ const image_source_1 = require("../../sources/image-source");
 class ArcGISImageServer extends image_source_1.ImageSource {
     constructor(props) {
         super(props);
-        this.props = props;
     }
     // ImageSource (normalized endpoints)
     async getMetadata() {

package/dist/lib/services/generic/image-service.d.ts CHANGED Viewed

@@ -14,11 +14,10 @@ export type ImageServiceProps = {
  * ImageSource allows template url strings to be used to ad hoc connect to arbitrary image data sources
  * Accepts a template url string and builds requests URLs
  */
-export declare class ImageService extends ImageSource {
+export declare class ImageService<PropsT extends ImageServiceProps> extends ImageSource<PropsT> {
     static type: 'template';
     static testURL: (url: string) => boolean;
-    props: ImageServiceProps;
-    constructor(props: ImageServiceProps);
+    constructor(props: PropsT);
     getMetadata(): Promise<ImageSourceMetadata>;
     getImage(parameters: GetImageParameters): Promise<ImageType>;
     /** Break up bounding box in east, north, south, west */

package/dist/lib/services/generic/image-service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"image-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/generic/image-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAGlD,OAAO,KAAK,EAAC,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAEvD,mFAAmF;AACnF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,gFAAgF;IAChF,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,~~YAAa~~,SAAQ,WAAW;~~IAC3C~~,MAAM,CAAC,IAAI,EAAE,UAAU,CAAc;IACrC,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAoC;~~IAE3E~~,KAAK,EAAE,~~iBAAiB,CAAC~~;~~gBAEb~~,~~KAAK,EAAE,iBAAiB;IAO9B,~~WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI3C,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAUlE,wDAAwD;IACxD,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAKxF,yCAAyC;IACzC,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAU1E"}
1	+ {"version":3,"file":"image-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/generic/image-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAGlD,OAAO,KAAK,EAAC,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAEvD,mFAAmF;AACnF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,gFAAgF;IAChF,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,YAAY,CAAC,MAAM,SAAS,iBAAiB,CAAE,SAAQ,WAAW,CAAC,MAAM,CAAC;IACrF,MAAM,CAAC,IAAI,EAAE,UAAU,CAAc;IACrC,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAoC;gBAE/D,KAAK,EAAE,MAAM;IAMnB,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI3C,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAUlE,wDAAwD;IACxD,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAKxF,yCAAyC;IACzC,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAU1E"}

package/dist/lib/services/generic/image-service.js CHANGED Viewed

@@ -12,7 +12,6 @@ const image_source_1 = require("../../sources/image-source");
 class ImageService extends image_source_1.ImageSource {
     constructor(props) {
         super(props);
-        this.props = props;
     }
     // IMAGE SOURCE API
     async getMetadata() {

package/dist/lib/services/ogc/csw-service.d.ts CHANGED Viewed

@@ -40,10 +40,9 @@ export type CSWServiceProps = DataSourceProps & {
  * - implements the ImageService interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export declare class CSWService extends DataSource {
+export declare class CSWService extends DataSource<CSWServiceProps> {
     static type: 'csw';
     static testURL: (url: string) => boolean;
-    props: CSWServiceProps;
     capabilities: CSWCapabilities | null;
     /** A list of loaders used by the CSWService methods */
     readonly loaders: ({

package/dist/lib/services/ogc/csw-service.d.ts.map CHANGED Viewed

	@@ -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,GAAG,OAAO,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,mBAAmB,GAAG;IAC/D,mBAAmB;IACnB,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,GAAG;IAC1D,mBAAmB;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,sBAAsB;IACtB,SAAS,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,mBAAmB,GAAG;IACzD,mBAAmB;IACnB,OAAO,CAAC,EAAE,WAAW,CAAC;CAEvB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAElG,MAAM,MAAM,eAAe,GAAG,eAAe,GAAG;IAC9C,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,UAAW,SAAQ,UAAU;~~IACxC~~,MAAM,CAAC,IAAI,EAAE,KAAK,CAAS;IAC3B,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAsC;IAE7E,~~KAAK,EAAE,eAAe,CAAC;IACvB,~~YAAY,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE5C,uDAAuD;IACvD,QAAQ,CAAC,OAAO;~~QA3ChB~~,0DAA0D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~SA2CC~~;IAE3D,0BAA0B;gBACd,KAAK,EAAE,eAAe;~~IAK5B~~,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAK7C,iBAAiB,CAAC,YAAY,EAAE,eAAe,GAAG,eAAe;IAI3D,mBAAmB,CAAC,OAAO,CAAC,EAAE;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAoCnF,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC;IAUxD,uBAAuB;IACjB,eAAe,CACnB,aAAa,CAAC,EAAE,4BAA4B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,eAAe,CAAC;IAS3B,kBAAkB;IACZ,UAAU,CACd,aAAa,CAAC,EAAE,uBAAuB,EACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,UAAU,CAAC;IAQtB,iBAAiB;IACX,SAAS,CACb,aAAa,CAAC,EAAE,sBAAsB,EACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,SAAS,CAAC;IAWrB,qDAAqD;IACrD,kBAAkB,CAChB,aAAa,CAAC,EAAE,4BAA4B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAWT,qDAAqD;IACrD,aAAa,CACX,aAAa,CAAC,EAAE,uBAAuB,EACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAYT,qDAAqD;IACrD,YAAY,CACV,aAAa,CAAC,EAAE,sBAAsB,EACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAaT;;SAEK;IACL,SAAS,CAAC,UAAU,CAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAeT,qFAAqF;IACrF,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAQ5E,+BAA+B;IAC/B,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK;CAIvD"}
1	+ {"version":3,"file":"csw-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/ogc/csw-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/ogc/csw-service.js CHANGED Viewed

@@ -21,7 +21,6 @@ class CSWService extends data_source_1.DataSource {
         this.capabilities = null;
         /** A list of loaders used by the CSWService methods */
         this.loaders = [wms_error_loader_1.WMSErrorLoader, csw_capabilities_loader_1.CSWCapabilitiesLoader];
-        this.props = props;
     }
     async getMetadata() {
         const capabilities = await this.getCapabilities();

package/dist/lib/services/ogc/wms-service.d.ts CHANGED Viewed

@@ -6,63 +6,82 @@ import type { WMSCapabilities } from '../../../wms-capabilities-loader';
 import type { WMSFeatureInfo } from '../../../wip/wms-feature-info-loader';
 import type { WMSLayerDescription } from '../../../wip/wms-layer-description-loader';
 import type { WMSLoaderOptions } from '../../../wms-error-loader';
-/** Static WMS parameters (not viewport or selected pixel dependent) that can be provided as defaults */
+/**
+ * "Static" WMS parameters (not viewport or selected pixel dependent)
+ * These can be provided as defaults in the WMSService constructor
+ */
 export type WMSParameters = {
-    /** WMS version */
+    /** WMS version (all requests) */
     version?: '1.3.0' | '1.1.1';
-    /** Layers to render */
+    /** Layers to render (GetMap, GetFeatureInfo) */
     layers?: string[];
+    /** list of layers to query.. (GetFeatureInfo) */
+    query_layers?: string[];
     /** Coordinate Reference System (CRS) for the image (not the bounding box) */
     crs?: string;
-    /** Requested format for the return image */
+    /** Requested format for the return image (GetMap, GetLegendGraphic) */
     format?: 'image/png';
-    /** Requested MIME type of returned feature info */
+    /** Requested MIME type of returned feature info (GetFeatureInfo) */
     info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';
     /** Styling - Not yet supported */
     styles?: unknown;
-    /** Any additional parameters specific to this WMSService */
+    /** Any additional parameters specific to this WMSService (GetMap) */
     transparent?: boolean;
 };
-type WMSCommonParameters = {
+/** Parameters for GetCapabilities */
+export type WMSGetCapabilitiesParameters = {
     /** In case the endpoint supports multiple WMS versions */
     version?: '1.3.0' | '1.1.1';
 };
-/** Parameters for GetCapabilities */
-export type WMSGetCapabilitiesParameters = WMSCommonParameters;
 /** Parameters for GetMap */
-export type WMSGetMapParameters = WMSCommonParameters & {
-    /** Layers to render */
-    layers: string | string[];
+export type WMSGetMapParameters = {
+    /** In case the endpoint supports multiple WMS versions */
+    version?: '1.3.0' | '1.1.1';
     /** bounding box of the requested map image */
     bbox: [number, number, number, number];
     /** pixel width of returned image */
     width: number;
     /** pixels */
     height: number;
-    /** Coordinate Reference System for the image (not the bounding box). */
+    /** Layers to render - can be provided in service constructor */
+    layers?: string | string[];
+    /** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */
     crs?: string;
-    /** Styling */
+    /** Styling. can be provided in service constructor */
     styles?: unknown;
-    /** Don't render background when no data */
+    /** Don't render background when no data. can be provided in service constructor */
     transparent?: boolean;
-    /** requested format for the return image */
+    /** requested format for the return image. can be provided in service constructor */
     format?: 'image/png';
 };
+/** GetMap parameters that are specific to the current view */
+export type WMSGetMapViewParameters = {
+    /** pixel width of returned image */
+    width: number;
+    /** pixels */
+    height: number;
+    /** bounding box of the requested map image */
+    bbox: [number, number, number, number];
+    /** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */
+    crs?: string;
+};
 /**
  * Parameters for GetFeatureInfo
  * @see https://imagery.pasda.psu.edu/arcgis/services/pasda/UrbanTreeCanopy_Landcover/MapServer/WmsServer?SERVICE=WMS&
  */
-export type WMSGetFeatureInfoParameters = WMSCommonParameters & {
+export type WMSGetFeatureInfoParameters = {
+    /** In case the endpoint supports multiple WMS versions */
+    version?: '1.3.0' | '1.1.1';
     /** x coordinate for the feature info request */
     x: number;
     /** y coordinate for the feature info request */
     y: number;
-    /** list of layers to query (could be different from rendered layers) */
-    query_layers: string[];
-    /** Requested MIME type of returned feature info */
+    /** MIME type of returned feature info. Can be specified in service constructor */
     info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';
-    /** Layers to render */
-    layers: string[];
+    /** list of layers to query. Required but can be specified in service constructor. */
+    query_layers?: string[];
+    /** Layers to render. Required, but can be specified in service constructor */
+    layers?: string[];
     /** Styling */
     styles?: unknown;
     /** bounding box of the requested map image */
@@ -72,18 +91,39 @@ export type WMSGetFeatureInfoParameters = WMSCommonParameters & {
     /** pixels */
     height: number;
     /** srs for the image (not the bounding box) */
-    srs?: string;
-    /** requested format for the return image */
-    format?: 'image/png';
+    crs?: string;
+};
+/** GetMap parameters that are specific to the current view */
+export type WMSGetFeatureInfoViewParameters = {
+    /** x coordinate for the feature info request */
+    x: number;
+    /** y coordinate for the feature info request */
+    y: number;
+    /** pixel width of returned image */
+    width: number;
+    /** pixels */
+    height: number;
+    /** bounding box of the requested map image */
+    bbox: [number, number, number, number];
+    /** srs for the image (not the bounding box) */
+    crs?: string;
 };
 /** Parameters for DescribeLayer */
-export type WMSDescribeLayerParameters = WMSCommonParameters;
+export type WMSDescribeLayerParameters = {
+    /** In case the endpoint supports multiple WMS versions */
+    version?: '1.3.0' | '1.1.1';
+};
 /** Parameters for GetLegendGraphic */
-export type WMSGetLegendGraphicParameters = WMSCommonParameters;
+export type WMSGetLegendGraphicParameters = {
+    /** In case the endpoint supports multiple WMS versions */
+    version?: '1.3.0' | '1.1.1';
+};
 /** Properties for creating a enw WMS service */
 export type WMSServiceProps = ImageSourceProps & {
     /** Base URL to the service */
     url: string;
+    /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */
+    substituteCRS84?: boolean;
     /** Default WMS parameters. If not provided here, must be provided in the various request */
     wmsParameters?: WMSParameters;
     /** Any additional service specific parameters */
@@ -96,10 +136,15 @@ export type WMSServiceProps = ImageSourceProps & {
  * - implements the ImageService interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export declare class WMSService extends ImageSource {
+export declare class WMSService extends ImageSource<WMSServiceProps> {
     static type: 'wms';
     static testURL: (url: string) => boolean;
+    /** Base URL to the service */
     readonly url: string;
+    /** In WMS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */
+    substituteCRS84: boolean;
+    /** In WMS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */
+    flipCRS: string[];
     /** Default static WMS parameters */
     wmsParameters: Required<WMSParameters>;
     /** Default static vendor parameters */
@@ -121,7 +166,6 @@ export declare class WMSService extends ImageSource {
             };
         };
         parse: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions | undefined) => Promise<string>;
-        /** WMS version */
         parseSync: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions | undefined) => string;
         parseTextSync: (text: string, options?: WMSLoaderOptions | undefined) => string;
     } | {
@@ -198,15 +242,22 @@ export declare class WMSService extends ImageSource {
      * @note case _getWMSUrl may need to be overridden to handle certain backends?
      * @note at the moment, only URLs with parameters are supported (no XML payloads)
      * */
-    protected _getWMSUrl(request: string, wmsParameters: WMSCommonParameters & {
+    protected _getWMSUrl(request: string, wmsParameters: {
+        version?: '1.3.0' | '1.1.1';
         [key: string]: unknown;
     }, vendorParameters?: Record<string, unknown>): string;
-    _getParameterValue(version: string, key: string, value: unknown): string;
+    _getWMS130Parameters<ParametersT extends {
+        crs?: string;
+        srs?: string;
+    }>(wmsParameters: ParametersT): ParametersT;
+    _getURLParameter(key: string, value: unknown, wmsParameters: WMSParameters): string;
+    /** Coordinate order is flipped for certain CRS in WMS 1.3.0 */
+    _flipBoundingBox(bboxValue: unknown, wmsParameters: WMSParameters): [number, number, number, number] | null;
+    /** Fetches an array buffer and checks the response (boilerplate reduction) */
     protected _fetchArrayBuffer(url: string): Promise<ArrayBuffer>;
     /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */
     protected _checkResponse(response: Response, arrayBuffer: ArrayBuffer): void;
     /** Error situation detected */
     protected _parseError(arrayBuffer: ArrayBuffer): Error;
 }
-export {};
 //# sourceMappingURL=wms-service.d.ts.map

package/dist/lib/services/ogc/wms-service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"wms-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/ogc/wms-service.ts"],"names":[],"mappings":"~~AAIA~~,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~~,wGAAwG~~;~~AACxG~~,MAAM,MAAM,aAAa,GAAG;IAC1B,~~kBAAkB~~;~~IAClB~~,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAC5B,~~uBAAuB~~;~~IACvB~~,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,~~4CAA4C~~;~~IAC5C~~,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,~~mDAAmD~~;~~IACnD~~,WAAW,CAAC,EAAE,YAAY,GAAG,qBAAqB,GAAG,yBAAyB,CAAC;IAC/E,kCAAkC;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,~~4DAA4D~~;~~IAC5D~~,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,~~KAAK~~,~~mBAAmB~~,GAAG;~~IACzB~~,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;CAC7B,CAAC;AAEF,~~qCAAqC;AACrC,MAAM,MAAM,~~4BAA4B~~,GAAG,mBAAmB,CAAC~~;~~AAE/D,4BAA4B;~~AAC5B,MAAM,MAAM,mBAAmB,GAAG~~,mBAAmB,GAAG~~;~~IACtD~~,~~uBAAuB~~;~~IACvB~~,~~MAAM~~,EAAE,~~MAAM~~,GAAG,~~MAAM~~,~~EAAE,~~CAAC;~~IAC1B~~,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,~~wEAAwE~~;~~IACxE~~,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,~~cAAc~~;~~IACd~~,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,~~2CAA2C~~;~~IAC3C~~,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,~~4CAA4C~~;~~IAC5C~~,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG~~,mBAAmB,GAAG~~;~~IAC9D~~,~~gDAAgD~~;~~IAChD~~,CAAC,EAAE,~~MAAM~~,CAAC;~~IACV~~,gDAAgD;IAChD,CAAC,EAAE,MAAM,CAAC;IACV,~~wEAAwE~~;~~IACxE~~,~~YAAY~~,EAAE,MAAM,~~EAAE,~~CAAC;~~IACvB~~,~~mDAAmD~~;~~IACnD~~,WAAW,CAAC,EAAE,YAAY,GAAG,qBAAqB,GAAG,yBAAyB,CAAC;~~IAE~~/E,~~uBAAuB~~;~~IACvB~~,MAAM,EAAE,MAAM,EAAE,CAAC;~~IACjB~~,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;AAEF,mCAAmC;AACnC,MAAM,MAAM,0BAA0B,GAAG,~~mBAAmB~~,CAAC;~~AAE7D~~,sCAAsC;AACtC,MAAM,MAAM,6BAA6B,GAAG,~~mBAAmB~~,CAAC;~~AAIhE~~,gDAAgD;AAChD,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG;IAC/C,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,4FAA4F;IAC5F,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iDAAiD;IACjD,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,UAAW,SAAQ,WAAW;~~IACzC~~,MAAM,CAAC,IAAI,EAAE,KAAK,CAAS;IAC3B,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAsC;IAE7E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;~~IACrB~~,oCAAoC;IACpC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IACvC,uCAAuC;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE3C,YAAY,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE5C,uDAAuD;IACvD,QAAQ,CAAC,OAAO~~;;;;;;;;;;;;;;;QAhHhB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAsHhB~~;IAEF,0BAA0B;gBACd,KAAK,EAAE,eAAe;~~IAwB5B~~,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK3C,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;~~IAOlE~~,iBAAiB,CAAC,YAAY,EAAE,eAAe,GAAG,mBAAmB;IAMrE,uBAAuB;IACjB,eAAe,CACnB,aAAa,CAAC,EAAE,4BAA4B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,eAAe,CAAC;IAU3B,sBAAsB;IAChB,MAAM,CACV,aAAa,EAAE,mBAAmB,EAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,SAAS,CAAC;IAYrB,wCAAwC;IAClC,cAAc,CAClB,aAAa,EAAE,2BAA2B,EAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,cAAc,CAAC;IAQ1B,wCAAwC;IAClC,kBAAkB,CACtB,aAAa,EAAE,2BAA2B,EAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,MAAM,CAAC;IAQlB,yCAAyC;IACnC,aAAa,CACjB,aAAa,EAAE,0BAA0B,EACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC;IAQ/B,0CAA0C;IACpC,gBAAgB,CACpB,aAAa,EAAE,6BAA6B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,SAAS,CAAC;IAerB,qDAAqD;IACrD,kBAAkB,CAChB,aAAa,CAAC,EAAE,4BAA4B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAQT,4CAA4C;IAC5C,SAAS,CACP,aAAa,EAAE,mBAAmB,EAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;~~IAgBT~~,oDAAoD;IACpD,iBAAiB,CACf,aAAa,EAAE,2BAA2B,EAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;~~IAmBT~~,oDAAoD;IACpD,gBAAgB,CACd,aAAa,EAAE,0BAA0B,EACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAQT,mBAAmB,CACjB,aAAa,EAAE,6BAA6B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAWT,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAC;IAa7E;;;;SAIK;IACL,SAAS,CAAC,UAAU,CAClB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,~~mBAAmB~~,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAC,~~EAC7D~~,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IA2BT,~~kBAAkB~~,CAAC,~~OAAO~~,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM;~~cAqBxD~~,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAOpE,qFAAqF;IACrF,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAY5E,+BAA+B;IAC/B,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK;CAIvD"}
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;CACvB,CAAC;AAEF,qCAAqC;AACrC,MAAM,MAAM,4BAA4B,GAAG;IACzC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;CAC7B,CAAC;AAEF,4BAA4B;AAC5B,MAAM,MAAM,mBAAmB,GAAG;IAChC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAC5B,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,gEAAgE;IAChE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,4GAA4G;IAC5G,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,mFAAmF;IACnF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oFAAoF;IACpF,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,uBAAuB,GAAG;IACpC,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,4GAA4G;IAC5G,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAC5B,gDAAgD;IAChD,CAAC,EAAE,MAAM,CAAC;IACV,gDAAgD;IAChD,CAAC,EAAE,MAAM,CAAC;IACV,kFAAkF;IAClF,WAAW,CAAC,EAAE,YAAY,GAAG,qBAAqB,GAAG,yBAAyB,CAAC;IAC/E,qFAAqF;IACrF,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,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;CACd,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,+BAA+B,GAAG;IAC5C,gDAAgD;IAChD,CAAC,EAAE,MAAM,CAAC;IACV,gDAAgD;IAChD,CAAC,EAAE,MAAM,CAAC;IACV,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,mCAAmC;AACnC,MAAM,MAAM,0BAA0B,GAAG;IACvC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;CAC7B,CAAC;AAEF,sCAAsC;AACtC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;CAC7B,CAAC;AAIF,gDAAgD;AAChD,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG;IAC/C,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,6DAA6D;IAC7D,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,4FAA4F;IAC5F,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iDAAiD;IACjD,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,UAAW,SAAQ,WAAW,CAAC,eAAe,CAAC;IAC1D,MAAM,CAAC,IAAI,EAAE,KAAK,CAAS;IAC3B,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAsC;IAE7E,8BAA8B;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB,2GAA2G;IAC3G,eAAe,EAAE,OAAO,CAAC;IACzB,iHAAiH;IACjH,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,oCAAoC;IACpC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IACvC,uCAAuC;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE3C,YAAY,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE5C,uDAAuD;IACvD,QAAQ,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAMd;IAEF,0BAA0B;gBACd,KAAK,EAAE,eAAe;IA4B5B,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK3C,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAIlE,iBAAiB,CAAC,YAAY,EAAE,eAAe,GAAG,mBAAmB;IAMrE,uBAAuB;IACjB,eAAe,CACnB,aAAa,CAAC,EAAE,4BAA4B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,eAAe,CAAC;IAU3B,sBAAsB;IAChB,MAAM,CACV,aAAa,EAAE,mBAAmB,EAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,SAAS,CAAC;IAYrB,wCAAwC;IAClC,cAAc,CAClB,aAAa,EAAE,2BAA2B,EAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,cAAc,CAAC;IAQ1B,wCAAwC;IAClC,kBAAkB,CACtB,aAAa,EAAE,2BAA2B,EAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,MAAM,CAAC;IAQlB,yCAAyC;IACnC,aAAa,CACjB,aAAa,EAAE,0BAA0B,EACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC;IAQ/B,0CAA0C;IACpC,gBAAgB,CACpB,aAAa,EAAE,6BAA6B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,SAAS,CAAC;IAerB,qDAAqD;IACrD,kBAAkB,CAChB,aAAa,CAAC,EAAE,4BAA4B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAQT,4CAA4C;IAC5C,SAAS,CACP,aAAa,EAAE,mBAAmB,EAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAiBT,oDAAoD;IACpD,iBAAiB,CACf,aAAa,EAAE,2BAA2B,EAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAoBT,oDAAoD;IACpD,gBAAgB,CACd,aAAa,EAAE,0BAA0B,EACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAQT,mBAAmB,CACjB,aAAa,EAAE,6BAA6B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAWT,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAC;IAa7E;;;;SAIK;IACL,SAAS,CAAC,UAAU,CAClB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE;QAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAC,EACpE,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IA2BT,oBAAoB,CAAC,WAAW,SAAS;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAC,EACnE,aAAa,EAAE,WAAW,GACzB,WAAW;IAUd,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,GAAG,MAAM;IAwCnF,+DAA+D;IAC/D,gBAAgB,CACd,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,aAAa,GAC3B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAkB1C,8EAA8E;cAC9D,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAOpE,qFAAqF;IACrF,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAY5E,+BAA+B;IAC/B,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK;CAIvD"}

package/dist/lib/services/ogc/wms-service.js CHANGED Viewed

@@ -33,8 +33,11 @@ class WMSService extends image_source_1.ImageSource {
         // This would make pasting in any WMS URL more likely to make this class just work.
         // const {baseUrl, parameters} = this._parseWMSUrl(props.url);
         this.url = props.url;
+        this.substituteCRS84 = props.substituteCRS84 ?? false;
+        this.flipCRS = ['EPSG:4326'];
         this.wmsParameters = {
             layers: undefined,
+            query_layers: undefined,
             styles: undefined,
             version: '1.3.0',
             crs: 'EPSG:4326',
@@ -51,10 +54,7 @@ class WMSService extends image_source_1.ImageSource {
         return this.normalizeMetadata(capabilities);
     }
     async getImage(parameters) {
-        // WMS 1.3.0 renamed SRS to CRS (sigh...)
-        const wmsParameters = { ...parameters, crs: parameters.srs };
-        delete wmsParameters.srs;
-        return await this.getMap(wmsParameters);
+        return await this.getMap(parameters);
     }
     normalizeMetadata(capabilities) {
         return capabilities;
@@ -132,16 +132,17 @@ class WMSService extends image_source_1.ImageSource {
     }
     /** Generate a URL for the GetMap request */
     getMapURL(wmsParameters, vendorParameters) {
+        wmsParameters = this._getWMS130Parameters(wmsParameters);
         const options = {
             version: this.wmsParameters.version,
-            // layers: [],
+            format: this.wmsParameters.format,
+            transparent: this.wmsParameters.transparent,
+            layers: this.wmsParameters.layers,
+            styles: this.wmsParameters.styles,
+            crs: this.wmsParameters.crs,
             // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],
             // width: 1200,
             // height: 900,
-            styles: this.wmsParameters.styles,
-            crs: this.wmsParameters.crs,
-            format: this.wmsParameters.format,
-            transparent: this.wmsParameters.transparent,
             ...wmsParameters
         };
         return this._getWMSUrl('GetMap', options, vendorParameters);
@@ -150,17 +151,18 @@ class WMSService extends image_source_1.ImageSource {
     getFeatureInfoURL(wmsParameters, vendorParameters) {
         const options = {
             version: this.wmsParameters.version,
-            // layers: this.props.layers,
+            // query_layers: [],
+            // format: this.wmsParameters.format,
+            info_format: this.wmsParameters.info_format,
+            layers: this.wmsParameters.layers,
+            query_layers: this.wmsParameters.query_layers,
+            styles: this.wmsParameters.styles,
+            crs: this.wmsParameters.crs,
             // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],
             // width: 1200,
             // height: 900,
             // x: undefined!,
             // y: undefined!,
-            // query_layers: [],
-            srs: this.wmsParameters.crs,
-            format: this.wmsParameters.format,
-            info_format: this.wmsParameters.info_format,
-            styles: this.wmsParameters.styles,
             ...wmsParameters
         };
         return this._getWMSUrl('GetFeatureInfo', options, vendorParameters);
@@ -215,28 +217,72 @@ class WMSService extends image_source_1.ImageSource {
             if (key !== 'transparent' || value) {
                 url += first ? '?' : '&';
                 first = false;
-                url += this._getParameterValue(wmsParameters.version, key, value);
+                url += this._getURLParameter(key, value, wmsParameters);
             }
         }
         return encodeURI(url);
     }
-    _getParameterValue(version, key, value) {
-        // SRS parameter changed to CRS in 1.3.0, in non-backwards compatible way (sigh...)
-        if (key === 'crs' && version !== '1.3.0') {
-            key = 'srs';
+    _getWMS130Parameters(wmsParameters) {
+        const newParameters = { ...wmsParameters };
+        if (newParameters.srs) {
+            newParameters.crs = newParameters.crs || newParameters.srs;
+            delete newParameters.srs;
+        }
+        return newParameters;
+    }
+    // eslint-disable-complexity
+    _getURLParameter(key, value, wmsParameters) {
+        // Substitute by key
+        switch (key) {
+            case 'crs':
+                // CRS was called SRS before WMS 1.3.0
+                if (wmsParameters.version !== '1.3.0') {
+                    key = 'srs';
+                }
+                else if (this.substituteCRS84 && value === 'EPSG:4326') {
+                    /** In 1.3.0, replaces references to 'EPSG:4326' with the new backwards compatible CRS:84 */
+                    // Substitute by value
+                    value = 'CRS:84';
+                }
+                break;
+            case 'srs':
+                // CRS was called SRS before WMS 1.3.0
+                if (wmsParameters.version === '1.3.0') {
+                    key = 'crs';
+                }
+                break;
+            case 'bbox':
+                // Coordinate order is flipped for certain CRS in WMS 1.3.0
+                const bbox = this._flipBoundingBox(value, wmsParameters);
+                if (bbox) {
+                    value = bbox;
+                }
+                break;
+            default:
+            // do nothing
         }
         key = key.toUpperCase();
-        // TODO - in v1.3.0 only, the order of parameters for BBOX depends on whether the CRS definition has flipped axes
-        // You will see this in the GetCapabilities request at 1.3.0 - the response should show the flipped axes.
-        // BBOX=xmin,ymin,xmax,ymax NON-FLIPPED
-        // BBOX=ymin,xmin,ymax,xmax FLIPPED
-        // / EPSG:4326 needs to have flipped axes. 4326 1 WGS 84 Latitude North Longitude East
-        // In WMS 1.1.1 EPSG:4326 is wrongly defined as having long/lat coordinate axes. In WMS 1.3.0 the correct axes lat/long are used. CRS:84 is defined by OGC as having the same datum as EPSG:4326 (that is the World Geodetic System 1984 datum ~ EPSG::6326) but axis order of long/lat.
-        // CRS:84 was introduced with the publication of the WMS 1.3.0 specification, to overcome this issue.
         return Array.isArray(value)
             ? `${key}=${value.join(',')}`
             : `${key}=${value ? String(value) : ''}`;
     }
+    /** Coordinate order is flipped for certain CRS in WMS 1.3.0 */
+    _flipBoundingBox(bboxValue, wmsParameters) {
+        // Sanity checks
+        if (!Array.isArray(bboxValue) || bboxValue.length !== 4) {
+            return null;
+        }
+        const flipCoordinates =
+        // Only affects WMS 1.3.0
+        wmsParameters.version === '1.3.0' &&
+            // Flip if we are dealing with a CRS that was flipped in 1.3.0
+            this.flipCRS.includes(wmsParameters.crs || '') &&
+            // Don't flip if we are subsituting EPSG:4326 with CRS:84
+            !(this.substituteCRS84 && wmsParameters.crs === 'EPSG:4326');
+        const bbox = bboxValue;
+        return flipCoordinates ? [bbox[1], bbox[0], bbox[3], bbox[2]] : bbox;
+    }
+    /** Fetches an array buffer and checks the response (boilerplate reduction) */
     async _fetchArrayBuffer(url) {
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();

package/dist/lib/sources/data-source.d.ts CHANGED Viewed

@@ -4,12 +4,22 @@ export type DataSourceProps = {
     loadOptions?: LoaderOptions;
 };
 /** base class of all data sources */
-export declare abstract class DataSource {
+export declare abstract class DataSource<PropsT extends DataSourceProps> {
     /** A resolved fetch function extracted from loadOptions prop */
     fetch: (url: string, options?: RequestInit) => Promise<Response>;
     /** The actual load options, if calling a loaders.gl loader */
     loadOptions: LoaderOptions;
-    constructor(props: DataSourceProps);
+    _needsRefresh: boolean;
+    props: PropsT;
+    constructor(props: PropsT);
+    setProps(props: PropsT): void;
+    /** Mark this data source as needing a refresh (redraw) */
+    setNeedsRefresh(): void;
+    /**
+     * Does this data source need refreshing?
+     * @note The specifics of the refresh mechanism depends on type of data source
+     */
+    getNeedsRefresh(clear?: boolean): boolean;
 }
 /**
  * Gets the current fetch function from options

package/dist/lib/sources/data-source.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/data-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,eAAe,GAAG;IAC5B,kGAAkG;IAClG,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC;AAEF,qCAAqC;AACrC,8BAAsB,UAAU;~~IAC9B~~,gEAAgE;IAChE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjE,8DAA8D;IAC9D,WAAW,EAAE,aAAa,CAAC;~~gBAEf~~,KAAK,EAAE,eAAe;~~CAInC~~;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,aAAa,SAKvC,MAAM,iBAAiB,WAAW,uBAWlD"}
1	+ {"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/data-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,eAAe,GAAG;IAC5B,kGAAkG;IAClG,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC;AAEF,qCAAqC;AACrC,8BAAsB,UAAU,CAAC,MAAM,SAAS,eAAe;IAC7D,gEAAgE;IAChE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjE,8DAA8D;IAC9D,WAAW,EAAE,aAAa,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAQ;IAE9B,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,MAAM;IAMzB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,0DAA0D;IAC1D,eAAe,IAAI,IAAI;IAIvB;;;OAGG;IACH,eAAe,CAAC,KAAK,GAAE,OAAc;CAOtC;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,aAAa,SAKvC,MAAM,iBAAiB,WAAW,uBAWlD"}

package/dist/lib/sources/data-source.js CHANGED Viewed

@@ -5,9 +5,31 @@ exports.getFetchFunction = exports.DataSource = void 0;
 /** base class of all data sources */
 class DataSource {
     constructor(props) {
+        this._needsRefresh = true;
+        this.props = { ...props };
         this.loadOptions = { ...props.loadOptions };
         this.fetch = getFetchFunction(this.loadOptions);
     }
+    setProps(props) {
+        this.props = Object.assign(this.props, props);
+        // TODO - add a shallow compare to avoid setting refresh if no change?
+        this.setNeedsRefresh();
+    }
+    /** Mark this data source as needing a refresh (redraw) */
+    setNeedsRefresh() {
+        this._needsRefresh = true;
+    }
+    /**
+     * Does this data source need refreshing?
+     * @note The specifics of the refresh mechanism depends on type of data source
+     */
+    getNeedsRefresh(clear = true) {
+        const needsRefresh = this._needsRefresh;
+        if (clear) {
+            this._needsRefresh = false;
+        }
+        return needsRefresh;
+    }
 }
 exports.DataSource = DataSource;
 /**