From 9e4be3e3b03c26fcc1e63ee4976f44a5d1f8dba1 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Mon, 26 Jul 2021 10:37:12 -0400 Subject: [PATCH] Remove unused network type params (#1155) Changes in #1143 removed the need for `name` and `ref` parameters in the network-to-network_type conversion function. This PR removes this dead code. Verified by running ./quickstart rhode-island which completed successfully. --- layers/transportation_name/update_route_member.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layers/transportation_name/update_route_member.sql b/layers/transportation_name/update_route_member.sql index f2b28bc..2ff295b 100644 --- a/layers/transportation_name/update_route_member.sql +++ b/layers/transportation_name/update_route_member.sql @@ -22,7 +22,7 @@ INSERT INTO osm_route_member (osm_id, member, ref, network) SELECT * FROM gbr_route_members_view; -CREATE OR REPLACE FUNCTION osm_route_member_network_type(network text, name text, ref text) RETURNS route_network_type AS +CREATE OR REPLACE FUNCTION osm_route_member_network_type(network text) RETURNS route_network_type AS $$ SELECT CASE WHEN network = 'US:I' THEN 'us-interstate'::route_network_type @@ -39,9 +39,9 @@ $$ LANGUAGE sql IMMUTABLE -- etldoc: osm_route_member -> osm_route_member -- see http://wiki.openstreetmap.org/wiki/Relation:route#Road_routes UPDATE osm_route_member -SET network_type = osm_route_member_network_type(network, name, ref) +SET network_type = osm_route_member_network_type(network) WHERE network != '' - AND network_type IS DISTINCT FROM osm_route_member_network_type(network, name, ref) + AND network_type IS DISTINCT FROM osm_route_member_network_type(network) ; CREATE OR REPLACE FUNCTION update_osm_route_member() RETURNS void AS @@ -62,10 +62,10 @@ BEGIN UPDATE osm_route_member AS r - SET network_type = osm_route_member_network_type(network, name, ref) + SET network_type = osm_route_member_network_type(network) FROM transportation_name.network_changes AS c WHERE network != '' - AND network_type IS DISTINCT FROM osm_route_member_network_type(network, name, ref) + AND network_type IS DISTINCT FROM osm_route_member_network_type(network) AND r.member = c.osm_id; END; $$ LANGUAGE plpgsql;