From 32607950c42bb55ef93f96e33db7bc55d530f5b4 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Sun, 20 Nov 2022 18:14:55 -0500 Subject: [PATCH 1/9] Add Canada top-level routes --- layers/transportation/network_type.sql | 2 +- layers/transportation/style.json | 222 +++++++++--------- layers/transportation/update_route_member.sql | 21 +- layers/transportation_name/style.json | 12 +- 4 files changed, 134 insertions(+), 123 deletions(-) diff --git a/layers/transportation/network_type.sql b/layers/transportation/network_type.sql index b54dc8d67..efa79fda3 100644 --- a/layers/transportation/network_type.sql +++ b/layers/transportation/network_type.sql @@ -15,7 +15,7 @@ $$ WHEN undefined_object THEN CREATE TYPE route_network_type AS enum ( 'us-interstate', 'us-highway', 'us-state', - 'ca-transcanada', + 'ca-transcanada', 'ca-provincial-arterial', 'ca-provincial', 'gb-motorway', 'gb-trunk' ); END diff --git a/layers/transportation/style.json b/layers/transportation/style.json index c5be85154..b11fb97d5 100644 --- a/layers/transportation/style.json +++ b/layers/transportation/style.json @@ -37,7 +37,7 @@ "ferry" ] ], - "order": 24 + "order": 3 }, { "id": "tunnel_motorway_link_casing", @@ -115,7 +115,7 @@ "tunnel" ] ], - "order": 28 + "order": 4 }, { "id": "tunnel_service_track_casing", @@ -165,7 +165,7 @@ "track" ] ], - "order": 29 + "order": 5 }, { "id": "tunnel_link_casing", @@ -220,7 +220,7 @@ 0 ] ], - "order": 30 + "order": 6 }, { "id": "tunnel_street_casing", @@ -282,7 +282,7 @@ "street_limited" ] ], - "order": 31 + "order": 7 }, { "id": "tunnel_tertiary_casing", @@ -353,7 +353,7 @@ "tertiary" ] ], - "order": 32 + "order": 8 }, { "id": "tunnel_secondary_casing", @@ -424,7 +424,7 @@ "secondary" ] ], - "order": 33 + "order": 9 }, { "id": "tunnel_trunk_casing", @@ -497,7 +497,7 @@ "trunk" ] ], - "order": 34 + "order": 10 }, { "id": "tunnel_trunk_construction_casing", @@ -559,7 +559,7 @@ "trunk_construction" ] ], - "order": 35 + "order": 11 }, { "id": "tunnel_primary_casing", @@ -632,7 +632,7 @@ "primary" ] ], - "order": 36 + "order": 12 }, { "id": "tunnel_motorway_construction_casing", @@ -692,7 +692,7 @@ "tunnel" ] ], - "order": 37 + "order": 13 }, { "id": "tunnel_motorway_casing", @@ -752,7 +752,7 @@ "tunnel" ] ], - "order": 38 + "order": 14 }, { "id": "tunnel_path_pedestrian", @@ -802,7 +802,7 @@ "pedestrian" ] ], - "order": 39 + "order": 15 }, { "id": "tunnel_motorway_link", @@ -878,7 +878,7 @@ "tunnel" ] ], - "order": 40 + "order": 16 }, { "id": "tunnel_service_track", @@ -933,7 +933,7 @@ "track" ] ], - "order": 41 + "order": 17 }, { "id": "tunnel_service_track_construction", @@ -992,7 +992,7 @@ "track_construction" ] ], - "order": 42 + "order": 18 }, { "id": "tunnel_link", @@ -1046,7 +1046,7 @@ 0 ] ], - "order": 43 + "order": 19 }, { "id": "tunnel_minor", @@ -1092,7 +1092,7 @@ "minor" ] ], - "order": 44 + "order": 20 }, { "id": "tunnel_minor_construction", @@ -1142,7 +1142,7 @@ "minor_construction" ] ], - "order": 45 + "order": 21 }, { "id": "tunnel_tertiary", @@ -1207,7 +1207,7 @@ "tertiary" ] ], - "order": 46 + "order": 22 }, { "id": "tunnel_tertiary_construction", @@ -1276,7 +1276,7 @@ "tertiary_construction" ] ], - "order": 47 + "order": 23 }, { "id": "tunnel_secondary", @@ -1354,7 +1354,7 @@ "secondary" ] ], - "order": 48 + "order": 24 }, { "id": "tunnel_secondary_construction", @@ -1436,7 +1436,7 @@ "secondary_construction" ] ], - "order": 49 + "order": 25 }, { "id": "tunnel_primary", @@ -1519,7 +1519,7 @@ "primary" ] ], - "order": 50 + "order": 26 }, { "id": "tunnel_primary_construction", @@ -1606,7 +1606,7 @@ "primary_construction" ] ], - "order": 51 + "order": 27 }, { "id": "tunnel_trunk", @@ -1699,7 +1699,7 @@ "trunk" ] ], - "order": 52 + "order": 28 }, { "id": "tunnel_trunk_construction", @@ -1785,7 +1785,7 @@ "trunk_construction" ] ], - "order": 53 + "order": 29 }, { "id": "tunnel_motorway", @@ -1841,7 +1841,7 @@ "tunnel" ] ], - "order": 54 + "order": 30 }, { "id": "tunnel_motorway_construction", @@ -1901,7 +1901,7 @@ "tunnel" ] ], - "order": 55 + "order": 31 }, { "id": "tunnel_major_rail", @@ -1945,7 +1945,7 @@ "rail" ] ], - "order": 56 + "order": 32 }, { "id": "tunnel_major_rail_hatching", @@ -2006,7 +2006,7 @@ "rail" ] ], - "order": 57 + "order": 33 }, { "id": "road_area_pier", @@ -2034,7 +2034,7 @@ "pier" ] ], - "order": 58 + "order": 34 }, { "id": "road_pier", @@ -2075,7 +2075,7 @@ "pier" ] ], - "order": 59 + "order": 35 }, { "id": "road_area_bridge", @@ -2104,7 +2104,7 @@ "bridge" ] ], - "order": 60 + "order": 36 }, { "id": "road_area_platform", @@ -2140,7 +2140,7 @@ "platform" ] ], - "order": 61 + "order": 37 }, { "id": "road_area_pedestrian", @@ -2172,7 +2172,7 @@ "pier" ] ], - "order": 62 + "order": 38 }, { "id": "road_service_track_casing", @@ -2232,7 +2232,7 @@ "track" ] ], - "order": 63 + "order": 39 }, { "id": "road_primary_link_casing", @@ -2312,7 +2312,7 @@ "primary" ] ], - "order": 64 + "order": 40 }, { "id": "road_trunk_link_casing", @@ -2388,7 +2388,7 @@ "trunk" ] ], - "order": 65 + "order": 41 }, { "id": "road_motorway_link_casing", @@ -2469,7 +2469,7 @@ 1 ] ], - "order": 66 + "order": 42 }, { "id": "road_minor_casing", @@ -2551,7 +2551,7 @@ "1" ] ], - "order": 67 + "order": 43 }, { "id": "road_tertiary_casing", @@ -2625,7 +2625,7 @@ 1 ] ], - "order": 68 + "order": 44 }, { "id": "road_secondary_link_casing", @@ -2710,7 +2710,7 @@ 1 ] ], - "order": 69 + "order": 45 }, { "id": "road_secondary_casing", @@ -2795,7 +2795,7 @@ 1 ] ], - "order": 70 + "order": 46 }, { "id": "road_trunk_casing", @@ -2885,7 +2885,7 @@ 1 ] ], - "order": 71 + "order": 47 }, { "id": "road_primary_casing", @@ -2975,7 +2975,7 @@ 1 ] ], - "order": 72 + "order": 48 }, { "id": "road_motorway_casing", @@ -3039,7 +3039,7 @@ 1 ] ], - "order": 73 + "order": 49 }, { "id": "road_pedestrian_casing", @@ -3103,7 +3103,7 @@ "tunnel" ] ], - "order": 74 + "order": 50 }, { "id": "road_pedestrian", @@ -3167,7 +3167,7 @@ "tunnel" ] ], - "order": 75 + "order": 51 }, { "id": "road_path_cycleway_casing", @@ -3229,7 +3229,7 @@ "cycleway" ] ], - "order": 76 + "order": 52 }, { "id": "road_path_footway_casing", @@ -3291,7 +3291,7 @@ "path" ] ], - "order": 77 + "order": 53 }, { "id": "road_path_cycleway", @@ -3356,7 +3356,7 @@ "cycleway" ] ], - "order": 78 + "order": 54 }, { "id": "road_path_footway", @@ -3426,7 +3426,7 @@ "path" ] ], - "order": 79 + "order": 55 }, { "id": "road_primary_link", @@ -3494,7 +3494,7 @@ "primary" ] ], - "order": 80 + "order": 56 }, { "id": "road_trunk_link", @@ -3570,7 +3570,7 @@ "trunk" ] ], - "order": 81 + "order": 57 }, { "id": "road_motorway_link", @@ -3654,7 +3654,7 @@ 1 ] ], - "order": 82 + "order": 58 }, { "id": "road_service_track", @@ -3719,7 +3719,7 @@ "track" ] ], - "order": 83 + "order": 59 }, { "id": "road_service_track_construction", @@ -3788,7 +3788,7 @@ "track_construction" ] ], - "order": 84 + "order": 60 }, { "id": "road_raceway", @@ -3850,7 +3850,7 @@ "raceway" ] ], - "order": 85 + "order": 61 }, { "id": "road_minor", @@ -3950,7 +3950,7 @@ ] ] ], - "order": 86 + "order": 62 }, { "id": "road_minor_construction", @@ -4054,7 +4054,7 @@ ] ] ], - "order": 87 + "order": 63 }, { "id": "road_secondary", @@ -4145,7 +4145,7 @@ "secondary" ] ], - "order": 88 + "order": 64 }, { "id": "road_tertiary", @@ -4232,7 +4232,7 @@ "tertiary" ] ], - "order": 89 + "order": 65 }, { "id": "road_tertiary_construction", @@ -4319,7 +4319,7 @@ "tertiary_construction" ] ], - "order": 90 + "order": 66 }, { "id": "road_secondary_construction", @@ -4414,7 +4414,7 @@ "secondary_construction" ] ], - "order": 91 + "order": 67 }, { "id": "road_primary_construction", @@ -4510,7 +4510,7 @@ "primary_construction" ] ], - "order": 92 + "order": 68 }, { "id": "road_primary", @@ -4606,7 +4606,7 @@ "primary" ] ], - "order": 93 + "order": 69 }, { "id": "road_trunk", @@ -4702,7 +4702,7 @@ "trunk" ] ], - "order": 94 + "order": 70 }, { "id": "road_trunk_construction", @@ -4802,7 +4802,7 @@ "trunk_construction" ] ], - "order": 95 + "order": 71 }, { "id": "road_motorway", @@ -4866,7 +4866,7 @@ 1 ] ], - "order": 96 + "order": 72 }, { "id": "road_motorway_construction", @@ -4935,7 +4935,7 @@ 1 ] ], - "order": 97 + "order": 73 }, { "id": "rail_subway", @@ -4979,7 +4979,7 @@ "subway" ] ], - "order": 98 + "order": 74 }, { "id": "rail_major", @@ -5039,7 +5039,7 @@ "rail" ] ], - "order": 99 + "order": 75 }, { "id": "rail_minor", @@ -5085,7 +5085,7 @@ "light_rail" ] ], - "order": 100 + "order": 76 }, { "id": "rail_major_hatching", @@ -5146,7 +5146,7 @@ "rail" ] ], - "order": 101 + "order": 77 }, { "id": "rail_minor_hatching", @@ -5196,7 +5196,7 @@ "light_rail" ] ], - "order": 102 + "order": 78 }, { "id": "bridge_motorway_link_casing", @@ -5262,7 +5262,7 @@ "bridge" ] ], - "order": 105 + "order": 79 }, { "id": "bridge_service_track_casing", @@ -5307,7 +5307,7 @@ "track" ] ], - "order": 106 + "order": 80 }, { "id": "bridge_link_casing", @@ -5356,7 +5356,7 @@ "bridge" ] ], - "order": 107 + "order": 81 }, { "id": "bridge_street_casing", @@ -5417,7 +5417,7 @@ "street_limited" ] ], - "order": 108 + "order": 82 }, { "id": "bridge_path_cycleway_casing", @@ -5485,7 +5485,7 @@ "cycleway" ] ], - "order": 109 + "order": 83 }, { "id": "bridge_path_footway_casing", @@ -5553,7 +5553,7 @@ "footway" ] ], - "order": 110 + "order": 84 }, { "id": "bridge_secondary_casing", @@ -5616,7 +5616,7 @@ "tertiary" ] ], - "order": 111 + "order": 85 }, { "id": "bridge_tertiary_casing", @@ -5658,7 +5658,7 @@ "tertiary" ] ], - "order": 112 + "order": 86 }, { "id": "bridge_trunk_casing", @@ -5726,7 +5726,7 @@ "trunk" ] ], - "order": 113 + "order": 87 }, { "id": "bridge_primary_casing", @@ -5783,7 +5783,7 @@ "primary" ] ], - "order": 114 + "order": 88 }, { "id": "bridge_motorway_casing", @@ -5833,7 +5833,7 @@ 1 ] ], - "order": 115 + "order": 89 }, { "id": "bridge_path_cycleway", @@ -5897,7 +5897,7 @@ "cycleway" ] ], - "order": 116 + "order": 90 }, { "id": "bridge_path_footway", @@ -5961,7 +5961,7 @@ "footway" ] ], - "order": 117 + "order": 91 }, { "id": "bridge_motorway_link", @@ -6026,7 +6026,7 @@ "bridge" ] ], - "order": 118 + "order": 92 }, { "id": "bridge_service_track", @@ -6072,7 +6072,7 @@ "track" ] ], - "order": 119 + "order": 93 }, { "id": "bridge_service_track_construction", @@ -6122,7 +6122,7 @@ "track_construction" ] ], - "order": 120 + "order": 94 }, { "id": "bridge_link", @@ -6171,7 +6171,7 @@ "bridge" ] ], - "order": 121 + "order": 95 }, { "id": "bridge_minor", @@ -6216,7 +6216,7 @@ "minor" ] ], - "order": 122 + "order": 96 }, { "id": "bridge_minor_construction", @@ -6266,7 +6266,7 @@ "minor_construction" ] ], - "order": 123 + "order": 97 }, { "id": "bridge_tertiary", @@ -6332,7 +6332,7 @@ "tertiary" ] ], - "order": 124 + "order": 98 }, { "id": "bridge_secondary", @@ -6402,7 +6402,7 @@ "secondary" ] ], - "order": 125 + "order": 99 }, { "id": "bridge_secondary_construction-copy", @@ -6450,7 +6450,7 @@ "secondary_construction" ] ], - "order": 126 + "order": 100 }, { "id": "bridge_tertiary_construction", @@ -6498,7 +6498,7 @@ "tertiary_construction" ] ], - "order": 127 + "order": 101 }, { "id": "bridge_primary", @@ -6563,7 +6563,7 @@ "primary" ] ], - "order": 128 + "order": 102 }, { "id": "bridge_trunk", @@ -6624,7 +6624,7 @@ "trunk" ] ], - "order": 129 + "order": 103 }, { "id": "bridge_trunk_primary_construction", @@ -6674,7 +6674,7 @@ "trunk_construction" ] ], - "order": 130 + "order": 104 }, { "id": "bridge_motorway", @@ -6734,7 +6734,7 @@ 1 ] ], - "order": 131 + "order": 105 }, { "id": "bridge_motorway_construction", @@ -6798,7 +6798,7 @@ 1 ] ], - "order": 132 + "order": 106 }, { "id": "bridge_major_rail", @@ -6857,7 +6857,7 @@ "rail" ] ], - "order": 133 + "order": 107 }, { "id": "bridge_major_rail_hatching", @@ -6917,7 +6917,7 @@ "rail" ] ], - "order": 134 + "order": 108 }, { "id": "cablecar", @@ -6950,7 +6950,7 @@ "class", "aerialway" ], - "order": 135 + "order": 109 }, { "id": "cablecar-dash", @@ -6987,7 +6987,7 @@ "class", "aerialway" ], - "order": 136 + "order": 110 }, { "id": "road_path-cycleway_oneway", @@ -7036,7 +7036,7 @@ "cycleway" ] ], - "order": 172 + "order": 116 }, { "id": "road_oneway", @@ -7086,7 +7086,7 @@ "service" ] ], - "order": 173 + "order": 117 }, { "id": "road_oneway_opposite", @@ -7137,7 +7137,7 @@ "service" ] ], - "order": 174 + "order": 118 } ] } \ No newline at end of file diff --git a/layers/transportation/update_route_member.sql b/layers/transportation/update_route_member.sql index 3a6240291..891e47d22 100644 --- a/layers/transportation/update_route_member.sql +++ b/layers/transportation/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) RETURNS route_network_type AS +CREATE OR REPLACE FUNCTION osm_route_member_network_type(network text, ref text) RETURNS route_network_type AS $$ SELECT CASE WHEN network = 'US:I' THEN 'us-interstate'::route_network_type @@ -30,6 +30,17 @@ SELECT CASE WHEN network LIKE 'US:__' THEN 'us-state'::route_network_type -- https://en.wikipedia.org/wiki/Trans-Canada_Highway WHEN network LIKE 'CA:transcanada%' THEN 'ca-transcanada'::route_network_type + WHEN network = 'CA:QC:A' THEN 'ca-provincial-arterial'::route_network_type + WHEN network = 'CA:ON:primary' THEN + CASE + WHEN ref LIKE '4__' THEN 'ca-provincial-arterial'::route_network_type + WHEN ref = 'QEW' THEN 'ca-provincial-arterial'::route_network_type + ELSE 'ca-provincial-arterial'::route_network_type + END + WHEN network = 'CA:MB:PTH' AND ref = '75' THEN 'ca-provincial-arterial'::route_network_type + WHEN network = 'CA:AB' AND ref IN ('2','3','4') THEN 'ca-provincial-arterial'::route_network_type + WHEN network = 'CA:BC' AND ref IN ('3','5','99') THEN 'ca-provincial-arterial'::route_network_type + WHEN network LIKE 'CA:__:%' THEN 'ca-provincial'::route_network_type WHEN network = 'omt-gb-motorway' THEN 'gb-motorway'::route_network_type WHEN network = 'omt-gb-trunk' THEN 'gb-trunk'::route_network_type END; @@ -39,9 +50,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) +SET network_type = osm_route_member_network_type(network, ref) WHERE network != '' - AND network_type IS DISTINCT FROM osm_route_member_network_type(network) + AND network_type IS DISTINCT FROM osm_route_member_network_type(network, ref) ; CREATE OR REPLACE FUNCTION update_osm_route_member() RETURNS void AS @@ -64,7 +75,7 @@ BEGIN SELECT id, osm_id, - osm_route_member_network_type(network) AS network_type, + osm_route_member_network_type(network, ref) AS network_type, DENSE_RANK() over (PARTITION BY member ORDER BY network_type, network, LENGTH(ref), ref) AS concurrency_index, CASE WHEN network IN ('iwn', 'nwn', 'rwn') THEN 1 @@ -80,7 +91,7 @@ BEGIN END; $$ LANGUAGE plpgsql; -CREATE INDEX IF NOT EXISTS osm_route_member_network_idx ON osm_route_member ("network"); +CREATE INDEX IF NOT EXISTS osm_route_member_network_idx ON osm_route_member ("network", "ref"); CREATE INDEX IF NOT EXISTS osm_route_member_member_idx ON osm_route_member ("member"); CREATE INDEX IF NOT EXISTS osm_route_member_name_idx ON osm_route_member ("name"); CREATE INDEX IF NOT EXISTS osm_route_member_ref_idx ON osm_route_member ("ref"); diff --git a/layers/transportation_name/style.json b/layers/transportation_name/style.json index e280f680a..4bb027ee6 100644 --- a/layers/transportation_name/style.json +++ b/layers/transportation_name/style.json @@ -34,7 +34,7 @@ "ferry" ] ], - "order": 175 + "order": 119 }, { "id": "road_label", @@ -81,7 +81,7 @@ "ferry" ] ], - "order": 176 + "order": 120 }, { "id": "highway-shield-tertiary", @@ -160,7 +160,7 @@ "ref" ] ], - "order": 177 + "order": 121 }, { "id": "highway-shield-secondary", @@ -239,7 +239,7 @@ "ref" ] ], - "order": 178 + "order": 122 }, { "id": "highway-shield-primary", @@ -318,7 +318,7 @@ "ref" ] ], - "order": 179 + "order": 123 }, { "id": "highway-shield-motorway", @@ -400,7 +400,7 @@ "ref" ] ], - "order": 180 + "order": 124 } ] } \ No newline at end of file From 70114d177afd790aa1fd6c4735874a18beac2d6f Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Sun, 20 Nov 2022 21:54:42 -0500 Subject: [PATCH 2/9] Set z4 roads --- layers/transportation/update_transportation_merge.sql | 2 +- layers/transportation_name/transportation_name.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql index 95e8574f3..dc0491f6a 100644 --- a/layers/transportation/update_transportation_merge.sql +++ b/layers/transportation/update_transportation_merge.sql @@ -354,7 +354,7 @@ BEGIN -- Allow trunk roads that are part of a nation's most important route network to show at z4 OR highway = 'trunk' AND network <> '' AND - network IN ('ca-transcanada','us-interstate') + network IN ('ca-transcanada','ca-provincial-arterial','us-interstate') ) AND ST_Length(geometry) > 1000; END; diff --git a/layers/transportation_name/transportation_name.yaml b/layers/transportation_name/transportation_name.yaml index 790fc421b..b08f1193a 100644 --- a/layers/transportation_name/transportation_name.yaml +++ b/layers/transportation_name/transportation_name.yaml @@ -28,6 +28,8 @@ layer: - us-highway - us-state - ca-transcanada + - ca-provincial-arterial + - ca-provincial - gb-motorway - gb-trunk - road (default) From 848e917865407e43291738937b6c0bb99354b3a1 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Tue, 22 Nov 2022 12:26:42 -0500 Subject: [PATCH 3/9] Fix zoom ordering --- .../update_transportation_merge.sql | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql index 95e8574f3..9f048a46c 100644 --- a/layers/transportation/update_transportation_merge.sql +++ b/layers/transportation/update_transportation_merge.sql @@ -327,7 +327,14 @@ BEGIN FROM osm_transportation_merge_linestring_gen_z6 WHERE (update_id IS NULL OR id = update_id) AND - -- Current view: motorway/trunk + -- Current view: all motorways and trunks of national-importance + (highway = 'motorway' + OR construction = 'motorway' + -- Allow trunk roads that are part of a nation's most important route network to show at z4 + OR highway = 'trunk' AND + network <> '' AND + network IN ('ca-transcanada','us-interstate') + ) AND ST_Length(geometry) > 500; DELETE FROM osm_transportation_merge_linestring_gen_z4 @@ -349,13 +356,8 @@ BEGIN FROM osm_transportation_merge_linestring_gen_z5 WHERE (update_id IS NULL OR id = update_id) AND - (highway = 'motorway' - OR construction = 'motorway' - -- Allow trunk roads that are part of a nation's most important route network to show at z4 - OR highway = 'trunk' AND - network <> '' AND - network IN ('ca-transcanada','us-interstate') - ) AND + -- Current view: national-importance motorways and trunks + network IN ('ca-transcanada','us-interstate') AND ST_Length(geometry) > 1000; END; $$ LANGUAGE plpgsql; From 7ef49ec3f535a4d11a4fd51322328591eb96e240 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Mon, 28 Nov 2022 10:50:40 -0500 Subject: [PATCH 4/9] Revert accidently style change --- layers/transportation_name/style.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layers/transportation_name/style.json b/layers/transportation_name/style.json index 4bb027ee6..e280f680a 100644 --- a/layers/transportation_name/style.json +++ b/layers/transportation_name/style.json @@ -34,7 +34,7 @@ "ferry" ] ], - "order": 119 + "order": 175 }, { "id": "road_label", @@ -81,7 +81,7 @@ "ferry" ] ], - "order": 120 + "order": 176 }, { "id": "highway-shield-tertiary", @@ -160,7 +160,7 @@ "ref" ] ], - "order": 121 + "order": 177 }, { "id": "highway-shield-secondary", @@ -239,7 +239,7 @@ "ref" ] ], - "order": 122 + "order": 178 }, { "id": "highway-shield-primary", @@ -318,7 +318,7 @@ "ref" ] ], - "order": 123 + "order": 179 }, { "id": "highway-shield-motorway", @@ -400,7 +400,7 @@ "ref" ] ], - "order": 124 + "order": 180 } ] } \ No newline at end of file From c07062619b7ea9a92d9bf429e62e61925780624c Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Mon, 28 Nov 2022 21:24:44 -0500 Subject: [PATCH 5/9] Fix route relation naming --- layers/transportation/network_type.sql | 11 +++++++++++ layers/transportation/update_route_member.sql | 2 +- layers/transportation/update_transportation_merge.sql | 7 ++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/layers/transportation/network_type.sql b/layers/transportation/network_type.sql index efa79fda3..7e384a37d 100644 --- a/layers/transportation/network_type.sql +++ b/layers/transportation/network_type.sql @@ -21,6 +21,17 @@ $$ END $$; +-- Top-level national route networks that should display at the lowest zooms +CREATE OR REPLACE FUNCTION osm_national_network(network text) RETURNS boolean AS +$$ + SELECT network <> '' AND network IN ( + -- Canada + 'ca-transcanada', 'ca-provincial-arterial', + -- United States + 'us-interstate'); +$$ LANGUAGE sql IMMUTABLE + PARALLEL SAFE; + DO $$ BEGIN diff --git a/layers/transportation/update_route_member.sql b/layers/transportation/update_route_member.sql index 891e47d22..604f7528b 100644 --- a/layers/transportation/update_route_member.sql +++ b/layers/transportation/update_route_member.sql @@ -40,7 +40,7 @@ SELECT CASE WHEN network = 'CA:MB:PTH' AND ref = '75' THEN 'ca-provincial-arterial'::route_network_type WHEN network = 'CA:AB' AND ref IN ('2','3','4') THEN 'ca-provincial-arterial'::route_network_type WHEN network = 'CA:BC' AND ref IN ('3','5','99') THEN 'ca-provincial-arterial'::route_network_type - WHEN network LIKE 'CA:__:%' THEN 'ca-provincial'::route_network_type + WHEN network LIKE 'CA:__' OR network LIKE 'CA:__:%' THEN 'ca-provincial'::route_network_type WHEN network = 'omt-gb-motorway' THEN 'gb-motorway'::route_network_type WHEN network = 'omt-gb-trunk' THEN 'gb-trunk'::route_network_type END; diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql index 694e9d033..59a8e4ce5 100644 --- a/layers/transportation/update_transportation_merge.sql +++ b/layers/transportation/update_transportation_merge.sql @@ -331,9 +331,7 @@ BEGIN (highway = 'motorway' OR construction = 'motorway' -- Allow trunk roads that are part of a nation's most important route network to show at z4 - OR highway = 'trunk' AND - network <> '' AND - network IN ('ca-transcanada','ca-provincial-arterial','us-interstate') + OR (highway = 'trunk' AND osm_national_network(network)) ) AND ST_Length(geometry) > 500; @@ -355,9 +353,8 @@ BEGIN z_order FROM osm_transportation_merge_linestring_gen_z5 WHERE - (update_id IS NULL OR id = update_id) AND + (update_id IS NULL OR id = update_id) AND osm_national_network(network) AND -- Current view: national-importance motorways and trunks - network IN ('ca-transcanada','ca-provincial-arterial','us-interstate') AND ST_Length(geometry) > 1000; END; $$ LANGUAGE plpgsql; From e3c2f5fd23ad93bcafcb758d753bb0f8b7889f00 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Mon, 28 Nov 2022 21:42:16 -0500 Subject: [PATCH 6/9] Revert unintended style.json change --- layers/transportation/style.json | 222 +++++++++++++++---------------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/layers/transportation/style.json b/layers/transportation/style.json index b11fb97d5..c5be85154 100644 --- a/layers/transportation/style.json +++ b/layers/transportation/style.json @@ -37,7 +37,7 @@ "ferry" ] ], - "order": 3 + "order": 24 }, { "id": "tunnel_motorway_link_casing", @@ -115,7 +115,7 @@ "tunnel" ] ], - "order": 4 + "order": 28 }, { "id": "tunnel_service_track_casing", @@ -165,7 +165,7 @@ "track" ] ], - "order": 5 + "order": 29 }, { "id": "tunnel_link_casing", @@ -220,7 +220,7 @@ 0 ] ], - "order": 6 + "order": 30 }, { "id": "tunnel_street_casing", @@ -282,7 +282,7 @@ "street_limited" ] ], - "order": 7 + "order": 31 }, { "id": "tunnel_tertiary_casing", @@ -353,7 +353,7 @@ "tertiary" ] ], - "order": 8 + "order": 32 }, { "id": "tunnel_secondary_casing", @@ -424,7 +424,7 @@ "secondary" ] ], - "order": 9 + "order": 33 }, { "id": "tunnel_trunk_casing", @@ -497,7 +497,7 @@ "trunk" ] ], - "order": 10 + "order": 34 }, { "id": "tunnel_trunk_construction_casing", @@ -559,7 +559,7 @@ "trunk_construction" ] ], - "order": 11 + "order": 35 }, { "id": "tunnel_primary_casing", @@ -632,7 +632,7 @@ "primary" ] ], - "order": 12 + "order": 36 }, { "id": "tunnel_motorway_construction_casing", @@ -692,7 +692,7 @@ "tunnel" ] ], - "order": 13 + "order": 37 }, { "id": "tunnel_motorway_casing", @@ -752,7 +752,7 @@ "tunnel" ] ], - "order": 14 + "order": 38 }, { "id": "tunnel_path_pedestrian", @@ -802,7 +802,7 @@ "pedestrian" ] ], - "order": 15 + "order": 39 }, { "id": "tunnel_motorway_link", @@ -878,7 +878,7 @@ "tunnel" ] ], - "order": 16 + "order": 40 }, { "id": "tunnel_service_track", @@ -933,7 +933,7 @@ "track" ] ], - "order": 17 + "order": 41 }, { "id": "tunnel_service_track_construction", @@ -992,7 +992,7 @@ "track_construction" ] ], - "order": 18 + "order": 42 }, { "id": "tunnel_link", @@ -1046,7 +1046,7 @@ 0 ] ], - "order": 19 + "order": 43 }, { "id": "tunnel_minor", @@ -1092,7 +1092,7 @@ "minor" ] ], - "order": 20 + "order": 44 }, { "id": "tunnel_minor_construction", @@ -1142,7 +1142,7 @@ "minor_construction" ] ], - "order": 21 + "order": 45 }, { "id": "tunnel_tertiary", @@ -1207,7 +1207,7 @@ "tertiary" ] ], - "order": 22 + "order": 46 }, { "id": "tunnel_tertiary_construction", @@ -1276,7 +1276,7 @@ "tertiary_construction" ] ], - "order": 23 + "order": 47 }, { "id": "tunnel_secondary", @@ -1354,7 +1354,7 @@ "secondary" ] ], - "order": 24 + "order": 48 }, { "id": "tunnel_secondary_construction", @@ -1436,7 +1436,7 @@ "secondary_construction" ] ], - "order": 25 + "order": 49 }, { "id": "tunnel_primary", @@ -1519,7 +1519,7 @@ "primary" ] ], - "order": 26 + "order": 50 }, { "id": "tunnel_primary_construction", @@ -1606,7 +1606,7 @@ "primary_construction" ] ], - "order": 27 + "order": 51 }, { "id": "tunnel_trunk", @@ -1699,7 +1699,7 @@ "trunk" ] ], - "order": 28 + "order": 52 }, { "id": "tunnel_trunk_construction", @@ -1785,7 +1785,7 @@ "trunk_construction" ] ], - "order": 29 + "order": 53 }, { "id": "tunnel_motorway", @@ -1841,7 +1841,7 @@ "tunnel" ] ], - "order": 30 + "order": 54 }, { "id": "tunnel_motorway_construction", @@ -1901,7 +1901,7 @@ "tunnel" ] ], - "order": 31 + "order": 55 }, { "id": "tunnel_major_rail", @@ -1945,7 +1945,7 @@ "rail" ] ], - "order": 32 + "order": 56 }, { "id": "tunnel_major_rail_hatching", @@ -2006,7 +2006,7 @@ "rail" ] ], - "order": 33 + "order": 57 }, { "id": "road_area_pier", @@ -2034,7 +2034,7 @@ "pier" ] ], - "order": 34 + "order": 58 }, { "id": "road_pier", @@ -2075,7 +2075,7 @@ "pier" ] ], - "order": 35 + "order": 59 }, { "id": "road_area_bridge", @@ -2104,7 +2104,7 @@ "bridge" ] ], - "order": 36 + "order": 60 }, { "id": "road_area_platform", @@ -2140,7 +2140,7 @@ "platform" ] ], - "order": 37 + "order": 61 }, { "id": "road_area_pedestrian", @@ -2172,7 +2172,7 @@ "pier" ] ], - "order": 38 + "order": 62 }, { "id": "road_service_track_casing", @@ -2232,7 +2232,7 @@ "track" ] ], - "order": 39 + "order": 63 }, { "id": "road_primary_link_casing", @@ -2312,7 +2312,7 @@ "primary" ] ], - "order": 40 + "order": 64 }, { "id": "road_trunk_link_casing", @@ -2388,7 +2388,7 @@ "trunk" ] ], - "order": 41 + "order": 65 }, { "id": "road_motorway_link_casing", @@ -2469,7 +2469,7 @@ 1 ] ], - "order": 42 + "order": 66 }, { "id": "road_minor_casing", @@ -2551,7 +2551,7 @@ "1" ] ], - "order": 43 + "order": 67 }, { "id": "road_tertiary_casing", @@ -2625,7 +2625,7 @@ 1 ] ], - "order": 44 + "order": 68 }, { "id": "road_secondary_link_casing", @@ -2710,7 +2710,7 @@ 1 ] ], - "order": 45 + "order": 69 }, { "id": "road_secondary_casing", @@ -2795,7 +2795,7 @@ 1 ] ], - "order": 46 + "order": 70 }, { "id": "road_trunk_casing", @@ -2885,7 +2885,7 @@ 1 ] ], - "order": 47 + "order": 71 }, { "id": "road_primary_casing", @@ -2975,7 +2975,7 @@ 1 ] ], - "order": 48 + "order": 72 }, { "id": "road_motorway_casing", @@ -3039,7 +3039,7 @@ 1 ] ], - "order": 49 + "order": 73 }, { "id": "road_pedestrian_casing", @@ -3103,7 +3103,7 @@ "tunnel" ] ], - "order": 50 + "order": 74 }, { "id": "road_pedestrian", @@ -3167,7 +3167,7 @@ "tunnel" ] ], - "order": 51 + "order": 75 }, { "id": "road_path_cycleway_casing", @@ -3229,7 +3229,7 @@ "cycleway" ] ], - "order": 52 + "order": 76 }, { "id": "road_path_footway_casing", @@ -3291,7 +3291,7 @@ "path" ] ], - "order": 53 + "order": 77 }, { "id": "road_path_cycleway", @@ -3356,7 +3356,7 @@ "cycleway" ] ], - "order": 54 + "order": 78 }, { "id": "road_path_footway", @@ -3426,7 +3426,7 @@ "path" ] ], - "order": 55 + "order": 79 }, { "id": "road_primary_link", @@ -3494,7 +3494,7 @@ "primary" ] ], - "order": 56 + "order": 80 }, { "id": "road_trunk_link", @@ -3570,7 +3570,7 @@ "trunk" ] ], - "order": 57 + "order": 81 }, { "id": "road_motorway_link", @@ -3654,7 +3654,7 @@ 1 ] ], - "order": 58 + "order": 82 }, { "id": "road_service_track", @@ -3719,7 +3719,7 @@ "track" ] ], - "order": 59 + "order": 83 }, { "id": "road_service_track_construction", @@ -3788,7 +3788,7 @@ "track_construction" ] ], - "order": 60 + "order": 84 }, { "id": "road_raceway", @@ -3850,7 +3850,7 @@ "raceway" ] ], - "order": 61 + "order": 85 }, { "id": "road_minor", @@ -3950,7 +3950,7 @@ ] ] ], - "order": 62 + "order": 86 }, { "id": "road_minor_construction", @@ -4054,7 +4054,7 @@ ] ] ], - "order": 63 + "order": 87 }, { "id": "road_secondary", @@ -4145,7 +4145,7 @@ "secondary" ] ], - "order": 64 + "order": 88 }, { "id": "road_tertiary", @@ -4232,7 +4232,7 @@ "tertiary" ] ], - "order": 65 + "order": 89 }, { "id": "road_tertiary_construction", @@ -4319,7 +4319,7 @@ "tertiary_construction" ] ], - "order": 66 + "order": 90 }, { "id": "road_secondary_construction", @@ -4414,7 +4414,7 @@ "secondary_construction" ] ], - "order": 67 + "order": 91 }, { "id": "road_primary_construction", @@ -4510,7 +4510,7 @@ "primary_construction" ] ], - "order": 68 + "order": 92 }, { "id": "road_primary", @@ -4606,7 +4606,7 @@ "primary" ] ], - "order": 69 + "order": 93 }, { "id": "road_trunk", @@ -4702,7 +4702,7 @@ "trunk" ] ], - "order": 70 + "order": 94 }, { "id": "road_trunk_construction", @@ -4802,7 +4802,7 @@ "trunk_construction" ] ], - "order": 71 + "order": 95 }, { "id": "road_motorway", @@ -4866,7 +4866,7 @@ 1 ] ], - "order": 72 + "order": 96 }, { "id": "road_motorway_construction", @@ -4935,7 +4935,7 @@ 1 ] ], - "order": 73 + "order": 97 }, { "id": "rail_subway", @@ -4979,7 +4979,7 @@ "subway" ] ], - "order": 74 + "order": 98 }, { "id": "rail_major", @@ -5039,7 +5039,7 @@ "rail" ] ], - "order": 75 + "order": 99 }, { "id": "rail_minor", @@ -5085,7 +5085,7 @@ "light_rail" ] ], - "order": 76 + "order": 100 }, { "id": "rail_major_hatching", @@ -5146,7 +5146,7 @@ "rail" ] ], - "order": 77 + "order": 101 }, { "id": "rail_minor_hatching", @@ -5196,7 +5196,7 @@ "light_rail" ] ], - "order": 78 + "order": 102 }, { "id": "bridge_motorway_link_casing", @@ -5262,7 +5262,7 @@ "bridge" ] ], - "order": 79 + "order": 105 }, { "id": "bridge_service_track_casing", @@ -5307,7 +5307,7 @@ "track" ] ], - "order": 80 + "order": 106 }, { "id": "bridge_link_casing", @@ -5356,7 +5356,7 @@ "bridge" ] ], - "order": 81 + "order": 107 }, { "id": "bridge_street_casing", @@ -5417,7 +5417,7 @@ "street_limited" ] ], - "order": 82 + "order": 108 }, { "id": "bridge_path_cycleway_casing", @@ -5485,7 +5485,7 @@ "cycleway" ] ], - "order": 83 + "order": 109 }, { "id": "bridge_path_footway_casing", @@ -5553,7 +5553,7 @@ "footway" ] ], - "order": 84 + "order": 110 }, { "id": "bridge_secondary_casing", @@ -5616,7 +5616,7 @@ "tertiary" ] ], - "order": 85 + "order": 111 }, { "id": "bridge_tertiary_casing", @@ -5658,7 +5658,7 @@ "tertiary" ] ], - "order": 86 + "order": 112 }, { "id": "bridge_trunk_casing", @@ -5726,7 +5726,7 @@ "trunk" ] ], - "order": 87 + "order": 113 }, { "id": "bridge_primary_casing", @@ -5783,7 +5783,7 @@ "primary" ] ], - "order": 88 + "order": 114 }, { "id": "bridge_motorway_casing", @@ -5833,7 +5833,7 @@ 1 ] ], - "order": 89 + "order": 115 }, { "id": "bridge_path_cycleway", @@ -5897,7 +5897,7 @@ "cycleway" ] ], - "order": 90 + "order": 116 }, { "id": "bridge_path_footway", @@ -5961,7 +5961,7 @@ "footway" ] ], - "order": 91 + "order": 117 }, { "id": "bridge_motorway_link", @@ -6026,7 +6026,7 @@ "bridge" ] ], - "order": 92 + "order": 118 }, { "id": "bridge_service_track", @@ -6072,7 +6072,7 @@ "track" ] ], - "order": 93 + "order": 119 }, { "id": "bridge_service_track_construction", @@ -6122,7 +6122,7 @@ "track_construction" ] ], - "order": 94 + "order": 120 }, { "id": "bridge_link", @@ -6171,7 +6171,7 @@ "bridge" ] ], - "order": 95 + "order": 121 }, { "id": "bridge_minor", @@ -6216,7 +6216,7 @@ "minor" ] ], - "order": 96 + "order": 122 }, { "id": "bridge_minor_construction", @@ -6266,7 +6266,7 @@ "minor_construction" ] ], - "order": 97 + "order": 123 }, { "id": "bridge_tertiary", @@ -6332,7 +6332,7 @@ "tertiary" ] ], - "order": 98 + "order": 124 }, { "id": "bridge_secondary", @@ -6402,7 +6402,7 @@ "secondary" ] ], - "order": 99 + "order": 125 }, { "id": "bridge_secondary_construction-copy", @@ -6450,7 +6450,7 @@ "secondary_construction" ] ], - "order": 100 + "order": 126 }, { "id": "bridge_tertiary_construction", @@ -6498,7 +6498,7 @@ "tertiary_construction" ] ], - "order": 101 + "order": 127 }, { "id": "bridge_primary", @@ -6563,7 +6563,7 @@ "primary" ] ], - "order": 102 + "order": 128 }, { "id": "bridge_trunk", @@ -6624,7 +6624,7 @@ "trunk" ] ], - "order": 103 + "order": 129 }, { "id": "bridge_trunk_primary_construction", @@ -6674,7 +6674,7 @@ "trunk_construction" ] ], - "order": 104 + "order": 130 }, { "id": "bridge_motorway", @@ -6734,7 +6734,7 @@ 1 ] ], - "order": 105 + "order": 131 }, { "id": "bridge_motorway_construction", @@ -6798,7 +6798,7 @@ 1 ] ], - "order": 106 + "order": 132 }, { "id": "bridge_major_rail", @@ -6857,7 +6857,7 @@ "rail" ] ], - "order": 107 + "order": 133 }, { "id": "bridge_major_rail_hatching", @@ -6917,7 +6917,7 @@ "rail" ] ], - "order": 108 + "order": 134 }, { "id": "cablecar", @@ -6950,7 +6950,7 @@ "class", "aerialway" ], - "order": 109 + "order": 135 }, { "id": "cablecar-dash", @@ -6987,7 +6987,7 @@ "class", "aerialway" ], - "order": 110 + "order": 136 }, { "id": "road_path-cycleway_oneway", @@ -7036,7 +7036,7 @@ "cycleway" ] ], - "order": 116 + "order": 172 }, { "id": "road_oneway", @@ -7086,7 +7086,7 @@ "service" ] ], - "order": 117 + "order": 173 }, { "id": "road_oneway_opposite", @@ -7137,7 +7137,7 @@ "service" ] ], - "order": 118 + "order": 174 } ] } \ No newline at end of file From 10382b8d6f234a0f0b03a1a8d0255ad378ebdedf Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Mon, 28 Nov 2022 21:43:36 -0500 Subject: [PATCH 7/9] Reformat --- layers/transportation/update_transportation_merge.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql index 59a8e4ce5..11fc614bd 100644 --- a/layers/transportation/update_transportation_merge.sql +++ b/layers/transportation/update_transportation_merge.sql @@ -353,7 +353,8 @@ BEGIN z_order FROM osm_transportation_merge_linestring_gen_z5 WHERE - (update_id IS NULL OR id = update_id) AND osm_national_network(network) AND + (update_id IS NULL OR id = update_id) AND + osm_national_network(network) AND -- Current view: national-importance motorways and trunks ST_Length(geometry) > 1000; END; From 785d537cba8cf32351e3f62cc9770287bfd6f3cf Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Mon, 28 Nov 2022 21:45:01 -0500 Subject: [PATCH 8/9] Reformat --- layers/transportation/update_transportation_merge.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql index 11fc614bd..dcf12a50d 100644 --- a/layers/transportation/update_transportation_merge.sql +++ b/layers/transportation/update_transportation_merge.sql @@ -353,7 +353,7 @@ BEGIN z_order FROM osm_transportation_merge_linestring_gen_z5 WHERE - (update_id IS NULL OR id = update_id) AND + (update_id IS NULL OR id = update_id) AND osm_national_network(network) AND -- Current view: national-importance motorways and trunks ST_Length(geometry) > 1000; From 73ab2e1ac37c45b1e79508b0b622e4c43b9d665e Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Mon, 28 Nov 2022 22:45:40 -0500 Subject: [PATCH 9/9] Fix Alberta top-level networks --- 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 604f7528b..de73c2a1e 100644 --- a/layers/transportation/update_route_member.sql +++ b/layers/transportation/update_route_member.sql @@ -38,7 +38,7 @@ SELECT CASE ELSE 'ca-provincial-arterial'::route_network_type END WHEN network = 'CA:MB:PTH' AND ref = '75' THEN 'ca-provincial-arterial'::route_network_type - WHEN network = 'CA:AB' AND ref IN ('2','3','4') THEN 'ca-provincial-arterial'::route_network_type + WHEN network = 'CA:AB:primary' AND ref IN ('2','3','4') THEN 'ca-provincial-arterial'::route_network_type WHEN network = 'CA:BC' AND ref IN ('3','5','99') THEN 'ca-provincial-arterial'::route_network_type WHEN network LIKE 'CA:__' OR network LIKE 'CA:__:%' THEN 'ca-provincial'::route_network_type WHEN network = 'omt-gb-motorway' THEN 'gb-motorway'::route_network_type