Merge pull request #4812 from UNDP-Data/release/develop-to-main

[RELEASE] Merge develop to main
UNDP-Data · Feb 7, 2025 · 5d2b603 · 5d2b603
2 parents ebbd45f + e469d87
commit 5d2b603
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/sites/geohub/CHANGELOG.md b/sites/geohub/CHANGELOG.md
@@ -1,5 +1,11 @@
 # geohub
 
+## 1.22.37
+
+### Patch Changes
+
+- c431709: fix: fixed bug of error of duplicate layer in CEEI dashboard.
+
 ## 1.22.36
 
 ### Patch Changes

diff --git a/sites/geohub/package.json b/sites/geohub/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "geohub",
-	"version": "1.22.36",
+	"version": "1.22.37",
 	"description": "GeoHub is a geospatial visualization data portal built by UNDP using sveltekit",
 	"scripts": {
 		"dev": "pnpm prebuild && vite dev",

diff --git a/sites/geohub/src/routes/(app)/dashboards/ceei/components/LayerControl.svelte b/sites/geohub/src/routes/(app)/dashboards/ceei/components/LayerControl.svelte
@@ -50,6 +50,12 @@
 	let colorGroups = $state(getColorGroups());
 
 	const openSimulateModal = () => {
+		if (layerDetails.sliders) {
+			sliders = [...layerDetails.sliders];
+		} else {
+			sliders = [...defaultSliders];
+		}
+
 		showSimulateModal = true;
 	};
 
@@ -78,7 +84,12 @@
 
 	const tippyTooltip = initTooltipTippy();
 
-	let sliders = $state([
+	const defaultSliders: {
+		id: number;
+		percentage: number;
+		label: string;
+		locked: boolean;
+	}[] = [
 		{ id: 1, percentage: 7.1429, label: 'Solar Power Potential', locked: false },
 		{ id: 2, percentage: 7.1429, label: 'Wind Speed', locked: false },
 		{ id: 3, percentage: 7.1429, label: 'Geothermal Power Potential', locked: false },
@@ -108,7 +119,9 @@
 			label: 'Fossil Fuel Share on Energy Capacity and Generation',
 			locked: false
 		}
-	]);
+	];
+
+	let sliders = $state(defaultSliders);
 
 	let pillarSliders = $state([
 		{ id: 1, percentage: 28.57, label: 'Potential', locked: false },
@@ -307,7 +320,7 @@
 			multiplierMap[slider.label] = multiplier;
 		});
 
-		applyDataSimulation($mapStore, index, sliders, multiplierMap);
+		applyDataSimulation($mapStore, index, $state.snapshot(sliders), multiplierMap);
 	};
 
 	const handleClicked = (callback: (index?: number) => unknown, index?: number) => () => {

diff --git a/sites/geohub/src/routes/(app)/dashboards/ceei/stores/index.ts b/sites/geohub/src/routes/(app)/dashboards/ceei/stores/index.ts
@@ -17,7 +17,12 @@ export interface Layer {
 	layer: AddLayerObject;
 	bounds: LngLatBoundsLike;
 	data: object[];
-	sliders?;
+	sliders?: {
+		id: number;
+		percentage: number;
+		label: string;
+		locked: boolean;
+	}[];
 	muliplierMap?: Map;
 	isVisible: boolean;
 	isMapLoaded: boolean;

diff --git a/sites/geohub/src/routes/(app)/dashboards/ceei/utils/layerHelper.ts b/sites/geohub/src/routes/(app)/dashboards/ceei/utils/layerHelper.ts
@@ -426,7 +426,7 @@ export const uploadData = async (map: Map, index: number) => {
 				map.once('sourcedata', (e) => {
 					const waiting = () => {
 						if (e.sourceId === layers[index].sourceId && e.isSourceLoaded) {
-							layers[index].data = results.data;
+							layers[index].data = results.data as object[];
 							layersStore.set(layers);
 							applyDataSimulation(map, index, layers[index].sliders, layers[index].muliplierMap);
 							toast.push(`Map data for layer ${layers[index].name} has been updated`);