diff --git a/web/src/App.svelte b/web/src/App.svelte index 12e16c9..646ba6e 100644 --- a/web/src/App.svelte +++ b/web/src/App.svelte @@ -8,6 +8,7 @@ import { type LayerName } from "src/types"; import { allScenarios, + referenceScenarioName, scenarioName, compareScenarioName, scaleFactors, @@ -38,6 +39,7 @@ $scaleFactors = setupScaleFactors(referenceScenarioUnscaled); $validAreaNames = setupAreaNames(referenceScenarioUnscaled); $allScenarios = setupScenarioMap($scaleFactors, $validAreaNames); + $referenceScenarioName = referenceScenarioUnscaled.metadata.name; // Set the initial scenario name to the reference scenario, and the // scenario being compared against to nothing $scenarioName = referenceScenarioUnscaled.metadata.name; diff --git a/web/src/lib/leftSidebar/create/ModifyOutputAreas.svelte b/web/src/lib/leftSidebar/create/ModifyOutputAreas.svelte index 99ee41b..c50136c 100644 --- a/web/src/lib/leftSidebar/create/ModifyOutputAreas.svelte +++ b/web/src/lib/leftSidebar/create/ModifyOutputAreas.svelte @@ -6,6 +6,7 @@ import { onMount, onDestroy } from "svelte"; import { allScenarios, + referenceScenarioName, customScenarioInProgress, clickedOAs, } from "src/stores"; @@ -31,9 +32,9 @@ $customScenarioInProgress = false; }); - function getBaselineSig(oaName: string): number { + function getReferenceSig(oaName: string): number { return $allScenarios - .get("baseline") + .get($referenceScenarioName) .values.get(oaName) .get("signature_type"); } @@ -42,7 +43,7 @@ // editable layers function getSingleOAChanges( oaName: string - ): Map { + ): Map { const hasChanges = changes.has(oaName); const thisChanges = changes.get(oaName); return new Map([ @@ -53,7 +54,7 @@ ["job_types", hasChanges ? thisChanges.get("job_types") : null], ["use", hasChanges ? thisChanges.get("use") : null], ["greenspace", hasChanges ? thisChanges.get("greenspace") : null], - ["baseline_sig", getBaselineSig(oaName)], + ["reference_sig", getReferenceSig(oaName)], ]); } @@ -88,7 +89,7 @@ thisOAChanges.set(macroVar, macroVarValue); } }); - thisOAChanges.delete("baseline_sig"); + thisOAChanges.delete("reference_sig"); changes.set(oa.name, thisOAChanges as Map); }); } @@ -137,23 +138,23 @@ useModified = use !== null; green = oaChanges.get("greenspace"); greenModified = green !== null; - baselineSig = oaChanges.get("baseline_sig"); + referenceSig = oaChanges.get("reference_sig"); } else { // More than one OA selected const allSigs: Array = oas.map((oa) => getSingleOAChanges(oa.name).get("signature_type") ); - const allBaselineSigs: Array = oas.map((oa) => - getSingleOAChanges(oa.name).get("baseline_sig") + const allReferenceSigs: Array = oas.map((oa) => + getSingleOAChanges(oa.name).get("reference_sig") ); - // If none of the values were changed, check if the baseline values + // If none of the values were changed, check if the reference values // are all the same. If so, display that if (allSigs.every((s) => s === null)) { sigModified = false; - if (allBaselineSigs.every((s) => s === allBaselineSigs[0])) { - baselineSig = allBaselineSigs[0]; + if (allReferenceSigs.every((s) => s === allReferenceSigs[0])) { + referenceSig = allReferenceSigs[0]; } else { - baselineSig = null; + referenceSig = null; } } // If some of the values were changed, but not all, display an unchecked checkbox @@ -163,7 +164,7 @@ ) { sig = null; sigModified = false; - baselineSig = null; + referenceSig = null; } // If we reached here, then that means that all of the values were // changed to something else. @@ -216,7 +217,7 @@ // Variables for OA modifiers let sig: number | null = null; let sigModified: boolean; - let baselineSig: null | number; + let referenceSig: null | number; let job: number | null = null; let jobModified: boolean; let use: number | null = null; @@ -267,7 +268,7 @@ bind:checked={sigModified} on:change={() => { if (sigModified) { - sig = baselineSig; + sig = referenceSig; } if ($clickedOAs.length > 1 && !sigModified) { sig = null; @@ -288,7 +289,7 @@ {/each} {:else} - {#each [...config.signatures.entries()] as [signatureId, signature]} > = writable(undefined); +export const referenceScenarioName: Writable = writable(undefined); export const scenarioName: Writable = writable(undefined); export const compareScenarioName: Writable = writable(undefined); export const scaleFactors: Writable> = writable(undefined);