add url utils

camptocamp · Jan 13, 2024 · 0694366 · 0694366
1 parent ddd069d
commit 0694366
Show file tree

Hide file tree

Showing 10 changed files with 584 additions and 164 deletions.
diff --git a/fixtures/wmts/arcgis.xml b/fixtures/wmts/arcgis.xml
@@ -86,6 +86,9 @@
             <ResourceURL format="image/png" resourceType="tile"
                          template="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/tile/1.0.0/Demographics_USA_Population_Density/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png"
             />
+            <ResourceURL format="image/jpeg" resourceType="tile"
+                         template="https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/tile/1.0.0/Demographics_USA_Population_Density/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg"
+            />
         </Layer>
         <!--TileMatrixSet-->
         <TileMatrixSet>

diff --git a/src/wmts/capabilities.spec.ts b/src/wmts/capabilities.spec.ts
@@ -570,9 +570,10 @@ describe('WMTS Capabilities', () => {
                 matrixSetLimits: [],
               },
             ],
-            urlTemplates: [
-              'http://www.example.com/wmts/coastlines/{TileMatrix}/{TileRow}/{TileCol}.png',
-            ],
+            urlTemplates: {
+              'image/png':
+                'http://www.example.com/wmts/coastlines/{TileMatrix}/{TileRow}/{TileCol}.png',
+            },
             dimensions: ['Time'],
           },
         ]);
@@ -609,9 +610,10 @@ describe('WMTS Capabilities', () => {
               },
             ],
             title: 'Demographics_USA_Population_Density',
-            urlTemplates: [
-              'https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/tile/1.0.0/Demographics_USA_Population_Density/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png',
-            ],
+            urlTemplates: {
+              'image/png':
+                'https://services.arcgisonline.com/arcgis/rest/services/Demographics/USA_Population_Density/MapServer/WMTS/tile/1.0.0/Demographics_USA_Population_Density/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png',
+            },
           },
         ]);
       });
@@ -682,7 +684,7 @@ describe('WMTS Capabilities', () => {
               },
             ],
             title: 'Photographies aériennes',
-            urlTemplates: [],
+            urlTemplates: {},
           },
         ]);
       });

diff --git a/src/wmts/capabilities.ts b/src/wmts/capabilities.ts
@@ -1,19 +1,22 @@
 import { XmlDocument, XmlElement } from '@rgrove/parse-xml';
-import {
-  BoundingBox,
-  CrsCode,
-  GenericEndpointInfo,
-  MimeType,
-} from '../shared/models';
+import { BoundingBox } from '../shared/models';
 import {
   findChildElement,
   findChildrenElement,
   getElementAttribute,
   getElementText,
   getRootElement,
 } from '../shared/xml-utils';
+import {
+  LayerStyle,
+  MatrixSetLink,
+  TileMatrix,
+  WmtsEndpointInfo,
+  WmtsLayer,
+  WmtsMatrixSet,
+} from './model';
 
-function parseBBox(xmlElement): BoundingBox {
+function parseBBox(xmlElement: XmlElement): BoundingBox {
   const result = ['LowerCorner', 'UpperCorner']
     .map((elName) => findChildElement(xmlElement, elName))
     .map((cornerEl) => getElementText(cornerEl).split(' '))
@@ -23,13 +26,6 @@ function parseBBox(xmlElement): BoundingBox {
   return result;
 }
 
-export interface WmtsEndpointInfo extends GenericEndpointInfo {
-  getTileUrls: {
-    kvp?: string;
-    rest?: string;
-  };
-}
-
 export function readInfoFromCapabilities(
   capabilitiesDoc: XmlDocument
 ): WmtsEndpointInfo {
@@ -67,29 +63,10 @@ export function readInfoFromCapabilities(
   };
 }
 
-interface TileMatrix {
-  identifier: string;
-  scaleDenominator: number;
-  resolution?: number; // FOR OL??? or computeResolution?
-  topLeft: [number, number];
-  tileWidth: number;
-  tileHeight: number;
-  matrixWidth: number;
-  matrixHeight: number;
-}
-
-export interface WmtsMatrixSet {
-  identifier: string;
-  wellKnownScaleSet?: string; // from fixed list?
-  crs: CrsCode;
-  boundingBox: BoundingBox;
-  tileMatrices: TileMatrix[];
-}
-
 export function readMatrixSetsFromCapabilities(
   capabilitiesDoc: XmlDocument
 ): WmtsMatrixSet[] {
-  function parseMatrixSet(element): TileMatrix {
+  function parseMatrixSet(element: XmlElement): TileMatrix {
     const topLeft = getElementText(findChildElement(element, 'TopLeftCorner'))
       .split(' ')
       .map(parseFloat) as [number, number];
@@ -135,36 +112,6 @@ export function readMatrixSetsFromCapabilities(
   });
 }
 
-interface LayerStyle {
-  name: string;
-  title: string;
-  legendUrl?: string;
-}
-
-interface MatrixSetLink {
-  matrixSetId: string;
-  matrixSetLimits: MatrixSetLimit[];
-}
-
-interface MatrixSetLimit {
-  tileMatrix: string;
-  minTileRow: number;
-  maxTileRow: number;
-  minTileCol: number;
-  maxTileCol: number;
-}
-
-export interface WmtsLayer {
-  name: string;
-  urlTemplates: string[];
-  styles: LayerStyle[];
-  defaultStyle: string;
-  matrixSets: MatrixSetLink[];
-  outputFormats: MimeType[];
-  latLonBoundingBox?: BoundingBox;
-  dimensions?: string[];
-}
-
 export function readLayersFromCapabilities(
   capabilitiesDoc: XmlDocument
 ): WmtsLayer[] {
@@ -224,7 +171,11 @@ export function readLayersFromCapabilities(
       .filter(
         (element) => getElementAttribute(element, 'resourceType') === 'tile'
       )
-      .map((element) => getElementAttribute(element, 'template'));
+      .reduce((prev, element) => {
+        const mimeType = getElementAttribute(element, 'format');
+        const urlTemplate = getElementAttribute(element, 'template');
+        return { ...prev, [mimeType]: urlTemplate };
+      }, {});
     const matrixSets = findChildrenElement(element, 'TileMatrixSetLink').map(
       parseMatrixSetLink
     );