diff --git a/.env b/.env index 3d7fc1be..37165442 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ TILESET_FILE=openmaptiles.yaml # Use 3-part patch version to ignore patch updates, e.g. 5.0.0 -TOOLS_VERSION=5.3 +TOOLS_VERSION=6.0 # Make sure these values are in sync with the ones in .env-postgres file PGDATABASE=openmaptiles diff --git a/layers/aerodrome_label/etl_diagram.png b/layers/aerodrome_label/etl_diagram.png index 09630a39..c659ab4d 100644 Binary files a/layers/aerodrome_label/etl_diagram.png and b/layers/aerodrome_label/etl_diagram.png differ diff --git a/layers/aerodrome_label/mapping_diagram.png b/layers/aerodrome_label/mapping_diagram.png index cbbb8991..7596a7c3 100644 Binary files a/layers/aerodrome_label/mapping_diagram.png and b/layers/aerodrome_label/mapping_diagram.png differ diff --git a/layers/aeroway/etl_diagram.png b/layers/aeroway/etl_diagram.png index de81e544..20e76223 100644 Binary files a/layers/aeroway/etl_diagram.png and b/layers/aeroway/etl_diagram.png differ diff --git a/layers/aeroway/mapping_diagram.png b/layers/aeroway/mapping_diagram.png index e76d4d03..7536f47f 100644 Binary files a/layers/aeroway/mapping_diagram.png and b/layers/aeroway/mapping_diagram.png differ diff --git a/layers/boundary/etl_diagram.png b/layers/boundary/etl_diagram.png index c571efd8..f45adcfd 100644 Binary files a/layers/boundary/etl_diagram.png and b/layers/boundary/etl_diagram.png differ diff --git a/layers/boundary/mapping_diagram.png b/layers/boundary/mapping_diagram.png index f75cc88b..db85cc42 100644 Binary files a/layers/boundary/mapping_diagram.png and b/layers/boundary/mapping_diagram.png differ diff --git a/layers/building/etl_diagram.png b/layers/building/etl_diagram.png index 6e16c11e..097a9641 100644 Binary files a/layers/building/etl_diagram.png and b/layers/building/etl_diagram.png differ diff --git a/layers/building/mapping_diagram.png b/layers/building/mapping_diagram.png index f27e7890..64812790 100644 Binary files a/layers/building/mapping_diagram.png and b/layers/building/mapping_diagram.png differ diff --git a/layers/housenumber/etl_diagram.png b/layers/housenumber/etl_diagram.png index add427d5..d93f9718 100644 Binary files a/layers/housenumber/etl_diagram.png and b/layers/housenumber/etl_diagram.png differ diff --git a/layers/housenumber/mapping_diagram.png b/layers/housenumber/mapping_diagram.png index a30e718a..08921690 100644 Binary files a/layers/housenumber/mapping_diagram.png and b/layers/housenumber/mapping_diagram.png differ diff --git a/layers/landcover/etl_diagram.png b/layers/landcover/etl_diagram.png index 38d21c6d..03b3e191 100644 Binary files a/layers/landcover/etl_diagram.png and b/layers/landcover/etl_diagram.png differ diff --git a/layers/landcover/mapping_diagram.png b/layers/landcover/mapping_diagram.png index 4d11023e..6b34e67e 100644 Binary files a/layers/landcover/mapping_diagram.png and b/layers/landcover/mapping_diagram.png differ diff --git a/layers/landuse/etl_diagram.png b/layers/landuse/etl_diagram.png index a4dfa7cb..159adebf 100644 Binary files a/layers/landuse/etl_diagram.png and b/layers/landuse/etl_diagram.png differ diff --git a/layers/landuse/mapping_diagram.png b/layers/landuse/mapping_diagram.png index 436fb074..d530e887 100644 Binary files a/layers/landuse/mapping_diagram.png and b/layers/landuse/mapping_diagram.png differ diff --git a/layers/mountain_peak/etl_diagram.png b/layers/mountain_peak/etl_diagram.png index e37654c5..b20a9ba3 100644 Binary files a/layers/mountain_peak/etl_diagram.png and b/layers/mountain_peak/etl_diagram.png differ diff --git a/layers/mountain_peak/mapping_diagram.png b/layers/mountain_peak/mapping_diagram.png index d038aa24..9e8a3e21 100644 Binary files a/layers/mountain_peak/mapping_diagram.png and b/layers/mountain_peak/mapping_diagram.png differ diff --git a/layers/park/etl_diagram.png b/layers/park/etl_diagram.png index ad61798e..e8625192 100644 Binary files a/layers/park/etl_diagram.png and b/layers/park/etl_diagram.png differ diff --git a/layers/park/mapping_diagram.png b/layers/park/mapping_diagram.png index 936755ce..72d2edb8 100644 Binary files a/layers/park/mapping_diagram.png and b/layers/park/mapping_diagram.png differ diff --git a/layers/place/etl_diagram.png b/layers/place/etl_diagram.png index 41b8c265..de2cb08b 100644 Binary files a/layers/place/etl_diagram.png and b/layers/place/etl_diagram.png differ diff --git a/layers/place/mapping_diagram.png b/layers/place/mapping_diagram.png index 5f21377a..6203fa82 100644 Binary files a/layers/place/mapping_diagram.png and b/layers/place/mapping_diagram.png differ diff --git a/layers/poi/etl_diagram.png b/layers/poi/etl_diagram.png index bbabf808..6dd7694a 100644 Binary files a/layers/poi/etl_diagram.png and b/layers/poi/etl_diagram.png differ diff --git a/layers/poi/mapping_diagram.png b/layers/poi/mapping_diagram.png index 606666e1..1341ef01 100644 Binary files a/layers/poi/mapping_diagram.png and b/layers/poi/mapping_diagram.png differ diff --git a/layers/transportation/etl_diagram.png b/layers/transportation/etl_diagram.png index 0e497b39..edf882e0 100644 Binary files a/layers/transportation/etl_diagram.png and b/layers/transportation/etl_diagram.png differ diff --git a/layers/transportation/mapping_diagram.png b/layers/transportation/mapping_diagram.png index 4ba4a3cf..62274d8d 100644 Binary files a/layers/transportation/mapping_diagram.png and b/layers/transportation/mapping_diagram.png differ diff --git a/layers/transportation/update_route_member.sql b/layers/transportation/update_route_member.sql index 3fc181f5..96c0f2bc 100644 --- a/layers/transportation/update_route_member.sql +++ b/layers/transportation/update_route_member.sql @@ -60,15 +60,16 @@ BEGIN JOIN transportation_name.network_changes AS c ON r.osm_id = c.osm_id; - INSERT INTO osm_route_member (id, network_type, concurrency_index) + INSERT INTO osm_route_member (id, osm_id, network_type, concurrency_index) SELECT id, + osm_id, osm_route_member_network_type(network) AS network_type, DENSE_RANK() over (PARTITION BY member ORDER BY network_type, network, LENGTH(ref), ref) AS concurrency_index FROM osm_route_member rm WHERE rm.member IN (SELECT DISTINCT osm_id FROM transportation_name.network_changes) - ON CONFLICT (id) DO UPDATE SET concurrency_index = EXCLUDED.concurrency_index; + ON CONFLICT (id, osm_id) DO UPDATE SET concurrency_index = EXCLUDED.concurrency_index; END; $$ LANGUAGE plpgsql; @@ -86,12 +87,13 @@ CREATE INDEX IF NOT EXISTS osm_highway_linestring_gen_z11_osm_id_idx ON osm_high ALTER TABLE osm_route_member ADD COLUMN IF NOT EXISTS concurrency_index int; -- One-time load of concurrency indexes; updates occur via trigger -INSERT INTO osm_route_member (id, concurrency_index) +INSERT INTO osm_route_member (id, osm_id, concurrency_index) SELECT id, + osm_id, DENSE_RANK() over (PARTITION BY member ORDER BY network_type, network, LENGTH(ref), ref) AS concurrency_index FROM osm_route_member - ON CONFLICT (id) DO UPDATE SET concurrency_index = EXCLUDED.concurrency_index; + ON CONFLICT (id, osm_id) DO UPDATE SET concurrency_index = EXCLUDED.concurrency_index; UPDATE osm_highway_linestring hl SET network = rm.network_type diff --git a/layers/transportation_name/etl_diagram.png b/layers/transportation_name/etl_diagram.png index afefcedc..1d32a7af 100644 Binary files a/layers/transportation_name/etl_diagram.png and b/layers/transportation_name/etl_diagram.png differ diff --git a/layers/transportation_name/mapping_diagram.png b/layers/transportation_name/mapping_diagram.png index 4ba4a3cf..62274d8d 100644 Binary files a/layers/transportation_name/mapping_diagram.png and b/layers/transportation_name/mapping_diagram.png differ diff --git a/layers/water/etl_diagram.png b/layers/water/etl_diagram.png index 998f535e..6efbbb81 100644 Binary files a/layers/water/etl_diagram.png and b/layers/water/etl_diagram.png differ diff --git a/layers/water/mapping_diagram.png b/layers/water/mapping_diagram.png index 4d08bc09..47f499f0 100644 Binary files a/layers/water/mapping_diagram.png and b/layers/water/mapping_diagram.png differ diff --git a/layers/water_name/etl_diagram.png b/layers/water_name/etl_diagram.png index 5792d426..8308ce14 100644 Binary files a/layers/water_name/etl_diagram.png and b/layers/water_name/etl_diagram.png differ diff --git a/layers/water_name/mapping_diagram.png b/layers/water_name/mapping_diagram.png index 4b8e5a40..d1e462f3 100644 Binary files a/layers/water_name/mapping_diagram.png and b/layers/water_name/mapping_diagram.png differ diff --git a/layers/waterway/etl_diagram.png b/layers/waterway/etl_diagram.png index 76195311..680785fd 100644 Binary files a/layers/waterway/etl_diagram.png and b/layers/waterway/etl_diagram.png differ diff --git a/layers/waterway/mapping_diagram.png b/layers/waterway/mapping_diagram.png index cd6c0b36..e4e7142e 100644 Binary files a/layers/waterway/mapping_diagram.png and b/layers/waterway/mapping_diagram.png differ