diff --git a/src/lib/browse/schemes/SchemesLayer.svelte b/src/lib/browse/schemes/SchemesLayer.svelte index 32243e96..155c4b77 100644 --- a/src/lib/browse/schemes/SchemesLayer.svelte +++ b/src/lib/browse/schemes/SchemesLayer.svelte @@ -39,7 +39,10 @@ filterLcwipSchemeText, filterLocalInterventionText, filterLocalSchemeText, + filterISTInterventionText, + filterISTSchemeText, finalInspectionsSchemes, + istSchemes, lcwipSchemes, localSchemes, } from "./stores"; @@ -65,6 +68,13 @@ $: [finalInspectionsColor, finalInspectionsLegend] = pickStyle("interventionType"); + let istName = "ist_schemes"; + let istTitle = "IST schemes"; + let istShow = showHideLayer(istName); + let istStyle = "interventionType"; + $: [istColor, istLegend] = + pickStyle("interventionType"); + let localName = "local_schemes"; let localTitle = "Your schemes"; let localShow = showHideLayer(localName); @@ -81,6 +91,7 @@ atfSchemes, lcwipSchemes, finalInspectionsSchemes, + istSchemes, ); } errorMessage = ""; @@ -217,6 +228,42 @@ {/if} + {#if Object.entries($finalInspectionsSchemes.schemes).length > 0} + + + + Please note there are data + quality caveats for all scheme data: + + + {#each $finalInspectionsSchemes.notes ?? [] as note} + {note} + {/each} + + + + + + + + + + + {/if} + {#if Object.entries($lcwipSchemes.schemes).length > 0} diff --git a/src/lib/browse/schemes/colors.ts b/src/lib/browse/schemes/colors.ts index d35a2898..cfd830b8 100644 --- a/src/lib/browse/schemes/colors.ts +++ b/src/lib/browse/schemes/colors.ts @@ -1,11 +1,12 @@ export let atfFundingProgrammes = { - ATF2: "#66c2a5", - "ATF2 or ATF3": "#fc8d62", - ATF3: "#8da0cb", - ATF4: "#e78ac3", - ATF4E: "#a6d854", - ATF5: "#ffd92f", - CATF: "#e5c494", + ATF2: "#1B9E77", + "ATF2 or ATF3": "#D95F02", + ATF3: "#7570B3", + ATF4: "#E7298A", + ATF4E: "#66A61E", + ATF5: "#E6AB02", + CATF: "#A6761D", + PLACEHOLDER: "#666666", }; export let currentMilestones = { diff --git a/src/lib/browse/schemes/data.ts b/src/lib/browse/schemes/data.ts index a6edcb30..1bdd8e28 100644 --- a/src/lib/browse/schemes/data.ts +++ b/src/lib/browse/schemes/data.ts @@ -17,6 +17,7 @@ export function setupSchemes( atfStore: Writable, lcwipStore: Writable, finalInspectionsStore: Writable, + istStore: Writable, ) { let atfGj: Schemes = { type: "FeatureCollection", diff --git a/src/lib/browse/schemes/stores.ts b/src/lib/browse/schemes/stores.ts index 60d6aeac..1dc1f704 100644 --- a/src/lib/browse/schemes/stores.ts +++ b/src/lib/browse/schemes/stores.ts @@ -20,6 +20,14 @@ export const finalInspectionsSchemes: Writable = writable({ export const filterFinalInspectionsInterventionText: Writable = writable(""); export const filterFinalInspectionsSchemeText: Writable = writable(""); +export const istSchemes: Writable = writable({ + type: "FeatureCollection", + features: [], + schemes: {}, +}); +export const filterISTInterventionText: Writable = + writable(""); +export const filterISTSchemeText: Writable = writable(""); export const lcwipSchemes: Writable = writable({ type: "FeatureCollection",
+ Please note there are data + quality caveats for all scheme data: +
{note}