From 06bd465e99c6a15a5c5dd76c081f20c550573a24 Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Tue, 18 Feb 2025 07:14:48 +0100
Subject: [PATCH 01/15] add lasso draft

---
 packages/clients/diplan/example/config.js     |   6 +
 packages/clients/diplan/example/index.html    |   1 +
 .../clients/diplan/example/prod-example.html  |   1 +
 packages/clients/diplan/example/setup.js      |   3 +
 packages/clients/diplan/src/polar-client.ts   |   5 +-
 packages/plugins/Draw/README.md               |  15 ++-
 packages/plugins/Draw/package.json            |   2 +
 packages/plugins/Draw/src/locales.ts          |   8 ++
 packages/plugins/Draw/src/store/actions.ts    |   2 +
 .../createLassoInteractions.ts                | 104 ++++++++++++++++++
 .../src/store/createInteractions/index.ts     |   2 +
 packages/plugins/Draw/src/types.ts            |   2 +-
 packages/types/custom/CHANGELOG.md            |   1 +
 packages/types/custom/core.ts                 |   7 ++
 14 files changed, 155 insertions(+), 4 deletions(-)
 create mode 100644 packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts

diff --git a/packages/clients/diplan/example/config.js b/packages/clients/diplan/example/config.js
index 14784fe7c..8a3356841 100644
--- a/packages/clients/diplan/example/config.js
+++ b/packages/clients/diplan/example/config.js
@@ -98,6 +98,11 @@ export default {
   },
   draw: {
     enableOptions: true,
+    lassos: [
+      {
+        id: flurstuecke,
+      },
+    ],
     measureOptions: {
       metres: true,
       kilometres: true,
@@ -111,6 +116,7 @@ export default {
         family: 'Arial',
       },
     },
+    toastAction: 'plugin/toast/addToast',
     style: {
       fill: { color: 'rgb(51 117 212 / 50%)' },
       stroke: {
diff --git a/packages/clients/diplan/example/index.html b/packages/clients/diplan/example/index.html
index 8c6202313..64e2a85f4 100644
--- a/packages/clients/diplan/example/index.html
+++ b/packages/clients/diplan/example/index.html
@@ -22,6 +22,7 @@ <h3>Steuerung von außen</h3>
           <button id="action-toast">Toast</button>
           <button id="action-load-geojson">GeoJSON hinzufügen</button>
           <button id="action-zoom-to-all">Zoome auf Zeichnung</button>
+          <button id="action-lasso">Lasso-Funktion</button>
           <label>
             Adresssuche (erstbestes Ergebnis):
             <input id="action-address-search-filler"/>
diff --git a/packages/clients/diplan/example/prod-example.html b/packages/clients/diplan/example/prod-example.html
index c552c6776..853c9c464 100644
--- a/packages/clients/diplan/example/prod-example.html
+++ b/packages/clients/diplan/example/prod-example.html
@@ -22,6 +22,7 @@ <h3>Steuerung von außen</h3>
           <button id="action-toast">Toast</button>
           <button id="action-load-geojson">GeoJSON hinzufügen</button>
           <button id="action-zoom-to-all">Zoome auf Zeichnung</button>
+          <button id="action-lasso">Lasso-Funktion</button>
           <label>
             Adresssuche (erstbestes Ergebnis):
             <input id="action-address-search-filler"/>
diff --git a/packages/clients/diplan/example/setup.js b/packages/clients/diplan/example/setup.js
index 757f19095..aa7dba9cb 100644
--- a/packages/clients/diplan/example/setup.js
+++ b/packages/clients/diplan/example/setup.js
@@ -70,6 +70,7 @@ export default (client, layerConf, config) => {
       const actionFillAddressSearch = document.getElementById(
         'action-address-search-filler'
       )
+      const actionLasso = document.getElementById('action-lasso')
 
       actionPlus.onclick = () =>
         mapInstance.$store.dispatch('plugin/zoom/increaseZoomLevel')
@@ -96,6 +97,8 @@ export default (client, layerConf, config) => {
           autoselect: 'first',
         })
       )
+      actionLasso.onclick = () =>
+        mapInstance.$store.dispatch('plugin/draw/setMode', 'lasso')
 
       const htmlZoom = document.getElementById('subscribed-zoom')
       const htmlGfi = document.getElementById('subscribed-gfi')
diff --git a/packages/clients/diplan/src/polar-client.ts b/packages/clients/diplan/src/polar-client.ts
index 212100965..a5f77abb9 100644
--- a/packages/clients/diplan/src/polar-client.ts
+++ b/packages/clients/diplan/src/polar-client.ts
@@ -42,7 +42,10 @@ polarCore.addPlugins([
         id: 'layerChooser',
       },
       {
-        plugin: Draw({}),
+        plugin: Draw({
+          addLoading: 'plugin/loadingIndicator/addLoadingKey',
+          removeLoading: 'plugin/loadingIndicator/removeLoadingKey',
+        }),
         icon: '$vuetify.icons.ruler',
         id: 'draw',
       },
diff --git a/packages/plugins/Draw/README.md b/packages/plugins/Draw/README.md
index 0c5cca523..906ebd2e9 100644
--- a/packages/plugins/Draw/README.md
+++ b/packages/plugins/Draw/README.md
@@ -33,12 +33,16 @@ The styling of the drawn features can be configured to overwrite the default ol-
 
 | fieldName | type | description |
 | - | - | - |
+| addLoading | string? | Expects the path to a mutation within the store. This mutation is committed with a plugin-specific loading key as payload when starting asynchronous procedures that are intended to be communicated to the user. |
 | enableOptions | boolean? | If `true`, draw options are displayed, like choosing and changing stroke color. Not available for texts features. Defaults to `false`. |
+| lassos | lasso[]? | Allows configuring lasso options. The lasso function allows free-hand drawing a geometry on the map; features completely fitting into that geometry will be copied up to the draw layer from all configured layers. 💡 Please mind that the lasso function currently has no UI in the client, and the functionality must be triggered externally. |
+| removeLoading | string? | Expects the path to a mutation within the store. This mutation is committed with a plugin-specific loading key as payload when finishing asynchronous procedures that are intended to be communicated to the user. |
 | measureOptions | measureOptions? | If set, an additional radio is being shown to the user to be able to let the (then) drawn features display their length and / or area. See [draw.measureOptions](#drawmeasureoptions) for further information. Not shown by default. |
 | selectableDrawModes | string[]? | List 'Point', 'LineString', 'Circle', 'Text' and/or 'Polygon' as desired. All besides 'Text' are selectable by default. |
 | snapTo | string[]? | Accepts an array of layer IDs. If these layers are active, they are used as snapping material for geometry manipulation. The Draw layer will also always snap to its own features regardless. Please mind that used layers must provide vector data. The layers referred to must be configured in `mapConfiguration.layers`. |
 | style | style? | Please see example below for styling options. Defaults to standard OpenLayers styling. |
 | textStyle | textStyle? | Use this object with properties 'font' and 'textColor' to style text feature. |
+| toastAction | string? | This string will be used as action to send a toast information to the user to clarify why something happened in edge cases. If this is not defined, the information will be printed to the console for debugging purposes instead. |
 
 For details on the `displayComponent` attribute, refer to the [Global Plugin Parameters](../../core/README.md#global-plugin-parameters) section of `@polar/core`.
 
@@ -55,8 +59,8 @@ draw: {
     },
   },
   style: {
-    fill: { 
-      color: 'rgba(255, 255, 255, 0.5)' 
+    fill: {
+      color: 'rgba(255, 255, 255, 0.5)'
     },
     stroke: {
       color: '#e51313',
@@ -72,6 +76,13 @@ draw: {
 
 </details>
 
+#### draw.lasso
+
+| fieldName | type | description |
+| - | - | - |
+| id | string | The layer id of a vector layer to copy up vector features from. |
+| minZoom | boolean | Defaults to `true`. If a boolean is given, the `minZoom` (if configured) of the `LayerConfiguration` in `mapConfiguration.layers` will be adhered to when copying up geometries from the source. This is to prevent the client from overly burdening feature-rich vector services on accident. |
+
 #### draw.measureOptions
 
 | fieldName | type | description |
diff --git a/packages/plugins/Draw/package.json b/packages/plugins/Draw/package.json
index edce852b5..e5830a622 100644
--- a/packages/plugins/Draw/package.json
+++ b/packages/plugins/Draw/package.json
@@ -27,8 +27,10 @@
     "@turf/center-of-mass": "^7.2.0"
   },
   "peerDependencies": {
+    "@masterportal/masterportalapi": "2.45.0",
     "@polar/core": "^3.0.0",
     "@repositoryname/vuex-generators": "^1.1.2",
+    "i18next": "^23.11.5",
     "ol": "^10.3.1",
     "vue": "^2.6.14",
     "vuex": "^3.6.2"
diff --git a/packages/plugins/Draw/src/locales.ts b/packages/plugins/Draw/src/locales.ts
index ef89c61ea..f60a21284 100644
--- a/packages/plugins/Draw/src/locales.ts
+++ b/packages/plugins/Draw/src/locales.ts
@@ -40,6 +40,10 @@ export const resourcesDe = {
       label: {
         textSize: 'Textgröße (px) wählen:',
       },
+      lasso: {
+        notInZoomRange:
+          'Der Layer "$t({{serviceName}})" wurde nicht für die Lasso-Funktion genutzt, da er auf der derzeitigen Zoomstufe nicht aktivierbar ist. Bitte zoomen Sie weiter rein.',
+      },
     },
   },
 } as const
@@ -84,6 +88,10 @@ export const resourcesEn = {
       label: {
         textSize: 'Choose text size (px):',
       },
+      lasso: {
+        notInZoomRange:
+          'The layer "$t({{serviceName}})" was not used for the lasso as it is not activatable on the current zoom level. Please zoom in further.',
+      },
     },
   },
 } as const
diff --git a/packages/plugins/Draw/src/store/actions.ts b/packages/plugins/Draw/src/store/actions.ts
index 3abf17ec9..c058fd48b 100644
--- a/packages/plugins/Draw/src/store/actions.ts
+++ b/packages/plugins/Draw/src/store/actions.ts
@@ -11,6 +11,7 @@ import createInteractions from './createInteractions'
 import createModifyInteractions from './createInteractions/createModifyInteractions'
 import createTextInteractions from './createInteractions/createTextInteractions'
 import createTranslateInteractions from './createInteractions/createTranslateInteractions'
+import createLassoInteractions from './createInteractions/createLassoInteractions'
 import modifyDrawStyle from './createInteractions/modifyDrawStyle'
 import modifyTextStyle from './createInteractions/modifyTextStyle'
 import createDrawInteractions from './createInteractions/createDrawInteractions'
@@ -25,6 +26,7 @@ export const makeActions = () => {
   const actions: PolarActionTree<DrawState, DrawGetters> = {
     createInteractions,
     createDrawInteractions,
+    createLassoInteractions,
     createModifyInteractions,
     createTranslateInteractions,
     createTextInteractions,
diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
new file mode 100644
index 000000000..79e963e05
--- /dev/null
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -0,0 +1,104 @@
+import Draw from 'ol/interaction/Draw'
+import Interaction from 'ol/interaction/Interaction'
+import i18next from 'i18next'
+import { rawLayerList } from '@masterportal/masterportalapi'
+import { PolarActionContext } from '@polar/lib-custom-types'
+import { DrawGetters, DrawState } from '../../types'
+
+const loaderKey = 'drawLasso'
+
+/*
+TODO use snippet to confirm the layer type worked on
+    const source = (
+      map
+        .getLayers()
+        .getArray()
+        .find((layer) => layer.get('id') === layerId) as VectorLayer
+    )?.getSource?.()
+    if (source instanceof VectorSource) {
+      accumulator.push(new Snap({ source }))
+    } else {
+      console.warn(
+        `@polar/plugin-draw: Layer with ID "${layerId}" configured for 'snapTo', but it has no source to snap to. The layer does probably not hold any vector data.`
+      )
+    }
+      */
+
+// TODO un – refactor after done
+// eslint-disable-next-line max-lines-per-function
+export default function ({
+  rootGetters,
+  commit,
+  dispatch,
+}: PolarActionContext<DrawState, DrawGetters>): Interaction[] {
+  const draw = new Draw({
+    type: 'Polygon',
+    freehand: true,
+  })
+  const { addLoading, removeLoading } = rootGetters.configuration?.draw || {}
+  // TODO un
+  // eslint-disable-next-line max-lines-per-function
+  draw.on('drawend', (e) => {
+    dispatch('setMode', 'none')
+
+    const drawnLasso = e.feature
+    const lassos = rootGetters.configuration.draw?.lassos || []
+    const toastAction = rootGetters.configuration.draw?.toastAction || ''
+    const promises = lassos.reduce((accumulator, { id, minZoom = true }) => {
+      const layerConfig = rootGetters.configuration.layers?.find(
+        (layer) => id === layer.id
+      )
+      if (
+        minZoom &&
+        layerConfig &&
+        typeof layerConfig.minZoom !== 'undefined' &&
+        rootGetters.zoomLevel < layerConfig.minZoom
+      ) {
+        if (toastAction) {
+          dispatch(toastAction, {
+            type: 'info',
+            text: i18next.t('plugins.draw.lasso.notInZoomRange', {
+              serviceName: layerConfig.name || id,
+            }),
+            timeout: 10000,
+          })
+        } else {
+          console.warn(
+            `Lasso not used with layer with id "${id}". (minZoom not reached)`
+          )
+        }
+        return accumulator
+      }
+      const serviceDefinition = rawLayerList.getLayerWhere({ id })
+
+      // TODO implement for OAF, use existing getFeatures for WFS
+      // https://api.hamburg.de/datasets/v1/alkis_vereinfacht/collections/Flurstueck/items?f=json&limit=10&bbox=10.0872,53.5357,10.0883,53.5362
+
+      accumulator.push(new Promise(() => ({})))
+      return accumulator
+    }, [] as Promise<object>[])
+
+    Promise.all(promises)
+      .then((resolutions) => {
+        if (addLoading) {
+          commit(addLoading, loaderKey, { root: true })
+        }
+
+        // TODO parse resolutions
+        // TODO filter with drawnLasso (we're probably just loading by bbox?)
+        // TODO add as geoJSON to draw
+
+        console.warn(resolutions)
+
+        dispatch('addFeatures', { geoJSON: {} })
+      })
+      .catch(() => {
+        /* TODO at least toast something */
+      })
+      .finally(
+        () => removeLoading && commit(removeLoading, loaderKey, { root: true })
+      )
+  })
+
+  return [draw]
+}
diff --git a/packages/plugins/Draw/src/store/createInteractions/index.ts b/packages/plugins/Draw/src/store/createInteractions/index.ts
index 79e295c45..dd2b77f92 100644
--- a/packages/plugins/Draw/src/store/createInteractions/index.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/index.ts
@@ -15,6 +15,8 @@ export default function (
     return dispatch('createTranslateInteractions', { drawSource, drawLayer })
   } else if (mode === 'delete') {
     return createDeleteInteractions(drawSource, drawLayer)
+  } else if (mode === 'lasso') {
+    return dispatch('createLassoInteractions')
   }
   return []
 }
diff --git a/packages/plugins/Draw/src/types.ts b/packages/plugins/Draw/src/types.ts
index a1208b452..c15ea9bc7 100644
--- a/packages/plugins/Draw/src/types.ts
+++ b/packages/plugins/Draw/src/types.ts
@@ -18,7 +18,7 @@ export interface PolarVectorOptions {
   style?: StyleLike
 }
 
-export type Mode = 'none' | 'draw' | 'edit' | 'translate' | 'delete'
+export type Mode = 'none' | 'draw' | 'edit' | 'translate' | 'delete' | 'lasso'
 
 export interface CreateInteractionsPayload {
   drawSource: VectorSource
diff --git a/packages/types/custom/CHANGELOG.md b/packages/types/custom/CHANGELOG.md
index e2bc30d1a..bb03d6686 100644
--- a/packages/types/custom/CHANGELOG.md
+++ b/packages/types/custom/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## unpublished
 
 - Feature: Add `snapTo` to `DrawConfiguration` for specification of layers to snap to.
+- Feature: Add `lassos` to `DrawConfiguration`. With this, `addLoading`, `removeLoading`, and `toastAction` have also been introduced to allow the feature to use other plugins via API calls.
 
 ## 2.0.0
 
diff --git a/packages/types/custom/core.ts b/packages/types/custom/core.ts
index 3492c36e9..05bc91ccc 100644
--- a/packages/types/custom/core.ts
+++ b/packages/types/custom/core.ts
@@ -196,12 +196,19 @@ export interface MeasureOptions {
 }
 
 export interface DrawConfiguration extends Partial<PluginOptions> {
+  addLoading?: string
   enableOptions?: boolean
+  lassos?: {
+    id: string
+    minZoom: boolean
+  }[]
   measureOptions?: MeasureOptions
+  removeLoading?: string
   selectableDrawModes?: DrawMode[]
   snapTo?: string[]
   style?: DrawStyle
   textStyle?: TextStyle
+  toastAction?: string
 }
 
 export interface ExportConfiguration extends PluginOptions {

From 501ef82953ac330ffc038bea31ccab33f82bb5e2 Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Tue, 18 Feb 2025 14:05:24 +0100
Subject: [PATCH 02/15] hardcode lasso solution for OAF layers (WIP)

---
 packages/plugins/Draw/CHANGELOG.md            |   1 +
 packages/plugins/Draw/README.md               |   2 +
 packages/plugins/Draw/package.json            |   3 +-
 packages/plugins/Draw/src/locales.ts          |   4 +-
 .../createLassoInteractions.ts                | 190 ++++++++++++------
 packages/types/custom/CHANGELOG.md            |   2 +-
 packages/types/custom/core.ts                 |  10 +-
 7 files changed, 146 insertions(+), 66 deletions(-)

diff --git a/packages/plugins/Draw/CHANGELOG.md b/packages/plugins/Draw/CHANGELOG.md
index cae2dea4d..db0bfdb43 100644
--- a/packages/plugins/Draw/CHANGELOG.md
+++ b/packages/plugins/Draw/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Feature: Add a `"translate"` mode that allows moving drawn features as they are.
 - Feature: Add a `"snapTo"` key to the configuration that allows defining vector layers to snap to while drawing, editing, and translating.
+- Feature: Add a lasso mode that allows copying up features from a vector layer that are contained within the user's hand drawn polygon. This feature is currently without UI and needs to be started from the outside, see docs.
 
 ## 3.0.0
 
diff --git a/packages/plugins/Draw/README.md b/packages/plugins/Draw/README.md
index 906ebd2e9..8a3211849 100644
--- a/packages/plugins/Draw/README.md
+++ b/packages/plugins/Draw/README.md
@@ -78,6 +78,8 @@ draw: {
 
 #### draw.lasso
 
+This feature currently has no UI and can only be started with a programmatic `mapInstance.$store.dispatch('plugin/draw/setMode', 'lasso')` call.
+
 | fieldName | type | description |
 | - | - | - |
 | id | string | The layer id of a vector layer to copy up vector features from. |
diff --git a/packages/plugins/Draw/package.json b/packages/plugins/Draw/package.json
index e5830a622..014e95fc4 100644
--- a/packages/plugins/Draw/package.json
+++ b/packages/plugins/Draw/package.json
@@ -24,7 +24,8 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@turf/center-of-mass": "^7.2.0"
+    "@turf/center-of-mass": "^7.2.0",
+    "@polar/lib-get-features": "^3.0.0"
   },
   "peerDependencies": {
     "@masterportal/masterportalapi": "2.45.0",
diff --git a/packages/plugins/Draw/src/locales.ts b/packages/plugins/Draw/src/locales.ts
index f60a21284..c62214ff8 100644
--- a/packages/plugins/Draw/src/locales.ts
+++ b/packages/plugins/Draw/src/locales.ts
@@ -42,7 +42,7 @@ export const resourcesDe = {
       },
       lasso: {
         notInZoomRange:
-          'Der Layer "$t({{serviceName}})" wurde nicht für die Lasso-Funktion genutzt, da er auf der derzeitigen Zoomstufe nicht aktivierbar ist. Bitte zoomen Sie weiter rein.',
+          'Der Layer "$t({{serviceName}})" wurde nicht für die Lasso-Funktion genutzt, da er auf der derzeitigen Zoomstufe nicht aktivierbar ist. Bitte passen Sie die Zoomstufe an, um die Lasso-Funktion zu nutzen.',
       },
     },
   },
@@ -90,7 +90,7 @@ export const resourcesEn = {
       },
       lasso: {
         notInZoomRange:
-          'The layer "$t({{serviceName}})" was not used for the lasso as it is not activatable on the current zoom level. Please zoom in further.',
+          'The layer "$t({{serviceName}})" was not used for the lasso as it is not activatable on the current zoom level. Please change the zoom level to use the lasso.',
       },
     },
   },
diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
index 79e963e05..7400372ec 100644
--- a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -2,11 +2,89 @@ import Draw from 'ol/interaction/Draw'
 import Interaction from 'ol/interaction/Interaction'
 import i18next from 'i18next'
 import { rawLayerList } from '@masterportal/masterportalapi'
-import { PolarActionContext } from '@polar/lib-custom-types'
+import { MapConfig, PolarActionContext } from '@polar/lib-custom-types'
+import { Dispatch } from 'vuex'
+import { Feature, Map } from 'ol'
+import { Polygon } from 'ol/geom'
+import { getWfsFeatures } from '@polar/lib-get-features'
+import { FeatureCollection, Feature as GeoJsonFeature } from 'geojson'
 import { DrawGetters, DrawState } from '../../types'
 
 const loaderKey = 'drawLasso'
 
+// TODO un – refactor after done (actions/getters are mixed here)
+/* eslint-disable max-lines-per-function */
+
+const getLassoIdsInZoomRange = (
+  configuration: MapConfig,
+  zoomLevel: number,
+  dispatch: Dispatch
+) =>
+  (configuration.draw?.lassos || []).reduce(
+    (accumulator, { id, minZoom = true }) => {
+      const layerConfig = configuration.layers?.find((layer) => id === layer.id)
+      const toastAction = configuration.draw?.toastAction || ''
+      if (
+        minZoom &&
+        layerConfig &&
+        typeof layerConfig.minZoom !== 'undefined' &&
+        zoomLevel < layerConfig.minZoom
+      ) {
+        if (toastAction) {
+          dispatch(
+            toastAction,
+            {
+              type: 'info',
+              text: i18next.t('plugins.draw.lasso.notInZoomRange', {
+                serviceName: layerConfig.name || id,
+              }),
+              timeout: 10000,
+            },
+            { root: true }
+          )
+        } else {
+          console.warn(
+            `Lasso not used with layer with id "${id}". (minZoom not reached)`
+          )
+        }
+        return accumulator
+      }
+      accumulator.push(id)
+      return accumulator
+    },
+    [] as string[]
+  )
+
+const getLassoRequests = (
+  lassoIds: string[],
+  lasso: Feature<Polygon>,
+  map: Map
+) =>
+  lassoIds.reduce((accumulator, id) => {
+    const serviceDefinition = rawLayerList.getLayerWhere({ id })
+
+    // TODO add WFS support
+    // getWfsFeatures(null, serviceDefinition.url, ) FILTER-ONLY atm
+
+    const [codeName, codeNumber] = map
+      .getView()
+      .getProjection()
+      .getCode()
+      .split(':')
+
+    const url = [
+      serviceDefinition.url,
+      'collections',
+      serviceDefinition.collection,
+      `items?f=json&limit=100&bbox=${lasso
+        .getGeometry()
+        ?.getExtent()}&bbox-crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}&crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}`,
+    ].join('/')
+
+    accumulator.push(fetch(url))
+    return accumulator
+  }, [] as Promise<Response>[])
+
 /*
 TODO use snippet to confirm the layer type worked on
     const source = (
@@ -24,8 +102,40 @@ TODO use snippet to confirm the layer type worked on
     }
       */
 
-// TODO un – refactor after done
-// eslint-disable-next-line max-lines-per-function
+const handleSettledRequests = (
+  resolutions: PromiseSettledResult<Response>[],
+  dispatch: Dispatch
+) =>
+  Promise.all(
+    (
+      resolutions.filter((promiseSettledResult) => {
+        if (promiseSettledResult.status === 'rejected') {
+          console.error(promiseSettledResult.reason)
+          // TODO toast
+          return false
+        }
+        return true
+      }) as PromiseFulfilledResult<Response>[]
+    ).map(
+      async (resolution) => (await resolution.value.json()) as FeatureCollection
+    )
+  )
+
+const handleFulfilledRequests = (
+  featureCollections: FeatureCollection[],
+  dispatch: Dispatch
+) =>
+  dispatch('addFeatures', {
+    geoJSON: {
+      type: 'FeatureCollection',
+      features: featureCollections.reduce(
+        (accumulator, { features }) => accumulator.concat(features),
+        [] as GeoJsonFeature[]
+      ),
+    },
+    // TODO filter with drawnLasso
+  })
+
 export default function ({
   rootGetters,
   commit,
@@ -36,65 +146,29 @@ export default function ({
     freehand: true,
   })
   const { addLoading, removeLoading } = rootGetters.configuration?.draw || {}
-  // TODO un
-  // eslint-disable-next-line max-lines-per-function
   draw.on('drawend', (e) => {
     dispatch('setMode', 'none')
 
-    const drawnLasso = e.feature
-    const lassos = rootGetters.configuration.draw?.lassos || []
-    const toastAction = rootGetters.configuration.draw?.toastAction || ''
-    const promises = lassos.reduce((accumulator, { id, minZoom = true }) => {
-      const layerConfig = rootGetters.configuration.layers?.find(
-        (layer) => id === layer.id
-      )
-      if (
-        minZoom &&
-        layerConfig &&
-        typeof layerConfig.minZoom !== 'undefined' &&
-        rootGetters.zoomLevel < layerConfig.minZoom
-      ) {
-        if (toastAction) {
-          dispatch(toastAction, {
-            type: 'info',
-            text: i18next.t('plugins.draw.lasso.notInZoomRange', {
-              serviceName: layerConfig.name || id,
-            }),
-            timeout: 10000,
-          })
-        } else {
-          console.warn(
-            `Lasso not used with layer with id "${id}". (minZoom not reached)`
-          )
-        }
-        return accumulator
-      }
-      const serviceDefinition = rawLayerList.getLayerWhere({ id })
-
-      // TODO implement for OAF, use existing getFeatures for WFS
-      // https://api.hamburg.de/datasets/v1/alkis_vereinfacht/collections/Flurstueck/items?f=json&limit=10&bbox=10.0872,53.5357,10.0883,53.5362
-
-      accumulator.push(new Promise(() => ({})))
-      return accumulator
-    }, [] as Promise<object>[])
-
-    Promise.all(promises)
-      .then((resolutions) => {
-        if (addLoading) {
-          commit(addLoading, loaderKey, { root: true })
-        }
-
-        // TODO parse resolutions
-        // TODO filter with drawnLasso (we're probably just loading by bbox?)
-        // TODO add as geoJSON to draw
-
-        console.warn(resolutions)
+    const drawnLasso = e.feature as Feature<Polygon> // due to Draw 'type' param
+    const lassoIds = getLassoIdsInZoomRange(
+      rootGetters.configuration,
+      rootGetters.zoomLevel,
+      dispatch
+    )
+    const requests = getLassoRequests(lassoIds, drawnLasso, rootGetters.map)
 
-        dispatch('addFeatures', { geoJSON: {} })
-      })
-      .catch(() => {
-        /* TODO at least toast something */
-      })
+    if (addLoading) {
+      commit(addLoading, loaderKey, { root: true })
+    }
+    Promise.allSettled(requests)
+      .then((settledRequests) =>
+        handleSettledRequests(settledRequests, dispatch)
+      )
+      .then((fulfilledRequests) =>
+        handleFulfilledRequests(fulfilledRequests, dispatch)
+      )
+      // TODO add toast, unexpected catastrophic error
+      .catch(console.error)
       .finally(
         () => removeLoading && commit(removeLoading, loaderKey, { root: true })
       )
diff --git a/packages/types/custom/CHANGELOG.md b/packages/types/custom/CHANGELOG.md
index bb03d6686..de0552c91 100644
--- a/packages/types/custom/CHANGELOG.md
+++ b/packages/types/custom/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## unpublished
 
 - Feature: Add `snapTo` to `DrawConfiguration` for specification of layers to snap to.
-- Feature: Add `lassos` to `DrawConfiguration`. With this, `addLoading`, `removeLoading`, and `toastAction` have also been introduced to allow the feature to use other plugins via API calls.
+- Feature: Add `lassos` to `DrawConfiguration`. With this, `addLoading`, `removeLoading`, and `toastAction` have also been introduced to allow the feature to use other plugins via API calls, and `Lasso` itself has been introduced.
 
 ## 2.0.0
 
diff --git a/packages/types/custom/core.ts b/packages/types/custom/core.ts
index 05bc91ccc..3412c8233 100644
--- a/packages/types/custom/core.ts
+++ b/packages/types/custom/core.ts
@@ -195,13 +195,15 @@ export interface MeasureOptions {
   initialOption?: MeasureMode
 }
 
+export interface Lasso {
+  id: string
+  minZoom: boolean
+}
+
 export interface DrawConfiguration extends Partial<PluginOptions> {
   addLoading?: string
   enableOptions?: boolean
-  lassos?: {
-    id: string
-    minZoom: boolean
-  }[]
+  lassos?: Lasso[]
   measureOptions?: MeasureOptions
   removeLoading?: string
   selectableDrawModes?: DrawMode[]

From 00f334f11902b3f276cdaf373b95f26bef700c9c Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Wed, 19 Feb 2025 07:37:57 +0100
Subject: [PATCH 03/15] hardcode WFS support for lasso interaction (WIP)

---
 packages/clients/diplan/example/config.js     |   3 +
 .../createLassoInteractions.ts                | 105 ++++++++++--------
 2 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/packages/clients/diplan/example/config.js b/packages/clients/diplan/example/config.js
index 8a3356841..eeb2978cd 100644
--- a/packages/clients/diplan/example/config.js
+++ b/packages/clients/diplan/example/config.js
@@ -102,6 +102,9 @@ export default {
       {
         id: flurstuecke,
       },
+      {
+        id: xplanwfs,
+      },
     ],
     measureOptions: {
       metres: true,
diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
index 7400372ec..3c52e55e2 100644
--- a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -6,8 +6,10 @@ import { MapConfig, PolarActionContext } from '@polar/lib-custom-types'
 import { Dispatch } from 'vuex'
 import { Feature, Map } from 'ol'
 import { Polygon } from 'ol/geom'
-import { getWfsFeatures } from '@polar/lib-get-features'
+import { parseWfsResponse } from '@polar/lib-get-features/wfs/parse'
 import { FeatureCollection, Feature as GeoJsonFeature } from 'geojson'
+import VectorLayer from 'ol/layer/Vector'
+import VectorSource from 'ol/source/Vector'
 import { DrawGetters, DrawState } from '../../types'
 
 const loaderKey = 'drawLasso'
@@ -63,8 +65,17 @@ const getLassoRequests = (
   lassoIds.reduce((accumulator, id) => {
     const serviceDefinition = rawLayerList.getLayerWhere({ id })
 
-    // TODO add WFS support
-    // getWfsFeatures(null, serviceDefinition.url, ) FILTER-ONLY atm
+    const source = (
+      map
+        .getLayers()
+        .getArray()
+        .find((layer) => layer.get('id') === id) as VectorLayer
+    )?.getSource?.()
+    if (!(source instanceof VectorSource)) {
+      console.warn(
+        `@polar/plugin-draw: Layer with ID "${id}" configured for 'lasso', but it has no vector source. The layer does probably not hold any vector data.`
+      )
+    }
 
     const [codeName, codeNumber] = map
       .getView()
@@ -72,55 +83,38 @@ const getLassoRequests = (
       .getCode()
       .split(':')
 
-    const url = [
-      serviceDefinition.url,
-      'collections',
-      serviceDefinition.collection,
-      `items?f=json&limit=100&bbox=${lasso
-        .getGeometry()
-        ?.getExtent()}&bbox-crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}&crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}`,
-    ].join('/')
+    // TODO use ol/source/Vector::getFeaturesInExtent instead? not easy to ensure data was loaded in extent
+
+    if (!['OAF', 'WFS'].includes(serviceDefinition.typ)) {
+      throw new Error('AAAAAAAAAAAAAAAAAAAA')
+    }
+
+    const url =
+      serviceDefinition.typ === 'OAF'
+        ? [
+            serviceDefinition.url,
+            'collections',
+            serviceDefinition.collection,
+            `items?f=json&limit=100&bbox=${lasso
+              .getGeometry()
+              ?.getExtent()}&bbox-crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}&crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}`,
+          ].join('/')
+        : `${serviceDefinition.url}${[
+            `?service=${serviceDefinition.typ}`,
+            `version=${serviceDefinition.version}`,
+            `request=GetFeature`,
+            `srsName=${map.getView().getProjection().getCode()}`,
+            `typeName=${serviceDefinition.featureType}`,
+            `bbox=${lasso.getGeometry()?.getExtent()},${map
+              .getView()
+              .getProjection()
+              .getCode()}`,
+          ].join('&')}`
 
     accumulator.push(fetch(url))
     return accumulator
   }, [] as Promise<Response>[])
 
-/*
-TODO use snippet to confirm the layer type worked on
-    const source = (
-      map
-        .getLayers()
-        .getArray()
-        .find((layer) => layer.get('id') === layerId) as VectorLayer
-    )?.getSource?.()
-    if (source instanceof VectorSource) {
-      accumulator.push(new Snap({ source }))
-    } else {
-      console.warn(
-        `@polar/plugin-draw: Layer with ID "${layerId}" configured for 'snapTo', but it has no source to snap to. The layer does probably not hold any vector data.`
-      )
-    }
-      */
-
-const handleSettledRequests = (
-  resolutions: PromiseSettledResult<Response>[],
-  dispatch: Dispatch
-) =>
-  Promise.all(
-    (
-      resolutions.filter((promiseSettledResult) => {
-        if (promiseSettledResult.status === 'rejected') {
-          console.error(promiseSettledResult.reason)
-          // TODO toast
-          return false
-        }
-        return true
-      }) as PromiseFulfilledResult<Response>[]
-    ).map(
-      async (resolution) => (await resolution.value.json()) as FeatureCollection
-    )
-  )
-
 const handleFulfilledRequests = (
   featureCollections: FeatureCollection[],
   dispatch: Dispatch
@@ -162,7 +156,22 @@ export default function ({
     }
     Promise.allSettled(requests)
       .then((settledRequests) =>
-        handleSettledRequests(settledRequests, dispatch)
+        Promise.all(
+          (
+            settledRequests.filter((promiseSettledResult) => {
+              if (promiseSettledResult.status === 'rejected') {
+                console.error(promiseSettledResult.reason)
+                // TODO toast
+                return false
+              }
+              return true
+            }) as PromiseFulfilledResult<Response>[]
+          ).map(async (resolution, index) =>
+            rawLayerList.getLayerWhere({ id: lassoIds[index] }).typ === 'WFS'
+              ? await parseWfsResponse(resolution.value, undefined, false)
+              : ((await resolution.value.json()) as FeatureCollection)
+          )
+        )
       )
       .then((fulfilledRequests) =>
         handleFulfilledRequests(fulfilledRequests, dispatch)

From 05b43f3f155ced94733460e1e45471f0b9c5c4bd Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Thu, 20 Feb 2025 06:46:25 +0100
Subject: [PATCH 04/15] add lasso radio on lasso configuration

---
 packages/plugins/Draw/README.md          |  4 +---
 packages/plugins/Draw/src/locales.ts     |  2 ++
 packages/plugins/Draw/src/store/index.ts | 16 ++++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/plugins/Draw/README.md b/packages/plugins/Draw/README.md
index 8a3211849..079db3b34 100644
--- a/packages/plugins/Draw/README.md
+++ b/packages/plugins/Draw/README.md
@@ -35,7 +35,7 @@ The styling of the drawn features can be configured to overwrite the default ol-
 | - | - | - |
 | addLoading | string? | Expects the path to a mutation within the store. This mutation is committed with a plugin-specific loading key as payload when starting asynchronous procedures that are intended to be communicated to the user. |
 | enableOptions | boolean? | If `true`, draw options are displayed, like choosing and changing stroke color. Not available for texts features. Defaults to `false`. |
-| lassos | lasso[]? | Allows configuring lasso options. The lasso function allows free-hand drawing a geometry on the map; features completely fitting into that geometry will be copied up to the draw layer from all configured layers. 💡 Please mind that the lasso function currently has no UI in the client, and the functionality must be triggered externally. |
+| lassos | lasso[]? | Allows configuring lasso options. The lasso function allows free-hand drawing a geometry on the map; features completely fitting into that geometry will be copied up to the draw layer from all configured layers. UI-wise, it is not intuitive for users do understand what a "Lasso" does. This feature currently requires further instructions by the outlying UI on what one is supposed to do with it. |
 | removeLoading | string? | Expects the path to a mutation within the store. This mutation is committed with a plugin-specific loading key as payload when finishing asynchronous procedures that are intended to be communicated to the user. |
 | measureOptions | measureOptions? | If set, an additional radio is being shown to the user to be able to let the (then) drawn features display their length and / or area. See [draw.measureOptions](#drawmeasureoptions) for further information. Not shown by default. |
 | selectableDrawModes | string[]? | List 'Point', 'LineString', 'Circle', 'Text' and/or 'Polygon' as desired. All besides 'Text' are selectable by default. |
@@ -78,8 +78,6 @@ draw: {
 
 #### draw.lasso
 
-This feature currently has no UI and can only be started with a programmatic `mapInstance.$store.dispatch('plugin/draw/setMode', 'lasso')` call.
-
 | fieldName | type | description |
 | - | - | - |
 | id | string | The layer id of a vector layer to copy up vector features from. |
diff --git a/packages/plugins/Draw/src/locales.ts b/packages/plugins/Draw/src/locales.ts
index c62214ff8..6a9d0cb14 100644
--- a/packages/plugins/Draw/src/locales.ts
+++ b/packages/plugins/Draw/src/locales.ts
@@ -9,6 +9,7 @@ export const resourcesDe = {
         measure: 'Zeichnen und Messen',
         write: 'Zeichnen und Schreiben',
         writeAndMeasure: 'Zeichnen, Schreiben und Messen',
+        lasso: 'Lasso',
         edit: 'Bearbeiten',
         translate: 'Verschieben',
         delete: 'Löschen',
@@ -57,6 +58,7 @@ export const resourcesEn = {
         measure: 'Draw and measure',
         write: 'Draw and write',
         writeAndMeasure: 'Draw, write and measure',
+        lasso: 'Lasso',
         edit: 'Edit',
         translate: 'Translate',
         delete: 'Delete',
diff --git a/packages/plugins/Draw/src/store/index.ts b/packages/plugins/Draw/src/store/index.ts
index 52e5b4559..6ed0d0d4a 100644
--- a/packages/plugins/Draw/src/store/index.ts
+++ b/packages/plugins/Draw/src/store/index.ts
@@ -79,13 +79,17 @@ export const makeStoreModule = () => {
         } else if (includesMeasure) {
           drawLabel = 'measure'
         }
-        return {
-          none: 'plugins.draw.mode.none',
-          draw: `plugins.draw.mode.${drawLabel}`,
-          edit: 'plugins.draw.mode.edit',
-          translate: 'plugins.draw.mode.translate',
-          delete: 'plugins.draw.mode.delete',
+        const modes = [
+          ['none', 'plugins.draw.mode.none'],
+          ['draw', `plugins.draw.mode.${drawLabel}`],
+          ['edit', 'plugins.draw.mode.edit'],
+          ['translate', 'plugins.draw.mode.translate'],
+          ['delete', 'plugins.draw.mode.delete'],
+        ]
+        if (configuration.lassos) {
+          modes.splice(4, 0, ['lasso', 'plugins.draw.mode.lasso'])
         }
+        return Object.fromEntries(modes)
       },
       measureOptions: (_, { configuration }) =>
         configuration.measureOptions || {},

From 5bc90146748a358121da452b74b78ebd7766d664 Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Thu, 20 Feb 2025 07:47:46 +0100
Subject: [PATCH 05/15] finish overly long implementation, readying for
 refactor (WIP)

---
 package-lock.json                             |  83 ++++++
 packages/plugins/Draw/package.json            |   1 +
 packages/plugins/Draw/src/locales.ts          |   8 +
 .../createLassoInteractions.ts                | 265 +++++++++---------
 4 files changed, 229 insertions(+), 128 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 20e7a72bb..7141c7346 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5442,6 +5442,70 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@turf/bbox": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-7.2.0.tgz",
+      "integrity": "sha512-wzHEjCXlYZiDludDbXkpBSmv8Zu6tPGLmJ1sXQ6qDwpLE1Ew3mcWqt8AaxfTP5QwDNQa3sf2vvgTEzNbPQkCiA==",
+      "license": "MIT",
+      "dependencies": {
+        "@turf/helpers": "^7.2.0",
+        "@turf/meta": "^7.2.0",
+        "@types/geojson": "^7946.0.10",
+        "tslib": "^2.8.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/turf"
+      }
+    },
+    "node_modules/@turf/boolean-contains": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@turf/boolean-contains/-/boolean-contains-7.2.0.tgz",
+      "integrity": "sha512-dgRQm4uVO5XuLee4PLVH7CFQZKdefUBMIXTPITm2oRIDmPLJKHDOFKQTNkGJ73mDKKBR2lmt6eVH3br6OYrEYg==",
+      "license": "MIT",
+      "dependencies": {
+        "@turf/bbox": "^7.2.0",
+        "@turf/boolean-point-in-polygon": "^7.2.0",
+        "@turf/boolean-point-on-line": "^7.2.0",
+        "@turf/helpers": "^7.2.0",
+        "@turf/invariant": "^7.2.0",
+        "@types/geojson": "^7946.0.10",
+        "tslib": "^2.8.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/turf"
+      }
+    },
+    "node_modules/@turf/boolean-point-in-polygon": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-7.2.0.tgz",
+      "integrity": "sha512-lvEOjxeXIp+wPXgl9kJA97dqzMfNexjqHou+XHVcfxQgolctoJiRYmcVCWGpiZ9CBf/CJha1KmD1qQoRIsjLaA==",
+      "license": "MIT",
+      "dependencies": {
+        "@turf/helpers": "^7.2.0",
+        "@turf/invariant": "^7.2.0",
+        "@types/geojson": "^7946.0.10",
+        "point-in-polygon-hao": "^1.1.0",
+        "tslib": "^2.8.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/turf"
+      }
+    },
+    "node_modules/@turf/boolean-point-on-line": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@turf/boolean-point-on-line/-/boolean-point-on-line-7.2.0.tgz",
+      "integrity": "sha512-H/bXX8+2VYeSyH8JWrOsu8OGmeA9KVZfM7M6U5/fSqGsRHXo9MyYJ94k39A9kcKSwI0aWiMXVD2UFmiWy8423Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@turf/helpers": "^7.2.0",
+        "@turf/invariant": "^7.2.0",
+        "@types/geojson": "^7946.0.10",
+        "tslib": "^2.8.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/turf"
+      }
+    },
     "node_modules/@turf/center-of-mass": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@turf/center-of-mass/-/center-of-mass-7.2.0.tgz",
@@ -14030,6 +14094,21 @@
       "integrity": "sha512-3ojrFwjnnw8Q9242TzgXuTD+eKiutbzyslcq1ydfu82Db2y+Ogbmyrkpv0Hgj31qwT3lbS9+QAAO/pIQM35XRw==",
       "license": "MIT"
     },
+    "node_modules/point-in-polygon-hao": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/point-in-polygon-hao/-/point-in-polygon-hao-1.2.4.tgz",
+      "integrity": "sha512-x2pcvXeqhRHlNRdhLs/tgFapAbSSe86wa/eqmj1G6pWftbEs5aVRJhRGM6FYSUERKu0PjekJzMq0gsI2XyiclQ==",
+      "license": "MIT",
+      "dependencies": {
+        "robust-predicates": "^3.0.2"
+      }
+    },
+    "node_modules/point-in-polygon-hao/node_modules/robust-predicates": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
+      "license": "Unlicense"
+    },
     "node_modules/polyclip-ts": {
       "version": "0.16.8",
       "resolved": "https://registry.npmjs.org/polyclip-ts/-/polyclip-ts-0.16.8.tgz",
@@ -18179,14 +18258,18 @@
       "version": "3.0.0",
       "license": "EUPL-1.2",
       "dependencies": {
+        "@polar/lib-get-features": "^3.0.0",
+        "@turf/boolean-contains": "^7.2.0",
         "@turf/center-of-mass": "^7.2.0"
       },
       "devDependencies": {
         "@polar/lib-custom-types": "^2.0.0"
       },
       "peerDependencies": {
+        "@masterportal/masterportalapi": "2.45.0",
         "@polar/core": "^3.0.0",
         "@repositoryname/vuex-generators": "^1.1.2",
+        "i18next": "^23.11.5",
         "ol": "^10.3.1",
         "vue": "^2.6.14",
         "vuex": "^3.6.2"
diff --git a/packages/plugins/Draw/package.json b/packages/plugins/Draw/package.json
index 014e95fc4..9fdabc5c1 100644
--- a/packages/plugins/Draw/package.json
+++ b/packages/plugins/Draw/package.json
@@ -24,6 +24,7 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
+    "@turf/boolean-contains": "^7.2.0",
     "@turf/center-of-mass": "^7.2.0",
     "@polar/lib-get-features": "^3.0.0"
   },
diff --git a/packages/plugins/Draw/src/locales.ts b/packages/plugins/Draw/src/locales.ts
index 6a9d0cb14..61dc009b7 100644
--- a/packages/plugins/Draw/src/locales.ts
+++ b/packages/plugins/Draw/src/locales.ts
@@ -42,8 +42,12 @@ export const resourcesDe = {
         textSize: 'Textgröße (px) wählen:',
       },
       lasso: {
+        layerRejected:
+          'Die Antwort des Layers "{{id}}" konnte nicht gelesen werden. Es wurden keine Geometrien aus diesem Layer bezogen.',
         notInZoomRange:
           'Der Layer "$t({{serviceName}})" wurde nicht für die Lasso-Funktion genutzt, da er auf der derzeitigen Zoomstufe nicht aktivierbar ist. Bitte passen Sie die Zoomstufe an, um die Lasso-Funktion zu nutzen.',
+        fatalError:
+          'Ein unerwarteter Fehler ist in der Verarbeitung der Lasso-Daten aufgetreten.',
       },
     },
   },
@@ -91,8 +95,12 @@ export const resourcesEn = {
         textSize: 'Choose text size (px):',
       },
       lasso: {
+        layerRejected:
+          'The response of layer "{{id}}" could not be read. No geometries were fetched from that layer.',
         notInZoomRange:
           'The layer "$t({{serviceName}})" was not used for the lasso as it is not activatable on the current zoom level. Please change the zoom level to use the lasso.',
+        fatalError:
+          'An unexpected error occured in the processing of lasso data.',
       },
     },
   },
diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
index 3c52e55e2..a1da1ac4d 100644
--- a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -1,10 +1,11 @@
 import Draw from 'ol/interaction/Draw'
 import Interaction from 'ol/interaction/Interaction'
 import i18next from 'i18next'
+import { GeoJSON } from 'ol/format'
+import { booleanContains } from '@turf/boolean-contains'
 import { rawLayerList } from '@masterportal/masterportalapi'
-import { MapConfig, PolarActionContext } from '@polar/lib-custom-types'
-import { Dispatch } from 'vuex'
-import { Feature, Map } from 'ol'
+import { PolarActionContext } from '@polar/lib-custom-types'
+import { Feature } from 'ol'
 import { Polygon } from 'ol/geom'
 import { parseWfsResponse } from '@polar/lib-get-features/wfs/parse'
 import { FeatureCollection, Feature as GeoJsonFeature } from 'geojson'
@@ -13,123 +14,11 @@ import VectorSource from 'ol/source/Vector'
 import { DrawGetters, DrawState } from '../../types'
 
 const loaderKey = 'drawLasso'
+const supportedFormats = ['OAF', 'WFS']
 
 // TODO un – refactor after done (actions/getters are mixed here)
 /* eslint-disable max-lines-per-function */
 
-const getLassoIdsInZoomRange = (
-  configuration: MapConfig,
-  zoomLevel: number,
-  dispatch: Dispatch
-) =>
-  (configuration.draw?.lassos || []).reduce(
-    (accumulator, { id, minZoom = true }) => {
-      const layerConfig = configuration.layers?.find((layer) => id === layer.id)
-      const toastAction = configuration.draw?.toastAction || ''
-      if (
-        minZoom &&
-        layerConfig &&
-        typeof layerConfig.minZoom !== 'undefined' &&
-        zoomLevel < layerConfig.minZoom
-      ) {
-        if (toastAction) {
-          dispatch(
-            toastAction,
-            {
-              type: 'info',
-              text: i18next.t('plugins.draw.lasso.notInZoomRange', {
-                serviceName: layerConfig.name || id,
-              }),
-              timeout: 10000,
-            },
-            { root: true }
-          )
-        } else {
-          console.warn(
-            `Lasso not used with layer with id "${id}". (minZoom not reached)`
-          )
-        }
-        return accumulator
-      }
-      accumulator.push(id)
-      return accumulator
-    },
-    [] as string[]
-  )
-
-const getLassoRequests = (
-  lassoIds: string[],
-  lasso: Feature<Polygon>,
-  map: Map
-) =>
-  lassoIds.reduce((accumulator, id) => {
-    const serviceDefinition = rawLayerList.getLayerWhere({ id })
-
-    const source = (
-      map
-        .getLayers()
-        .getArray()
-        .find((layer) => layer.get('id') === id) as VectorLayer
-    )?.getSource?.()
-    if (!(source instanceof VectorSource)) {
-      console.warn(
-        `@polar/plugin-draw: Layer with ID "${id}" configured for 'lasso', but it has no vector source. The layer does probably not hold any vector data.`
-      )
-    }
-
-    const [codeName, codeNumber] = map
-      .getView()
-      .getProjection()
-      .getCode()
-      .split(':')
-
-    // TODO use ol/source/Vector::getFeaturesInExtent instead? not easy to ensure data was loaded in extent
-
-    if (!['OAF', 'WFS'].includes(serviceDefinition.typ)) {
-      throw new Error('AAAAAAAAAAAAAAAAAAAA')
-    }
-
-    const url =
-      serviceDefinition.typ === 'OAF'
-        ? [
-            serviceDefinition.url,
-            'collections',
-            serviceDefinition.collection,
-            `items?f=json&limit=100&bbox=${lasso
-              .getGeometry()
-              ?.getExtent()}&bbox-crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}&crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}`,
-          ].join('/')
-        : `${serviceDefinition.url}${[
-            `?service=${serviceDefinition.typ}`,
-            `version=${serviceDefinition.version}`,
-            `request=GetFeature`,
-            `srsName=${map.getView().getProjection().getCode()}`,
-            `typeName=${serviceDefinition.featureType}`,
-            `bbox=${lasso.getGeometry()?.getExtent()},${map
-              .getView()
-              .getProjection()
-              .getCode()}`,
-          ].join('&')}`
-
-    accumulator.push(fetch(url))
-    return accumulator
-  }, [] as Promise<Response>[])
-
-const handleFulfilledRequests = (
-  featureCollections: FeatureCollection[],
-  dispatch: Dispatch
-) =>
-  dispatch('addFeatures', {
-    geoJSON: {
-      type: 'FeatureCollection',
-      features: featureCollections.reduce(
-        (accumulator, { features }) => accumulator.concat(features),
-        [] as GeoJsonFeature[]
-      ),
-    },
-    // TODO filter with drawnLasso
-  })
-
 export default function ({
   rootGetters,
   commit,
@@ -140,16 +29,96 @@ export default function ({
     freehand: true,
   })
   const { addLoading, removeLoading } = rootGetters.configuration?.draw || {}
+  const toastAction = rootGetters.configuration.draw?.toastAction || ''
   draw.on('drawend', (e) => {
     dispatch('setMode', 'none')
 
     const drawnLasso = e.feature as Feature<Polygon> // due to Draw 'type' param
-    const lassoIds = getLassoIdsInZoomRange(
-      rootGetters.configuration,
-      rootGetters.zoomLevel,
-      dispatch
+    const drawnLassoAsGeoJson = JSON.parse(
+      new GeoJSON().writeFeature(drawnLasso)
     )
-    const requests = getLassoRequests(lassoIds, drawnLasso, rootGetters.map)
+    const lassoIds = (rootGetters.configuration.draw?.lassos || []).reduce(
+      (accumulator, { id, minZoom = true }) => {
+        const layerConfig = rootGetters.configuration.layers?.find(
+          (layer) => id === layer.id
+        )
+        if (
+          minZoom &&
+          layerConfig &&
+          typeof layerConfig.minZoom !== 'undefined' &&
+          rootGetters.zoomLevel < layerConfig.minZoom
+        ) {
+          if (toastAction) {
+            dispatch(
+              toastAction,
+              {
+                type: 'info',
+                text: i18next.t('plugins.draw.lasso.notInZoomRange', {
+                  serviceName: layerConfig.name || id,
+                }),
+                timeout: 10000,
+              },
+              { root: true }
+            )
+          } else {
+            console.warn(
+              `Lasso not used with layer with id "${id}". (minZoom not reached)`
+            )
+          }
+          return accumulator
+        }
+        accumulator.push(id)
+        return accumulator
+      },
+      [] as string[]
+    )
+    const requests = lassoIds.reduce((accumulator, id) => {
+      const serviceDefinition = rawLayerList.getLayerWhere({ id })
+      if (!supportedFormats.includes(serviceDefinition.typ)) {
+        console.warn(
+          `@polar/plugin-draw: Layer with ID "${id} configured for 'lasso, but it's not a supported format. Layer is of type "${serviceDefinition.typ}", but only [${supportedFormats}] are supported.`
+        )
+        return accumulator
+      }
+
+      const source = (
+        rootGetters.map
+          .getLayers()
+          .getArray()
+          .find((layer) => layer.get('id') === id) as VectorLayer
+      )?.getSource?.()
+      if (!(source instanceof VectorSource)) {
+        console.warn(
+          `@polar/plugin-draw: Layer with ID "${id}" configured for 'lasso', but it has no vector source. The layer does probably not hold any vector data and is skipped.`
+        )
+        return accumulator
+      }
+
+      const code = rootGetters.map.getView().getProjection().getCode()
+      const [codeName, codeNumber] = code.split(':')
+
+      const url =
+        serviceDefinition.typ === 'OAF'
+          ? [
+              serviceDefinition.url,
+              'collections',
+              serviceDefinition.collection,
+              `items?f=json&limit=100&bbox=${drawnLasso
+                .getGeometry()
+                ?.getExtent()}&bbox-crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}&crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}`,
+            ].join('/')
+          : `${serviceDefinition.url}${[
+              `?service=${serviceDefinition.typ}`,
+              `version=${serviceDefinition.version}`,
+              `request=GetFeature`,
+              `srsName=${code}`,
+              `typeName=${serviceDefinition.featureType}`,
+              `bbox=${drawnLasso.getGeometry()?.getExtent()},${code}`,
+            ].join('&')}`
+
+      accumulator.push(fetch(url))
+      return accumulator
+    }, [] as Promise<Response>[])
 
     if (addLoading) {
       commit(addLoading, loaderKey, { root: true })
@@ -158,10 +127,24 @@ export default function ({
       .then((settledRequests) =>
         Promise.all(
           (
-            settledRequests.filter((promiseSettledResult) => {
+            settledRequests.filter((promiseSettledResult, index) => {
               if (promiseSettledResult.status === 'rejected') {
-                console.error(promiseSettledResult.reason)
-                // TODO toast
+                console.error(
+                  '@polar/plugin-draw: Error during reading lasso response from layer.',
+                  promiseSettledResult.reason
+                )
+                if (toastAction) {
+                  dispatch(
+                    toastAction,
+                    {
+                      type: 'error',
+                      text: i18next.t('plugins.draw.lasso.layerRejected', {
+                        id: lassoIds[index],
+                      }),
+                    },
+                    { root: true }
+                  )
+                }
                 return false
               }
               return true
@@ -173,11 +156,37 @@ export default function ({
           )
         )
       )
-      .then((fulfilledRequests) =>
-        handleFulfilledRequests(fulfilledRequests, dispatch)
+      .then((featureCollections) =>
+        dispatch('addFeatures', {
+          geoJSON: {
+            type: 'FeatureCollection',
+            features: featureCollections
+              .reduce(
+                (accumulator, { features }) => accumulator.concat(features),
+                [] as GeoJsonFeature[]
+              )
+              .filter((feature) =>
+                booleanContains(drawnLassoAsGeoJson, feature)
+              ),
+          },
+        })
       )
-      // TODO add toast, unexpected catastrophic error
-      .catch(console.error)
+      .catch((error) => {
+        console.error(
+          '@polar/plugin-draw: Client failure in reading responses in lasso action.',
+          error
+        )
+        if (toastAction) {
+          dispatch(
+            toastAction,
+            {
+              type: 'error',
+              text: i18next.t('plugins.draw.lasso.fatalError'),
+            },
+            { root: true }
+          )
+        }
+      })
       .finally(
         () => removeLoading && commit(removeLoading, loaderKey, { root: true })
       )

From e5ba9badab3d5488fb5d498ad4d9aadeba6ac0c2 Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Thu, 20 Feb 2025 10:20:35 +0100
Subject: [PATCH 06/15] refactor lasso, centralize service requests

---
 packages/lib/getFeatures/CHANGELOG.md         |   4 +
 packages/lib/getFeatures/index.ts             |   4 +
 packages/lib/getFeatures/vector/index.ts      |  66 ++++++
 packages/plugins/Draw/src/locales.ts          |   8 +-
 .../createLassoInteractions.ts                | 220 ++++++------------
 packages/plugins/Draw/src/store/index.ts      |  20 ++
 packages/plugins/Draw/src/types.ts            |   2 +
 7 files changed, 175 insertions(+), 149 deletions(-)
 create mode 100644 packages/lib/getFeatures/vector/index.ts

diff --git a/packages/lib/getFeatures/CHANGELOG.md b/packages/lib/getFeatures/CHANGELOG.md
index 89733a175..61cb7fc81 100644
--- a/packages/lib/getFeatures/CHANGELOG.md
+++ b/packages/lib/getFeatures/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## unpublished
+
+- Feature: Add new methods `getVectorFeaturesByBboxRequest` and `getVectorFeaturesByFeatureRequest` that support both WFS and OAF layers.
+
 ## 3.0.0
 
 - Breaking: Upgrade peerDependency `ol` from `^9.2.4` to `^10.3.1`.
diff --git a/packages/lib/getFeatures/index.ts b/packages/lib/getFeatures/index.ts
index a7307b6ae..3f8f327c1 100644
--- a/packages/lib/getFeatures/index.ts
+++ b/packages/lib/getFeatures/index.ts
@@ -1,2 +1,6 @@
 export * from './types'
 export { getWfsFeatures } from './wfs'
+export {
+  getVectorFeaturesByBboxRequest,
+  getVectorFeaturesByFeatureRequest,
+} from './vector'
diff --git a/packages/lib/getFeatures/vector/index.ts b/packages/lib/getFeatures/vector/index.ts
new file mode 100644
index 000000000..d082ecb33
--- /dev/null
+++ b/packages/lib/getFeatures/vector/index.ts
@@ -0,0 +1,66 @@
+import { rawLayerList } from '@masterportal/masterportalapi'
+import { Feature } from 'ol'
+
+const supportedFormats = ['OAF', 'WFS']
+
+export const getVectorFeaturesByBboxRequest = ({
+  bbox,
+  fetchLayerId,
+  projectionCode,
+}: {
+  bbox: number[]
+  fetchLayerId: string
+  projectionCode: string
+}) => {
+  const serviceDefinition = rawLayerList.getLayerWhere({ id: fetchLayerId })
+  if (!supportedFormats.includes(serviceDefinition.typ)) {
+    throw new Error(
+      `@polar/lib-get-features#getVectorFeaturesByBboxRequest: Layer with ID "${fetchLayerId}" of type "${serviceDefinition.typ}" used to retrieve vector data, but is not within the range of supported types [${supportedFormats}].`
+    )
+  }
+
+  const [codeName, codeNumber] = projectionCode.split(':')
+
+  const url =
+    serviceDefinition.typ === 'OAF'
+      ? [
+          serviceDefinition.url,
+          'collections',
+          serviceDefinition.collection,
+          `items?f=json&limit=100&bbox=${bbox}&bbox-crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}&crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}`,
+        ].join('/')
+      : `${serviceDefinition.url}${[
+          `?service=${serviceDefinition.typ}`,
+          `version=${serviceDefinition.version}`,
+          `request=GetFeature`,
+          `srsName=${projectionCode}`,
+          `typeName=${serviceDefinition.featureType}`,
+          `bbox=${bbox},${projectionCode}`,
+        ].join('&')}`
+
+  return fetch(url)
+}
+
+export const getVectorFeaturesByFeatureRequest = ({
+  feature,
+  fetchLayerId,
+  projectionCode,
+}: {
+  feature: Feature
+  fetchLayerId: string
+  projectionCode: string
+}) => {
+  const bbox = feature.getGeometry()?.getExtent?.()
+
+  if (typeof bbox === 'undefined') {
+    throw new Error(
+      '@polar/lib-get-features#getVectorFeaturesByFeatureRequest: Given feature had no extent.'
+    )
+  }
+
+  return getVectorFeaturesByBboxRequest({
+    bbox,
+    fetchLayerId,
+    projectionCode,
+  })
+}
diff --git a/packages/plugins/Draw/src/locales.ts b/packages/plugins/Draw/src/locales.ts
index 61dc009b7..cb093359b 100644
--- a/packages/plugins/Draw/src/locales.ts
+++ b/packages/plugins/Draw/src/locales.ts
@@ -44,9 +44,7 @@ export const resourcesDe = {
       lasso: {
         layerRejected:
           'Die Antwort des Layers "{{id}}" konnte nicht gelesen werden. Es wurden keine Geometrien aus diesem Layer bezogen.',
-        notInZoomRange:
-          'Der Layer "$t({{serviceName}})" wurde nicht für die Lasso-Funktion genutzt, da er auf der derzeitigen Zoomstufe nicht aktivierbar ist. Bitte passen Sie die Zoomstufe an, um die Lasso-Funktion zu nutzen.',
-        fatalError:
+        internalError:
           'Ein unerwarteter Fehler ist in der Verarbeitung der Lasso-Daten aufgetreten.',
       },
     },
@@ -97,9 +95,7 @@ export const resourcesEn = {
       lasso: {
         layerRejected:
           'The response of layer "{{id}}" could not be read. No geometries were fetched from that layer.',
-        notInZoomRange:
-          'The layer "$t({{serviceName}})" was not used for the lasso as it is not activatable on the current zoom level. Please change the zoom level to use the lasso.',
-        fatalError:
+        internalError:
           'An unexpected error occured in the processing of lasso data.',
       },
     },
diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
index a1da1ac4d..487dfdb78 100644
--- a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -1,5 +1,4 @@
 import Draw from 'ol/interaction/Draw'
-import Interaction from 'ol/interaction/Interaction'
 import i18next from 'i18next'
 import { GeoJSON } from 'ol/format'
 import { booleanContains } from '@turf/boolean-contains'
@@ -9,186 +8,121 @@ import { Feature } from 'ol'
 import { Polygon } from 'ol/geom'
 import { parseWfsResponse } from '@polar/lib-get-features/wfs/parse'
 import { FeatureCollection, Feature as GeoJsonFeature } from 'geojson'
-import VectorLayer from 'ol/layer/Vector'
-import VectorSource from 'ol/source/Vector'
+import { getVectorFeaturesByFeatureRequest } from '@polar/lib-get-features'
 import { DrawGetters, DrawState } from '../../types'
 
-const loaderKey = 'drawLasso'
-const supportedFormats = ['OAF', 'WFS']
+let loaderKeyCounter = 0
+const loaderKeyBase = 'draw-lasso-load'
 
-// TODO un – refactor after done (actions/getters are mixed here)
-/* eslint-disable max-lines-per-function */
+const requestError = `@polar/plugin-draw: An error occurred on creating the lasso request: `
+const rejectedError =
+  '@polar/plugin-draw: The response to a lasso request indicated an error.'
+const parseError =
+  '@polar/plugin-draw: Client failure in reading responses in lasso action.'
+const internalError = () => ({
+  type: 'error',
+  text: i18next.t('plugins.draw.lasso.internalError'),
+})
 
+const buildAddFeaturesPayload = (
+  featureCollections: FeatureCollection[],
+  drawnLasso: Feature
+) => ({
+  geoJSON: {
+    type: 'FeatureCollection',
+    features: featureCollections
+      .reduce(
+        (accumulator, { features }) => accumulator.concat(features),
+        [] as GeoJsonFeature[]
+      )
+      .filter((feature) =>
+        booleanContains(
+          JSON.parse(new GeoJSON().writeFeature(drawnLasso)),
+          feature
+        )
+      ),
+  },
+})
+
+// should be fine, surrounding method is only unpacking/packing, also see below
+// eslint-disable-next-line max-lines-per-function
 export default function ({
   rootGetters,
+  getters,
   commit,
   dispatch,
-}: PolarActionContext<DrawState, DrawGetters>): Interaction[] {
-  const draw = new Draw({
-    type: 'Polygon',
-    freehand: true,
-  })
-  const { addLoading, removeLoading } = rootGetters.configuration?.draw || {}
-  const toastAction = rootGetters.configuration.draw?.toastAction || ''
+}: PolarActionContext<DrawState, DrawGetters>) {
+  const draw = new Draw({ type: 'Polygon', freehand: true })
+
+  // should be fine, line bloat is from error handling (only logging/toasting)
+  // eslint-disable-next-line max-lines-per-function
   draw.on('drawend', (e) => {
     dispatch('setMode', 'none')
 
+    const toast = (toastObject) =>
+      getters.toastAction &&
+      dispatch(getters.toastAction, toastObject, { root: true })
     const drawnLasso = e.feature as Feature<Polygon> // due to Draw 'type' param
-    const drawnLassoAsGeoJson = JSON.parse(
-      new GeoJSON().writeFeature(drawnLasso)
-    )
-    const lassoIds = (rootGetters.configuration.draw?.lassos || []).reduce(
-      (accumulator, { id, minZoom = true }) => {
-        const layerConfig = rootGetters.configuration.layers?.find(
-          (layer) => id === layer.id
-        )
-        if (
-          minZoom &&
-          layerConfig &&
-          typeof layerConfig.minZoom !== 'undefined' &&
-          rootGetters.zoomLevel < layerConfig.minZoom
-        ) {
-          if (toastAction) {
-            dispatch(
-              toastAction,
-              {
-                type: 'info',
-                text: i18next.t('plugins.draw.lasso.notInZoomRange', {
-                  serviceName: layerConfig.name || id,
-                }),
-                timeout: 10000,
-              },
-              { root: true }
-            )
-          } else {
-            console.warn(
-              `Lasso not used with layer with id "${id}". (minZoom not reached)`
-            )
-          }
-          return accumulator
-        }
-        accumulator.push(id)
-        return accumulator
-      },
-      [] as string[]
-    )
-    const requests = lassoIds.reduce((accumulator, id) => {
-      const serviceDefinition = rawLayerList.getLayerWhere({ id })
-      if (!supportedFormats.includes(serviceDefinition.typ)) {
-        console.warn(
-          `@polar/plugin-draw: Layer with ID "${id} configured for 'lasso, but it's not a supported format. Layer is of type "${serviceDefinition.typ}", but only [${supportedFormats}] are supported.`
-        )
-        return accumulator
-      }
-
-      const source = (
-        rootGetters.map
-          .getLayers()
-          .getArray()
-          .find((layer) => layer.get('id') === id) as VectorLayer
-      )?.getSource?.()
-      if (!(source instanceof VectorSource)) {
-        console.warn(
-          `@polar/plugin-draw: Layer with ID "${id}" configured for 'lasso', but it has no vector source. The layer does probably not hold any vector data and is skipped.`
-        )
-        return accumulator
+    const requests = getters.activeLassoIds.reduce((accumulator, id) => {
+      try {
+        const request = getVectorFeaturesByFeatureRequest({
+          feature: drawnLasso,
+          fetchLayerId: id,
+          projectionCode: rootGetters.map.getView().getProjection().getCode(),
+        })
+        accumulator.push(request)
+      } catch (e) {
+        console.error(requestError, e)
+        toast(internalError())
       }
-
-      const code = rootGetters.map.getView().getProjection().getCode()
-      const [codeName, codeNumber] = code.split(':')
-
-      const url =
-        serviceDefinition.typ === 'OAF'
-          ? [
-              serviceDefinition.url,
-              'collections',
-              serviceDefinition.collection,
-              `items?f=json&limit=100&bbox=${drawnLasso
-                .getGeometry()
-                ?.getExtent()}&bbox-crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}&crs=http://www.opengis.net/def/crs/${codeName}/0/${codeNumber}`,
-            ].join('/')
-          : `${serviceDefinition.url}${[
-              `?service=${serviceDefinition.typ}`,
-              `version=${serviceDefinition.version}`,
-              `request=GetFeature`,
-              `srsName=${code}`,
-              `typeName=${serviceDefinition.featureType}`,
-              `bbox=${drawnLasso.getGeometry()?.getExtent()},${code}`,
-            ].join('&')}`
-
-      accumulator.push(fetch(url))
       return accumulator
     }, [] as Promise<Response>[])
 
-    if (addLoading) {
-      commit(addLoading, loaderKey, { root: true })
+    let loaderKey
+    if (getters.configuration.addLoading) {
+      loaderKey = `${loaderKeyBase}-${loaderKeyCounter++}`
+      commit(getters.configuration.addLoading, loaderKey, { root: true })
     }
+
     Promise.allSettled(requests)
       .then((settledRequests) =>
         Promise.all(
           (
             settledRequests.filter((promiseSettledResult, index) => {
               if (promiseSettledResult.status === 'rejected') {
-                console.error(
-                  '@polar/plugin-draw: Error during reading lasso response from layer.',
-                  promiseSettledResult.reason
-                )
-                if (toastAction) {
-                  dispatch(
-                    toastAction,
-                    {
-                      type: 'error',
-                      text: i18next.t('plugins.draw.lasso.layerRejected', {
-                        id: lassoIds[index],
-                      }),
-                    },
-                    { root: true }
-                  )
-                }
+                console.error(rejectedError, promiseSettledResult.reason)
+                toast({
+                  type: 'error',
+                  text: i18next.t('plugins.draw.lasso.layerRejected', {
+                    id: getters.activeLassoIds[index],
+                  }),
+                })
                 return false
               }
               return true
             }) as PromiseFulfilledResult<Response>[]
           ).map(async (resolution, index) =>
-            rawLayerList.getLayerWhere({ id: lassoIds[index] }).typ === 'WFS'
+            rawLayerList.getLayerWhere({ id: getters.activeLassoIds[index] })
+              .typ === 'WFS'
               ? await parseWfsResponse(resolution.value, undefined, false)
               : ((await resolution.value.json()) as FeatureCollection)
           )
         )
       )
       .then((featureCollections) =>
-        dispatch('addFeatures', {
-          geoJSON: {
-            type: 'FeatureCollection',
-            features: featureCollections
-              .reduce(
-                (accumulator, { features }) => accumulator.concat(features),
-                [] as GeoJsonFeature[]
-              )
-              .filter((feature) =>
-                booleanContains(drawnLassoAsGeoJson, feature)
-              ),
-          },
-        })
+        dispatch(
+          'addFeatures',
+          buildAddFeaturesPayload(featureCollections, drawnLasso)
+        )
       )
       .catch((error) => {
-        console.error(
-          '@polar/plugin-draw: Client failure in reading responses in lasso action.',
-          error
-        )
-        if (toastAction) {
-          dispatch(
-            toastAction,
-            {
-              type: 'error',
-              text: i18next.t('plugins.draw.lasso.fatalError'),
-            },
-            { root: true }
-          )
-        }
+        console.error(parseError, error)
+        toast(internalError())
       })
       .finally(
-        () => removeLoading && commit(removeLoading, loaderKey, { root: true })
+        () =>
+          getters.configuration.removeLoading &&
+          commit(getters.configuration.removeLoading, loaderKey, { root: true })
       )
   })
 
diff --git a/packages/plugins/Draw/src/store/index.ts b/packages/plugins/Draw/src/store/index.ts
index 6ed0d0d4a..af9e15bce 100644
--- a/packages/plugins/Draw/src/store/index.ts
+++ b/packages/plugins/Draw/src/store/index.ts
@@ -91,6 +91,26 @@ export const makeStoreModule = () => {
         }
         return Object.fromEntries(modes)
       },
+      activeLassoIds: (_, { configuration }, __, rootGetters) =>
+        (configuration.lassos || []).reduce(
+          (accumulator, { id, minZoom = true }) => {
+            const layerConfig = rootGetters.configuration.layers?.find(
+              (layer) => id === layer.id
+            )
+            if (
+              minZoom &&
+              layerConfig &&
+              typeof layerConfig.minZoom !== 'undefined' &&
+              rootGetters.zoomLevel < layerConfig.minZoom
+            ) {
+              return accumulator
+            }
+            accumulator.push(id)
+            return accumulator
+          },
+          [] as string[]
+        ),
+      toastAction: (_, { configuration }) => configuration.toastAction || '',
       measureOptions: (_, { configuration }) =>
         configuration.measureOptions || {},
       selectableMeasureModes: (_, { drawMode, measureOptions }) =>
diff --git a/packages/plugins/Draw/src/types.ts b/packages/plugins/Draw/src/types.ts
index c15ea9bc7..13ed85ac7 100644
--- a/packages/plugins/Draw/src/types.ts
+++ b/packages/plugins/Draw/src/types.ts
@@ -49,6 +49,8 @@ export interface DrawGetters extends Omit<DrawState, 'selectedFeature'> {
   showSizeSlider: boolean
   /* actual text size to use */
   textSize: number
+  activeLassoIds: string[]
+  toastAction: string
   showDrawOptions: boolean
   showMeasureOptions: boolean
 }

From 0cffa570173abb99bfd458b7db5a88e36b54b67d Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Thu, 20 Feb 2025 11:06:23 +0100
Subject: [PATCH 07/15] fix bug where multi-geometries errored in lasso

---
 .../createLassoInteractions.ts                | 57 +++++++++++++------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
index 487dfdb78..a5054fcd6 100644
--- a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -7,7 +7,12 @@ import { PolarActionContext } from '@polar/lib-custom-types'
 import { Feature } from 'ol'
 import { Polygon } from 'ol/geom'
 import { parseWfsResponse } from '@polar/lib-get-features/wfs/parse'
-import { FeatureCollection, Feature as GeoJsonFeature } from 'geojson'
+import {
+  FeatureCollection,
+  Feature as GeoJsonFeature,
+  Geometry,
+  GeometryCollection,
+} from 'geojson'
 import { getVectorFeaturesByFeatureRequest } from '@polar/lib-get-features'
 import { DrawGetters, DrawState } from '../../types'
 
@@ -27,22 +32,42 @@ const internalError = () => ({
 const buildAddFeaturesPayload = (
   featureCollections: FeatureCollection[],
   drawnLasso: Feature
-) => ({
-  geoJSON: {
-    type: 'FeatureCollection',
-    features: featureCollections
-      .reduce(
-        (accumulator, { features }) => accumulator.concat(features),
-        [] as GeoJsonFeature[]
-      )
-      .filter((feature) =>
-        booleanContains(
-          JSON.parse(new GeoJSON().writeFeature(drawnLasso)),
-          feature
+) => {
+  const drawnLassoGeoJson = JSON.parse(new GeoJSON().writeFeature(drawnLasso))
+
+  console.error(featureCollections)
+
+  return {
+    geoJSON: {
+      type: 'FeatureCollection',
+      features: featureCollections
+        .reduce(
+          (accumulator, { features }) => accumulator.concat(features),
+          [] as GeoJsonFeature[]
         )
-      ),
-  },
-})
+        .filter((feature) => {
+          if (feature.geometry.type.startsWith('Multi')) {
+            return (
+              // since .type on GeometryCollection doesn't start with 'Multi'
+              (
+                feature.geometry as Exclude<Geometry, GeometryCollection>
+              ).coordinates.every((partialCoordinates) =>
+                booleanContains(drawnLassoGeoJson, {
+                  type: 'Feature',
+                  geometry: {
+                    type: feature.geometry.type.slice(5), // un«Multi»ed
+                    coordinates: partialCoordinates,
+                  },
+                  properties: {},
+                })
+              )
+            )
+          }
+          return booleanContains(drawnLassoGeoJson, feature)
+        }),
+    },
+  }
+}
 
 // should be fine, surrounding method is only unpacking/packing, also see below
 // eslint-disable-next-line max-lines-per-function

From d8a5e5204d94516375603a37ba473258972cc198 Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Thu, 20 Feb 2025 11:11:30 +0100
Subject: [PATCH 08/15] remove bonus console.error

---
 .../src/store/createInteractions/createLassoInteractions.ts     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
index a5054fcd6..740e91c43 100644
--- a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -35,8 +35,6 @@ const buildAddFeaturesPayload = (
 ) => {
   const drawnLassoGeoJson = JSON.parse(new GeoJSON().writeFeature(drawnLasso))
 
-  console.error(featureCollections)
-
   return {
     geoJSON: {
       type: 'FeatureCollection',

From 49b0e40814b25e9584d5723cefb11b3abc8200c7 Mon Sep 17 00:00:00 2001
From: Dennis Sen <108349707+warm-coolguy@users.noreply.github.com>
Date: Thu, 20 Feb 2025 21:21:27 +0100
Subject: [PATCH 09/15] Update packages/plugins/Draw/README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

apply suggestion "clarify a little"

Co-authored-by: Pascal Röhling <73653210+dopenguin@users.noreply.github.com>
---
 packages/plugins/Draw/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/Draw/README.md b/packages/plugins/Draw/README.md
index 079db3b34..a0e53a605 100644
--- a/packages/plugins/Draw/README.md
+++ b/packages/plugins/Draw/README.md
@@ -42,7 +42,7 @@ The styling of the drawn features can be configured to overwrite the default ol-
 | snapTo | string[]? | Accepts an array of layer IDs. If these layers are active, they are used as snapping material for geometry manipulation. The Draw layer will also always snap to its own features regardless. Please mind that used layers must provide vector data. The layers referred to must be configured in `mapConfiguration.layers`. |
 | style | style? | Please see example below for styling options. Defaults to standard OpenLayers styling. |
 | textStyle | textStyle? | Use this object with properties 'font' and 'textColor' to style text feature. |
-| toastAction | string? | This string will be used as action to send a toast information to the user to clarify why something happened in edge cases. If this is not defined, the information will be printed to the console for debugging purposes instead. |
+| toastAction | string? | This string will be used as action to send a toast information to the user to clarify why something happened in edge cases. If this is not defined, the information will only be printed to the console for debugging purposes instead. |
 
 For details on the `displayComponent` attribute, refer to the [Global Plugin Parameters](../../core/README.md#global-plugin-parameters) section of `@polar/core`.
 

From d0c63cae1cf9724ec8c560e4f2a90c3f667bcdb2 Mon Sep 17 00:00:00 2001
From: Dennis Sen <108349707+warm-coolguy@users.noreply.github.com>
Date: Thu, 20 Feb 2025 21:22:11 +0100
Subject: [PATCH 10/15] Update packages/plugins/Draw/CHANGELOG.md

apply suggestion "remove outdated sentence"
---
 packages/plugins/Draw/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/Draw/CHANGELOG.md b/packages/plugins/Draw/CHANGELOG.md
index 3080ed82b..b8c860eb3 100644
--- a/packages/plugins/Draw/CHANGELOG.md
+++ b/packages/plugins/Draw/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 - Feature: Add a `"translate"` mode that allows moving drawn features as they are.
 - Feature: Add a `"snapTo"` key to the configuration that allows defining vector layers to snap to while drawing, editing, and translating.
-- Feature: Add a lasso mode that allows copying up features from a vector layer that are contained within the user's hand drawn polygon. This feature is currently without UI and needs to be started from the outside, see docs.
+- Feature: Add a lasso mode that allows copying up features from a vector layer that are contained within the user's hand drawn polygon.
 - Feature: Interactions requiring dragging are now marked with the POLAR flag `_isPolarDragLikeInteraction`.
 
 ## 3.0.0

From eb4b2f72f2641aee950ef02a3d42b7299aa1529c Mon Sep 17 00:00:00 2001
From: Dennis Sen <108349707+warm-coolguy@users.noreply.github.com>
Date: Thu, 20 Feb 2025 21:25:04 +0100
Subject: [PATCH 11/15] add additional new flags to changelog

---
 packages/plugins/Draw/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/Draw/CHANGELOG.md b/packages/plugins/Draw/CHANGELOG.md
index b8c860eb3..81733adaf 100644
--- a/packages/plugins/Draw/CHANGELOG.md
+++ b/packages/plugins/Draw/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 - Feature: Add a `"translate"` mode that allows moving drawn features as they are.
 - Feature: Add a `"snapTo"` key to the configuration that allows defining vector layers to snap to while drawing, editing, and translating.
-- Feature: Add a lasso mode that allows copying up features from a vector layer that are contained within the user's hand drawn polygon.
+- Feature: Add a lasso mode that allows copying up features from a vector layer that are contained within the user's hand drawn polygon. This also adds the fields `addLoading`, `removeLoading`, and `toastAction` for usage in the `lassos`.
 - Feature: Interactions requiring dragging are now marked with the POLAR flag `_isPolarDragLikeInteraction`.
 
 ## 3.0.0

From d39895448f4d79b24593d88ae7abcaa6ba9d21c1 Mon Sep 17 00:00:00 2001
From: Dennis Sen <108349707+warm-coolguy@users.noreply.github.com>
Date: Thu, 20 Feb 2025 21:35:56 +0100
Subject: [PATCH 12/15] rephrase error log

---
 packages/lib/getFeatures/vector/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lib/getFeatures/vector/index.ts b/packages/lib/getFeatures/vector/index.ts
index d082ecb33..f26ce459d 100644
--- a/packages/lib/getFeatures/vector/index.ts
+++ b/packages/lib/getFeatures/vector/index.ts
@@ -15,7 +15,7 @@ export const getVectorFeaturesByBboxRequest = ({
   const serviceDefinition = rawLayerList.getLayerWhere({ id: fetchLayerId })
   if (!supportedFormats.includes(serviceDefinition.typ)) {
     throw new Error(
-      `@polar/lib-get-features#getVectorFeaturesByBboxRequest: Layer with ID "${fetchLayerId}" of type "${serviceDefinition.typ}" used to retrieve vector data, but is not within the range of supported types [${supportedFormats}].`
+      `@polar/lib-get-features#getVectorFeaturesByBboxRequest: Layer with ID "${fetchLayerId}" of type "${serviceDefinition.typ}" was used to retrieve vector data, but is not within the range of supported types [${supportedFormats}].`
     )
   }
 

From 5edfb485f8a999ca34f1bcdfc8fc5d278ab109ce Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Fri, 21 Feb 2025 11:28:37 +0100
Subject: [PATCH 13/15] generalize toastAction config decision

---
 packages/clients/diplan/example/config.js   | 1 -
 packages/clients/diplan/src/polar-client.ts | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/clients/diplan/example/config.js b/packages/clients/diplan/example/config.js
index 4143220dd..264c354fc 100644
--- a/packages/clients/diplan/example/config.js
+++ b/packages/clients/diplan/example/config.js
@@ -132,7 +132,6 @@ export default {
         family: 'Arial',
       },
     },
-    toastAction: 'plugin/toast/addToast',
     style: {
       fill: { color: 'rgb(51 117 212 / 50%)' },
       stroke: {
diff --git a/packages/clients/diplan/src/polar-client.ts b/packages/clients/diplan/src/polar-client.ts
index a5f77abb9..e71eb56ff 100644
--- a/packages/clients/diplan/src/polar-client.ts
+++ b/packages/clients/diplan/src/polar-client.ts
@@ -43,6 +43,7 @@ polarCore.addPlugins([
       },
       {
         plugin: Draw({
+          toastAction: 'plugin/toast/addToast',
           addLoading: 'plugin/loadingIndicator/addLoadingKey',
           removeLoading: 'plugin/loadingIndicator/removeLoadingKey',
         }),

From b5fbda45b200801ffc1f899f7ff06f9246411bce Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Mon, 24 Feb 2025 13:11:22 +0100
Subject: [PATCH 14/15] change parseWfsResponse export path

---
 packages/lib/getFeatures/CHANGELOG.md                       | 1 +
 packages/lib/getFeatures/index.ts                           | 1 +
 .../src/store/createInteractions/createLassoInteractions.ts | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/lib/getFeatures/CHANGELOG.md b/packages/lib/getFeatures/CHANGELOG.md
index 61cb7fc81..e4024b209 100644
--- a/packages/lib/getFeatures/CHANGELOG.md
+++ b/packages/lib/getFeatures/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## unpublished
 
 - Feature: Add new methods `getVectorFeaturesByBboxRequest` and `getVectorFeaturesByFeatureRequest` that support both WFS and OAF layers.
+- Feature: Add `parseWfsResponse` method to package re-exports.
 
 ## 3.0.0
 
diff --git a/packages/lib/getFeatures/index.ts b/packages/lib/getFeatures/index.ts
index 3f8f327c1..10560eeec 100644
--- a/packages/lib/getFeatures/index.ts
+++ b/packages/lib/getFeatures/index.ts
@@ -1,5 +1,6 @@
 export * from './types'
 export { getWfsFeatures } from './wfs'
+export { parseWfsResponse } from './wfs/parse'
 export {
   getVectorFeaturesByBboxRequest,
   getVectorFeaturesByFeatureRequest,
diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
index 740e91c43..0ca045f57 100644
--- a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -6,14 +6,16 @@ import { rawLayerList } from '@masterportal/masterportalapi'
 import { PolarActionContext } from '@polar/lib-custom-types'
 import { Feature } from 'ol'
 import { Polygon } from 'ol/geom'
-import { parseWfsResponse } from '@polar/lib-get-features/wfs/parse'
+import {
+  parseWfsResponse,
+  getVectorFeaturesByFeatureRequest,
+} from '@polar/lib-get-features'
 import {
   FeatureCollection,
   Feature as GeoJsonFeature,
   Geometry,
   GeometryCollection,
 } from 'geojson'
-import { getVectorFeaturesByFeatureRequest } from '@polar/lib-get-features'
 import { DrawGetters, DrawState } from '../../types'
 
 let loaderKeyCounter = 0

From bb093e2aa47f8b4daea2a2fba4cd5cc394043cfb Mon Sep 17 00:00:00 2001
From: Dennis Sen <dennis.sen@dataport.de>
Date: Tue, 25 Feb 2025 06:53:06 +0100
Subject: [PATCH 15/15] rename variable to be less zoomy

---
 .../src/store/createInteractions/createLassoInteractions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
index 0ca045f57..2e6e1f98c 100644
--- a/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
+++ b/packages/plugins/Draw/src/store/createInteractions/createLassoInteractions.ts
@@ -126,11 +126,11 @@ export default function ({
               }
               return true
             }) as PromiseFulfilledResult<Response>[]
-          ).map(async (resolution, index) =>
+          ).map(async (result, index) =>
             rawLayerList.getLayerWhere({ id: getters.activeLassoIds[index] })
               .typ === 'WFS'
-              ? await parseWfsResponse(resolution.value, undefined, false)
-              : ((await resolution.value.json()) as FeatureCollection)
+              ? await parseWfsResponse(result.value, undefined, false)
+              : ((await result.value.json()) as FeatureCollection)
           )
         )
       )