Merge branch 'main' into feature/add-lasso-logic-to-draw

Dataport · Feb 18, 2025 · 69fa0a4 · 69fa0a4
2 parents 06bd465 + de516a1
commit 69fa0a4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/packages/plugins/Gfi/CHANGELOG.md b/packages/plugins/Gfi/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## unpublished
+
+- Fix: Allow layers that have `singleTile` set to `true` and thus being an `ImageLayer` instead a `TileLayer` to be used for GFI-requests as well.
+
 ## 3.0.1
 
 - Fix: Clean-up internal flag used for `multiSelect` if a drawing is aborted. This is always the case if a user simply clicks into the map holding CTRL / Command.

diff --git a/packages/plugins/Gfi/src/types.ts b/packages/plugins/Gfi/src/types.ts
@@ -1,7 +1,8 @@
 import { Map, Feature } from 'ol'
 import BaseLayer from 'ol/layer/Base'
+import ImageLayer from 'ol/layer/Image'
 import TileLayer from 'ol/layer/Tile'
-import { TileWMS } from 'ol/source'
+import { ImageWMS, TileWMS } from 'ol/source'
 import VectorSource from 'ol/source/Vector'
 import { Feature as GeoJsonFeature, GeoJsonProperties } from 'geojson'
 import {
@@ -31,7 +32,7 @@ export interface RequestGfiWmsParameters {
   coordinate: [number, number]
   layerConfiguration: RequestGfiParameters['layerConfiguration']
   layerSpecification: RequestGfiParameters['layerSpecification']
-  layer: TileLayer<TileWMS>
+  layer: TileLayer<TileWMS> | ImageLayer<ImageWMS>
 }
 
 export type FeaturesByLayerId = Record<string, GeoJsonFeature[] | symbol>

diff --git a/packages/plugins/Gfi/src/utils/requestGfi.ts b/packages/plugins/Gfi/src/utils/requestGfi.ts
@@ -1,7 +1,8 @@
 import { Feature as GeoJsonFeature } from 'geojson'
-import { Tile as TileLayer, Vector as VectorLayer } from 'ol/layer'
+import ImageLayer from 'ol/layer/Image'
+import TileLayer from 'ol/layer/Tile'
+import VectorLayer from 'ol/layer/Vector'
 import { rawLayerList } from '@masterportal/masterportalapi'
-
 import { RequestGfiParameters } from '../types'
 
 import requestGfiWms from './requestGfiWms'
@@ -32,7 +33,7 @@ export function requestGfi({
       layerConfiguration,
       layerSpecification,
     }
-    if (layer instanceof TileLayer) {
+    if (layer instanceof TileLayer || layer instanceof ImageLayer) {
       return coordinateOrExtent.length === 2
         ? requestGfiWms({
             ...params,