From b698385acc4cd9e2f438dc2297fa4490b3b46a74 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Sat, 15 Jun 2024 22:17:15 -0400 Subject: [PATCH 1/3] Add British crown dependencies --- layers/transportation/update_route_member.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/transportation/update_route_member.sql b/layers/transportation/update_route_member.sql index 52bc7c49..a9399f7a 100644 --- a/layers/transportation/update_route_member.sql +++ b/layers/transportation/update_route_member.sql @@ -6,7 +6,7 @@ DROP TRIGGER IF EXISTS trigger_store_transportation_highway_linestring ON osm_hi CREATE TABLE IF NOT EXISTS ne_10m_admin_0_gb_buffer AS SELECT ST_Buffer(geometry, 10000) FROM ne_10m_admin_0_countries -WHERE iso_a2 = 'GB'; +WHERE iso_a2 IN ('GB', 'IM', 'JE', 'GG'); -- etldoc: ne_10m_admin_0_countries -> ne_10m_admin_0_ie_buffer CREATE TABLE IF NOT EXISTS ne_10m_admin_0_ie_buffer AS From 9c6430156aae412def9ac870fd245223598790d2 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Sat, 15 Jun 2024 22:28:16 -0400 Subject: [PATCH 2/3] Handle multiple entries --- layers/transportation/update_route_member.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/transportation/update_route_member.sql b/layers/transportation/update_route_member.sql index a9399f7a..3faf8dc5 100644 --- a/layers/transportation/update_route_member.sql +++ b/layers/transportation/update_route_member.sql @@ -26,7 +26,7 @@ SELECT osm_id AS member, WHEN highway IN ('primary','secondary') THEN 'omt-gb-primary' END AS network FROM osm_highway_linestring WHERE length(ref) > 1 - AND ST_Intersects(geometry, (SELECT * FROM ne_10m_admin_0_gb_buffer)) + AND ST_Intersects(geometry, (SELECT geometry FROM ne_10m_admin_0_gb_buffer)) AND highway IN ('motorway', 'trunk', 'primary', 'secondary') ; From 2b55791c995eb4e0ca6b2ad355b6ee6e5d056e92 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Sat, 15 Jun 2024 22:34:19 -0400 Subject: [PATCH 3/3] Use union clause --- layers/transportation/update_route_member.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layers/transportation/update_route_member.sql b/layers/transportation/update_route_member.sql index 3faf8dc5..7b0da85e 100644 --- a/layers/transportation/update_route_member.sql +++ b/layers/transportation/update_route_member.sql @@ -4,7 +4,7 @@ DROP TRIGGER IF EXISTS trigger_store_transportation_highway_linestring ON osm_hi -- etldoc: ne_10m_admin_0_countries -> ne_10m_admin_0_gb_buffer CREATE TABLE IF NOT EXISTS ne_10m_admin_0_gb_buffer AS -SELECT ST_Buffer(geometry, 10000) +SELECT ST_Union(ST_Buffer(geometry, 10000)) AS geometry FROM ne_10m_admin_0_countries WHERE iso_a2 IN ('GB', 'IM', 'JE', 'GG'); @@ -26,7 +26,7 @@ SELECT osm_id AS member, WHEN highway IN ('primary','secondary') THEN 'omt-gb-primary' END AS network FROM osm_highway_linestring WHERE length(ref) > 1 - AND ST_Intersects(geometry, (SELECT geometry FROM ne_10m_admin_0_gb_buffer)) + AND ST_Intersects(geometry, (SELECT * FROM ne_10m_admin_0_gb_buffer)) AND highway IN ('motorway', 'trunk', 'primary', 'secondary') ;