fixes for change to taxonomy endpoint

Author: bothness

src/routes/(app)/app/+page.svelte

@@ -81,7 +81,7 @@
 
   <Card title="Local indicators" mode="featured">
     <p style:margin-bottom="28px">
-      Explore {$page.data.taxonomyFlat.length} indicators, including
+      Explore {$page.data.taxonomy.count} indicators, including
       <a
         href={resolve(`/app/indicators/gross-disposable-household-income-per-head`)}
         class="no-wrap">household income</a

src/routes/(app)/app/indicators/+page.js renamed to src/routes/(app)/app/+page.ts

@@ -4,11 +4,7 @@ export const load = async ({ fetch }) => {
   const path = resolve("/api/v1/metadata/taxonomy");
 	const taxonomy = await(await fetch(path)).json();
 
-  const pathFlat = resolve("/api/v1/metadata/taxonomy?flat=true");
-  const taxonomyFlat = await(await fetch(pathFlat)).json()
-
 	return {
-		taxonomy,
-    taxonomyFlat
+		taxonomy
 	};
 };

src/routes/(app)/app/indicators/+page.svelte

@@ -24,7 +24,7 @@
 
 <Hero width="medium" title="Local indicators" cls="titleblock-transparent">
   <p class="ons-hero__text">
-    Explore our {data.taxonomyFlat.length} local indicators, including
+    Explore our {data.taxonomy.count} local indicators, including
     <b>disposable household income</b>,
     <b>participation in further education</b>
     and
@@ -41,7 +41,7 @@
 {/snippet}
 
 <NavSections cls="nav-sections">
-  {#each data.taxonomy as theme}
+  {#each data.taxonomy.data as theme}
     <NavSection title={theme.label} id={theme.slug}>
       {#each theme.children as child}
         {#if child.description}

src/routes/(app)/app/+page.js renamed to src/routes/(app)/app/indicators/+page.ts

@@ -4,11 +4,7 @@ export const load = async ({ fetch }) => {
   const path = resolve("/api/v1/metadata/taxonomy");
 	const taxonomy = await(await fetch(path)).json();
 
-    const pathFlat = resolve("/api/v1/metadata/taxonomy?flat=true");
-    const taxonomyFlat = await(await fetch(pathFlat)).json()
-
 	return {
-		taxonomy,
-    taxonomyFlat
+		taxonomy
 	};
 };

src/routes/(demo)/indicator/+page.js

@@ -7,6 +7,6 @@ export const load = async ({ fetch }) => {
 	const indicators = await(await fetch(path)).json();
 
 	return {
-		indicators: indicators.filter(ind => !exclude.includes(ind.slug))
+		indicators: indicators.data.filter(ind => !exclude.includes(ind.slug))
 	};
 };

src/routes/(demo)/indicators/+page.js

@@ -5,6 +5,6 @@ export const load = async ({ fetch }) => {
 	const taxonomy = await(await fetch(path)).json();
 
 	return {
-		taxonomy
+		taxonomy: taxonomy.data
 	};
 };

src/routes/(demo)/query/+page.js

@@ -19,9 +19,9 @@ export const load = async ({ fetch, url }) => {
 	const areaList = await(await fetch(`/api/v1/geo/list`)).json();
   areaList.sort((a, b) => a.areanm.localeCompare(b.areanm));
 
-  const taxonomy = await (
+  const taxonomy = (await (
     await fetch(resolve("/api/v1/metadata/taxonomy?flat=true"))
-  ).json();
+  ).json()).data;
 
   const topics = Array.from(new Set(taxonomy.map((t) => t.topic))).map((t) => ({
     slug: t,