Merge pull request #807 from Deltares/DWO-691

Only retrieve the child locations and the required attributes

package.json

@@ -17,7 +17,7 @@
     "test-ct": "playwright test -c playwright-ct.config.ts"
   },
   "dependencies": {
-    "@deltares/fews-pi-requests": "^1.0.10",
+    "@deltares/fews-pi-requests": "^1.0.11",
     "@deltares/fews-ssd-requests": "^1.0.1",
     "@deltares/fews-ssd-webcomponent": "^1.0.1",
     "@deltares/fews-web-oc-charts": "^3.0.2",

src/components/download/DataDownloadDisplayComponent.vue

@@ -408,37 +408,34 @@ function getParameterName(parameter: TimeSeriesParameter): string {
 async function getLocations(): Promise<Location[]> {
   const filter: LocationsFilter = {
     showAttributes: true,
+    showParentLocations: false,
+    attributeIds: props.topologyNode.dataDownloadDisplay?.attributes.map(
+      (item) => item.id,
+    ),
     filterId: filterId,
     documentFormat: DocumentFormat.PI_JSON,
   }
   const locationsResponse = await piProvider.getLocations(filter)
-  const allLocations = locationsResponse.locations
-  const allParentLocations = allLocations.map(
-    (location) => location.parentLocationId,
-  )
-  return locationsResponse.locations.filter(
-    (location) => !allParentLocations.includes(location.locationId),
-  )
+  return locationsResponse.locations
 }
 
 function getAttributeValues(locations: Location[]): string[][] {
   const attributeValuesMap: string[][] = []
   const configuredAttributeIds =
     props.topologyNode.dataDownloadDisplay?.attributes.map((item) => item.id)
   configuredAttributeIds?.forEach((item) => attributeValuesMap.push([]))
+  if (configuredAttributeIds === undefined) return attributeValuesMap
   for (const newLocation of locations) {
     let attributes = newLocation.attributes
     if (attributes == undefined) continue
     for (let i = 0; i < attributes.length; i++) {
       const attribute = attributes[i]
       if (attribute.id === undefined) continue
       if (attribute.value === undefined) continue
-      if (configuredAttributeIds?.includes(attribute.id)) {
-        const arrayForAttribute =
-          attributeValuesMap[configuredAttributeIds.indexOf(attribute.id)]
-        if (!arrayForAttribute.includes(attribute.value)) {
-          arrayForAttribute.push(attribute.value)
-        }
+      const arrayForAttribute =
+        attributeValuesMap[configuredAttributeIds.indexOf(attribute.id)]
+      if (!arrayForAttribute.includes(attribute.value)) {
+        arrayForAttribute.push(attribute.value)
       }
     }
   }

src/lib/topology/locations.ts

@@ -67,6 +67,7 @@ async function fetchLocationsAsGeoJsonForSingleFilterId(
   const filter = {
     documentFormat: DocumentFormat.GEO_JSON,
     filterId: filterId,
+    showParentLocations: false,
     includeIconNames: true,
   }
   // TODO: Remove cast to any when fews-pi-requests supports GeoJSON response in LocationResponse