Merge pull request #64 from RobQuincey-DC/feature-add-formats-to-wms

Add formats from WMS Capabilities to `outputFormats`
camptocamp · Jul 26, 2024 · c75dcba · c75dcba
2 parents 377887e + 0324648
commit c75dcba
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 0 deletions.
diff --git a/src/shared/models.ts b/src/shared/models.ts
@@ -12,6 +12,10 @@ export type GenericEndpointInfo = {
   fees: string;
   constraints: string;
   keywords: string[];
+  /**
+   * Can contain the list of outputFormats from a WFS GetCapabilities,
+   * or the list of 'Formats' from a WMS GetCapabilities
+   */
   outputFormats?: MimeType[];
 };
 

diff --git a/src/wms/capabilities.spec.ts b/src/wms/capabilities.spec.ts
@@ -287,6 +287,16 @@ describe('WMS capabilities', () => {
       fees: 'no conditions apply',
       name: 'WMS',
       title: 'GéoServices : géologie, hydrogéologie et gravimétrie',
+      outputFormats: [
+        'image/png',
+        'image/gif',
+        'image/jpeg',
+        'image/ecw',
+        'image/tiff',
+        'image/png; mode=8bit',
+        'application/x-pdf',
+        'image/svg+xml',
+      ],
       keywords: [
         'Géologie',
         'BRGM',

diff --git a/src/wms/capabilities.ts b/src/wms/capabilities.ts
@@ -40,6 +40,23 @@ export function readLayersFromCapabilities(capabilitiesDoc: XmlDocument) {
   );
 }
 
+export function readOutputFormatsFromCapabilities(
+  capabilitiesDoc: XmlDocument
+) {
+  const capability = findChildElement(
+    getRootElement(capabilitiesDoc),
+    'Capability'
+  );
+  const getMap = findChildElement(
+    findChildElement(capability, 'Request'),
+    'GetMap'
+  );
+  const outputFormats = findChildrenElement(getMap, 'Format').map(
+    getElementText
+  );
+  return outputFormats;
+}
+
 /**
  * Will read service-related info from the capabilities doc
  * @param capabilitiesDoc Capabilities document
@@ -49,6 +66,7 @@ export function readInfoFromCapabilities(
   capabilitiesDoc: XmlDocument
 ): GenericEndpointInfo {
   const service = findChildElement(getRootElement(capabilitiesDoc), 'Service');
+  const formats = readOutputFormatsFromCapabilities(capabilitiesDoc);
   const keywords = findChildrenElement(
     findChildElement(service, 'KeywordList'),
     'Keyword'
@@ -60,6 +78,7 @@ export function readInfoFromCapabilities(
     title: getElementText(findChildElement(service, 'Title')),
     name: getElementText(findChildElement(service, 'Name')),
     abstract: getElementText(findChildElement(service, 'Abstract')),
+    outputFormats: formats,
     fees: getElementText(findChildElement(service, 'Fees')),
     constraints: getElementText(findChildElement(service, 'AccessConstraints')),
     keywords,

diff --git a/src/wms/endpoint.spec.ts b/src/wms/endpoint.spec.ts
@@ -177,6 +177,16 @@ describe('WmsEndpoint', () => {
         fees: 'no conditions apply',
         name: 'WMS',
         title: 'GéoServices : géologie, hydrogéologie et gravimétrie',
+        outputFormats: [
+          'image/png',
+          'image/gif',
+          'image/jpeg',
+          'image/ecw',
+          'image/tiff',
+          'image/png; mode=8bit',
+          'application/x-pdf',
+          'image/svg+xml',
+        ],
         keywords: [
           'Géologie',
           'BRGM',