@loaders.gl/wms 4.3.0-alpha.1 → 4.3.0-alpha.3

package/dist/wms-error-loader.js

@@ -4,7 +4,7 @@
 import { parseWMSError } from "./lib/parsers/wms/parse-wms-error.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.2.0" !== 'undefined' ? "4.2.0" : 'latest';
+const VERSION = typeof "4.3.0-alpha.2" !== 'undefined' ? "4.3.0-alpha.2" : 'latest';
 /**
  * Loader for the response to the WMS GetCapability request
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/wms",
-  "version": "4.3.0-alpha.1",
+  "version": "4.3.0-alpha.3",
   "description": "Framework-independent loaders for the WMS (Web Map Service) standard",
   "license": "MIT",
   "type": "module",
@@ -50,15 +50,15 @@
     "path": false
   },
   "dependencies": {
-    "@loaders.gl/images": "4.3.0-alpha.1",
-    "@loaders.gl/loader-utils": "4.3.0-alpha.1",
-    "@loaders.gl/schema": "4.3.0-alpha.1",
-    "@loaders.gl/xml": "4.3.0-alpha.1",
+    "@loaders.gl/images": "4.3.0-alpha.3",
+    "@loaders.gl/loader-utils": "4.3.0-alpha.3",
+    "@loaders.gl/schema": "4.3.0-alpha.3",
+    "@loaders.gl/xml": "4.3.0-alpha.3",
     "@turf/rewind": "^5.1.5",
     "deep-strict-equal": "^0.2.0"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "568446ea69eb590f0c42d965459b636216cda74e"
+  "gitHead": "3213679d79e6ff2814d48fd3337acfa446c74099"
 }

package/src/index.ts

@@ -42,10 +42,9 @@ export {WMSLayerDescriptionLoader as _WMSLayerDescriptionLoader} from './wip/wms
 
 // WFS - Web Feature Service
 
-export type {WFSLoaderOptions as _WFSLoaderOptions} from './wip/wfs-capabilities-loader';
-
-export type {WFSCapabilities as _WFSCapabilities} from './wip/wfs-capabilities-loader';
-export {WFSCapabilitiesLoader as _WFSCapabilitiesLoader} from './wip/wfs-capabilities-loader';
+export type {WFSLoaderOptions as _WFSLoaderOptions} from './wfs-capabilities-loader';
+export type {WFSCapabilities as _WFSCapabilities} from './wfs-capabilities-loader';
+export {WFSCapabilitiesLoader as _WFSCapabilitiesLoader} from './wfs-capabilities-loader';
 
 // GML - Geographic Markup Language
 
@@ -55,28 +54,17 @@ export {GMLLoader as _GMLLoader} from './gml-loader';
 
 // EXPERIMENTAL: DATA SOURCES
 
-// TODO - restore once deck.gl has been udpated
-export {ImageSource} from '@loaders.gl/loader-utils';
-
-export type {ImageType} from '@loaders.gl/images';
-
-export type {CreateImageServiceProps} from './lib/services/create-image-service';
-export {createImageService} from './lib/services/create-image-service';
-
-export type {ImageServiceType} from './services/create-image-source';
-export {createImageSource} from './services/create-image-source';
-
-// Generic (Template URL) Services
-
-export type {ImageServiceProps} from './lib/services/image-service';
-export {ImageService} from './lib/services/image-service';
-
 // OGC Services
 
-export {CSWService} from './services/ogc/csw-service';
-export {WMSSource, WMSService} from './services/ogc/wms-service';
+// export {CSWSource} from './services/ogc/csw-service';
+export {WMSSource, WMSImageSource} from './services/ogc/wms-service';
 
-// ArcGIS Services
+// ArcGIS SourceLoaders
 
 export {getArcGISServices as _getArcGISServices} from './services/arcgis/arcgis-server';
-export {ArcGISImageService as _ArcGISImageService} from './services/arcgis/arcgis-image-service';
+export {ArcGISImageServerSource as _ArcGISImageServerSource} from './services/arcgis/arcgis-image-server';
+
+// DEPRECATED: TODO - remove once deck.gl has been udpated
+export {ImageSource} from '@loaders.gl/loader-utils';
+export type {ImageType} from '@loaders.gl/images';
+export {createImageSource} from './lib/deprecated/create-image-source';

package/src/lib/{services/create-image-service.ts → deprecated/create-image-service.ts.disabled}

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {ImageSource, Service} from '@loaders.gl/loader-utils';
-import {ImageServiceProps} from './image-service';
+import {ImageService, ImageServiceProps} from './image-service';
 
 export type CreateImageServiceProps = ImageServiceProps & {
   type?: string | 'auto';
@@ -18,7 +18,7 @@ export type CreateImageServiceProps = ImageServiceProps & {
  */
 export function createImageService(
   props: CreateImageServiceProps,
-  services: Service[]
+  services: ImageService[]
 ): ImageSource {
   const {type = 'auto'} = props;
   const service: Service | null =
@@ -27,11 +27,11 @@ export function createImageService(
   if (!service) {
     throw new Error('Not a valid image source type');
   }
-  return service.create(props);
+  return service.createSource(props) as ImageService;
 }
 
 /** Guess service type from URL */
-function getServiceOfType(type: string, services: Service[]): Service | null {
+function getServiceOfType(type: string, services: ImageService[]): ImageService | null {
   // if (type === 'template') {
   //   return ImageService;
   // }

package/src/lib/deprecated/create-image-source.ts

@@ -0,0 +1,70 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {Source, ImageSource, ImageSourceProps} from '@loaders.gl/loader-utils';
+import type {WMSImageSourceProps} from '../../services/ogc/wms-service';
+import {WMSSource} from '../../services/ogc/wms-service';
+import {ArcGISImageServerSource} from '../../services/arcgis/arcgis-image-server';
+
+export type ImageSourceType = 'wms' | 'arcgis-image-server' | 'template';
+
+const SOURCES: Source[] = [WMSSource, ArcGISImageServerSource];
+
+/**
+ * * @deprecated Use createDataSource from @loaders.gl/core
+ */
+type CreateImageSourceProps = ImageSourceProps &
+  WMSImageSourceProps & {
+    type?: ImageSourceType | 'auto';
+  };
+
+/**
+ * Creates an image source
+ * If type is not supplied, will try to automatically detect the the
+ * @param url URL to the image source
+ * @param type type of source. if not known, set to 'auto'
+ * @returns an ImageSource instance
+ *
+ * @deprecated Use createDataSource from @loaders.gl/core
+ */
+export function createImageSource(
+  url: string,
+  props: CreateImageSourceProps,
+  sources = SOURCES
+): ImageSource {
+  const {type = 'auto'} = props;
+  const source: Source | null =
+    type === 'auto' ? guessSourceType(url, sources) : getSourceOfType(type, sources);
+
+  if (!source) {
+    throw new Error('Not a valid image source type');
+  }
+  return source.createDataSource(url, props) as ImageSource;
+}
+
+/** Guess service type from URL */
+function getSourceOfType(type: string, sources: Source[]): Source | null {
+  // if (type === 'template') {
+  //   return ImageSource;
+  // }
+
+  for (const source of sources) {
+    if (source.type === type) {
+      return source;
+    }
+  }
+
+  return null;
+}
+
+/** Guess source type from URL */
+function guessSourceType(url: string, sources: Source[]): Source | null {
+  for (const source of sources) {
+    if (source.testURL && source.testURL(url)) {
+      return source;
+    }
+  }
+
+  return null;
+}

package/src/{wip/lib → lib/parsers}/wfs/parse-wfs-capabilities.ts

@@ -83,11 +83,14 @@ export type WFSCapabilities = {
  * @note Error handlings is fairly weak
  */
 export function parseWFSCapabilities(text: string, options): WFSCapabilities {
-  const parsedXML = XMLLoader.parseTextSync?.(text, {...options, xml: {
-    ...options?.xml, 
-    removeNSPrefix: true,
-    uncapitalizeKeys: true
-  }});
+  const parsedXML = XMLLoader.parseTextSync?.(text, {
+    ...options,
+    xml: {
+      ...options?.xml,
+      removeNSPrefix: true,
+      uncapitalizeKeys: true
+    }
+  });
 
   const xmlCapabilities: any = parsedXML.Capabilities || parsedXML;
   return xmlCapabilities;