From 826619714901ba1d2e57f90dcfbd97f10cd9c633 Mon Sep 17 00:00:00 2001 From: Tomas Pohanka Date: Tue, 2 Apr 2024 10:09:20 +0200 Subject: [PATCH] Revert `e-road` and `a-road`. (#1648) Partial revert the `e-road` and `a-road` added in https://github.com/openmaptiles/openmaptiles/pull/1619. This PR leads to breaking the change of `network` and `ref` attributes for roads, which are not included in `osm_route_member_network_type`. --- layers/transportation/update_route_member.sql | 4 ---- layers/transportation/update_transportation_merge.sql | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/layers/transportation/update_route_member.sql b/layers/transportation/update_route_member.sql index c369ed8..c7901c4 100644 --- a/layers/transportation/update_route_member.sql +++ b/layers/transportation/update_route_member.sql @@ -48,10 +48,6 @@ WHERE length(ref) > 1 CREATE OR REPLACE FUNCTION osm_route_member_network_type(network text, ref text) RETURNS route_network_type AS $$ SELECT CASE - -- https://wiki.openstreetmap.org/wiki/WikiProject_Europe/E-road_network - WHEN network = 'e-road' THEN 'e-road'::route_network_type - -- https://wiki.openstreetmap.org/wiki/Asia/Asian_Highway_Network - WHEN network = 'AsianHighway' THEN 'a-road'::route_network_type -- https://wiki.openstreetmap.org/wiki/United_States_roads_tagging WHEN network = 'US:I' THEN 'us-interstate'::route_network_type WHEN network = 'US:US' THEN 'us-highway'::route_network_type diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql index 7ad9194..6f29451 100644 --- a/layers/transportation/update_transportation_merge.sql +++ b/layers/transportation/update_transportation_merge.sql @@ -824,7 +824,7 @@ BEGIN WHERE transportation.changes_z4_z5_z6_z7.is_old IS FALSE AND transportation.changes_z4_z5_z6_z7.id = osm_transportation_merge_linestring_gen_z5.id )) AND - (highway = 'motorway' AND osm_national_network(network) + (highway = 'motorway' OR construction = 'motorway' ) AND -- Current view: national-importance motorways and trunks ST_Length(geometry) > 1000