From 261210d7da49817ba2e786b3d3913be9ec580ea6 Mon Sep 17 00:00:00 2001 From: Cees Voesenek Date: Tue, 18 Jun 2024 15:16:39 +0200 Subject: [PATCH 1/2] Use speed exponent from WMS getCapabilities instead of hard-coded value --- package-lock.json | 8 ++++---- package.json | 2 +- src/components/wms/AnimatedStreamlineRasterLayer.vue | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2154a47a9..a416157eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@deltares/fews-ssd-requests": "^1.0.1", "@deltares/fews-ssd-webcomponent": "^1.0.1", "@deltares/fews-web-oc-charts": "^3.0.3-beta.3", - "@deltares/fews-wms-requests": "^1.0.0", + "@deltares/fews-wms-requests": "^1.0.1", "@jsonforms/core": "^3.1.0", "@jsonforms/vue": "^3.1.0", "@jsonforms/vue-vuetify": "^3.1.0-preview.0", @@ -143,9 +143,9 @@ } }, "node_modules/@deltares/fews-wms-requests": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@deltares/fews-wms-requests/-/fews-wms-requests-1.0.0.tgz", - "integrity": "sha512-aqh2cBGdmsPcJhyPoQZV2TmwwTx68e3NdWZiELdtklkG/sEncxiELLVFOqdwruFIdGZCw5uYzrKwPqLOwjCnHg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@deltares/fews-wms-requests/-/fews-wms-requests-1.0.1.tgz", + "integrity": "sha512-BxC629Gu51vBkCT1qZwPKQuSpI5Uj/Z2byfYQ+y97ujbky9HL9XD7srsqfxHBdYpo9JWI6O2zAdRwNdp26JBRw==", "dependencies": { "@deltares/fews-web-oc-utils": "^1.0.0" }, diff --git a/package.json b/package.json index 7abf07b6f..a38626a7d 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@deltares/fews-ssd-requests": "^1.0.1", "@deltares/fews-ssd-webcomponent": "^1.0.1", "@deltares/fews-web-oc-charts": "^3.0.3-beta.3", - "@deltares/fews-wms-requests": "^1.0.0", + "@deltares/fews-wms-requests": "^1.0.1", "@jsonforms/core": "^3.1.0", "@jsonforms/vue": "^3.1.0", "@jsonforms/vue-vuetify": "^3.1.0-preview.0", diff --git a/src/components/wms/AnimatedStreamlineRasterLayer.vue b/src/components/wms/AnimatedStreamlineRasterLayer.vue index a231ef7d4..95dbf67ce 100644 --- a/src/components/wms/AnimatedStreamlineRasterLayer.vue +++ b/src/components/wms/AnimatedStreamlineRasterLayer.vue @@ -150,7 +150,7 @@ function mergeOptions( particleSize: streamlineOptions?.particleSize ?? 3, speedFactor: streamlineOptions?.speedFactor ?? 0.2, fadeAmountPerSecond: streamlineOptions?.fadeAmount ?? 0.1, - speedExponent: 1, + speedExponent: streamlineOptions?.speedExponent ?? 1, particleColor: streamlineOptions?.particleColor ? `#${streamlineOptions?.particleColor}` : undefined, From 9b762b1932bc65888fd0efde314a13a48ea0fa31 Mon Sep 17 00:00:00 2001 From: Cees Voesenek Date: Tue, 18 Jun 2024 15:20:09 +0200 Subject: [PATCH 2/2] Remove no longer necessary @ts-expect-error --- src/components/spatialdisplay/SpatialDisplayComponent.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/spatialdisplay/SpatialDisplayComponent.vue b/src/components/spatialdisplay/SpatialDisplayComponent.vue index 396b790c2..590ce125f 100644 --- a/src/components/spatialdisplay/SpatialDisplayComponent.vue +++ b/src/components/spatialdisplay/SpatialDisplayComponent.vue @@ -268,7 +268,6 @@ watch( colourMap: legend, range: legendToRange(legend), initialRange: legendToRange(legend), - // @ts-expect-error: remove once fews-wms-requests is updated useGradients: !legend.some((entry) => entry.colorSmoothing === false), }) colourScalesStore.scales[styleId] = newColourScale