diff --git a/client/package.json b/client/package.json
index ea940d4..15d5285 100644
--- a/client/package.json
+++ b/client/package.json
@@ -13,13 +13,22 @@
   },
   "dependencies": {
     "@artsy/fresnel": "7.1.4",
+    "@deck.gl/core": "9.0.34",
+    "@deck.gl/json": "9.0.34",
+    "@deck.gl/layers": "9.0.34",
+    "@dnd-kit/core": "6.1.0",
+    "@dnd-kit/modifiers": "7.0.0",
+    "@dnd-kit/sortable": "8.0.0",
     "@radix-ui/react-checkbox": "1.1.2",
+    "@radix-ui/react-collapsible": "1.1.1",
     "@radix-ui/react-dialog": "1.1.2",
     "@radix-ui/react-label": "2.1.0",
     "@radix-ui/react-popover": "1.1.2",
     "@radix-ui/react-radio-group": "1.2.1",
     "@radix-ui/react-separator": "1.1.0",
+    "@radix-ui/react-slider": "1.2.1",
     "@radix-ui/react-slot": "1.1.0",
+    "@radix-ui/react-switch": "1.1.1",
     "@radix-ui/react-tooltip": "1.1.3",
     "@t3-oss/env-nextjs": "0.11.1",
     "@tanstack/react-query": "5.59.16",
diff --git a/client/src/components/map/controls/index.tsx b/client/src/components/map/controls/index.tsx
index fa77efe..b9c9228 100644
--- a/client/src/components/map/controls/index.tsx
+++ b/client/src/components/map/controls/index.tsx
@@ -1,16 +1,31 @@
+import useMapLayers from "@/hooks/use-map-layers";
+import { cn } from "@/lib/utils";
+
 import ContextualLayersControls from "./contextual-layers";
+import LegendControls from "./legend";
 import MapSettingsControls from "./map-settings";
 import ZoomControls from "./zoom";
 
 const Controls = () => {
+  const [layers] = useMapLayers();
+
   return (
     <>
-      <div className="absolute bottom-20 right-5 z-10 leading-none xl:bottom-auto xl:right-10 xl:top-6">
+      <div
+        className={cn({
+          "absolute right-5 z-10 leading-none xl:bottom-auto xl:right-10 xl:top-6": true,
+          "bottom-[120px]": layers.length > 0,
+          "bottom-[80px]": layers.length === 0,
+        })}
+      >
         <ContextualLayersControls />
       </div>
-      <div className="absolute bottom-10 right-5 z-10 flex flex-col gap-2 xl:bottom-6 xl:right-10">
+      <div className="absolute bottom-10 right-5 z-10 flex flex-col items-end gap-2 xl:bottom-6 xl:right-10">
         <ZoomControls />
-        <MapSettingsControls />
+        <div className="flex flex-col gap-2 xl:flex-row-reverse xl:gap-6">
+          <MapSettingsControls />
+          <LegendControls />
+        </div>
       </div>
     </>
   );
diff --git a/client/src/components/map/controls/legend.tsx b/client/src/components/map/controls/legend.tsx
new file mode 100644
index 0000000..85ce519
--- /dev/null
+++ b/client/src/components/map/controls/legend.tsx
@@ -0,0 +1,57 @@
+import Legend from "@/components/map/legend";
+import { Button } from "@/components/ui/button";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import useMapLayers from "@/hooks/use-map-layers";
+import { Media, MediaContextProvider } from "@/media";
+import ChevronDownIcon from "@/svgs/chevron-down.svg";
+import ListBulletIcon from "@/svgs/list-bullet.svg";
+
+const LegendControls = () => {
+  const [layers] = useMapLayers();
+
+  if (layers.length === 0) {
+    return null;
+  }
+
+  return (
+    <MediaContextProvider>
+      <Media lessThan="xl" className="leading-none">
+        <Popover>
+          <PopoverTrigger asChild>
+            <Button type="button" variant="yellow" className="w-8 font-sans">
+              <span className="sr-only">Legend</span>
+              <ListBulletIcon aria-hidden />
+            </Button>
+          </PopoverTrigger>
+          <PopoverContent
+            side="left"
+            align="end"
+            className="max-h-[500px] w-[300px] max-w-[calc(100vw_-_theme(spacing.8)_-_2_*_theme(spacing.5)_-_24px)] overflow-y-auto"
+          >
+            <Legend />
+          </PopoverContent>
+        </Popover>
+      </Media>
+      <Media greaterThanOrEqual="xl" className="relative">
+        <Collapsible className="absolute bottom-0 right-0" defaultOpen>
+          <CollapsibleTrigger asChild>
+            <Button
+              type="button"
+              variant="yellow-alt"
+              className="group w-[300px] justify-between px-2.5 font-sans"
+            >
+              <span>Legend</span>
+              <ChevronDownIcon aria-hidden className="group-data-[state=closed]:rotate-180" />
+            </Button>
+          </CollapsibleTrigger>
+          <CollapsibleContent className="max-h-[500px] w-[300px] overflow-y-auto border-t border-t-casper-blue-400 bg-white">
+            <Legend />
+          </CollapsibleContent>
+        </Collapsible>
+      </Media>
+    </MediaContextProvider>
+  );
+};
+
+export default LegendControls;
diff --git a/client/src/components/map/index.tsx b/client/src/components/map/index.tsx
index e852e00..55e5faa 100644
--- a/client/src/components/map/index.tsx
+++ b/client/src/components/map/index.tsx
@@ -3,6 +3,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import ReactMapGL from "react-map-gl";
 
+import LayerManager from "@/components/map/layer-manager";
 import { SIDEBAR_WIDTH } from "@/components/ui/sidebar";
 import { env } from "@/env";
 import useApplyMapSettings from "@/hooks/use-apply-map-settings";
@@ -72,6 +73,7 @@ const Map = () => {
       logoPosition="bottom-right"
       onLoad={() => setMap(mapRef.current)}
     >
+      <LayerManager />
       <Controls />
     </ReactMapGL>
   );
diff --git a/client/src/components/map/layer-manager/index.tsx b/client/src/components/map/layer-manager/index.tsx
new file mode 100644
index 0000000..789ebf1
--- /dev/null
+++ b/client/src/components/map/layer-manager/index.tsx
@@ -0,0 +1,48 @@
+import { useMemo } from "react";
+import { Layer } from "react-map-gl";
+
+import useMapLayers from "@/hooks/use-map-layers";
+
+import LayerManagerItem from "./item";
+
+const LayerManager = () => {
+  const [layers] = useMapLayers();
+
+  /**
+   * These layers are here to aid with positioning the real data layers between themselves.
+   * See more: https://github.com/visgl/react-map-gl/issues/939#issuecomment-625290200
+   */
+  const positioningLayers = useMemo(() => {
+    return layers.map((layer, index) => {
+      const beforeId = index === 0 ? "data-layers" : `layer-position-${layers[index - 1].id}`;
+      return (
+        <Layer
+          key={`layer-position-${layer.id}`}
+          id={`layer-position-${layer.id}`}
+          type="background"
+          layout={{ visibility: "none" }}
+          beforeId={beforeId}
+        />
+      );
+    });
+  }, [layers]);
+
+  const layerManagerItems = useMemo(() => {
+    return layers.map((layer, index) => {
+      const beforeId = index === 0 ? "data-layers" : `layer-position-${layers[index - 1].id}`;
+      const { id, ...settings } = layer;
+      return (
+        <LayerManagerItem key={`layer-${id}`} id={id} settings={settings} beforeId={beforeId} />
+      );
+    });
+  }, [layers]);
+
+  return (
+    <>
+      {positioningLayers}
+      {layerManagerItems}
+    </>
+  );
+};
+
+export default LayerManager;
diff --git a/client/src/components/map/layer-manager/item.tsx b/client/src/components/map/layer-manager/item.tsx
new file mode 100644
index 0000000..73f78e5
--- /dev/null
+++ b/client/src/components/map/layer-manager/item.tsx
@@ -0,0 +1,28 @@
+import { Layer, Source } from "react-map-gl";
+
+import useLayerConfig from "@/hooks/use-layer-config";
+import { LayerSettings } from "@/types/layer";
+
+interface LayerManagerItemProps {
+  id: number;
+  beforeId: string;
+  settings: LayerSettings;
+}
+
+const LayerManagerItem = ({ id, beforeId, settings }: LayerManagerItemProps) => {
+  const config = useLayerConfig(id, settings);
+
+  if (!config) {
+    return null;
+  }
+
+  return (
+    <Source {...config.source}>
+      {config.styles.map((style) => (
+        <Layer key={style.id} {...style} beforeId={beforeId} />
+      ))}
+    </Source>
+  );
+};
+
+export default LayerManagerItem;
diff --git a/client/src/components/map/legend/index.tsx b/client/src/components/map/legend/index.tsx
new file mode 100644
index 0000000..6028891
--- /dev/null
+++ b/client/src/components/map/legend/index.tsx
@@ -0,0 +1,125 @@
+"use client";
+
+import {
+  Announcements,
+  closestCenter,
+  DndContext,
+  DragEndEvent,
+  DragOverlay,
+  DragStartEvent,
+  ScreenReaderInstructions,
+} from "@dnd-kit/core";
+import { restrictToParentElement, restrictToVerticalAxis } from "@dnd-kit/modifiers";
+import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
+import { useCallback, useMemo, useState } from "react";
+
+import SortableItem from "@/components/map/legend/sortable-item";
+import useMapLayers from "@/hooks/use-map-layers";
+
+import LegendItem from "./item";
+
+const Legend = () => {
+  const [layers, { updateLayerOrder }] = useMapLayers();
+  const [draggedLayerId, setDraggedLayerId] = useState<number | null>(null);
+
+  const legendItems = useMemo(() => {
+    return layers.map(({ id, ...settings }) => (
+      <SortableItem key={id} id={id} settings={settings} />
+    ));
+  }, [layers]);
+
+  const draggedLegendItem = useMemo(() => {
+    if (draggedLayerId === null) {
+      return null;
+    }
+
+    const layer = layers.find(({ id }) => id === draggedLayerId);
+    if (!layer) {
+      return null;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { id, ...settings } = layer;
+
+    return (
+      <div className="shadow">
+        <LegendItem id={draggedLayerId} settings={settings} />
+      </div>
+    );
+  }, [layers, draggedLayerId]);
+
+  const layerIds = useMemo(() => layers.map(({ id }) => id), [layers]);
+
+  const accessibility: {
+    announcements: Announcements;
+    screenReaderInstructions: ScreenReaderInstructions;
+  } = useMemo(
+    () => ({
+      announcements: {
+        onDragStart({ active }) {
+          const position = layers.findIndex(({ id }) => id === active.id);
+          return `Picked up layer in position ${position} of ${layers.length}`;
+        },
+        onDragOver({ over }) {
+          if (over) {
+            const position = layers.findIndex(({ id }) => id === over.id);
+            return `Layer was moved into position ${position} of ${layers.length}`;
+          }
+        },
+        onDragEnd({ over }) {
+          if (over) {
+            const position = layers.findIndex(({ id }) => id === over.id);
+            return `Layer was dropped at position ${position} of ${layers.length}`;
+          }
+        },
+        onDragCancel() {
+          return `Dragging was cancelled.`;
+        },
+      },
+      screenReaderInstructions: {
+        draggable:
+          "Press space or enter to grab the layer. Use the arrow keys to move the layer up or down. Press space or enter again to drop the layer. Press escape to cancel.",
+      },
+    }),
+    [layers],
+  );
+
+  const onDragStart = useCallback(
+    ({ active }: DragStartEvent) => {
+      setDraggedLayerId(active.id as number);
+    },
+    [setDraggedLayerId],
+  );
+
+  const onDragEnd = useCallback(
+    ({ active, over }: DragEndEvent) => {
+      if (over === null || active.id === over.id) {
+        return;
+      }
+
+      const id = active.id as number;
+      const index = layerIds.indexOf(over.id as number);
+
+      updateLayerOrder(id, index);
+      setDraggedLayerId(null);
+    },
+    [layerIds, updateLayerOrder, setDraggedLayerId],
+  );
+
+  return (
+    <DndContext
+      collisionDetection={closestCenter}
+      modifiers={[restrictToVerticalAxis, restrictToParentElement]}
+      accessibility={accessibility}
+      onDragStart={onDragStart}
+      onDragEnd={onDragEnd}
+    >
+      <SortableContext strategy={verticalListSortingStrategy} items={layerIds}>
+        {legendItems}
+      </SortableContext>
+      <DragOverlay>{draggedLegendItem}</DragOverlay>
+    </DndContext>
+  );
+};
+
+export default Legend;
diff --git a/client/src/components/map/legend/item/basic-legend.tsx b/client/src/components/map/legend/item/basic-legend.tsx
new file mode 100644
index 0000000..8e76f97
--- /dev/null
+++ b/client/src/components/map/legend/item/basic-legend.tsx
@@ -0,0 +1,27 @@
+import Square from "@/components/map/legend/item/square";
+import useLayerLegend from "@/hooks/use-layer-legend";
+
+type BasicLegendProps = ReturnType<typeof useLayerLegend>["data"];
+
+const BasicLegend = (data: BasicLegendProps) => {
+  if (!data.items || data.items.length === 0) {
+    return null;
+  }
+
+  if (data.items.length === 1) {
+    return <Square item={data.items[0]} className="h-3" />;
+  }
+
+  return (
+    <div className="columns-2">
+      {data.items.map((item) => (
+        <div key={item.color} className="flex items-start gap-2">
+          <Square item={item} className="relative top-0.5 h-3 w-5 shrink-0" />
+          <div className="text-2xs text-gray-500">{item.value}</div>
+        </div>
+      ))}
+    </div>
+  );
+};
+
+export default BasicLegend;
diff --git a/client/src/components/map/legend/item/choropleth-legend.tsx b/client/src/components/map/legend/item/choropleth-legend.tsx
new file mode 100644
index 0000000..c40106c
--- /dev/null
+++ b/client/src/components/map/legend/item/choropleth-legend.tsx
@@ -0,0 +1,26 @@
+import Square from "@/components/map/legend/item/square";
+import Unit from "@/components/map/legend/item/unit";
+import Values from "@/components/map/legend/item/values";
+import useLayerLegend from "@/hooks/use-layer-legend";
+
+type ChoroplethLegendProps = ReturnType<typeof useLayerLegend>["data"];
+
+const ChoroplethLegend = (data: ChoroplethLegendProps) => {
+  if (!data.items || data.items.length === 0) {
+    return null;
+  }
+
+  return (
+    <>
+      <Unit {...data} />
+      <div className="flex h-3">
+        {data.items.map((item) => (
+          <Square key={item.color} item={item} className="flex-1" />
+        ))}
+      </div>
+      <Values {...data} />
+    </>
+  );
+};
+
+export default ChoroplethLegend;
diff --git a/client/src/components/map/legend/item/gradient-legend.tsx b/client/src/components/map/legend/item/gradient-legend.tsx
new file mode 100644
index 0000000..14288a6
--- /dev/null
+++ b/client/src/components/map/legend/item/gradient-legend.tsx
@@ -0,0 +1,31 @@
+import BasicLegend from "@/components/map/legend/item/basic-legend";
+import Unit from "@/components/map/legend/item/unit";
+import Values from "@/components/map/legend/item/values";
+import useLayerLegend from "@/hooks/use-layer-legend";
+
+type GradientLegendProps = ReturnType<typeof useLayerLegend>["data"];
+
+const GradientLegend = (data: GradientLegendProps) => {
+  if (!data.items || data.items.length === 0) {
+    return null;
+  }
+
+  if (data.items.length === 1) {
+    return <BasicLegend {...data} />;
+  }
+
+  return (
+    <>
+      <Unit {...data} />
+      <div
+        className="h-3"
+        style={{
+          background: `linear-gradient(to right, ${data.items.map((item) => item.color).join(", ")})`,
+        }}
+      />
+      <Values {...data} />
+    </>
+  );
+};
+
+export default GradientLegend;
diff --git a/client/src/components/map/legend/item/index.tsx b/client/src/components/map/legend/item/index.tsx
new file mode 100644
index 0000000..e5c5ba9
--- /dev/null
+++ b/client/src/components/map/legend/item/index.tsx
@@ -0,0 +1,141 @@
+import { DraggableAttributes } from "@dnd-kit/core";
+import { SyntheticListenerMap } from "@dnd-kit/core/dist/hooks/utilities";
+
+import { Button } from "@/components/ui/button";
+import { Label } from "@/components/ui/label";
+import { Popover, PopoverArrow, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { Skeleton } from "@/components/ui/skeleton";
+import { Slider } from "@/components/ui/slider";
+import useLayerLegend from "@/hooks/use-layer-legend";
+import useMapLayers from "@/hooks/use-map-layers";
+import EyeSlashedIcon from "@/svgs/eye-slashed.svg";
+import EyeIcon from "@/svgs/eye.svg";
+import HandleIcon from "@/svgs/handle.svg";
+import OpacityIcon from "@/svgs/opacity.svg";
+import { LayerSettings } from "@/types/layer";
+
+import BasicLegend from "./basic-legend";
+import ChoroplethLegend from "./choropleth-legend";
+import GradientLegend from "./gradient-legend";
+
+interface LegendItemProps {
+  id: number;
+  settings: LayerSettings;
+  sortableAttributes?: DraggableAttributes;
+  sortableListeners?: SyntheticListenerMap;
+}
+
+const LegendItem = ({ id, settings, sortableAttributes, sortableListeners }: LegendItemProps) => {
+  const { data, isLoading } = useLayerLegend(id);
+  const [, { updateLayer }] = useMapLayers();
+
+  if (!isLoading && !data) {
+    return null;
+  }
+
+  return (
+    <div className="flex items-start gap-2 bg-white px-2.5 py-2 font-sans text-sm">
+      <Button
+        type="button"
+        variant="ghost"
+        size="auto"
+        className="relative top-1 shrink-0"
+        {...(sortableAttributes ?? {})}
+        {...(sortableListeners ?? {})}
+      >
+        <span className="sr-only">Grab to reorder the layer</span>
+        <HandleIcon className="!h-3 !w-auto text-casper-blue-400" aria-hidden />
+      </Button>
+      <div className="flex-grow overflow-hidden">
+        {isLoading && (
+          <div className="flex justify-between">
+            <Skeleton className="h-5 w-2/3" />
+            <Skeleton className="h-5 w-[36px]" />
+          </div>
+        )}
+        {!isLoading && (
+          <div className="flex items-center gap-2">
+            <div
+              className="flex-grow overflow-hidden overflow-ellipsis whitespace-nowrap"
+              title={data.topicSlug === "contextual" ? data.name : data.dataset}
+            >
+              {data.topicSlug === "contextual" ? data.name : data.dataset}
+            </div>
+            <div className="flex shrink-0 gap-1">
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button type="button" variant="ghost" size="icon-sm" className="group">
+                    <span className="sr-only">Change opacity</span>
+                    <OpacityIcon
+                      className="!size-4 transition-colors group-hover:text-casper-blue-300"
+                      aria-hidden
+                    />
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent
+                  side="top"
+                  sideOffset={8}
+                  variant="dark"
+                  className="w-32 px-2.5 pb-2.5 pt-2"
+                >
+                  <Label htmlFor="opacity-slider" className="text-xs">
+                    Opacity
+                  </Label>
+                  <Slider
+                    id="opacity-slider"
+                    value={[settings.opacity]}
+                    onValueChange={([value]) => updateLayer(id, { opacity: value })}
+                  />
+                  <PopoverArrow variant="dark" />
+                </PopoverContent>
+              </Popover>
+              <Button
+                type="button"
+                variant="ghost"
+                size="icon-sm"
+                className="group"
+                aria-pressed={!settings.visibility}
+                onClick={() => updateLayer(id, { visibility: !settings.visibility })}
+              >
+                <span className="sr-only">Hide</span>
+                {settings.visibility && (
+                  <EyeIcon
+                    className="!size-4 transition-colors group-hover:text-casper-blue-300"
+                    aria-hidden
+                  />
+                )}
+                {!settings.visibility && (
+                  <EyeSlashedIcon
+                    className="!size-4 transition-colors group-hover:text-casper-blue-300"
+                    aria-hidden
+                  />
+                )}
+              </Button>
+            </div>
+          </div>
+        )}
+        {!isLoading && data.topicSlug !== "contextual" && (
+          <div className="mt-1 text-xs">{data.name}</div>
+        )}
+        <div className="mt-1">
+          {isLoading && (
+            <>
+              <Skeleton className="ml-auto h-4 w-1/12" />
+              <Skeleton className="mt-1 h-3 w-full" />
+              <Skeleton className="mt-1 h-4 w-full" />
+            </>
+          )}
+          {!isLoading && !!data.items?.length && (
+            <>
+              {data.type === "basic" && <BasicLegend {...data} />}
+              {data.type === "choropleth" && <ChoroplethLegend {...data} />}
+              {data.type === "gradient" && <GradientLegend {...data} />}
+            </>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default LegendItem;
diff --git a/client/src/components/map/legend/item/square.tsx b/client/src/components/map/legend/item/square.tsx
new file mode 100644
index 0000000..effb848
--- /dev/null
+++ b/client/src/components/map/legend/item/square.tsx
@@ -0,0 +1,32 @@
+import { cn } from "@/lib/utils";
+import { LegendLegendConfigComponentItemsItem } from "@/types/generated/strapi.schemas";
+
+interface SquareProps {
+  item: LegendLegendConfigComponentItemsItem;
+  className?: string;
+}
+
+const Square = ({ item, className }: SquareProps) => {
+  if (item.pattern === "stripes") {
+    return (
+      <div
+        className={className}
+        style={{
+          background: `repeating-linear-gradient(-45deg, transparent 0px, ${item.color} 0.5px, ${item.color} 1px, transparent 1.5px, transparent 3px)`,
+        }}
+      />
+    );
+  }
+
+  return (
+    <div
+      className={cn(className, {
+        "border border-casper-blue-400":
+          item.color?.toLowerCase() === "#fff" || item.color?.toLowerCase() === "#ffffff",
+      })}
+      style={{ background: item.color }}
+    />
+  );
+};
+
+export default Square;
diff --git a/client/src/components/map/legend/item/unit.tsx b/client/src/components/map/legend/item/unit.tsx
new file mode 100644
index 0000000..4def2ed
--- /dev/null
+++ b/client/src/components/map/legend/item/unit.tsx
@@ -0,0 +1,13 @@
+import useLayerLegend from "@/hooks/use-layer-legend";
+
+type UnitProps = ReturnType<typeof useLayerLegend>["data"];
+
+const Unit = (data: UnitProps) => {
+  if (!data.unit) {
+    return null;
+  }
+
+  return <div className="mb-1 flex justify-end text-2xs text-gray-500">({data.unit})</div>;
+};
+
+export default Unit;
diff --git a/client/src/components/map/legend/item/values.tsx b/client/src/components/map/legend/item/values.tsx
new file mode 100644
index 0000000..0037229
--- /dev/null
+++ b/client/src/components/map/legend/item/values.tsx
@@ -0,0 +1,31 @@
+import useLayerLegend from "@/hooks/use-layer-legend";
+import { cn } from "@/lib/utils";
+
+type ValuesProps = ReturnType<typeof useLayerLegend>["data"];
+
+const Values = (data: ValuesProps) => {
+  if (!data.items || data.items.length === 0) {
+    return null;
+  }
+
+  return (
+    <div className="mt-1 flex text-2xs text-gray-500">
+      {data.items.map((item, index) => (
+        <div
+          key={item.color}
+          title={item.value}
+          className={cn({
+            "flex-1 overflow-hidden overflow-ellipsis whitespace-nowrap": true,
+            "text-left": index === 0,
+            "text-center": index > 0 && index + 1 < data.items!.length,
+            "text-right": index + 1 === data.items!.length,
+          })}
+        >
+          {item.value}
+        </div>
+      ))}
+    </div>
+  );
+};
+
+export default Values;
diff --git a/client/src/components/map/legend/sortable-item.tsx b/client/src/components/map/legend/sortable-item.tsx
new file mode 100644
index 0000000..5aba79b
--- /dev/null
+++ b/client/src/components/map/legend/sortable-item.tsx
@@ -0,0 +1,39 @@
+import { useSortable } from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
+import { useMemo } from "react";
+
+import LegendItem from "@/components/map/legend/item";
+import { cn } from "@/lib/utils";
+import { LayerSettings } from "@/types/layer";
+
+interface SortableItemProps {
+  id: number;
+  settings: LayerSettings;
+}
+
+const SortableItem = ({ id, settings }: SortableItemProps) => {
+  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
+    id,
+  });
+
+  const style = useMemo(
+    () => ({
+      transform: CSS.Transform.toString(transform),
+      transition,
+    }),
+    [transform, transition],
+  );
+
+  return (
+    <div ref={setNodeRef} style={style} className={cn({ "opacity-0": isDragging })}>
+      <LegendItem
+        id={id}
+        settings={settings}
+        sortableAttributes={attributes}
+        sortableListeners={listeners}
+      />
+    </div>
+  );
+};
+
+export default SortableItem;
diff --git a/client/src/components/panels/contextual-layers/item.tsx b/client/src/components/panels/contextual-layers/item.tsx
index ee1468f..94090a7 100644
--- a/client/src/components/panels/contextual-layers/item.tsx
+++ b/client/src/components/panels/contextual-layers/item.tsx
@@ -1,3 +1,6 @@
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+import useMapLayers from "@/hooks/use-map-layers";
 import { Dataset, Layer } from "@/types/generated/strapi.schemas";
 
 interface ItemProps {
@@ -6,13 +9,26 @@ interface ItemProps {
 }
 
 const Item = ({ name, layers }: ItemProps) => {
+  const [layersConfiguration, { addLayer, removeLayer }] = useMapLayers();
+
   return (
     <div>
       <div className="border-b border-casper-blue-400/50 py-2 uppercase">{name}</div>
       <ul className="py-2">
         {layers.map((layer) => (
-          <li key={layer.id} className="py-2">
-            <span className="text-xl">{layer.name}</span>
+          <li key={layer.id} className="flex items-start justify-between gap-4 py-2">
+            <Label htmlFor={`${layer.id}-toggle`} className="text-xl">
+              {layer.name}
+            </Label>
+            <div className="pt-1">
+              <Switch
+                id={`${layer.id}-toggle`}
+                checked={layersConfiguration.findIndex(({ id }) => id === layer.id) !== -1}
+                onCheckedChange={(checked) =>
+                  checked ? addLayer(layer.id) : removeLayer(layer.id)
+                }
+              />
+            </div>
           </li>
         ))}
       </ul>
diff --git a/client/src/components/ui/button.tsx b/client/src/components/ui/button.tsx
index fe2446f..d5b133d 100644
--- a/client/src/components/ui/button.tsx
+++ b/client/src/components/ui/button.tsx
@@ -13,12 +13,14 @@ const buttonVariants = cva(
           "bg-neutral-900 text-neutral-50 hover:bg-neutral-900/90 ring-offset-white focus-visible:ring-casper-blue-400",
         yellow:
           "bg-supernova-yellow-400 hover:bg-supernova-yellow-300 text-casper-blue-950 focus-visible:ring-casper-blue-400 data-[state=open]:bg-rhino-blue-900 data-[state=open]:hover:bg-rhino-blue-950 data-[state=open]:text-supernova-yellow-400",
-        ghost:
-          "bg-neutral-900 text-neutral-50 hover:bg-neutral-900/90 ring-offset-white focus-visible:ring-casper-blue-400",
+        "yellow-alt":
+          "bg-supernova-yellow-400 hover:bg-supernova-yellow-300 text-casper-blue-950 focus-visible:ring-casper-blue-400 data-[state=open]:bg-white data-[state=open]:hover:bg-casper-blue-200",
+        ghost: "focus-visible:ring-casper-blue-400",
       },
       size: {
         default: "h-8 w-auto xl:h-10 px-4 xl:py-2",
         icon: "h-8 w-8 xl:h-10 xl:w-10",
+        "icon-sm": "h-4 w-4",
         auto: "",
       },
     },
diff --git a/client/src/components/ui/collapsible.tsx b/client/src/components/ui/collapsible.tsx
new file mode 100644
index 0000000..17213df
--- /dev/null
+++ b/client/src/components/ui/collapsible.tsx
@@ -0,0 +1,27 @@
+"use client";
+
+import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
+import React from "react";
+
+import { cn } from "@/lib/utils";
+
+const Collapsible = CollapsiblePrimitive.Root;
+
+const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;
+
+const CollapsibleContent = React.forwardRef<
+  React.ElementRef<typeof CollapsiblePrimitive.CollapsibleContent>,
+  React.ComponentPropsWithoutRef<typeof CollapsiblePrimitive.CollapsibleContent>
+>(({ className, ...props }, ref) => (
+  <CollapsiblePrimitive.CollapsibleContent
+    className={cn(
+      "overflow-hidden data-[state=closed]:animate-collapsible-up data-[state=open]:animate-collapsible-down",
+      className,
+    )}
+    {...props}
+    ref={ref}
+  />
+));
+CollapsibleContent.displayName = CollapsiblePrimitive.CollapsibleContent.displayName;
+
+export { Collapsible, CollapsibleTrigger, CollapsibleContent };
diff --git a/client/src/components/ui/popover.tsx b/client/src/components/ui/popover.tsx
index 03e5415..93d7f0f 100644
--- a/client/src/components/ui/popover.tsx
+++ b/client/src/components/ui/popover.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import * as PopoverPrimitive from "@radix-ui/react-popover";
+import { cva, VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -9,23 +10,61 @@ const Popover = PopoverPrimitive.Root;
 
 const PopoverTrigger = PopoverPrimitive.Trigger;
 
+const popoverContentVariants = cva(
+  "z-10 outline-none duration-500 ease-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+  {
+    variants: {
+      variant: {
+        default: "bg-white",
+        dark: "bg-rhino-blue-900 text-white",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+    },
+  },
+);
+
 const PopoverContent = React.forwardRef<
   React.ElementRef<typeof PopoverPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
->(({ className, align = "center", sideOffset = 26, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content> &
+    VariantProps<typeof popoverContentVariants>
+>(({ variant, className, align = "center", sideOffset = 24, ...props }, ref) => (
   <PopoverPrimitive.Portal>
     <PopoverPrimitive.Content
       ref={ref}
       align={align}
       sideOffset={sideOffset}
-      className={cn(
-        "z-10 bg-white outline-none duration-500 ease-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-        className,
-      )}
+      className={cn(popoverContentVariants({ variant, className }))}
       {...props}
     />
   </PopoverPrimitive.Portal>
 ));
 PopoverContent.displayName = PopoverPrimitive.Content.displayName;
 
-export { Popover, PopoverTrigger, PopoverContent };
+const popoverArrowVariants = cva("", {
+  variants: {
+    variant: {
+      default: "fill-white",
+      dark: "fill-rhino-blue-900",
+    },
+  },
+  defaultVariants: {
+    variant: "default",
+  },
+});
+
+const PopoverArrow = React.forwardRef<
+  React.ElementRef<typeof PopoverPrimitive.Arrow>,
+  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Arrow> &
+    VariantProps<typeof popoverArrowVariants>
+>(({ variant, className, ...props }, ref) => (
+  <PopoverPrimitive.Arrow
+    ref={ref}
+    className={cn(popoverArrowVariants({ variant, className }))}
+    {...props}
+  />
+));
+PopoverArrow.displayName = PopoverPrimitive.Arrow.displayName;
+
+export { Popover, PopoverTrigger, PopoverContent, PopoverArrow };
diff --git a/client/src/components/ui/slider.tsx b/client/src/components/ui/slider.tsx
new file mode 100644
index 0000000..9a2f429
--- /dev/null
+++ b/client/src/components/ui/slider.tsx
@@ -0,0 +1,54 @@
+"use client";
+
+import * as SliderPrimitive from "@radix-ui/react-slider";
+import * as React from "react";
+
+import { cn } from "@/lib/utils";
+
+const Slider = React.forwardRef<
+  React.ElementRef<typeof SliderPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root> & { showPercentage?: boolean }
+>(({ className, min = 0, max = 1, step = 0.1, showPercentage = true, ...props }, ref) => {
+  const value = props.value?.[0] ?? props.defaultValue?.[0] ?? 0;
+
+  return (
+    <SliderPrimitive.Root
+      ref={ref}
+      className={cn(
+        {
+          "relative flex w-full touch-none select-none items-center": true,
+          "pt-4": showPercentage,
+        },
+        className,
+      )}
+      min={min}
+      max={max}
+      step={step}
+      {...props}
+    >
+      <SliderPrimitive.Track className="relative h-0.5 w-full grow rounded-full bg-casper-blue-500">
+        <SliderPrimitive.Range className="absolute h-full bg-white" />
+        <div className="absolute left-0 top-1/2 size-1 -translate-y-1/2 rounded-full bg-white" />
+        <div className="absolute right-0 top-1/2 size-1 -translate-y-1/2 rounded-full bg-casper-blue-500" />
+      </SliderPrimitive.Track>
+      <SliderPrimitive.Thumb className="relative block h-2 w-2 rounded-full bg-white transition-colors hover:bg-casper-blue-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-casper-blue-500 disabled:pointer-events-none disabled:opacity-20">
+        {showPercentage && (
+          <div
+            className={cn({
+              "absolute bottom-1.5 text-xs text-white": true,
+              "left-0": value === min,
+              "left-1/2 -translate-x-1/2": value > min && value < max,
+              "right-0": value === max,
+            })}
+            aria-hidden
+          >
+            {value * 100}%
+          </div>
+        )}
+      </SliderPrimitive.Thumb>
+    </SliderPrimitive.Root>
+  );
+});
+Slider.displayName = SliderPrimitive.Root.displayName;
+
+export { Slider };
diff --git a/client/src/components/ui/switch.tsx b/client/src/components/ui/switch.tsx
new file mode 100644
index 0000000..6edbc0f
--- /dev/null
+++ b/client/src/components/ui/switch.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import * as SwitchPrimitives from "@radix-ui/react-switch";
+import * as React from "react";
+
+import { cn } from "@/lib/utils";
+
+const Switch = React.forwardRef<
+  React.ElementRef<typeof SwitchPrimitives.Root>,
+  React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
+>(({ className, ...props }, ref) => (
+  <SwitchPrimitives.Root
+    className={cn(
+      "peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-[3px] border-white transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-casper-blue-400 disabled:cursor-not-allowed disabled:opacity-20 data-[state=checked]:bg-supernova-yellow-400 data-[state=unchecked]:bg-casper-blue-400 data-[state=checked]:hover:bg-supernova-yellow-300 data-[state=unchecked]:hover:bg-casper-blue-300",
+      className,
+    )}
+    {...props}
+    ref={ref}
+  >
+    <SwitchPrimitives.Thumb
+      className={cn(
+        "pointer-events-none block h-5 w-5 rounded-full border-[3px] border-white bg-rhino-blue-950 ring-0 transition-transform data-[state=checked]:translate-x-3 data-[state=unchecked]:-translate-x-[3px]",
+      )}
+    />
+  </SwitchPrimitives.Root>
+));
+Switch.displayName = SwitchPrimitives.Root.displayName;
+
+export { Switch };
diff --git a/client/src/hooks/use-datasets-by-sub-topic.ts b/client/src/hooks/use-datasets-by-sub-topic.ts
index 6a7a97c..3566b6c 100644
--- a/client/src/hooks/use-datasets-by-sub-topic.ts
+++ b/client/src/hooks/use-datasets-by-sub-topic.ts
@@ -45,7 +45,7 @@ export default function useDatasetsBySubTopic(topicSlug: string, layersFields =
           let currentSubTopic = null;
 
           for (const item of data.data) {
-            const subTopic = item.attributes!.sub_topic!.data!.attributes!.name!;
+            const subTopic = item.attributes!.sub_topic!.data!.attributes!.name! as string;
             const dataset = item.attributes!.name;
             const layers = item.attributes!.layers!.data!;
 
diff --git a/client/src/hooks/use-layer-config.ts b/client/src/hooks/use-layer-config.ts
new file mode 100644
index 0000000..27090cc
--- /dev/null
+++ b/client/src/hooks/use-layer-config.ts
@@ -0,0 +1,92 @@
+import { JSONConverter } from "@deck.gl/json";
+import { useMemo } from "react";
+
+import { useGetLayersId } from "@/types/generated/layer";
+import {
+  LayerConfig,
+  LayerParamsConfig,
+  LayerResolvedParamsConfig,
+  LayerSettings,
+} from "@/types/layer";
+
+const resolveLayerParamsConfig = (
+  paramsConfig: LayerParamsConfig,
+  settings: LayerSettings,
+): LayerResolvedParamsConfig => {
+  return paramsConfig.reduce((res, param) => {
+    const hasSettings = (key: string): key is keyof LayerSettings => {
+      return key in settings;
+    };
+
+    // No setting for this param, we just keep the default value
+    if (!hasSettings(param.key)) {
+      return { ...res, [param.key]: param.default };
+    }
+
+    // We replace the default by the setting's value
+    return {
+      ...res,
+      [param.key]: settings[param.key] ?? param.default,
+    };
+  }, {});
+};
+
+const resolveLayerConfig = (
+  config: LayerConfig,
+  resolvedParamsConfig: LayerResolvedParamsConfig,
+): LayerConfig => {
+  const converter = new JSONConverter({
+    configuration: {
+      functions: {
+        setOpacity({ o = 1, base = 1 }: { o: number; base: number }) {
+          return o * base;
+        },
+        setVisibility({ v }: { v: boolean }) {
+          return v ? "visible" : "none";
+        },
+      },
+      enumerations: {
+        params: resolvedParamsConfig,
+      },
+    },
+  });
+
+  return converter.convertJson(config);
+};
+
+export default function useLayerConfig(layerId: number, settings: LayerSettings) {
+  const { data, isLoading } = useGetLayersId(layerId, {
+    query: {
+      select: (data) => {
+        if (!data?.data) {
+          return undefined;
+        }
+
+        const { params_config: paramsConfig, mapbox_config: config } = data.data.attributes!;
+
+        return {
+          paramsConfig,
+          config,
+        } as { paramsConfig: LayerParamsConfig; config: LayerConfig };
+      },
+    },
+  });
+
+  const resolvedParamsConfig = useMemo(() => {
+    if (isLoading || !data) {
+      return undefined;
+    }
+
+    return resolveLayerParamsConfig(data.paramsConfig, settings);
+  }, [data, isLoading, settings]);
+
+  const resolvedConfig = useMemo(() => {
+    if (isLoading || !data || !resolvedParamsConfig) {
+      return undefined;
+    }
+
+    return resolveLayerConfig(data.config, resolvedParamsConfig);
+  }, [data, isLoading, resolvedParamsConfig]);
+
+  return resolvedConfig;
+}
diff --git a/client/src/hooks/use-layer-legend.ts b/client/src/hooks/use-layer-legend.ts
new file mode 100644
index 0000000..1740dae
--- /dev/null
+++ b/client/src/hooks/use-layer-legend.ts
@@ -0,0 +1,63 @@
+import { useGetLayers } from "@/types/generated/layer";
+import { LegendLegendConfigComponent } from "@/types/generated/strapi.schemas";
+
+export default function useLayerLegend(id: number) {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  return useGetLayers<{
+    name: string;
+    dataset: string;
+    topicSlug: string;
+    type: LegendLegendConfigComponent["type"];
+    unit: string;
+    items: LegendLegendConfigComponent["items"];
+  }>(
+    {
+      fields: ["name"],
+      populate: {
+        legend_config: {
+          populate: {
+            items: true,
+          },
+        },
+        dataset: {
+          fields: ["name"],
+          populate: {
+            topic: {
+              fields: ["slug"],
+            },
+          },
+        },
+      },
+      filters: {
+        id: {
+          $eq: id,
+        },
+      },
+      "pagination[limit]": 1,
+    },
+    {
+      query: {
+        select: (data) => {
+          if (!data?.data?.length) {
+            return undefined;
+          }
+
+          const { name, dataset, legend_config } = data.data[0].attributes!;
+          const { name: datasetName, topic } = dataset!.data!.attributes!;
+          const { slug: topicSlug } = topic!.data!.attributes!;
+          const { type, unit, items } = legend_config!;
+
+          return {
+            name,
+            dataset: datasetName,
+            topicSlug,
+            type,
+            unit,
+            items,
+          };
+        },
+      },
+    },
+  );
+}
diff --git a/client/src/hooks/use-map-layers.ts b/client/src/hooks/use-map-layers.ts
new file mode 100644
index 0000000..c55cbb9
--- /dev/null
+++ b/client/src/hooks/use-map-layers.ts
@@ -0,0 +1,70 @@
+import { parseAsArrayOf, parseAsJson, useQueryState } from "nuqs";
+import { useCallback } from "react";
+import { z } from "zod";
+
+import { LayerSettings } from "@/types/layer";
+
+const schema = z.object({
+  id: z.number(),
+  visibility: z.boolean(),
+  opacity: z.number().min(0).max(1),
+});
+
+export default function useMapLayers() {
+  const [layers, setLayers] = useQueryState(
+    "layers",
+    parseAsArrayOf(parseAsJson(schema.parse)).withDefault([]),
+  );
+
+  const addLayer = useCallback(
+    (id: number) => {
+      setLayers((layers) => [
+        {
+          id,
+          visibility: true,
+          opacity: 1,
+        },
+        ...layers,
+      ]);
+    },
+    [setLayers],
+  );
+
+  const removeLayer = useCallback(
+    (id: number) => {
+      setLayers((layers) => layers.filter((layer) => layer.id !== id));
+    },
+    [setLayers],
+  );
+
+  const updateLayer = useCallback(
+    (id: number, attributes: Partial<z.infer<typeof schema>>) => {
+      setLayers((layers) =>
+        layers.map((layer) => (layer.id === id ? { ...layer, ...attributes } : layer)),
+      );
+    },
+    [setLayers],
+  );
+
+  const updateLayerOrder = useCallback(
+    (id: number, position: number) => {
+      setLayers((layers) => {
+        const newLayers = [...layers];
+        const previousLayerPosition = layers.findIndex((layer) => layer.id === id);
+
+        if (previousLayerPosition !== -1) {
+          const [layer] = newLayers.splice(previousLayerPosition, 1);
+          newLayers.splice(position, 0, layer);
+        }
+
+        return newLayers;
+      });
+    },
+    [setLayers],
+  );
+
+  return [
+    layers as (LayerSettings & { id: number })[],
+    { addLayer, removeLayer, updateLayer, updateLayerOrder },
+  ] as const;
+}
diff --git a/client/src/svgs/eye-slashed.svg b/client/src/svgs/eye-slashed.svg
new file mode 100644
index 0000000..f89d896
--- /dev/null
+++ b/client/src/svgs/eye-slashed.svg
@@ -0,0 +1,16 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon/Eye/Slash">
+<g id="Union">
+<path
+        d="M2.94145 2.05806C2.69738 1.81398 2.30165 1.81398 2.05757 2.05806C1.81349 2.30214 1.81349 2.69786 2.05757 2.94194L17.0576 17.9419C17.3016 18.186 17.6974 18.186 17.9415 17.9419C18.1855 17.6979 18.1855 17.3021 17.9415 17.0581L2.94145 2.05806Z" fill="currentColor"/>
+<path
+        d="M18.8961 10.4611C18.4427 11.8239 17.685 13.0479 16.7034 14.0523L14.1214 11.4702C14.2853 11.0107 14.3745 10.5158 14.3745 10C14.3745 7.58375 12.4158 5.625 9.99951 5.625C9.48373 5.625 8.9888 5.71425 8.52932 5.87816L6.46532 3.81416C7.55604 3.36984 8.74932 3.125 9.99994 3.125C14.1419 3.125 17.6549 5.8106 18.8958 9.53371C18.9961 9.8346 18.9962 10.1601 18.8961 10.4611Z" fill="currentColor"/>
+<path
+        d="M13.1245 10C13.1245 10.1501 13.1139 10.2978 13.0935 10.4423L9.55722 6.90606C9.70171 6.88559 9.84937 6.875 9.99951 6.875C11.7254 6.875 13.1245 8.27411 13.1245 10Z" fill="currentColor"/>
+<path
+        d="M10.4418 13.0939L6.90557 9.55771C6.8851 9.7022 6.87451 9.84986 6.87451 10C6.87451 11.7259 8.27362 13.125 9.99951 13.125C10.1496 13.125 10.2973 13.1144 10.4418 13.0939Z" fill="currentColor"/>
+<path
+        d="M5.62451 10C5.62451 9.48422 5.71376 8.98929 5.87767 8.52981L3.29528 5.94742C2.31357 6.95185 1.55574 8.17595 1.10235 9.53891C1.00225 9.83986 1.00234 10.1654 1.10263 10.4663C2.34354 14.1894 5.85657 16.875 9.99848 16.875C11.2493 16.875 12.4427 16.6301 13.5335 16.1857L11.4697 14.1218C11.0102 14.2857 10.5153 14.375 9.99951 14.375C7.58327 14.375 5.62451 12.4162 5.62451 10Z" fill="currentColor"/>
+</g>
+</g>
+</svg>
diff --git a/client/src/svgs/eye.svg b/client/src/svgs/eye.svg
new file mode 100644
index 0000000..862f1d6
--- /dev/null
+++ b/client/src/svgs/eye.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon/Eye">
+<path id="Vector"
+      d="M8 10C8.53043 10 9.03914 9.78929 9.41421 9.41421C9.78929 9.03914 10 8.53043 10 8C10 7.46957 9.78929 6.96086 9.41421 6.58579C9.03914 6.21071 8.53043 6 8 6C7.46957 6 6.96086 6.21071 6.58579 6.58579C6.21071 6.96086 6 7.46957 6 8C6 8.53043 6.21071 9.03914 6.58579 9.41421C6.96086 9.78929 7.46957 10 8 10Z" fill="currentColor"/>
+<path id="Vector_2" fill-rule="evenodd" clip-rule="evenodd"
+      d="M0.531253 8.47202C0.413736 8.16667 0.413736 7.82858 0.531253 7.52323C1.11304 6.01482 2.13802 4.71798 3.47122 3.80347C4.80443 2.88896 6.38334 2.39967 8.00005 2.40002C11.4057 2.40002 14.3145 4.52802 15.4689 7.52802C15.5865 7.83282 15.5857 8.17122 15.4689 8.47682C14.8871 9.98523 13.8621 11.2821 12.5289 12.1966C11.1957 13.1111 9.61677 13.6004 8.00005 13.6C4.59445 13.6 1.68565 11.472 0.531253 8.47202ZM11.2001 8.00002C11.2001 8.84872 10.8629 9.66265 10.2628 10.2628C9.66268 10.8629 8.84875 11.2 8.00005 11.2C7.15136 11.2 6.33743 10.8629 5.73731 10.2628C5.13719 9.66265 4.80005 8.84872 4.80005 8.00002C4.80005 7.15133 5.13719 6.3374 5.73731 5.73728C6.33743 5.13717 7.15136 4.80002 8.00005 4.80002C8.84875 4.80002 9.66268 5.13717 10.2628 5.73728C10.8629 6.3374 11.2001 7.15133 11.2001 8.00002Z" fill="currentColor"/>
+</g>
+</svg>
diff --git a/client/src/svgs/handle.svg b/client/src/svgs/handle.svg
new file mode 100644
index 0000000..0ae445f
--- /dev/null
+++ b/client/src/svgs/handle.svg
@@ -0,0 +1,10 @@
+<svg width="8" height="12" viewBox="0 0 8 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Legend.drag">
+<circle id="Ellipse 36" cx="1.63636" cy="1.63639" r="1.63636" fill="currentColor"/>
+<circle id="Ellipse 37" cx="6.00013" cy="1.63639" r="1.63636" fill="currentColor"/>
+<circle id="Ellipse 38" cx="6.00013" cy="6.00004" r="1.63636" fill="currentColor"/>
+<circle id="Ellipse 39" cx="1.63636" cy="6.00004" r="1.63636" fill="currentColor"/>
+<circle id="Ellipse 40" cx="1.63636" cy="10.3637" r="1.63636" fill="currentColor"/>
+<circle id="Ellipse 41" cx="6.00013" cy="10.3637" r="1.63636" fill="currentColor"/>
+</g>
+</svg>
diff --git a/client/src/svgs/list-bullet.svg b/client/src/svgs/list-bullet.svg
new file mode 100644
index 0000000..0b7661a
--- /dev/null
+++ b/client/src/svgs/list-bullet.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="heroicons-outline/list-bullet">
+<path id="Vector"
+      d="M8.25 7.5498H20.25M8.25 12.7998H20.25M8.25 18.0498H20.25M3.75 7.5498H3.7575V7.5573H3.75V7.5498ZM4.125 7.5498C4.125 7.75691 3.95711 7.9248 3.75 7.9248C3.54289 7.9248 3.375 7.75691 3.375 7.5498C3.375 7.3427 3.54289 7.1748 3.75 7.1748C3.95711 7.1748 4.125 7.3427 4.125 7.5498ZM3.75 12.7998H3.7575V12.8073H3.75V12.7998ZM4.125 12.7998C4.125 13.0069 3.95711 13.1748 3.75 13.1748C3.54289 13.1748 3.375 13.0069 3.375 12.7998C3.375 12.5927 3.54289 12.4248 3.75 12.4248C3.95711 12.4248 4.125 12.5927 4.125 12.7998ZM3.75 18.0498H3.7575V18.0573H3.75V18.0498ZM4.125 18.0498C4.125 18.2569 3.95711 18.4248 3.75 18.4248C3.54289 18.4248 3.375 18.2569 3.375 18.0498C3.375 17.8427 3.54289 17.6748 3.75 17.6748C3.95711 17.6748 4.125 17.8427 4.125 18.0498Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/client/src/svgs/opacity.svg b/client/src/svgs/opacity.svg
new file mode 100644
index 0000000..9acb947
--- /dev/null
+++ b/client/src/svgs/opacity.svg
@@ -0,0 +1,8 @@
+<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Vector">
+<g id="iconopacitydefault">
+<path id="Shape" fill-rule="evenodd" clip-rule="evenodd"
+      d="M8.08848 14C4.70755 14 1.9668 11.2592 1.9668 7.87832C1.9668 5.74606 3.79276 3.19623 7.44514 0.228359C7.8202 -0.0761195 8.35722 -0.0761195 8.73182 0.228359C12.3842 3.19623 14.2102 5.74606 14.2102 7.87832C14.2102 11.2592 11.4694 14 8.08848 14ZM3.49746 7.87785C3.49746 10.4137 5.55325 12.4694 8.08906 12.4694C10.6249 12.4694 12.6807 10.4137 12.6807 7.87785C12.6807 6.38532 11.1958 4.26257 8.08906 1.68016C4.9823 4.26302 3.49746 6.38532 3.49746 7.87785ZM8.08848 10.9389L8.09255 4.09199C8.3269 4.0929 8.5608 4.17433 8.75037 4.33585C10.3501 5.69944 11.1495 6.88025 11.1495 7.87784C11.1495 9.56853 9.77917 10.9389 8.08848 10.9389Z" fill="currentColor"/>
+</g>
+</g>
+</svg>
diff --git a/client/src/types/generated/strapi.schemas.ts b/client/src/types/generated/strapi.schemas.ts
index 3576926..4dd972c 100644
--- a/client/src/types/generated/strapi.schemas.ts
+++ b/client/src/types/generated/strapi.schemas.ts
@@ -245,6 +245,15 @@ export interface UploadFile {
 
 export type TopicResponseMeta = { [key: string]: unknown };
 
+export interface Topic {
+  createdAt?: string;
+  createdBy?: TopicCreatedBy;
+  name: string;
+  slug: string;
+  updatedAt?: string;
+  updatedBy?: TopicUpdatedBy;
+}
+
 export interface TopicResponseDataObject {
   attributes?: Topic;
   id?: number;
@@ -266,15 +275,6 @@ export type TopicUpdatedBy = {
   data?: TopicUpdatedByData;
 };
 
-export interface Topic {
-  createdAt?: string;
-  createdBy?: TopicCreatedBy;
-  name: string;
-  slug: string;
-  updatedAt?: string;
-  updatedBy?: TopicUpdatedBy;
-}
-
 export type TopicCreatedByDataAttributes = {
   blocked?: boolean;
   createdAt?: string;
@@ -312,18 +312,6 @@ export type TopicCreatedByDataAttributesUpdatedBy = {
   data?: TopicCreatedByDataAttributesUpdatedByData;
 };
 
-export type TopicCreatedByDataAttributesRolesDataItemAttributes = {
-  code?: string;
-  createdAt?: string;
-  createdBy?: TopicCreatedByDataAttributesRolesDataItemAttributesCreatedBy;
-  description?: string;
-  name?: string;
-  permissions?: TopicCreatedByDataAttributesRolesDataItemAttributesPermissions;
-  updatedAt?: string;
-  updatedBy?: TopicCreatedByDataAttributesRolesDataItemAttributesUpdatedBy;
-  users?: TopicCreatedByDataAttributesRolesDataItemAttributesUsers;
-};
-
 export type TopicCreatedByDataAttributesRolesDataItem = {
   attributes?: TopicCreatedByDataAttributesRolesDataItemAttributes;
   id?: number;
@@ -344,6 +332,18 @@ export type TopicCreatedByDataAttributesRolesDataItemAttributesUsers = {
   data?: TopicCreatedByDataAttributesRolesDataItemAttributesUsersDataItem[];
 };
 
+export type TopicCreatedByDataAttributesRolesDataItemAttributes = {
+  code?: string;
+  createdAt?: string;
+  createdBy?: TopicCreatedByDataAttributesRolesDataItemAttributesCreatedBy;
+  description?: string;
+  name?: string;
+  permissions?: TopicCreatedByDataAttributesRolesDataItemAttributesPermissions;
+  updatedAt?: string;
+  updatedBy?: TopicCreatedByDataAttributesRolesDataItemAttributesUpdatedBy;
+  users?: TopicCreatedByDataAttributesRolesDataItemAttributesUsers;
+};
+
 export type TopicCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
 
 export type TopicCreatedByDataAttributesRolesDataItemAttributesUpdatedByData = {
@@ -466,6 +466,14 @@ export interface TopicRequest {
 
 export type SubTopicResponseMeta = { [key: string]: unknown };
 
+export interface SubTopic {
+  createdAt?: string;
+  createdBy?: SubTopicCreatedBy;
+  name: string;
+  updatedAt?: string;
+  updatedBy?: SubTopicUpdatedBy;
+}
+
 export interface SubTopicResponseDataObject {
   attributes?: SubTopic;
   id?: number;
@@ -487,6 +495,23 @@ export type SubTopicUpdatedBy = {
   data?: SubTopicUpdatedByData;
 };
 
+export type SubTopicCreatedByDataAttributes = {
+  blocked?: boolean;
+  createdAt?: string;
+  createdBy?: SubTopicCreatedByDataAttributesCreatedBy;
+  email?: string;
+  firstname?: string;
+  isActive?: boolean;
+  lastname?: string;
+  preferedLanguage?: string;
+  registrationToken?: string;
+  resetPasswordToken?: string;
+  roles?: SubTopicCreatedByDataAttributesRoles;
+  updatedAt?: string;
+  updatedBy?: SubTopicCreatedByDataAttributesUpdatedBy;
+  username?: string;
+};
+
 export type SubTopicCreatedByData = {
   attributes?: SubTopicCreatedByDataAttributes;
   id?: number;
@@ -496,14 +521,6 @@ export type SubTopicCreatedBy = {
   data?: SubTopicCreatedByData;
 };
 
-export interface SubTopic {
-  createdAt?: string;
-  createdBy?: SubTopicCreatedBy;
-  name: string;
-  updatedAt?: string;
-  updatedBy?: SubTopicUpdatedBy;
-}
-
 export type SubTopicCreatedByDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
 
 export type SubTopicCreatedByDataAttributesUpdatedByData = {
@@ -524,23 +541,6 @@ export type SubTopicCreatedByDataAttributesRoles = {
   data?: SubTopicCreatedByDataAttributesRolesDataItem[];
 };
 
-export type SubTopicCreatedByDataAttributes = {
-  blocked?: boolean;
-  createdAt?: string;
-  createdBy?: SubTopicCreatedByDataAttributesCreatedBy;
-  email?: string;
-  firstname?: string;
-  isActive?: boolean;
-  lastname?: string;
-  preferedLanguage?: string;
-  registrationToken?: string;
-  resetPasswordToken?: string;
-  roles?: SubTopicCreatedByDataAttributesRoles;
-  updatedAt?: string;
-  updatedBy?: SubTopicCreatedByDataAttributesUpdatedBy;
-  username?: string;
-};
-
 export type SubTopicCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes = { [key: string]: unknown };
 
 export type SubTopicCreatedByDataAttributesRolesDataItemAttributesUsersDataItem = {
@@ -575,19 +575,6 @@ export type SubTopicCreatedByDataAttributesRolesDataItemAttributesUpdatedBy = {
   data?: SubTopicCreatedByDataAttributesRolesDataItemAttributesUpdatedByData;
 };
 
-export type SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes = {
-  action?: string;
-  actionParameters?: unknown;
-  conditions?: unknown;
-  createdAt?: string;
-  createdBy?: SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy;
-  properties?: unknown;
-  role?: SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole;
-  subject?: string;
-  updatedAt?: string;
-  updatedBy?: SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy;
-};
-
 export type SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem = {
   attributes?: SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes;
   id?: number;
@@ -630,6 +617,19 @@ export type SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDat
   data?: SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData;
 };
 
+export type SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes = {
+  action?: string;
+  actionParameters?: unknown;
+  conditions?: unknown;
+  createdAt?: string;
+  createdBy?: SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy;
+  properties?: unknown;
+  role?: SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole;
+  subject?: string;
+  updatedAt?: string;
+  updatedBy?: SubTopicCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy;
+};
+
 export type SubTopicCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
 export type SubTopicCreatedByDataAttributesRolesDataItemAttributesCreatedByData = {
@@ -685,11 +685,6 @@ export interface SubTopicRequest {
 
 export type LocationResponseMeta = { [key: string]: unknown };
 
-export interface LocationResponseDataObject {
-  attributes?: Location;
-  id?: number;
-}
-
 export interface LocationResponse {
   data?: LocationResponseDataObject;
   meta?: LocationResponseMeta;
@@ -727,6 +722,11 @@ export interface Location {
   updatedBy?: LocationUpdatedBy;
 }
 
+export interface LocationResponseDataObject {
+  attributes?: Location;
+  id?: number;
+}
+
 export type LocationParentData = {
   attributes?: LocationParentDataAttributes;
   id?: number;
@@ -836,6 +836,18 @@ export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttr
   data?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItem[];
 };
 
+export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributes = {
+  code?: string;
+  createdAt?: string;
+  createdBy?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedBy;
+  description?: string;
+  name?: string;
+  permissions?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissions;
+  updatedAt?: string;
+  updatedBy?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedBy;
+  users?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsers;
+};
+
 export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
 
 export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByData = {
@@ -847,6 +859,19 @@ export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttr
   data?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByData;
 };
 
+export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes = {
+  action?: string;
+  actionParameters?: unknown;
+  conditions?: unknown;
+  createdAt?: string;
+  createdBy?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy;
+  properties?: unknown;
+  role?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole;
+  subject?: string;
+  updatedAt?: string;
+  updatedBy?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy;
+};
+
 export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem = {
   attributes?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes;
   id?: number;
@@ -856,18 +881,6 @@ export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttr
   data?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem[];
 };
 
-export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributes = {
-  code?: string;
-  createdAt?: string;
-  createdBy?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedBy;
-  description?: string;
-  name?: string;
-  permissions?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissions;
-  updatedAt?: string;
-  updatedBy?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedBy;
-  users?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsers;
-};
-
 export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
 
 export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData = {
@@ -901,18 +914,7 @@ export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttr
   data?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData;
 };
 
-export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes = {
-  action?: string;
-  actionParameters?: unknown;
-  conditions?: unknown;
-  createdAt?: string;
-  createdBy?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy;
-  properties?: unknown;
-  role?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole;
-  subject?: string;
-  updatedAt?: string;
-  updatedBy?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy;
-};
+export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
 export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByData = {
   attributes?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes;
@@ -923,8 +925,6 @@ export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttr
   data?: LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByData;
 };
 
-export type LocationParentDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
-
 export type LocationParentDataAttributesCreatedByDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
 export type LocationParentDataAttributesCreatedByDataAttributesCreatedByData = {
@@ -1006,6 +1006,7 @@ export const LegendLegendConfigComponentType = {
 export type LegendLegendConfigComponentItemsItem = {
   color?: string;
   id?: number;
+  pattern?: string;
   value?: string;
 };
 
@@ -1013,10 +1014,16 @@ export interface LegendLegendConfigComponent {
   id?: number;
   items?: LegendLegendConfigComponentItemsItem[];
   type?: LegendLegendConfigComponentType;
+  unit?: string;
 }
 
 export type LayerResponseMeta = { [key: string]: unknown };
 
+export interface LayerResponseDataObject {
+  attributes?: Layer;
+  id?: number;
+}
+
 export interface LayerResponse {
   data?: LayerResponseDataObject;
   meta?: LayerResponseMeta;
@@ -1045,6 +1052,7 @@ export const LayerType = {
 export interface Layer {
   createdAt?: string;
   createdBy?: LayerCreatedBy;
+  dataset?: LayerDataset;
   legend_config: LegendLegendConfigComponent;
   mapbox_config: unknown;
   name: string;
@@ -1054,35 +1062,217 @@ export interface Layer {
   updatedBy?: LayerUpdatedBy;
 }
 
-export interface LayerResponseDataObject {
-  attributes?: Layer;
+export type LayerDatasetDataAttributes = {
+  createdAt?: string;
+  createdBy?: LayerDatasetDataAttributesCreatedBy;
+  default_layer?: LayerDatasetDataAttributesDefaultLayer;
+  layers?: LayerDatasetDataAttributesLayers;
+  name?: string;
+  sub_topic?: LayerDatasetDataAttributesSubTopic;
+  topic?: LayerDatasetDataAttributesTopic;
+  updatedAt?: string;
+  updatedBy?: LayerDatasetDataAttributesUpdatedBy;
+};
+
+export type LayerDatasetData = {
+  attributes?: LayerDatasetDataAttributes;
   id?: number;
-}
+};
+
+export type LayerDataset = {
+  data?: LayerDatasetData;
+};
+
+export type LayerDatasetDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesUpdatedByData = {
+  attributes?: LayerDatasetDataAttributesUpdatedByDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesUpdatedBy = {
+  data?: LayerDatasetDataAttributesUpdatedByData;
+};
+
+export type LayerDatasetDataAttributesTopicDataAttributesUpdatedBy = {
+  data?: LayerDatasetDataAttributesTopicDataAttributesUpdatedByData;
+};
+
+export type LayerDatasetDataAttributesTopicDataAttributes = {
+  createdAt?: string;
+  createdBy?: LayerDatasetDataAttributesTopicDataAttributesCreatedBy;
+  name?: string;
+  slug?: string;
+  updatedAt?: string;
+  updatedBy?: LayerDatasetDataAttributesTopicDataAttributesUpdatedBy;
+};
+
+export type LayerDatasetDataAttributesTopicData = {
+  attributes?: LayerDatasetDataAttributesTopicDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesTopic = {
+  data?: LayerDatasetDataAttributesTopicData;
+};
+
+export type LayerDatasetDataAttributesTopicDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesTopicDataAttributesUpdatedByData = {
+  attributes?: LayerDatasetDataAttributesTopicDataAttributesUpdatedByDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesTopicDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesTopicDataAttributesCreatedByData = {
+  attributes?: LayerDatasetDataAttributesTopicDataAttributesCreatedByDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesTopicDataAttributesCreatedBy = {
+  data?: LayerDatasetDataAttributesTopicDataAttributesCreatedByData;
+};
+
+export type LayerDatasetDataAttributesSubTopicData = {
+  attributes?: LayerDatasetDataAttributesSubTopicDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesSubTopic = {
+  data?: LayerDatasetDataAttributesSubTopicData;
+};
+
+export type LayerDatasetDataAttributesSubTopicDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesSubTopicDataAttributesUpdatedByData = {
+  attributes?: LayerDatasetDataAttributesSubTopicDataAttributesUpdatedByDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesSubTopicDataAttributesUpdatedBy = {
+  data?: LayerDatasetDataAttributesSubTopicDataAttributesUpdatedByData;
+};
+
+export type LayerDatasetDataAttributesSubTopicDataAttributes = {
+  createdAt?: string;
+  createdBy?: LayerDatasetDataAttributesSubTopicDataAttributesCreatedBy;
+  name?: string;
+  updatedAt?: string;
+  updatedBy?: LayerDatasetDataAttributesSubTopicDataAttributesUpdatedBy;
+};
+
+export type LayerDatasetDataAttributesSubTopicDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesSubTopicDataAttributesCreatedByData = {
+  attributes?: LayerDatasetDataAttributesSubTopicDataAttributesCreatedByDataAttributes;
+  id?: number;
+};
 
-export type LayerCreatedByDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+export type LayerDatasetDataAttributesSubTopicDataAttributesCreatedBy = {
+  data?: LayerDatasetDataAttributesSubTopicDataAttributesCreatedByData;
+};
 
-export type LayerCreatedByDataAttributesUpdatedByData = {
-  attributes?: LayerCreatedByDataAttributesUpdatedByDataAttributes;
+export type LayerDatasetDataAttributesLayersDataItem = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesUpdatedBy = {
-  data?: LayerCreatedByDataAttributesUpdatedByData;
+export type LayerDatasetDataAttributesLayers = {
+  data?: LayerDatasetDataAttributesLayersDataItem[];
 };
 
-export type LayerCreatedByDataAttributesRolesDataItem = {
-  attributes?: LayerCreatedByDataAttributesRolesDataItemAttributes;
+export type LayerDatasetDataAttributesLayersDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesUpdatedByData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesUpdatedByDataAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesRoles = {
-  data?: LayerCreatedByDataAttributesRolesDataItem[];
+export type LayerDatasetDataAttributesLayersDataItemAttributesUpdatedBy = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesUpdatedByData;
 };
 
-export type LayerCreatedByDataAttributes = {
+export type LayerDatasetDataAttributesLayersDataItemAttributesType = typeof LayerDatasetDataAttributesLayersDataItemAttributesType[keyof typeof LayerDatasetDataAttributesLayersDataItemAttributesType];
+
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const LayerDatasetDataAttributesLayersDataItemAttributesType = {
+  static: 'static',
+  animated: 'animated',
+} as const;
+
+export type LayerDatasetDataAttributesLayersDataItemAttributes = {
+  createdAt?: string;
+  createdBy?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedBy;
+  dataset?: LayerDatasetDataAttributesLayersDataItemAttributesDataset;
+  legend_config?: LayerDatasetDataAttributesLayersDataItemAttributesLegendConfig;
+  mapbox_config?: unknown;
+  name?: string;
+  params_config?: unknown;
+  type?: LayerDatasetDataAttributesLayersDataItemAttributesType;
+  updatedAt?: string;
+  updatedBy?: LayerDatasetDataAttributesLayersDataItemAttributesUpdatedBy;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesLegendConfigType = typeof LayerDatasetDataAttributesLayersDataItemAttributesLegendConfigType[keyof typeof LayerDatasetDataAttributesLayersDataItemAttributesLegendConfigType];
+
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const LayerDatasetDataAttributesLayersDataItemAttributesLegendConfigType = {
+  basic: 'basic',
+  choropleth: 'choropleth',
+  gradient: 'gradient',
+} as const;
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesLegendConfigItemsItem = {
+  color?: string;
+  id?: number;
+  pattern?: string;
+  value?: string;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesLegendConfig = {
+  id?: number;
+  items?: LayerDatasetDataAttributesLayersDataItemAttributesLegendConfigItemsItem[];
+  type?: LayerDatasetDataAttributesLayersDataItemAttributesLegendConfigType;
+  unit?: string;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesDatasetDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesDatasetData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesDatasetDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesDataset = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesDatasetData;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedBy = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByData;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesUpdatedByData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesUpdatedByDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesUpdatedBy = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesUpdatedByData;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRoles = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItem[];
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributes = {
   blocked?: boolean;
   createdAt?: string;
-  createdBy?: LayerCreatedByDataAttributesCreatedBy;
+  createdBy?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesCreatedBy;
   email?: string;
   firstname?: string;
   isActive?: boolean;
@@ -1090,130 +1280,164 @@ export type LayerCreatedByDataAttributes = {
   preferedLanguage?: string;
   registrationToken?: string;
   resetPasswordToken?: string;
-  roles?: LayerCreatedByDataAttributesRoles;
+  roles?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRoles;
   updatedAt?: string;
-  updatedBy?: LayerCreatedByDataAttributesUpdatedBy;
+  updatedBy?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesUpdatedBy;
   username?: string;
 };
 
-export type LayerCreatedByData = {
-  attributes?: LayerCreatedByDataAttributes;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributes;
   id?: number;
 };
 
-export type LayerCreatedBy = {
-  data?: LayerCreatedByData;
-};
-
-export type LayerCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes = { [key: string]: unknown };
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes = { [key: string]: unknown };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesUsersDataItem = {
-  attributes?: LayerCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItem = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesUsers = {
-  data?: LayerCreatedByDataAttributesRolesDataItemAttributesUsersDataItem[];
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsers = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItem[];
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes;
+  id?: number;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesUpdatedBy = {
-  data?: LayerCreatedByDataAttributesRolesDataItemAttributesUpdatedByData;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedBy = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByData;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributes = {
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributes = {
   code?: string;
   createdAt?: string;
-  createdBy?: LayerCreatedByDataAttributesRolesDataItemAttributesCreatedBy;
+  createdBy?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedBy;
   description?: string;
   name?: string;
-  permissions?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissions;
+  permissions?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissions;
   updatedAt?: string;
-  updatedBy?: LayerCreatedByDataAttributesRolesDataItemAttributesUpdatedBy;
-  users?: LayerCreatedByDataAttributesRolesDataItemAttributesUsers;
+  updatedBy?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedBy;
+  users?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsers;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItem = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributes;
+  id?: number;
+};
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesUpdatedByData = {
-  attributes?: LayerCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem = {
-  attributes?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes = {
+  action?: string;
+  actionParameters?: unknown;
+  conditions?: unknown;
+  createdAt?: string;
+  createdBy?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy;
+  properties?: unknown;
+  role?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole;
+  subject?: string;
+  updatedAt?: string;
+  updatedBy?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissions = {
-  data?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem[];
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissions = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem[];
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData = {
-  attributes?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleDataAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy = {
-  data?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleData;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleDataAttributes = { [key: string]: unknown };
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleData = {
-  attributes?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleDataAttributes;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByDataAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole = {
-  data?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleData;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData = {
-  attributes?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByDataAttributes;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy = {
-  data?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedBy = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByData;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes = {
-  action?: string;
-  actionParameters?: unknown;
-  conditions?: unknown;
-  createdAt?: string;
-  createdBy?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy;
-  properties?: unknown;
-  role?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole;
-  subject?: string;
-  updatedAt?: string;
-  updatedBy?: LayerCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy;
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesCreatedByData = {
+  attributes?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesCreatedByDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesCreatedBy = {
+  data?: LayerDatasetDataAttributesLayersDataItemAttributesCreatedByDataAttributesCreatedByData;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
+export type LayerDatasetDataAttributesDefaultLayerDataAttributes = { [key: string]: unknown };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesCreatedByData = {
-  attributes?: LayerCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes;
+export type LayerDatasetDataAttributesDefaultLayerData = {
+  attributes?: LayerDatasetDataAttributesDefaultLayerDataAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesRolesDataItemAttributesCreatedBy = {
-  data?: LayerCreatedByDataAttributesRolesDataItemAttributesCreatedByData;
+export type LayerDatasetDataAttributesDefaultLayer = {
+  data?: LayerDatasetDataAttributesDefaultLayerData;
 };
 
-export type LayerCreatedByDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
+export type LayerDatasetDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
-export type LayerCreatedByDataAttributesCreatedByData = {
-  attributes?: LayerCreatedByDataAttributesCreatedByDataAttributes;
+export type LayerDatasetDataAttributesCreatedByData = {
+  attributes?: LayerDatasetDataAttributesCreatedByDataAttributes;
+  id?: number;
+};
+
+export type LayerDatasetDataAttributesCreatedBy = {
+  data?: LayerDatasetDataAttributesCreatedByData;
+};
+
+export type LayerCreatedByDataAttributes = { [key: string]: unknown };
+
+export type LayerCreatedByData = {
+  attributes?: LayerCreatedByDataAttributes;
   id?: number;
 };
 
-export type LayerCreatedByDataAttributesCreatedBy = {
-  data?: LayerCreatedByDataAttributesCreatedByData;
+export type LayerCreatedBy = {
+  data?: LayerCreatedByData;
 };
 
 export type LayerListResponseMetaPagination = {
@@ -1248,7 +1472,10 @@ export const LayerRequestDataType = {
   animated: 'animated',
 } as const;
 
+export type LayerRequestDataDataset = number | string;
+
 export type LayerRequestData = {
+  dataset?: LayerRequestDataDataset;
   legend_config: LegendLegendConfigComponent;
   mapbox_config: unknown;
   name: string;
@@ -1262,6 +1489,18 @@ export interface LayerRequest {
 
 export type DatasetResponseMeta = { [key: string]: unknown };
 
+export interface Dataset {
+  createdAt?: string;
+  createdBy?: DatasetCreatedBy;
+  default_layer?: DatasetDefaultLayer;
+  layers?: DatasetLayers;
+  name: string;
+  sub_topic?: DatasetSubTopic;
+  topic?: DatasetTopic;
+  updatedAt?: string;
+  updatedBy?: DatasetUpdatedBy;
+}
+
 export interface DatasetResponseDataObject {
   attributes?: Dataset;
   id?: number;
@@ -1283,35 +1522,7 @@ export type DatasetUpdatedBy = {
   data?: DatasetUpdatedByData;
 };
 
-export interface Dataset {
-  createdAt?: string;
-  createdBy?: DatasetCreatedBy;
-  default_layer?: DatasetDefaultLayer;
-  layers?: DatasetLayers;
-  name: string;
-  sub_topic?: DatasetSubTopic;
-  topic?: DatasetTopic;
-  updatedAt?: string;
-  updatedBy?: DatasetUpdatedBy;
-}
-
-export type DatasetTopicDataAttributesUpdatedByData = {
-  attributes?: DatasetTopicDataAttributesUpdatedByDataAttributes;
-  id?: number;
-};
-
-export type DatasetTopicDataAttributesUpdatedBy = {
-  data?: DatasetTopicDataAttributesUpdatedByData;
-};
-
-export type DatasetTopicDataAttributes = {
-  createdAt?: string;
-  createdBy?: DatasetTopicDataAttributesCreatedBy;
-  name?: string;
-  slug?: string;
-  updatedAt?: string;
-  updatedBy?: DatasetTopicDataAttributesUpdatedBy;
-};
+export type DatasetTopicDataAttributes = { [key: string]: unknown };
 
 export type DatasetTopicData = {
   attributes?: DatasetTopicDataAttributes;
@@ -1322,18 +1533,7 @@ export type DatasetTopic = {
   data?: DatasetTopicData;
 };
 
-export type DatasetTopicDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
-
-export type DatasetTopicDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
-
-export type DatasetTopicDataAttributesCreatedByData = {
-  attributes?: DatasetTopicDataAttributesCreatedByDataAttributes;
-  id?: number;
-};
-
-export type DatasetTopicDataAttributesCreatedBy = {
-  data?: DatasetTopicDataAttributesCreatedByData;
-};
+export type DatasetSubTopicDataAttributes = { [key: string]: unknown };
 
 export type DatasetSubTopicData = {
   attributes?: DatasetSubTopicDataAttributes;
@@ -1344,34 +1544,21 @@ export type DatasetSubTopic = {
   data?: DatasetSubTopicData;
 };
 
-export type DatasetSubTopicDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
-
-export type DatasetSubTopicDataAttributesUpdatedByData = {
-  attributes?: DatasetSubTopicDataAttributesUpdatedByDataAttributes;
-  id?: number;
-};
-
-export type DatasetSubTopicDataAttributesUpdatedBy = {
-  data?: DatasetSubTopicDataAttributesUpdatedByData;
+export type DatasetLayersDataItemAttributesUpdatedBy = {
+  data?: DatasetLayersDataItemAttributesUpdatedByData;
 };
 
-export type DatasetSubTopicDataAttributes = {
+export type DatasetLayersDataItemAttributes = {
   createdAt?: string;
-  createdBy?: DatasetSubTopicDataAttributesCreatedBy;
+  createdBy?: DatasetLayersDataItemAttributesCreatedBy;
+  dataset?: DatasetLayersDataItemAttributesDataset;
+  legend_config?: DatasetLayersDataItemAttributesLegendConfig;
+  mapbox_config?: unknown;
   name?: string;
+  params_config?: unknown;
+  type?: DatasetLayersDataItemAttributesType;
   updatedAt?: string;
-  updatedBy?: DatasetSubTopicDataAttributesUpdatedBy;
-};
-
-export type DatasetSubTopicDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
-
-export type DatasetSubTopicDataAttributesCreatedByData = {
-  attributes?: DatasetSubTopicDataAttributesCreatedByDataAttributes;
-  id?: number;
-};
-
-export type DatasetSubTopicDataAttributesCreatedBy = {
-  data?: DatasetSubTopicDataAttributesCreatedByData;
+  updatedBy?: DatasetLayersDataItemAttributesUpdatedBy;
 };
 
 export type DatasetLayersDataItem = {
@@ -1390,10 +1577,6 @@ export type DatasetLayersDataItemAttributesUpdatedByData = {
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesUpdatedBy = {
-  data?: DatasetLayersDataItemAttributesUpdatedByData;
-};
-
 export type DatasetLayersDataItemAttributesType = typeof DatasetLayersDataItemAttributesType[keyof typeof DatasetLayersDataItemAttributesType];
 
 
@@ -1403,18 +1586,6 @@ export const DatasetLayersDataItemAttributesType = {
   animated: 'animated',
 } as const;
 
-export type DatasetLayersDataItemAttributes = {
-  createdAt?: string;
-  createdBy?: DatasetLayersDataItemAttributesCreatedBy;
-  legend_config?: DatasetLayersDataItemAttributesLegendConfig;
-  mapbox_config?: unknown;
-  name?: string;
-  params_config?: unknown;
-  type?: DatasetLayersDataItemAttributesType;
-  updatedAt?: string;
-  updatedBy?: DatasetLayersDataItemAttributesUpdatedBy;
-};
-
 export type DatasetLayersDataItemAttributesLegendConfigType = typeof DatasetLayersDataItemAttributesLegendConfigType[keyof typeof DatasetLayersDataItemAttributesLegendConfigType];
 
 
@@ -1428,6 +1599,7 @@ export const DatasetLayersDataItemAttributesLegendConfigType = {
 export type DatasetLayersDataItemAttributesLegendConfigItemsItem = {
   color?: string;
   id?: number;
+  pattern?: string;
   value?: string;
 };
 
@@ -1435,12 +1607,74 @@ export type DatasetLayersDataItemAttributesLegendConfig = {
   id?: number;
   items?: DatasetLayersDataItemAttributesLegendConfigItemsItem[];
   type?: DatasetLayersDataItemAttributesLegendConfigType;
+  unit?: string;
+};
+
+export type DatasetLayersDataItemAttributesDatasetData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesDataset = {
+  data?: DatasetLayersDataItemAttributesDatasetData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesUpdatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesUpdatedByDataAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesUpdatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesUpdatedByData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopic = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributes = {
+  createdAt?: string;
+  createdBy?: DatasetLayersDataItemAttributesDatasetDataAttributesCreatedBy;
+  default_layer?: DatasetLayersDataItemAttributesDatasetDataAttributesDefaultLayer;
+  layers?: DatasetLayersDataItemAttributesDatasetDataAttributesLayers;
+  name?: string;
+  sub_topic?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopic;
+  topic?: DatasetLayersDataItemAttributesDatasetDataAttributesTopic;
+  updatedAt?: string;
+  updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesUpdatedBy;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesUpdatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesUpdatedByDataAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesUpdatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesUpdatedByData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributes = {
+  createdAt?: string;
+  createdBy?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedBy;
+  name?: string;
+  slug?: string;
+  updatedAt?: string;
+  updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesUpdatedBy;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributes = {
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributes = {
   blocked?: boolean;
   createdAt?: string;
-  createdBy?: DatasetLayersDataItemAttributesCreatedByDataAttributesCreatedBy;
+  createdBy?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesCreatedBy;
   email?: string;
   firstname?: string;
   isActive?: boolean;
@@ -1448,150 +1682,233 @@ export type DatasetLayersDataItemAttributesCreatedByDataAttributes = {
   preferedLanguage?: string;
   registrationToken?: string;
   resetPasswordToken?: string;
-  roles?: DatasetLayersDataItemAttributesCreatedByDataAttributesRoles;
+  roles?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRoles;
   updatedAt?: string;
-  updatedBy?: DatasetLayersDataItemAttributesCreatedByDataAttributesUpdatedBy;
+  updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesUpdatedBy;
   username?: string;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByData = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedBy = {
-  data?: DatasetLayersDataItemAttributesCreatedByData;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByData;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesUpdatedByData = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesUpdatedByDataAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesUpdatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesUpdatedByDataAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesUpdatedBy = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesUpdatedByData;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesUpdatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesUpdatedByData;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributes = {
-  code?: string;
-  createdAt?: string;
-  createdBy?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedBy;
-  description?: string;
-  name?: string;
-  permissions?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissions;
-  updatedAt?: string;
-  updatedBy?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedBy;
-  users?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsers;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItem = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRoles = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItem[];
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItem = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItem = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRoles = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItem[];
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsers = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItem[];
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes;
+  id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes = { [key: string]: unknown };
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByData;
+};
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItem = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItemAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsers = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUsersDataItem[];
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissions = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem[];
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributes = {
+  code?: string;
+  createdAt?: string;
+  createdBy?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedBy;
+  description?: string;
+  name?: string;
+  permissions?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissions;
+  updatedAt?: string;
+  updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedBy;
+  users?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesUsers;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByData = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByDataAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedBy = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesUpdatedByData;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleDataAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleDataAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissions = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItem[];
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleData;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByDataAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByDataAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedByData;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes = {
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributes = {
   action?: string;
   actionParameters?: unknown;
   conditions?: unknown;
   createdAt?: string;
-  createdBy?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy;
+  createdBy?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy;
   properties?: unknown;
-  role?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole;
+  role?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole;
   subject?: string;
   updatedAt?: string;
-  updatedBy?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy;
+  updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesUpdatedBy;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes;
+  id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleDataAttributes = { [key: string]: unknown };
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleData = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleDataAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesCreatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesCreatedByDataAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRole = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesRoleData;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesCreatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesTopicDataAttributesCreatedByDataAttributesCreatedByData;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopic = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesUpdatedByDataAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesUpdatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesUpdatedByDataAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesUpdatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesUpdatedByData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByDataAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesCreatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesCreatedByDataAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedBy = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesPermissionsDataItemAttributesCreatedByData;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesCreatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesCreatedByData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributes = {
+  createdAt?: string;
+  createdBy?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesCreatedBy;
+  name?: string;
+  updatedAt?: string;
+  updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesSubTopicDataAttributesUpdatedBy;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
+export type DatasetLayersDataItemAttributesDatasetDataAttributesLayersDataItemAttributes = { [key: string]: unknown };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByData = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByDataAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesLayersDataItem = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesLayersDataItemAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedBy = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesRolesDataItemAttributesCreatedByData;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesLayers = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesLayersDataItem[];
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
+export type DatasetLayersDataItemAttributesDatasetDataAttributesDefaultLayerDataAttributes = { [key: string]: unknown };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesCreatedByData = {
-  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributesCreatedByDataAttributes;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesDefaultLayerData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesDefaultLayerDataAttributes;
   id?: number;
 };
 
-export type DatasetLayersDataItemAttributesCreatedByDataAttributesCreatedBy = {
-  data?: DatasetLayersDataItemAttributesCreatedByDataAttributesCreatedByData;
+export type DatasetLayersDataItemAttributesDatasetDataAttributesDefaultLayer = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesDefaultLayerData;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesCreatedByDataAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesCreatedByData = {
+  attributes?: DatasetLayersDataItemAttributesDatasetDataAttributesCreatedByDataAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesDatasetDataAttributesCreatedBy = {
+  data?: DatasetLayersDataItemAttributesDatasetDataAttributesCreatedByData;
+};
+
+export type DatasetLayersDataItemAttributesCreatedByDataAttributes = { [key: string]: unknown };
+
+export type DatasetLayersDataItemAttributesCreatedByData = {
+  attributes?: DatasetLayersDataItemAttributesCreatedByDataAttributes;
+  id?: number;
+};
+
+export type DatasetLayersDataItemAttributesCreatedBy = {
+  data?: DatasetLayersDataItemAttributesCreatedByData;
 };
 
 export type DatasetDefaultLayerDataAttributes = { [key: string]: unknown };
diff --git a/client/src/types/layer.ts b/client/src/types/layer.ts
new file mode 100644
index 0000000..69ab1b5
--- /dev/null
+++ b/client/src/types/layer.ts
@@ -0,0 +1,22 @@
+import { AnyLayer, AnySource, SkyLayer } from "react-map-gl";
+
+export interface LayerSettings {
+  visibility: boolean;
+  opacity: number;
+}
+
+export interface LayerConfig {
+  source: AnySource;
+  styles: Exclude<AnyLayer, SkyLayer>[];
+}
+
+export interface LayerParamsConfigValue {
+  key: string;
+  default: unknown;
+}
+
+export type LayerParamsConfig = LayerParamsConfigValue[];
+
+export interface LayerResolvedParamsConfig {
+  [key: string]: unknown;
+}
diff --git a/client/tailwind.config.ts b/client/tailwind.config.ts
index b8f5340..0607e31 100644
--- a/client/tailwind.config.ts
+++ b/client/tailwind.config.ts
@@ -13,6 +13,9 @@ const config: Config = {
     },
     colors: {
       white: "#ffffff",
+      gray: {
+        "500": "#60626A",
+      },
       "casper-blue": {
         "50": "#f4f8fa",
         "200": "#d4e0e9",
@@ -37,6 +40,9 @@ const config: Config = {
       },
     },
     extend: {
+      fontSize: {
+        "2xs": ["10px", "16px"],
+      },
       borderRadius: {
         lg: "var(--radius)",
         md: "calc(var(--radius) - 2px)",
@@ -54,6 +60,21 @@ const config: Config = {
           ring: "hsl(var(--sidebar-ring))",
         },
       },
+      // From https://github.com/shadcn-ui/ui/issues/2053#issuecomment-1902542088
+      keyframes: {
+        "collapsible-down": {
+          from: { height: "0" },
+          to: { height: "var(--radix-collapsible-content-height)" },
+        },
+        "collapsible-up": {
+          from: { height: "var(--radix-collapsible-content-height)" },
+          to: { height: "0" },
+        },
+      },
+      animation: {
+        "collapsible-down": "collapsible-down 0.2s ease-out",
+        "collapsible-up": "collapsible-up 0.2s ease-out",
+      },
     },
   },
   extend: {},
diff --git a/client/yarn.lock b/client/yarn.lock
index ecc7d67..d6b918f 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1316,6 +1316,123 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@deck.gl/core@npm:9.0.34":
+  version: 9.0.34
+  resolution: "@deck.gl/core@npm:9.0.34"
+  dependencies:
+    "@loaders.gl/core": "npm:^4.2.0"
+    "@loaders.gl/images": "npm:^4.2.0"
+    "@luma.gl/constants": "npm:~9.0.27"
+    "@luma.gl/core": "npm:~9.0.27"
+    "@luma.gl/engine": "npm:~9.0.27"
+    "@luma.gl/shadertools": "npm:~9.0.27"
+    "@luma.gl/webgl": "npm:~9.0.27"
+    "@math.gl/core": "npm:^4.0.0"
+    "@math.gl/sun": "npm:^4.0.0"
+    "@math.gl/web-mercator": "npm:^4.0.0"
+    "@probe.gl/env": "npm:^4.0.9"
+    "@probe.gl/log": "npm:^4.0.9"
+    "@probe.gl/stats": "npm:^4.0.9"
+    "@types/offscreencanvas": "npm:^2019.6.4"
+    gl-matrix: "npm:^3.0.0"
+    mjolnir.js: "npm:^2.7.0"
+  checksum: 10c0/13983e5e742ac2e38969ec941b179f193d384d93f0b51ab724e292653af36c3f3953b027554276aae86a4048d36ad8aaaa33cf5cb9d1b0cf384e0a3b6b95f4b7
+  languageName: node
+  linkType: hard
+
+"@deck.gl/json@npm:9.0.34":
+  version: 9.0.34
+  resolution: "@deck.gl/json@npm:9.0.34"
+  dependencies:
+    jsep: "npm:^0.3.0"
+  peerDependencies:
+    "@deck.gl/core": ^9.0.0
+  checksum: 10c0/bafda5c8edcd96f768753fb316f6b4416ec5f0300216b6856f81fcc06818580bded25fd55b111b1f8e14f842edf75fb394848334014e72cdf9ff81f3cfb97730
+  languageName: node
+  linkType: hard
+
+"@deck.gl/layers@npm:9.0.34":
+  version: 9.0.34
+  resolution: "@deck.gl/layers@npm:9.0.34"
+  dependencies:
+    "@loaders.gl/images": "npm:^4.2.0"
+    "@loaders.gl/schema": "npm:^4.2.0"
+    "@mapbox/tiny-sdf": "npm:^2.0.5"
+    "@math.gl/core": "npm:^4.0.0"
+    "@math.gl/polygon": "npm:^4.0.0"
+    "@math.gl/web-mercator": "npm:^4.0.0"
+    earcut: "npm:^2.2.4"
+  peerDependencies:
+    "@deck.gl/core": ^9.0.0
+    "@loaders.gl/core": ^4.2.0
+    "@luma.gl/core": ~9.0.0
+    "@luma.gl/engine": ~9.0.0
+  checksum: 10c0/16373b0674989ac24936b7fda9874cfa41e72ad868867cdd0585e3d9fd1aed0a9f6feefd57eeeb3bd834ec81c3f5ebd7310252411bb10b7936d09e264e169d74
+  languageName: node
+  linkType: hard
+
+"@dnd-kit/accessibility@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@dnd-kit/accessibility@npm:3.1.0"
+  dependencies:
+    tslib: "npm:^2.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+  checksum: 10c0/4f9d24e801d66d4fbb551ec389ed90424dd4c5bbdf527000a618e9abb9833cbd84d9a79e362f470ccbccfbd6d00217a9212c92f3cef66e01c951c7f79625b9d7
+  languageName: node
+  linkType: hard
+
+"@dnd-kit/core@npm:6.1.0":
+  version: 6.1.0
+  resolution: "@dnd-kit/core@npm:6.1.0"
+  dependencies:
+    "@dnd-kit/accessibility": "npm:^3.1.0"
+    "@dnd-kit/utilities": "npm:^3.2.2"
+    tslib: "npm:^2.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 10c0/c793eb97cb59285ca8937ebcdfcd27cff09d750ae06722e36ca5ed07925e41abc36a38cff98f9f6056f7a07810878d76909826142a2968330e7e22060e6be584
+  languageName: node
+  linkType: hard
+
+"@dnd-kit/modifiers@npm:7.0.0":
+  version: 7.0.0
+  resolution: "@dnd-kit/modifiers@npm:7.0.0"
+  dependencies:
+    "@dnd-kit/utilities": "npm:^3.2.2"
+    tslib: "npm:^2.0.0"
+  peerDependencies:
+    "@dnd-kit/core": ^6.1.0
+    react: ">=16.8.0"
+  checksum: 10c0/542e1d2b6102a5c826118c36158aab23c5437d24008cab4848b0866d3d850b4410c4f465690767dd1f31fde33a1fa9d238675be70f174c179485ce376f0c8aa6
+  languageName: node
+  linkType: hard
+
+"@dnd-kit/sortable@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@dnd-kit/sortable@npm:8.0.0"
+  dependencies:
+    "@dnd-kit/utilities": "npm:^3.2.2"
+    tslib: "npm:^2.0.0"
+  peerDependencies:
+    "@dnd-kit/core": ^6.1.0
+    react: ">=16.8.0"
+  checksum: 10c0/a6066c652b892c6a11320c7d8f5c18fdf723e721e8eea37f4ab657dee1ac5e7ca710ac32ce0712a57fe968bc07c13bcea5d5599d90dfdd95619e162befd4d2fb
+  languageName: node
+  linkType: hard
+
+"@dnd-kit/utilities@npm:^3.2.2":
+  version: 3.2.2
+  resolution: "@dnd-kit/utilities@npm:3.2.2"
+  dependencies:
+    tslib: "npm:^2.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+  checksum: 10c0/9aa90526f3e3fd567b5acc1b625a63177b9e8d00e7e50b2bd0e08fa2bf4dba7e19529777e001fdb8f89a7ce69f30b190c8364d390212634e0afdfa8c395e85a0
+  languageName: node
+  linkType: hard
+
 "@esbuild/aix-ppc64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/aix-ppc64@npm:0.24.0"
@@ -1702,6 +1819,122 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@loaders.gl/core@npm:^4.2.0":
+  version: 4.3.2
+  resolution: "@loaders.gl/core@npm:4.3.2"
+  dependencies:
+    "@loaders.gl/loader-utils": "npm:4.3.2"
+    "@loaders.gl/schema": "npm:4.3.2"
+    "@loaders.gl/worker-utils": "npm:4.3.2"
+    "@probe.gl/log": "npm:^4.0.2"
+  checksum: 10c0/3dbc564707996f376221e49f6ceaa53c8ce1b8026af591cbdce5c6eb87ffaeddc5e4174c0f4c4f2b589c5c586a4fa0045b6891d196ea3a6929d9a8ce1a6ae9e5
+  languageName: node
+  linkType: hard
+
+"@loaders.gl/images@npm:^4.2.0":
+  version: 4.3.2
+  resolution: "@loaders.gl/images@npm:4.3.2"
+  dependencies:
+    "@loaders.gl/loader-utils": "npm:4.3.2"
+  peerDependencies:
+    "@loaders.gl/core": ^4.3.0
+  checksum: 10c0/2fc2f32880436dbf28d14b642fe2007b41372951b65248e5c5c4dd1bc631236af387b0561b4f5fb2ad85fe72852be79b26c91fa206980aa8d57465d21ba332b3
+  languageName: node
+  linkType: hard
+
+"@loaders.gl/loader-utils@npm:4.3.2":
+  version: 4.3.2
+  resolution: "@loaders.gl/loader-utils@npm:4.3.2"
+  dependencies:
+    "@loaders.gl/schema": "npm:4.3.2"
+    "@loaders.gl/worker-utils": "npm:4.3.2"
+    "@probe.gl/log": "npm:^4.0.2"
+    "@probe.gl/stats": "npm:^4.0.2"
+  peerDependencies:
+    "@loaders.gl/core": ^4.3.0
+  checksum: 10c0/bbaeb362c63b760569323c50ad3a695737fdc93f5ef68c594aa35668ebb35a8332f53cd0cb74c49cc5cf026b9fad4f889c2efde0dc294a269c10c6b304ec5f0c
+  languageName: node
+  linkType: hard
+
+"@loaders.gl/schema@npm:4.3.2, @loaders.gl/schema@npm:^4.2.0":
+  version: 4.3.2
+  resolution: "@loaders.gl/schema@npm:4.3.2"
+  dependencies:
+    "@types/geojson": "npm:^7946.0.7"
+  peerDependencies:
+    "@loaders.gl/core": ^4.3.0
+  checksum: 10c0/6ba7f1b60b1c746f71a62e0dc627a13e1f7ebedb338630ce8b00972ef8c67dae614bc698be35618f4bc02c7d2536b2e686329af6076ed22ddddaf2269fc5efd1
+  languageName: node
+  linkType: hard
+
+"@loaders.gl/worker-utils@npm:4.3.2":
+  version: 4.3.2
+  resolution: "@loaders.gl/worker-utils@npm:4.3.2"
+  peerDependencies:
+    "@loaders.gl/core": ^4.3.0
+  checksum: 10c0/53a2b595f6e85786fb7233e28239dc49b52fb08278d93c85a3f01d9315dcd9404aa0d3458ec586768a43894d7ba1a32e14f10e11a8308dc1c6baed63a06bd8da
+  languageName: node
+  linkType: hard
+
+"@luma.gl/constants@npm:9.0.27, @luma.gl/constants@npm:~9.0.27":
+  version: 9.0.27
+  resolution: "@luma.gl/constants@npm:9.0.27"
+  checksum: 10c0/3c7c1c56373c4c2bccf2c12cdd5cb3ae9ade2b6040d66ebef2dd45c7cb564ecdd9555f6f03690d736dbe337f25500863baa9468226f96618b3e930e3ecf8adf0
+  languageName: node
+  linkType: hard
+
+"@luma.gl/core@npm:~9.0.27":
+  version: 9.0.27
+  resolution: "@luma.gl/core@npm:9.0.27"
+  dependencies:
+    "@math.gl/types": "npm:^4.0.0"
+    "@probe.gl/env": "npm:^4.0.2"
+    "@probe.gl/log": "npm:^4.0.2"
+    "@probe.gl/stats": "npm:^4.0.2"
+    "@types/offscreencanvas": "npm:^2019.6.4"
+  checksum: 10c0/e61f52042cc368fcbb80eaa43b6bfe62c7a9c57c2bc05d42b4c8c33b9e957a710566c3f2237112150754f7ee1de346a04123bb19cfa5477aa892c109d5cf9cf4
+  languageName: node
+  linkType: hard
+
+"@luma.gl/engine@npm:~9.0.27":
+  version: 9.0.27
+  resolution: "@luma.gl/engine@npm:9.0.27"
+  dependencies:
+    "@luma.gl/shadertools": "npm:9.0.27"
+    "@math.gl/core": "npm:^4.0.0"
+    "@probe.gl/log": "npm:^4.0.2"
+    "@probe.gl/stats": "npm:^4.0.2"
+  peerDependencies:
+    "@luma.gl/core": ^9.0.0
+  checksum: 10c0/810499cb07ec33c7443b5d318a23d8c792ba45cd74267bac104114247af8b945c4e28e2cc3927b1d2ae3f64c1f9b92be554be34c1057c64ed7bcafdb7798845d
+  languageName: node
+  linkType: hard
+
+"@luma.gl/shadertools@npm:9.0.27, @luma.gl/shadertools@npm:~9.0.27":
+  version: 9.0.27
+  resolution: "@luma.gl/shadertools@npm:9.0.27"
+  dependencies:
+    "@math.gl/core": "npm:^4.0.0"
+    "@math.gl/types": "npm:^4.0.0"
+    wgsl_reflect: "npm:^1.0.1"
+  peerDependencies:
+    "@luma.gl/core": ^9.0.0
+  checksum: 10c0/36b4206c2c23e3aa3918f8504ec5f606bd20656b936086a39bdbf7cf4ba1e1a6fa59fa39decc21c16be00fd7d8ff5037c27163ec600c7d3fe986c7a8204ddd9c
+  languageName: node
+  linkType: hard
+
+"@luma.gl/webgl@npm:~9.0.27":
+  version: 9.0.27
+  resolution: "@luma.gl/webgl@npm:9.0.27"
+  dependencies:
+    "@luma.gl/constants": "npm:9.0.27"
+    "@probe.gl/env": "npm:^4.0.2"
+  peerDependencies:
+    "@luma.gl/core": ^9.0.0
+  checksum: 10c0/01ee92d421932c95c71db485b73988c1bc5daf7bb444e428acda37d71c59835b132ae0d360b7c22732fe3d82bf8db02a133c208befa6a4346f8526bae227dc7d
+  languageName: node
+  linkType: hard
+
 "@mapbox/jsonlint-lines-primitives@npm:^2.0.2, @mapbox/jsonlint-lines-primitives@npm:~2.0.2":
   version: 2.0.2
   resolution: "@mapbox/jsonlint-lines-primitives@npm:2.0.2"
@@ -1723,7 +1956,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mapbox/tiny-sdf@npm:^2.0.6":
+"@mapbox/tiny-sdf@npm:^2.0.5, @mapbox/tiny-sdf@npm:^2.0.6":
   version: 2.0.6
   resolution: "@mapbox/tiny-sdf@npm:2.0.6"
   checksum: 10c0/cb272578a30c88d6694937af9b084106aa251e92c71089e7d57b0df8152fd0ce0598d5816182a4cd478dc40b188ea680cb6d53f4385107719424beabe7ed4e13
@@ -1771,6 +2004,47 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@math.gl/core@npm:4.1.0, @math.gl/core@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "@math.gl/core@npm:4.1.0"
+  dependencies:
+    "@math.gl/types": "npm:4.1.0"
+  checksum: 10c0/495934dc2be0b60cd6ff2cc16a0215608c9254919db741a0074b6b41cef9a0543c7f790eda7d529afa102d2937490608ef75fcc64c789ef2876ae750fd0ed3d6
+  languageName: node
+  linkType: hard
+
+"@math.gl/polygon@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "@math.gl/polygon@npm:4.1.0"
+  dependencies:
+    "@math.gl/core": "npm:4.1.0"
+  checksum: 10c0/0fcfb489c5613ddff6dd0cbea65084e10fa9a3523fb87a36a4fdf10057d12d2a99f1ebd93da6e72b45db0783fb8cd9cff704765473372a8db580faaf50c85ab5
+  languageName: node
+  linkType: hard
+
+"@math.gl/sun@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "@math.gl/sun@npm:4.1.0"
+  checksum: 10c0/baf813f3134124a1701c5f64cc8725fdb1d8d4c9e47c7fbd0d2e960d823f776d35312f82c62a09dcb140ea31d42b3945aa781066495291df190566ae17b5857b
+  languageName: node
+  linkType: hard
+
+"@math.gl/types@npm:4.1.0, @math.gl/types@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "@math.gl/types@npm:4.1.0"
+  checksum: 10c0/3c4dfa5ac5c9e2cef24d31f56b89c1dde785a5d70fd1a7030386346cb7dd4fa2cce5ba983b89842c1971492e30870dd22a078d64893f9c66887e38367bf992fa
+  languageName: node
+  linkType: hard
+
+"@math.gl/web-mercator@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "@math.gl/web-mercator@npm:4.1.0"
+  dependencies:
+    "@math.gl/core": "npm:4.1.0"
+  checksum: 10c0/7aa4921b9442da75664ef517f41de65b1eae9970d7eee61d14d2eb0b332e1af6203785e8d198376a8ab5924d62b24856d648ff6478cca95b14d3a8d82822ef93
+  languageName: node
+  linkType: hard
+
 "@next/env@npm:14.2.15":
   version: 14.2.15
   resolution: "@next/env@npm:14.2.15"
@@ -2029,6 +2303,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@probe.gl/env@npm:4.0.9, @probe.gl/env@npm:^4.0.2, @probe.gl/env@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "@probe.gl/env@npm:4.0.9"
+  checksum: 10c0/c6fcd1742aea014d15fe36a6cf0724d7faf3eeda27856978d87c1658b26ceaefc86254b011de65de35c1dfc0e3074fdbeaef5fd4362a05541a5e46b880e4024f
+  languageName: node
+  linkType: hard
+
+"@probe.gl/log@npm:^4.0.2, @probe.gl/log@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "@probe.gl/log@npm:4.0.9"
+  dependencies:
+    "@probe.gl/env": "npm:4.0.9"
+  checksum: 10c0/23521b46fdda80470d8b38d70c62d77f3b50257a63b3e7660655936593cf5f54ec7f1e2b0a36e8ecb7635c7fd45280bb66bd379a3e58afbde99f23d46f43c112
+  languageName: node
+  linkType: hard
+
+"@probe.gl/stats@npm:^4.0.2, @probe.gl/stats@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "@probe.gl/stats@npm:4.0.9"
+  checksum: 10c0/23c205232a45941b13d1e87efe060d81f3a09339b0294991fc9fdf6dd9d090a9e6c79cccf23ce8f09e5c14aa44ef128836639490df22729a13214b0ff3c7cd80
+  languageName: node
+  linkType: hard
+
+"@radix-ui/number@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/number@npm:1.1.0"
+  checksum: 10c0/a48e34d5ff1484de1b7cf5d7317fefc831d49e96a2229f300fd37b657bd8cfb59c922830c00ec02838ab21de3b299a523474592e4f30882153412ed47edce6a4
+  languageName: node
+  linkType: hard
+
 "@radix-ui/primitive@npm:1.1.0":
   version: 1.1.0
   resolution: "@radix-ui/primitive@npm:1.1.0"
@@ -2081,6 +2385,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-collapsible@npm:1.1.1":
+  version: 1.1.1
+  resolution: "@radix-ui/react-collapsible@npm:1.1.1"
+  dependencies:
+    "@radix-ui/primitive": "npm:1.1.0"
+    "@radix-ui/react-compose-refs": "npm:1.1.0"
+    "@radix-ui/react-context": "npm:1.1.1"
+    "@radix-ui/react-id": "npm:1.1.0"
+    "@radix-ui/react-presence": "npm:1.1.1"
+    "@radix-ui/react-primitive": "npm:2.0.0"
+    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
+    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 10c0/e3a510c8f3a31709add35c31e3e108a2bc4db2df06e9e50cb5f25144b1cf9596b8118ad2618f851fa7c1498e057938f641a842a6770b5b7b6cd068cd2b4914f1
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-collection@npm:1.1.0":
   version: 1.1.0
   resolution: "@radix-ui/react-collection@npm:1.1.0"
@@ -2472,6 +2802,35 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-slider@npm:1.2.1":
+  version: 1.2.1
+  resolution: "@radix-ui/react-slider@npm:1.2.1"
+  dependencies:
+    "@radix-ui/number": "npm:1.1.0"
+    "@radix-ui/primitive": "npm:1.1.0"
+    "@radix-ui/react-collection": "npm:1.1.0"
+    "@radix-ui/react-compose-refs": "npm:1.1.0"
+    "@radix-ui/react-context": "npm:1.1.1"
+    "@radix-ui/react-direction": "npm:1.1.0"
+    "@radix-ui/react-primitive": "npm:2.0.0"
+    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
+    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
+    "@radix-ui/react-use-previous": "npm:1.1.0"
+    "@radix-ui/react-use-size": "npm:1.1.0"
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 10c0/f39b67f019accc2fddebddb0d7f5bca7fc6ce8b370d294779e5139f7f36135ead9dff8672a9e4d5c771103280df9a05185ff17656d11e9eb88170e8f30e5efb4
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-slot@npm:1.1.0":
   version: 1.1.0
   resolution: "@radix-ui/react-slot@npm:1.1.0"
@@ -2487,6 +2846,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-switch@npm:1.1.1":
+  version: 1.1.1
+  resolution: "@radix-ui/react-switch@npm:1.1.1"
+  dependencies:
+    "@radix-ui/primitive": "npm:1.1.0"
+    "@radix-ui/react-compose-refs": "npm:1.1.0"
+    "@radix-ui/react-context": "npm:1.1.1"
+    "@radix-ui/react-primitive": "npm:2.0.0"
+    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
+    "@radix-ui/react-use-previous": "npm:1.1.0"
+    "@radix-ui/react-use-size": "npm:1.1.0"
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 10c0/8b61aa3bf80d3a2037d67495cf5de9e1ffc0d0843edc0cde5adc1ff1a9b99b0a6b63a85951c79769ab5a44d484611d90dc85933a86d71f28028caa53d8db177b
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-tooltip@npm:1.1.3":
   version: 1.1.3
   resolution: "@radix-ui/react-tooltip@npm:1.1.3"
@@ -3161,13 +3545,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/geojson@npm:*, @types/geojson@npm:^7946.0.14":
+"@types/geojson@npm:*, @types/geojson@npm:^7946.0.14, @types/geojson@npm:^7946.0.7":
   version: 7946.0.14
   resolution: "@types/geojson@npm:7946.0.14"
   checksum: 10c0/54f3997708fa2970c03eeb31f7e4540a0eb6387b15e9f8a60513a1409c23cafec8d618525404573468b59c6fecbfd053724b3327f7fca416729c26271d799f55
   languageName: node
   linkType: hard
 
+"@types/hammerjs@npm:^2.0.41":
+  version: 2.0.46
+  resolution: "@types/hammerjs@npm:2.0.46"
+  checksum: 10c0/f3c1cb20dc2f0523f7b8c76065078544d50d8ae9b0edc1f62fed657210ed814266ff2dfa835d2c157a075991001eec3b64c88bf92e3e6e895c0db78d05711d06
+  languageName: node
+  linkType: hard
+
 "@types/json-schema@npm:^7.0.11, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.7":
   version: 7.0.15
   resolution: "@types/json-schema@npm:7.0.15"
@@ -3227,6 +3618,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/offscreencanvas@npm:^2019.6.4":
+  version: 2019.7.3
+  resolution: "@types/offscreencanvas@npm:2019.7.3"
+  checksum: 10c0/6d1dfae721d321cd2b5435f347a0e53b09f33b2f9e9333396480f592823bc323847b8169f7d251d2285cb93dbc1ba2e30741ac5cf4b1c003d660fd4c24526963
+  languageName: node
+  linkType: hard
+
 "@types/pbf@npm:*, @types/pbf@npm:^3.0.5":
   version: 3.0.5
   resolution: "@types/pbf@npm:3.0.5"
@@ -4238,13 +4636,22 @@ __metadata:
   resolution: "client@workspace:."
   dependencies:
     "@artsy/fresnel": "npm:7.1.4"
+    "@deck.gl/core": "npm:9.0.34"
+    "@deck.gl/json": "npm:9.0.34"
+    "@deck.gl/layers": "npm:9.0.34"
+    "@dnd-kit/core": "npm:6.1.0"
+    "@dnd-kit/modifiers": "npm:7.0.0"
+    "@dnd-kit/sortable": "npm:8.0.0"
     "@radix-ui/react-checkbox": "npm:1.1.2"
+    "@radix-ui/react-collapsible": "npm:1.1.1"
     "@radix-ui/react-dialog": "npm:1.1.2"
     "@radix-ui/react-label": "npm:2.1.0"
     "@radix-ui/react-popover": "npm:1.1.2"
     "@radix-ui/react-radio-group": "npm:1.2.1"
     "@radix-ui/react-separator": "npm:1.1.0"
+    "@radix-ui/react-slider": "npm:1.2.1"
     "@radix-ui/react-slot": "npm:1.1.0"
+    "@radix-ui/react-switch": "npm:1.1.1"
     "@radix-ui/react-tooltip": "npm:1.1.3"
     "@svgr/webpack": "npm:8.1.0"
     "@t3-oss/env-nextjs": "npm:0.11.1"
@@ -4797,6 +5204,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"earcut@npm:^2.2.4":
+  version: 2.2.4
+  resolution: "earcut@npm:2.2.4"
+  checksum: 10c0/01ca51830edd2787819f904ae580087d37351f6048b4565e7add4b3da8a86b7bc19262ab2aa7fdc64129ab03af2d9cec8cccee4d230c82275f97ef285c79aafb
+  languageName: node
+  linkType: hard
+
 "earcut@npm:^3.0.0":
   version: 3.0.0
   resolution: "earcut@npm:3.0.0"
@@ -6026,7 +6440,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gl-matrix@npm:^3.4.3":
+"gl-matrix@npm:^3.0.0, gl-matrix@npm:^3.4.3":
   version: 3.4.3
   resolution: "gl-matrix@npm:3.4.3"
   checksum: 10c0/c8ee6e2ce2d089b4ba4ae13ec9d4cb99bf2abe5f68f0cb08d94bbd8bafbec13aacc7230b86539ce5ca01b79226ea8c3194f971f5ca0c81838bc5e4e619dc398e
@@ -6166,6 +6580,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hammerjs@npm:^2.0.8":
+  version: 2.0.8
+  resolution: "hammerjs@npm:2.0.8"
+  checksum: 10c0/5c95e5774b5ea49492cb3fa8f1949aea67048a0b84af33acb555e7139abfcf3c83aca2b83e0c5008755bc230166df7b5e469d1e3eb6746c48f215f3672609fed
+  languageName: node
+  linkType: hard
+
 "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-bigints@npm:1.0.2"
@@ -6840,6 +7261,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsep@npm:^0.3.0":
+  version: 0.3.5
+  resolution: "jsep@npm:0.3.5"
+  checksum: 10c0/fb5def7a4ba1cee41d144ebdd0d477785dc84b6bc1fed6cf5169f106de980dbe363bf99cb36a450435d7fd952d22b1d76e1609aeb5c7e7cbbbdb6d15fad03614
+  languageName: node
+  linkType: hard
+
 "jsep@npm:^1.1.2, jsep@npm:^1.2.0":
   version: 1.3.9
   resolution: "jsep@npm:1.3.9"
@@ -7449,6 +7877,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mjolnir.js@npm:^2.7.0":
+  version: 2.7.3
+  resolution: "mjolnir.js@npm:2.7.3"
+  dependencies:
+    "@types/hammerjs": "npm:^2.0.41"
+    hammerjs: "npm:^2.0.8"
+  checksum: 10c0/82f86dedfd410a640e5d0ef6f04e1d72ab292e61d42434bc56f103670ada45b2aacf130527f434d7d4bd0b8d2d5bc82bd36850e7586f1b70ebb72da2fe2c72b2
+  languageName: node
+  linkType: hard
+
 "mkdirp@npm:^1.0.3":
   version: 1.0.4
   resolution: "mkdirp@npm:1.0.4"
@@ -10129,6 +10567,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wgsl_reflect@npm:^1.0.1":
+  version: 1.0.14
+  resolution: "wgsl_reflect@npm:1.0.14"
+  checksum: 10c0/5e292b2fa4bae694b46d93a0642d9bdace2a27a8f0e6f1faa16a9fbab9613a58c7947bf79ec6112479ff5cf01bd9752039f5ac48d915781b4f5c393d9d709622
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^5.0.0":
   version: 5.0.0
   resolution: "whatwg-url@npm:5.0.0"
diff --git a/cms/config/sync/admin-role.strapi-super-admin.json b/cms/config/sync/admin-role.strapi-super-admin.json
index ba78fb5..8c6e5a4 100644
--- a/cms/config/sync/admin-role.strapi-super-admin.json
+++ b/cms/config/sync/admin-role.strapi-super-admin.json
@@ -67,7 +67,10 @@
           "params_config",
           "legend_config.type",
           "legend_config.items.color",
-          "legend_config.items.value"
+          "legend_config.items.value",
+          "legend_config.items.pattern",
+          "legend_config.unit",
+          "dataset"
         ]
       },
       "conditions": []
@@ -91,7 +94,10 @@
           "params_config",
           "legend_config.type",
           "legend_config.items.color",
-          "legend_config.items.value"
+          "legend_config.items.value",
+          "legend_config.items.pattern",
+          "legend_config.unit",
+          "dataset"
         ]
       },
       "conditions": []
@@ -108,7 +114,10 @@
           "params_config",
           "legend_config.type",
           "legend_config.items.color",
-          "legend_config.items.value"
+          "legend_config.items.value",
+          "legend_config.items.pattern",
+          "legend_config.unit",
+          "dataset"
         ]
       },
       "conditions": []
diff --git a/cms/config/sync/core-store.plugin_content_manager_configuration_components##legend.items.json b/cms/config/sync/core-store.plugin_content_manager_configuration_components##legend.items.json
index da6a0a2..3fa2619 100644
--- a/cms/config/sync/core-store.plugin_content_manager_configuration_components##legend.items.json
+++ b/cms/config/sync/core-store.plugin_content_manager_configuration_components##legend.items.json
@@ -46,13 +46,28 @@
           "searchable": true,
           "sortable": true
         }
+      },
+      "pattern": {
+        "edit": {
+          "label": "pattern",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true
+        },
+        "list": {
+          "label": "pattern",
+          "searchable": true,
+          "sortable": true
+        }
       }
     },
     "layouts": {
       "list": [
         "id",
         "color",
-        "value"
+        "value",
+        "pattern"
       ],
       "edit": [
         [
@@ -60,6 +75,12 @@
             "name": "color",
             "size": 6
           },
+          {
+            "name": "pattern",
+            "size": 6
+          }
+        ],
+        [
           {
             "name": "value",
             "size": 6
diff --git a/cms/config/sync/core-store.plugin_content_manager_configuration_components##legend.legend-config.json b/cms/config/sync/core-store.plugin_content_manager_configuration_components##legend.legend-config.json
index 7d5a9d2..de3e228 100644
--- a/cms/config/sync/core-store.plugin_content_manager_configuration_components##legend.legend-config.json
+++ b/cms/config/sync/core-store.plugin_content_manager_configuration_components##legend.legend-config.json
@@ -6,7 +6,7 @@
       "filterable": true,
       "searchable": true,
       "pageSize": 10,
-      "mainField": "id",
+      "mainField": "unit",
       "defaultSortBy": "id",
       "defaultSortOrder": "ASC"
     },
@@ -46,19 +46,38 @@
           "searchable": false,
           "sortable": false
         }
+      },
+      "unit": {
+        "edit": {
+          "label": "unit",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true
+        },
+        "list": {
+          "label": "unit",
+          "searchable": true,
+          "sortable": true
+        }
       }
     },
     "layouts": {
       "list": [
         "id",
         "type",
-        "items"
+        "items",
+        "unit"
       ],
       "edit": [
         [
           {
             "name": "type",
             "size": 6
+          },
+          {
+            "name": "unit",
+            "size": 6
           }
         ],
         [
diff --git a/cms/config/sync/core-store.plugin_content_manager_configuration_content_types##api##layer.layer.json b/cms/config/sync/core-store.plugin_content_manager_configuration_content_types##api##layer.layer.json
index 5907cca..92e78eb 100644
--- a/cms/config/sync/core-store.plugin_content_manager_configuration_content_types##api##layer.layer.json
+++ b/cms/config/sync/core-store.plugin_content_manager_configuration_content_types##api##layer.layer.json
@@ -89,6 +89,21 @@
           "sortable": false
         }
       },
+      "dataset": {
+        "edit": {
+          "label": "dataset",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true,
+          "mainField": "name"
+        },
+        "list": {
+          "label": "dataset",
+          "searchable": true,
+          "sortable": true
+        }
+      },
       "createdAt": {
         "edit": {
           "label": "createdAt",
@@ -149,18 +164,18 @@
       }
     },
     "layouts": {
-      "list": [
-        "id",
-        "name",
-        "type",
-        "legend_config"
-      ],
       "edit": [
         [
           {
             "name": "name",
             "size": 6
           },
+          {
+            "name": "dataset",
+            "size": 6
+          }
+        ],
+        [
           {
             "name": "type",
             "size": 6
@@ -184,6 +199,12 @@
             "size": 12
           }
         ]
+      ],
+      "list": [
+        "id",
+        "dataset",
+        "type",
+        "name"
       ]
     },
     "uid": "api::layer.layer"
diff --git a/cms/src/api/layer/content-types/layer/schema.json b/cms/src/api/layer/content-types/layer/schema.json
index 0027721..41ba907 100644
--- a/cms/src/api/layer/content-types/layer/schema.json
+++ b/cms/src/api/layer/content-types/layer/schema.json
@@ -37,6 +37,11 @@
       "repeatable": false,
       "component": "legend.legend-config",
       "required": true
+    },
+    "dataset": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::dataset.dataset"
     }
   }
 }
diff --git a/cms/src/components/legend/items.json b/cms/src/components/legend/items.json
index ff10b5f..db60822 100644
--- a/cms/src/components/legend/items.json
+++ b/cms/src/components/legend/items.json
@@ -13,6 +13,9 @@
     },
     "value": {
       "type": "string"
+    },
+    "pattern": {
+      "type": "string"
     }
   }
 }
diff --git a/cms/src/components/legend/legend-config.json b/cms/src/components/legend/legend-config.json
index ea49e15..5d59dd3 100644
--- a/cms/src/components/legend/legend-config.json
+++ b/cms/src/components/legend/legend-config.json
@@ -20,6 +20,9 @@
       "type": "component",
       "repeatable": true,
       "component": "legend.items"
+    },
+    "unit": {
+      "type": "string"
     }
   }
 }
diff --git a/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json
index 997cbba..067d4d2 100644
--- a/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json
+++ b/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "2024-10-31T09:42:41.784Z"
+    "x-generation-date": "2024-11-01T10:04:13.891Z"
   },
   "x-strapi-config": {
     "path": "/documentation",
@@ -260,21 +260,19 @@
                                   },
                                   "value": {
                                     "type": "string"
+                                  },
+                                  "pattern": {
+                                    "type": "string"
                                   }
                                 }
                               }
+                            },
+                            "unit": {
+                              "type": "string"
                             }
                           }
                         },
-                        "createdAt": {
-                          "type": "string",
-                          "format": "date-time"
-                        },
-                        "updatedAt": {
-                          "type": "string",
-                          "format": "date-time"
-                        },
-                        "createdBy": {
+                        "dataset": {
                           "type": "object",
                           "properties": {
                             "data": {
@@ -286,29 +284,10 @@
                                 "attributes": {
                                   "type": "object",
                                   "properties": {
-                                    "firstname": {
-                                      "type": "string"
-                                    },
-                                    "lastname": {
-                                      "type": "string"
-                                    },
-                                    "username": {
-                                      "type": "string"
-                                    },
-                                    "email": {
-                                      "type": "string",
-                                      "format": "email"
-                                    },
-                                    "resetPasswordToken": {
-                                      "type": "string"
-                                    },
-                                    "registrationToken": {
+                                    "name": {
                                       "type": "string"
                                     },
-                                    "isActive": {
-                                      "type": "boolean"
-                                    },
-                                    "roles": {
+                                    "layers": {
                                       "type": "object",
                                       "properties": {
                                         "data": {
@@ -321,115 +300,314 @@
                                               },
                                               "attributes": {
                                                 "type": "object",
-                                                "properties": {
-                                                  "name": {
-                                                    "type": "string"
-                                                  },
-                                                  "code": {
-                                                    "type": "string"
-                                                  },
-                                                  "description": {
-                                                    "type": "string"
-                                                  },
-                                                  "users": {
-                                                    "type": "object",
-                                                    "properties": {
-                                                      "data": {
-                                                        "type": "array",
-                                                        "items": {
+                                                "properties": {}
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    },
+                                    "default_layer": {
+                                      "type": "object",
+                                      "properties": {
+                                        "data": {
+                                          "type": "object",
+                                          "properties": {
+                                            "id": {
+                                              "type": "number"
+                                            },
+                                            "attributes": {
+                                              "type": "object",
+                                              "properties": {}
+                                            }
+                                          }
+                                        }
+                                      }
+                                    },
+                                    "topic": {
+                                      "type": "object",
+                                      "properties": {
+                                        "data": {
+                                          "type": "object",
+                                          "properties": {
+                                            "id": {
+                                              "type": "number"
+                                            },
+                                            "attributes": {
+                                              "type": "object",
+                                              "properties": {
+                                                "name": {
+                                                  "type": "string"
+                                                },
+                                                "slug": {
+                                                  "type": "string"
+                                                },
+                                                "createdAt": {
+                                                  "type": "string",
+                                                  "format": "date-time"
+                                                },
+                                                "updatedAt": {
+                                                  "type": "string",
+                                                  "format": "date-time"
+                                                },
+                                                "createdBy": {
+                                                  "type": "object",
+                                                  "properties": {
+                                                    "data": {
+                                                      "type": "object",
+                                                      "properties": {
+                                                        "id": {
+                                                          "type": "number"
+                                                        },
+                                                        "attributes": {
                                                           "type": "object",
                                                           "properties": {
-                                                            "id": {
-                                                              "type": "number"
+                                                            "firstname": {
+                                                              "type": "string"
                                                             },
-                                                            "attributes": {
-                                                              "type": "object",
-                                                              "properties": {}
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  },
-                                                  "permissions": {
-                                                    "type": "object",
-                                                    "properties": {
-                                                      "data": {
-                                                        "type": "array",
-                                                        "items": {
-                                                          "type": "object",
-                                                          "properties": {
-                                                            "id": {
-                                                              "type": "number"
+                                                            "lastname": {
+                                                              "type": "string"
                                                             },
-                                                            "attributes": {
+                                                            "username": {
+                                                              "type": "string"
+                                                            },
+                                                            "email": {
+                                                              "type": "string",
+                                                              "format": "email"
+                                                            },
+                                                            "resetPasswordToken": {
+                                                              "type": "string"
+                                                            },
+                                                            "registrationToken": {
+                                                              "type": "string"
+                                                            },
+                                                            "isActive": {
+                                                              "type": "boolean"
+                                                            },
+                                                            "roles": {
                                                               "type": "object",
                                                               "properties": {
-                                                                "action": {
-                                                                  "type": "string"
-                                                                },
-                                                                "actionParameters": {},
-                                                                "subject": {
-                                                                  "type": "string"
-                                                                },
-                                                                "properties": {},
-                                                                "conditions": {},
-                                                                "role": {
-                                                                  "type": "object",
-                                                                  "properties": {
-                                                                    "data": {
-                                                                      "type": "object",
-                                                                      "properties": {
-                                                                        "id": {
-                                                                          "type": "number"
-                                                                        },
-                                                                        "attributes": {
-                                                                          "type": "object",
-                                                                          "properties": {}
+                                                                "data": {
+                                                                  "type": "array",
+                                                                  "items": {
+                                                                    "type": "object",
+                                                                    "properties": {
+                                                                      "id": {
+                                                                        "type": "number"
+                                                                      },
+                                                                      "attributes": {
+                                                                        "type": "object",
+                                                                        "properties": {
+                                                                          "name": {
+                                                                            "type": "string"
+                                                                          },
+                                                                          "code": {
+                                                                            "type": "string"
+                                                                          },
+                                                                          "description": {
+                                                                            "type": "string"
+                                                                          },
+                                                                          "users": {
+                                                                            "type": "object",
+                                                                            "properties": {
+                                                                              "data": {
+                                                                                "type": "array",
+                                                                                "items": {
+                                                                                  "type": "object",
+                                                                                  "properties": {
+                                                                                    "id": {
+                                                                                      "type": "number"
+                                                                                    },
+                                                                                    "attributes": {
+                                                                                      "type": "object",
+                                                                                      "properties": {}
+                                                                                    }
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            }
+                                                                          },
+                                                                          "permissions": {
+                                                                            "type": "object",
+                                                                            "properties": {
+                                                                              "data": {
+                                                                                "type": "array",
+                                                                                "items": {
+                                                                                  "type": "object",
+                                                                                  "properties": {
+                                                                                    "id": {
+                                                                                      "type": "number"
+                                                                                    },
+                                                                                    "attributes": {
+                                                                                      "type": "object",
+                                                                                      "properties": {
+                                                                                        "action": {
+                                                                                          "type": "string"
+                                                                                        },
+                                                                                        "actionParameters": {},
+                                                                                        "subject": {
+                                                                                          "type": "string"
+                                                                                        },
+                                                                                        "properties": {},
+                                                                                        "conditions": {},
+                                                                                        "role": {
+                                                                                          "type": "object",
+                                                                                          "properties": {
+                                                                                            "data": {
+                                                                                              "type": "object",
+                                                                                              "properties": {
+                                                                                                "id": {
+                                                                                                  "type": "number"
+                                                                                                },
+                                                                                                "attributes": {
+                                                                                                  "type": "object",
+                                                                                                  "properties": {}
+                                                                                                }
+                                                                                              }
+                                                                                            }
+                                                                                          }
+                                                                                        },
+                                                                                        "createdAt": {
+                                                                                          "type": "string",
+                                                                                          "format": "date-time"
+                                                                                        },
+                                                                                        "updatedAt": {
+                                                                                          "type": "string",
+                                                                                          "format": "date-time"
+                                                                                        },
+                                                                                        "createdBy": {
+                                                                                          "type": "object",
+                                                                                          "properties": {
+                                                                                            "data": {
+                                                                                              "type": "object",
+                                                                                              "properties": {
+                                                                                                "id": {
+                                                                                                  "type": "number"
+                                                                                                },
+                                                                                                "attributes": {
+                                                                                                  "type": "object",
+                                                                                                  "properties": {}
+                                                                                                }
+                                                                                              }
+                                                                                            }
+                                                                                          }
+                                                                                        },
+                                                                                        "updatedBy": {
+                                                                                          "type": "object",
+                                                                                          "properties": {
+                                                                                            "data": {
+                                                                                              "type": "object",
+                                                                                              "properties": {
+                                                                                                "id": {
+                                                                                                  "type": "number"
+                                                                                                },
+                                                                                                "attributes": {
+                                                                                                  "type": "object",
+                                                                                                  "properties": {}
+                                                                                                }
+                                                                                              }
+                                                                                            }
+                                                                                          }
+                                                                                        }
+                                                                                      }
+                                                                                    }
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            }
+                                                                          },
+                                                                          "createdAt": {
+                                                                            "type": "string",
+                                                                            "format": "date-time"
+                                                                          },
+                                                                          "updatedAt": {
+                                                                            "type": "string",
+                                                                            "format": "date-time"
+                                                                          },
+                                                                          "createdBy": {
+                                                                            "type": "object",
+                                                                            "properties": {
+                                                                              "data": {
+                                                                                "type": "object",
+                                                                                "properties": {
+                                                                                  "id": {
+                                                                                    "type": "number"
+                                                                                  },
+                                                                                  "attributes": {
+                                                                                    "type": "object",
+                                                                                    "properties": {}
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            }
+                                                                          },
+                                                                          "updatedBy": {
+                                                                            "type": "object",
+                                                                            "properties": {
+                                                                              "data": {
+                                                                                "type": "object",
+                                                                                "properties": {
+                                                                                  "id": {
+                                                                                    "type": "number"
+                                                                                  },
+                                                                                  "attributes": {
+                                                                                    "type": "object",
+                                                                                    "properties": {}
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            }
+                                                                          }
                                                                         }
                                                                       }
                                                                     }
                                                                   }
-                                                                },
-                                                                "createdAt": {
-                                                                  "type": "string",
-                                                                  "format": "date-time"
-                                                                },
-                                                                "updatedAt": {
-                                                                  "type": "string",
-                                                                  "format": "date-time"
-                                                                },
-                                                                "createdBy": {
+                                                                }
+                                                              }
+                                                            },
+                                                            "blocked": {
+                                                              "type": "boolean"
+                                                            },
+                                                            "preferedLanguage": {
+                                                              "type": "string"
+                                                            },
+                                                            "createdAt": {
+                                                              "type": "string",
+                                                              "format": "date-time"
+                                                            },
+                                                            "updatedAt": {
+                                                              "type": "string",
+                                                              "format": "date-time"
+                                                            },
+                                                            "createdBy": {
+                                                              "type": "object",
+                                                              "properties": {
+                                                                "data": {
                                                                   "type": "object",
                                                                   "properties": {
-                                                                    "data": {
+                                                                    "id": {
+                                                                      "type": "number"
+                                                                    },
+                                                                    "attributes": {
                                                                       "type": "object",
-                                                                      "properties": {
-                                                                        "id": {
-                                                                          "type": "number"
-                                                                        },
-                                                                        "attributes": {
-                                                                          "type": "object",
-                                                                          "properties": {}
-                                                                        }
-                                                                      }
+                                                                      "properties": {}
                                                                     }
                                                                   }
-                                                                },
-                                                                "updatedBy": {
+                                                                }
+                                                              }
+                                                            },
+                                                            "updatedBy": {
+                                                              "type": "object",
+                                                              "properties": {
+                                                                "data": {
                                                                   "type": "object",
                                                                   "properties": {
-                                                                    "data": {
+                                                                    "id": {
+                                                                      "type": "number"
+                                                                    },
+                                                                    "attributes": {
                                                                       "type": "object",
-                                                                      "properties": {
-                                                                        "id": {
-                                                                          "type": "number"
-                                                                        },
-                                                                        "attributes": {
-                                                                          "type": "object",
-                                                                          "properties": {}
-                                                                        }
-                                                                      }
+                                                                      "properties": {}
                                                                     }
                                                                   }
                                                                 }
@@ -439,45 +617,83 @@
                                                         }
                                                       }
                                                     }
-                                                  },
-                                                  "createdAt": {
-                                                    "type": "string",
-                                                    "format": "date-time"
-                                                  },
-                                                  "updatedAt": {
-                                                    "type": "string",
-                                                    "format": "date-time"
-                                                  },
-                                                  "createdBy": {
-                                                    "type": "object",
-                                                    "properties": {
-                                                      "data": {
-                                                        "type": "object",
-                                                        "properties": {
-                                                          "id": {
-                                                            "type": "number"
-                                                          },
-                                                          "attributes": {
-                                                            "type": "object",
-                                                            "properties": {}
-                                                          }
+                                                  }
+                                                },
+                                                "updatedBy": {
+                                                  "type": "object",
+                                                  "properties": {
+                                                    "data": {
+                                                      "type": "object",
+                                                      "properties": {
+                                                        "id": {
+                                                          "type": "number"
+                                                        },
+                                                        "attributes": {
+                                                          "type": "object",
+                                                          "properties": {}
                                                         }
                                                       }
                                                     }
-                                                  },
-                                                  "updatedBy": {
-                                                    "type": "object",
-                                                    "properties": {
-                                                      "data": {
-                                                        "type": "object",
-                                                        "properties": {
-                                                          "id": {
-                                                            "type": "number"
-                                                          },
-                                                          "attributes": {
-                                                            "type": "object",
-                                                            "properties": {}
-                                                          }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    },
+                                    "sub_topic": {
+                                      "type": "object",
+                                      "properties": {
+                                        "data": {
+                                          "type": "object",
+                                          "properties": {
+                                            "id": {
+                                              "type": "number"
+                                            },
+                                            "attributes": {
+                                              "type": "object",
+                                              "properties": {
+                                                "name": {
+                                                  "type": "string"
+                                                },
+                                                "createdAt": {
+                                                  "type": "string",
+                                                  "format": "date-time"
+                                                },
+                                                "updatedAt": {
+                                                  "type": "string",
+                                                  "format": "date-time"
+                                                },
+                                                "createdBy": {
+                                                  "type": "object",
+                                                  "properties": {
+                                                    "data": {
+                                                      "type": "object",
+                                                      "properties": {
+                                                        "id": {
+                                                          "type": "number"
+                                                        },
+                                                        "attributes": {
+                                                          "type": "object",
+                                                          "properties": {}
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                },
+                                                "updatedBy": {
+                                                  "type": "object",
+                                                  "properties": {
+                                                    "data": {
+                                                      "type": "object",
+                                                      "properties": {
+                                                        "id": {
+                                                          "type": "number"
+                                                        },
+                                                        "attributes": {
+                                                          "type": "object",
+                                                          "properties": {}
                                                         }
                                                       }
                                                     }
@@ -489,12 +705,6 @@
                                         }
                                       }
                                     },
-                                    "blocked": {
-                                      "type": "boolean"
-                                    },
-                                    "preferedLanguage": {
-                                      "type": "string"
-                                    },
                                     "createdAt": {
                                       "type": "string",
                                       "format": "date-time"
@@ -543,6 +753,31 @@
                             }
                           }
                         },
+                        "createdAt": {
+                          "type": "string",
+                          "format": "date-time"
+                        },
+                        "updatedAt": {
+                          "type": "string",
+                          "format": "date-time"
+                        },
+                        "createdBy": {
+                          "type": "object",
+                          "properties": {
+                            "data": {
+                              "type": "object",
+                              "properties": {
+                                "id": {
+                                  "type": "number"
+                                },
+                                "attributes": {
+                                  "type": "object",
+                                  "properties": {}
+                                }
+                              }
+                            }
+                          }
+                        },
                         "updatedBy": {
                           "type": "object",
                           "properties": {
@@ -590,124 +825,29 @@
               "data": {
                 "type": "object",
                 "properties": {
-                  "id": {
-                    "type": "number"
-                  },
-                  "attributes": {
-                    "type": "object",
-                    "properties": {
-                      "name": {
-                        "type": "string"
-                      },
-                      "slug": {
-                        "type": "string"
-                      },
-                      "createdAt": {
-                        "type": "string",
-                        "format": "date-time"
-                      },
-                      "updatedAt": {
-                        "type": "string",
-                        "format": "date-time"
-                      },
-                      "createdBy": {
-                        "type": "object",
-                        "properties": {
-                          "data": {
-                            "type": "object",
-                            "properties": {
-                              "id": {
-                                "type": "number"
-                              },
-                              "attributes": {
-                                "type": "object",
-                                "properties": {}
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "updatedBy": {
-                        "type": "object",
-                        "properties": {
-                          "data": {
-                            "type": "object",
-                            "properties": {
-                              "id": {
-                                "type": "number"
-                              },
-                              "attributes": {
-                                "type": "object",
-                                "properties": {}
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "sub_topic": {
-            "type": "object",
-            "properties": {
-              "data": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "number"
-                  },
-                  "attributes": {
-                    "type": "object",
-                    "properties": {
-                      "name": {
-                        "type": "string"
-                      },
-                      "createdAt": {
-                        "type": "string",
-                        "format": "date-time"
-                      },
-                      "updatedAt": {
-                        "type": "string",
-                        "format": "date-time"
-                      },
-                      "createdBy": {
-                        "type": "object",
-                        "properties": {
-                          "data": {
-                            "type": "object",
-                            "properties": {
-                              "id": {
-                                "type": "number"
-                              },
-                              "attributes": {
-                                "type": "object",
-                                "properties": {}
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "updatedBy": {
-                        "type": "object",
-                        "properties": {
-                          "data": {
-                            "type": "object",
-                            "properties": {
-                              "id": {
-                                "type": "number"
-                              },
-                              "attributes": {
-                                "type": "object",
-                                "properties": {}
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
+                  "id": {
+                    "type": "number"
+                  },
+                  "attributes": {
+                    "type": "object",
+                    "properties": {}
+                  }
+                }
+              }
+            }
+          },
+          "sub_topic": {
+            "type": "object",
+            "properties": {
+              "data": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "number"
+                  },
+                  "attributes": {
+                    "type": "object",
+                    "properties": {}
                   }
                 }
               }
@@ -809,6 +949,17 @@
               "params_config": {},
               "legend_config": {
                 "$ref": "#/components/schemas/LegendLegendConfigComponent"
+              },
+              "dataset": {
+                "oneOf": [
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ],
+                "example": "string or id"
               }
             }
           }
@@ -885,15 +1036,7 @@
           "legend_config": {
             "$ref": "#/components/schemas/LegendLegendConfigComponent"
           },
-          "createdAt": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "updatedAt": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "createdBy": {
+          "dataset": {
             "type": "object",
             "properties": {
               "data": {
@@ -905,29 +1048,10 @@
                   "attributes": {
                     "type": "object",
                     "properties": {
-                      "firstname": {
-                        "type": "string"
-                      },
-                      "lastname": {
-                        "type": "string"
-                      },
-                      "username": {
-                        "type": "string"
-                      },
-                      "email": {
-                        "type": "string",
-                        "format": "email"
-                      },
-                      "resetPasswordToken": {
-                        "type": "string"
-                      },
-                      "registrationToken": {
+                      "name": {
                         "type": "string"
                       },
-                      "isActive": {
-                        "type": "boolean"
-                      },
-                      "roles": {
+                      "layers": {
                         "type": "object",
                         "properties": {
                           "data": {
@@ -944,16 +1068,30 @@
                                     "name": {
                                       "type": "string"
                                     },
-                                    "code": {
-                                      "type": "string"
-                                    },
-                                    "description": {
-                                      "type": "string"
+                                    "type": {
+                                      "type": "string",
+                                      "enum": [
+                                        "static",
+                                        "animated"
+                                      ]
                                     },
-                                    "users": {
+                                    "mapbox_config": {},
+                                    "params_config": {},
+                                    "legend_config": {
                                       "type": "object",
                                       "properties": {
-                                        "data": {
+                                        "id": {
+                                          "type": "number"
+                                        },
+                                        "type": {
+                                          "type": "string",
+                                          "enum": [
+                                            "basic",
+                                            "choropleth",
+                                            "gradient"
+                                          ]
+                                        },
+                                        "items": {
                                           "type": "array",
                                           "items": {
                                             "type": "object",
@@ -961,67 +1099,88 @@
                                               "id": {
                                                 "type": "number"
                                               },
-                                              "attributes": {
-                                                "type": "object",
-                                                "properties": {}
+                                              "color": {
+                                                "type": "string"
+                                              },
+                                              "value": {
+                                                "type": "string"
+                                              },
+                                              "pattern": {
+                                                "type": "string"
                                               }
                                             }
                                           }
+                                        },
+                                        "unit": {
+                                          "type": "string"
                                         }
                                       }
                                     },
-                                    "permissions": {
+                                    "dataset": {
                                       "type": "object",
                                       "properties": {
                                         "data": {
-                                          "type": "array",
-                                          "items": {
-                                            "type": "object",
-                                            "properties": {
-                                              "id": {
-                                                "type": "number"
-                                              },
-                                              "attributes": {
-                                                "type": "object",
-                                                "properties": {
-                                                  "action": {
-                                                    "type": "string"
-                                                  },
-                                                  "actionParameters": {},
-                                                  "subject": {
-                                                    "type": "string"
-                                                  },
-                                                  "properties": {},
-                                                  "conditions": {},
-                                                  "role": {
-                                                    "type": "object",
-                                                    "properties": {
-                                                      "data": {
-                                                        "type": "object",
-                                                        "properties": {
-                                                          "id": {
-                                                            "type": "number"
-                                                          },
-                                                          "attributes": {
-                                                            "type": "object",
-                                                            "properties": {}
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  },
-                                                  "createdAt": {
-                                                    "type": "string",
-                                                    "format": "date-time"
-                                                  },
-                                                  "updatedAt": {
-                                                    "type": "string",
-                                                    "format": "date-time"
-                                                  },
-                                                  "createdBy": {
-                                                    "type": "object",
-                                                    "properties": {
-                                                      "data": {
+                                          "type": "object",
+                                          "properties": {
+                                            "id": {
+                                              "type": "number"
+                                            },
+                                            "attributes": {
+                                              "type": "object",
+                                              "properties": {}
+                                            }
+                                          }
+                                        }
+                                      }
+                                    },
+                                    "createdAt": {
+                                      "type": "string",
+                                      "format": "date-time"
+                                    },
+                                    "updatedAt": {
+                                      "type": "string",
+                                      "format": "date-time"
+                                    },
+                                    "createdBy": {
+                                      "type": "object",
+                                      "properties": {
+                                        "data": {
+                                          "type": "object",
+                                          "properties": {
+                                            "id": {
+                                              "type": "number"
+                                            },
+                                            "attributes": {
+                                              "type": "object",
+                                              "properties": {
+                                                "firstname": {
+                                                  "type": "string"
+                                                },
+                                                "lastname": {
+                                                  "type": "string"
+                                                },
+                                                "username": {
+                                                  "type": "string"
+                                                },
+                                                "email": {
+                                                  "type": "string",
+                                                  "format": "email"
+                                                },
+                                                "resetPasswordToken": {
+                                                  "type": "string"
+                                                },
+                                                "registrationToken": {
+                                                  "type": "string"
+                                                },
+                                                "isActive": {
+                                                  "type": "boolean"
+                                                },
+                                                "roles": {
+                                                  "type": "object",
+                                                  "properties": {
+                                                    "data": {
+                                                      "type": "array",
+                                                      "items": {
                                                         "type": "object",
                                                         "properties": {
                                                           "id": {
@@ -1029,25 +1188,217 @@
                                                           },
                                                           "attributes": {
                                                             "type": "object",
-                                                            "properties": {}
+                                                            "properties": {
+                                                              "name": {
+                                                                "type": "string"
+                                                              },
+                                                              "code": {
+                                                                "type": "string"
+                                                              },
+                                                              "description": {
+                                                                "type": "string"
+                                                              },
+                                                              "users": {
+                                                                "type": "object",
+                                                                "properties": {
+                                                                  "data": {
+                                                                    "type": "array",
+                                                                    "items": {
+                                                                      "type": "object",
+                                                                      "properties": {
+                                                                        "id": {
+                                                                          "type": "number"
+                                                                        },
+                                                                        "attributes": {
+                                                                          "type": "object",
+                                                                          "properties": {}
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                }
+                                                              },
+                                                              "permissions": {
+                                                                "type": "object",
+                                                                "properties": {
+                                                                  "data": {
+                                                                    "type": "array",
+                                                                    "items": {
+                                                                      "type": "object",
+                                                                      "properties": {
+                                                                        "id": {
+                                                                          "type": "number"
+                                                                        },
+                                                                        "attributes": {
+                                                                          "type": "object",
+                                                                          "properties": {
+                                                                            "action": {
+                                                                              "type": "string"
+                                                                            },
+                                                                            "actionParameters": {},
+                                                                            "subject": {
+                                                                              "type": "string"
+                                                                            },
+                                                                            "properties": {},
+                                                                            "conditions": {},
+                                                                            "role": {
+                                                                              "type": "object",
+                                                                              "properties": {
+                                                                                "data": {
+                                                                                  "type": "object",
+                                                                                  "properties": {
+                                                                                    "id": {
+                                                                                      "type": "number"
+                                                                                    },
+                                                                                    "attributes": {
+                                                                                      "type": "object",
+                                                                                      "properties": {}
+                                                                                    }
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            },
+                                                                            "createdAt": {
+                                                                              "type": "string",
+                                                                              "format": "date-time"
+                                                                            },
+                                                                            "updatedAt": {
+                                                                              "type": "string",
+                                                                              "format": "date-time"
+                                                                            },
+                                                                            "createdBy": {
+                                                                              "type": "object",
+                                                                              "properties": {
+                                                                                "data": {
+                                                                                  "type": "object",
+                                                                                  "properties": {
+                                                                                    "id": {
+                                                                                      "type": "number"
+                                                                                    },
+                                                                                    "attributes": {
+                                                                                      "type": "object",
+                                                                                      "properties": {}
+                                                                                    }
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            },
+                                                                            "updatedBy": {
+                                                                              "type": "object",
+                                                                              "properties": {
+                                                                                "data": {
+                                                                                  "type": "object",
+                                                                                  "properties": {
+                                                                                    "id": {
+                                                                                      "type": "number"
+                                                                                    },
+                                                                                    "attributes": {
+                                                                                      "type": "object",
+                                                                                      "properties": {}
+                                                                                    }
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            }
+                                                                          }
+                                                                        }
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                }
+                                                              },
+                                                              "createdAt": {
+                                                                "type": "string",
+                                                                "format": "date-time"
+                                                              },
+                                                              "updatedAt": {
+                                                                "type": "string",
+                                                                "format": "date-time"
+                                                              },
+                                                              "createdBy": {
+                                                                "type": "object",
+                                                                "properties": {
+                                                                  "data": {
+                                                                    "type": "object",
+                                                                    "properties": {
+                                                                      "id": {
+                                                                        "type": "number"
+                                                                      },
+                                                                      "attributes": {
+                                                                        "type": "object",
+                                                                        "properties": {}
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                }
+                                                              },
+                                                              "updatedBy": {
+                                                                "type": "object",
+                                                                "properties": {
+                                                                  "data": {
+                                                                    "type": "object",
+                                                                    "properties": {
+                                                                      "id": {
+                                                                        "type": "number"
+                                                                      },
+                                                                      "attributes": {
+                                                                        "type": "object",
+                                                                        "properties": {}
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            }
                                                           }
                                                         }
                                                       }
                                                     }
-                                                  },
-                                                  "updatedBy": {
-                                                    "type": "object",
-                                                    "properties": {
-                                                      "data": {
-                                                        "type": "object",
-                                                        "properties": {
-                                                          "id": {
-                                                            "type": "number"
-                                                          },
-                                                          "attributes": {
-                                                            "type": "object",
-                                                            "properties": {}
-                                                          }
+                                                  }
+                                                },
+                                                "blocked": {
+                                                  "type": "boolean"
+                                                },
+                                                "preferedLanguage": {
+                                                  "type": "string"
+                                                },
+                                                "createdAt": {
+                                                  "type": "string",
+                                                  "format": "date-time"
+                                                },
+                                                "updatedAt": {
+                                                  "type": "string",
+                                                  "format": "date-time"
+                                                },
+                                                "createdBy": {
+                                                  "type": "object",
+                                                  "properties": {
+                                                    "data": {
+                                                      "type": "object",
+                                                      "properties": {
+                                                        "id": {
+                                                          "type": "number"
+                                                        },
+                                                        "attributes": {
+                                                          "type": "object",
+                                                          "properties": {}
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                },
+                                                "updatedBy": {
+                                                  "type": "object",
+                                                  "properties": {
+                                                    "data": {
+                                                      "type": "object",
+                                                      "properties": {
+                                                        "id": {
+                                                          "type": "number"
+                                                        },
+                                                        "attributes": {
+                                                          "type": "object",
+                                                          "properties": {}
                                                         }
                                                       }
                                                     }
@@ -1059,15 +1410,7 @@
                                         }
                                       }
                                     },
-                                    "createdAt": {
-                                      "type": "string",
-                                      "format": "date-time"
-                                    },
-                                    "updatedAt": {
-                                      "type": "string",
-                                      "format": "date-time"
-                                    },
-                                    "createdBy": {
+                                    "updatedBy": {
                                       "type": "object",
                                       "properties": {
                                         "data": {
@@ -1083,20 +1426,86 @@
                                           }
                                         }
                                       }
-                                    },
-                                    "updatedBy": {
-                                      "type": "object",
-                                      "properties": {
-                                        "data": {
-                                          "type": "object",
-                                          "properties": {
-                                            "id": {
-                                              "type": "number"
-                                            },
-                                            "attributes": {
-                                              "type": "object",
-                                              "properties": {}
-                                            }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      },
+                      "default_layer": {
+                        "type": "object",
+                        "properties": {
+                          "data": {
+                            "type": "object",
+                            "properties": {
+                              "id": {
+                                "type": "number"
+                              },
+                              "attributes": {
+                                "type": "object",
+                                "properties": {}
+                              }
+                            }
+                          }
+                        }
+                      },
+                      "topic": {
+                        "type": "object",
+                        "properties": {
+                          "data": {
+                            "type": "object",
+                            "properties": {
+                              "id": {
+                                "type": "number"
+                              },
+                              "attributes": {
+                                "type": "object",
+                                "properties": {
+                                  "name": {
+                                    "type": "string"
+                                  },
+                                  "slug": {
+                                    "type": "string"
+                                  },
+                                  "createdAt": {
+                                    "type": "string",
+                                    "format": "date-time"
+                                  },
+                                  "updatedAt": {
+                                    "type": "string",
+                                    "format": "date-time"
+                                  },
+                                  "createdBy": {
+                                    "type": "object",
+                                    "properties": {
+                                      "data": {
+                                        "type": "object",
+                                        "properties": {
+                                          "id": {
+                                            "type": "number"
+                                          },
+                                          "attributes": {
+                                            "type": "object",
+                                            "properties": {}
+                                          }
+                                        }
+                                      }
+                                    }
+                                  },
+                                  "updatedBy": {
+                                    "type": "object",
+                                    "properties": {
+                                      "data": {
+                                        "type": "object",
+                                        "properties": {
+                                          "id": {
+                                            "type": "number"
+                                          },
+                                          "attributes": {
+                                            "type": "object",
+                                            "properties": {}
                                           }
                                         }
                                       }
@@ -1108,11 +1517,68 @@
                           }
                         }
                       },
-                      "blocked": {
-                        "type": "boolean"
-                      },
-                      "preferedLanguage": {
-                        "type": "string"
+                      "sub_topic": {
+                        "type": "object",
+                        "properties": {
+                          "data": {
+                            "type": "object",
+                            "properties": {
+                              "id": {
+                                "type": "number"
+                              },
+                              "attributes": {
+                                "type": "object",
+                                "properties": {
+                                  "name": {
+                                    "type": "string"
+                                  },
+                                  "createdAt": {
+                                    "type": "string",
+                                    "format": "date-time"
+                                  },
+                                  "updatedAt": {
+                                    "type": "string",
+                                    "format": "date-time"
+                                  },
+                                  "createdBy": {
+                                    "type": "object",
+                                    "properties": {
+                                      "data": {
+                                        "type": "object",
+                                        "properties": {
+                                          "id": {
+                                            "type": "number"
+                                          },
+                                          "attributes": {
+                                            "type": "object",
+                                            "properties": {}
+                                          }
+                                        }
+                                      }
+                                    }
+                                  },
+                                  "updatedBy": {
+                                    "type": "object",
+                                    "properties": {
+                                      "data": {
+                                        "type": "object",
+                                        "properties": {
+                                          "id": {
+                                            "type": "number"
+                                          },
+                                          "attributes": {
+                                            "type": "object",
+                                            "properties": {}
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
                       },
                       "createdAt": {
                         "type": "string",
@@ -1162,6 +1628,31 @@
               }
             }
           },
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "updatedAt": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "createdBy": {
+            "type": "object",
+            "properties": {
+              "data": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "number"
+                  },
+                  "attributes": {
+                    "type": "object",
+                    "properties": {}
+                  }
+                }
+              }
+            }
+          },
           "updatedBy": {
             "type": "object",
             "properties": {
@@ -1230,9 +1721,15 @@
                 },
                 "value": {
                   "type": "string"
+                },
+                "pattern": {
+                  "type": "string"
                 }
               }
             }
+          },
+          "unit": {
+            "type": "string"
           }
         }
       },
diff --git a/cms/types/generated/components.d.ts b/cms/types/generated/components.d.ts
index 41ab908..e6ef569 100644
--- a/cms/types/generated/components.d.ts
+++ b/cms/types/generated/components.d.ts
@@ -10,6 +10,7 @@ export interface LegendLegendConfig extends Schema.Component {
     type: Attribute.Enumeration<['basic', 'choropleth', 'gradient']> &
       Attribute.Required;
     items: Attribute.Component<'legend.items', true>;
+    unit: Attribute.String;
   };
 }
 
@@ -22,6 +23,7 @@ export interface LegendItems extends Schema.Component {
   attributes: {
     color: Attribute.String & Attribute.Required;
     value: Attribute.String;
+    pattern: Attribute.String;
   };
 }
 
diff --git a/cms/types/generated/contentTypes.d.ts b/cms/types/generated/contentTypes.d.ts
index e07fb98..daea56b 100644
--- a/cms/types/generated/contentTypes.d.ts
+++ b/cms/types/generated/contentTypes.d.ts
@@ -856,6 +856,11 @@ export interface ApiLayerLayer extends Schema.CollectionType {
     params_config: Attribute.JSON & Attribute.Required;
     legend_config: Attribute.Component<'legend.legend-config'> &
       Attribute.Required;
+    dataset: Attribute.Relation<
+      'api::layer.layer',
+      'oneToOne',
+      'api::dataset.dataset'
+    >;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     createdBy: Attribute.Relation<