@loaders.gl/wms 3.4.0-alpha.2 → 3.4.0-alpha.4

package/src/lib/parsers/xml/parse-xml-helpers.ts

@@ -0,0 +1,65 @@
+// loaders.gl, MIT license
+
+/** A single element of an array is not represented as an array in XML */
+export function getXMLArray(xmlValue: any): any[] {
+  // Already an array, return as is
+  if (Array.isArray(xmlValue)) {
+    return xmlValue;
+  }
+  // Single value, wrap in array
+  if (xmlValue) {
+    return [xmlValue];
+  }
+  // nullish, return empty array
+  return [];
+}
+
+/** Get a list of strings from XML */
+export function getXMLStringArray(xmlValue: any): string[] {
+  const xmlArray = getXMLArray(xmlValue);
+  if (xmlArray.length > 0 && xmlArray.every((_) => typeof _ === 'string')) {
+    return xmlArray as string[];
+  }
+  // TODO - error handling?
+  return [];
+}
+
+/** Get XML float */
+export function getXMLFloat(xmlValue: any, defaultValue = undefined): number | undefined {
+  switch (typeof xmlValue) {
+    case 'number':
+      return xmlValue;
+    case 'string':
+      return parseFloat(xmlValue);
+    default:
+      return undefined;
+  }
+}
+
+/** Get XML integer */
+export function getXMLInteger(xmlValue: any, defaultValue = undefined): number | undefined {
+  switch (typeof xmlValue) {
+    case 'number':
+      return xmlValue;
+    case 'string':
+      return parseInt(xmlValue, 10);
+    default:
+      return undefined;
+  }
+}
+
+/** Somewhat arbitrary boolean parsing */
+export function getXMLBoolean(xmlValue: any): boolean {
+  switch (xmlValue) {
+    case 'true':
+      return true;
+    case 'false':
+      return false;
+    case '1':
+      return true;
+    case '0':
+      return false;
+    default:
+      return false;
+  }
+}

package/src/lib/services/arcgis/arcgis-image-service.ts

@@ -14,15 +14,12 @@ 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 class ArcGISImageServer extends ImageSource {
+export class ArcGISImageServer extends ImageSource<ArcGISImageServerProps> {
   static type: 'arcgis-image-server' = 'arcgis-image-server';
   static testURL = (url: string): boolean => url.toLowerCase().includes('ImageServer');
 
-  props: ArcGISImageServerProps;
-
   constructor(props: ArcGISImageServerProps) {
     super(props);
-    this.props = props;
   }
 
   // ImageSource (normalized endpoints)

package/src/lib/services/generic/image-service.ts

@@ -20,15 +20,12 @@ 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 class ImageService extends ImageSource {
+export class ImageService<PropsT extends ImageServiceProps> extends ImageSource<PropsT> {
   static type: 'template' = 'template';
   static testURL = (url: string): boolean => url.toLowerCase().includes('{');
 
-  props: ImageServiceProps;
-
-  constructor(props: ImageServiceProps) {
+  constructor(props: PropsT) {
     super(props);
-    this.props = props;
   }
 
   // IMAGE SOURCE API

package/src/lib/services/ogc/csw-service.ts

@@ -54,11 +54,10 @@ export type CSWServiceProps = DataSourceProps & {
  * - implements the ImageService interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class CSWService extends DataSource {
+export class CSWService extends DataSource<CSWServiceProps> {
   static type: 'csw' = 'csw';
   static testURL = (url: string): boolean => url.toLowerCase().includes('csw');
 
-  props: CSWServiceProps;
   capabilities: CSWCapabilities | null = null;
 
   /** A list of loaders used by the CSWService methods */
@@ -67,7 +66,6 @@ export class CSWService extends DataSource {
   /** Create a CSWService */
   constructor(props: CSWServiceProps) {
     super(props);
-    this.props = props;
   }
 
   async getMetadata(): Promise<CSWCapabilities> {
@@ -79,7 +77,7 @@ export class CSWService extends DataSource {
     return capabilities;
   }
 
-  async getServiceDirectory(options: {includeUnknown?: boolean}): Promise<Service[]> {
+  async getServiceDirectory(options?: {includeUnknown?: boolean}): Promise<Service[]> {
     const services: Service[] = [];
     const unknownServices: Service[] = [];