Merge pull request #350 from wearepal/designations-component

Add Ancient Woodland to Designations
wearepal · Feb 22, 2024 · 2333748 · 2333748
2 parents 6b3bc6d + ebf7a28
commit 2333748
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/app/javascript/projects/layer_palette.tsx b/app/javascript/projects/layer_palette.tsx
@@ -202,7 +202,7 @@ export const LayerPalette = ({ addLayer, hide, dbModels, getTeamDatasets, teamNa
         </Section>
         <Section title="Designations">
           {
-            designations.sort((a, b) => (a.name < b.name) ? -1 : 1).map(({ name, identifier, stroke, fill }) =>
+            designations.sort((a, b) => (a.name < b.name) ? -1 : 1).map(({ name, identifier, stroke, fill, attribution }) =>
               <AddLayerButton
                 addLayer={addLayer}
                 prototype={{
@@ -215,6 +215,7 @@ export const LayerPalette = ({ addLayer, hide, dbModels, getTeamDatasets, teamNa
                   identifier,
                   visible: true,
                   opacity: 1,
+                  attribution
                 }}
               />
             )

diff --git a/app/javascript/projects/modelling/designations.ts b/app/javascript/projects/modelling/designations.ts
@@ -11,6 +11,7 @@ export interface Designation {
     identifier: string
     fill: [number, number, number, number]
     stroke: [number, number, number, number]
+    attribution?: string
 }
 
 // Designations available from both the Model and Map view, add new designations here to make them available in both views
@@ -78,5 +79,15 @@ export const designations : Designation[] = [
         identifier: "shapefiles:ramsar_eng",
         fill: [0, 60, 110, 1],
         stroke: [0, 0, 0, 1]
+    },
+    {
+        id: 8,
+        value: "AW",
+        socket: booleanDataSocket,
+        name: "Ancient Woodland",
+        identifier: "shapefiles:aw_eng",
+        fill: [252, 186, 3, 1],
+        stroke: [0, 0, 0, 1],
+        attribution: '&copy; <a href="https://naturalengland-defra.opendata.arcgis.com/datasets/Defra::ancient-woodland-england/about">Natural England</a>'
     }
 ]
diff --git a/app/javascript/projects/reify_layer/shapefile.ts b/app/javascript/projects/reify_layer/shapefile.ts
@@ -9,7 +9,7 @@ import { memoize } from "lodash"
 import { Map } from "ol"
 
 
-const getSource = memoize((id: string) => {
+const getSource = memoize((id: string, attribution: undefined | string) => {
 
     const store = id.split(":")[0]
 
@@ -19,6 +19,7 @@ const getSource = memoize((id: string) => {
             extractGeometryName: true
         }),
         strategy: bbox,
+        attributions: attribution
     })
 
     return source
@@ -41,7 +42,7 @@ const getStyle = (layer: ShapeLayer, zoom: number | undefined) => (
 export function reifyShapeFileLayer (layer: ShapeLayer, existingLayer: BaseLayer | null, map: Map) {
 
     const vectLayer =  new VectorLayer({
-        source: getSource(layer.identifier),
+        source: getSource(layer.identifier, layer.attribution),
         style: getStyle(layer, map.getView().getZoom()),
         minZoom: layer.minZoom,
     })

diff --git a/app/javascript/projects/state.ts b/app/javascript/projects/state.ts
@@ -57,6 +57,7 @@ export interface ShapeLayer extends BaseLayer {
   identifier: string
   colors: StrokeFill
   minZoom?: number
+  attribution?: string
 }
 
 export interface BoundaryLayer extends BaseLayer {