cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused network type params (#1155)

Browse Source 
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.
This commit is contained in:
Brian Sperlongano 2021-07-26 10:37:12 -04:00 committed by GitHub
parent 951aa907b2
commit 9e4be3e3b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layers/transportation_name/update_route_member.sql
View File

@ -22,7 +22,7 @@ INSERT INTO osm_route_member (osm_id, member, ref, network)
SELECT * SELECT *
FROM gbr_route_members_view; 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 SELECT CASE
WHEN network = 'US:I' THEN 'us-interstate'::route_network_type WHEN network = 'US:I' THEN 'us-interstate'::route_network_type
@ -39,9 +39,9 @@ $$ LANGUAGE sql IMMUTABLE
-- etldoc: osm_route_member -> osm_route_member -- etldoc: osm_route_member -> osm_route_member
-- see http://wiki.openstreetmap.org/wiki/Relation:route#Road_routes -- see http://wiki.openstreetmap.org/wiki/Relation:route#Road_routes
UPDATE osm_route_member 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 != '' 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 CREATE OR REPLACE FUNCTION update_osm_route_member() RETURNS void AS
@ -62,10 +62,10 @@ BEGIN
UPDATE UPDATE
osm_route_member AS r 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 FROM transportation_name.network_changes AS c
WHERE 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)
AND r.member = c.osm_id; AND r.member = c.osm_id;
END; END;
$$ LANGUAGE plpgsql; $$ LANGUAGE plpgsql;