From 1e523dfaa72c01ff13dcf6b309e0c212aac4f899 Mon Sep 17 00:00:00 2001
From: CarlosCoelhoSL <ccoelho@scottlogic.com>
Date: Fri, 6 Oct 2023 15:45:03 +0100
Subject: [PATCH 1/2] Adds download for la geometry

---
 makerules.mk | 7 +++++++
 pipeline.mk  | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/makerules.mk b/makerules.mk
index ca0d2d5..8b53a94 100644
--- a/makerules.mk
+++ b/makerules.mk
@@ -144,6 +144,13 @@ $(CACHE_DIR)organisation.csv:
 	@mkdir -p $(CACHE_DIR)
 	curl -qfs "https://raw.githubusercontent.com/digital-land/organisation-dataset/main/collection/organisation.csv" > $(CACHE_DIR)organisation.csv
 
+
+# download la geometry
+$(CACHE_DIR)la_geometry.geojson:
+	@mkdir -p $(CACHE_DIR)
+	curl -qfs "https://services1.arcgis.com/ESMARspQHYMw9BZ9/arcgis/rest/services/Local_Authority_Districts_May_2023_UK_BFE_V2/FeatureServer/0/query?where=1%3D1&outFields=*&outSR=4326&f=json" > $(CACHE_DIR)la_geometry.geojson
+
+
 init:: config
 
 config::;
diff --git a/pipeline.mk b/pipeline.mk
index d0f0de5..84ac570 100644
--- a/pipeline.mk
+++ b/pipeline.mk
@@ -139,6 +139,9 @@ clean::
 # local copy of the organisation dataset
 init::	$(CACHE_DIR)organisation.csv
 
+# get local authority geometry data
+init:: $(CACHE_DIR)la_geometry.geojson
+
 makerules::
 	curl -qfsL '$(SOURCE_URL)/makerules/main/pipeline.mk' > makerules/pipeline.mk
 

From ab49ee655e71455772cba6f8034ee36cb92912db Mon Sep 17 00:00:00 2001
From: CarlosCoelhoSL <ccoelho@scottlogic.com>
Date: Fri, 3 Nov 2023 15:42:40 +0000
Subject: [PATCH 2/2] Adds organisation-lpa relationship & adjustments

---
 makerules.mk | 10 +++++++---
 pipeline.mk  |  6 ++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/makerules.mk b/makerules.mk
index 8b53a94..15674fb 100644
--- a/makerules.mk
+++ b/makerules.mk
@@ -145,11 +145,15 @@ $(CACHE_DIR)organisation.csv:
 	curl -qfs "https://raw.githubusercontent.com/digital-land/organisation-dataset/main/collection/organisation.csv" > $(CACHE_DIR)organisation.csv
 
 
-# download la geometry
-$(CACHE_DIR)la_geometry.geojson:
+# download organisation-lpa relationships
+$(CACHE_DIR)local-authority.csv:
 	@mkdir -p $(CACHE_DIR)
-	curl -qfs "https://services1.arcgis.com/ESMARspQHYMw9BZ9/arcgis/rest/services/Local_Authority_Districts_May_2023_UK_BFE_V2/FeatureServer/0/query?where=1%3D1&outFields=*&outSR=4326&f=json" > $(CACHE_DIR)la_geometry.geojson
+	curl -qfs "https://raw.githubusercontent.com/digital-land/organisation-collection/main/data/local-authority.csv" > $(CACHE_DIR)local-authority.csv
 
+# download lpa geometry
+$(CACHE_DIR)lpa-geometry.csv:
+	@mkdir -p $(CACHE_DIR)
+	curl -qfs "https://datasette.planning.data.gov.uk/entity.csv?sql=select+geometry%2C+reference+from+entity+where+%22dataset%22+%3D+%3Ap0+order+by+entity+limit+101&p0=local-planning-authority&_size=max" > $(CACHE_DIR)lpa-geometry.csv
 
 init:: config
 
diff --git a/pipeline.mk b/pipeline.mk
index 84ac570..9cfc7fb 100644
--- a/pipeline.mk
+++ b/pipeline.mk
@@ -139,8 +139,10 @@ clean::
 # local copy of the organisation dataset
 init::	$(CACHE_DIR)organisation.csv
 
-# get local authority geometry data
-init:: $(CACHE_DIR)la_geometry.geojson
+# local copy of local-authority for organisation-lpa relationship
+init:: $(CACHE_DIR)local-authority.csv
+
+init:: $(CACHE_DIR)lpa-geometry.csv
 
 makerules::
 	curl -qfsL '$(SOURCE_URL)/makerules/main/pipeline.mk' > makerules/pipeline.mk