Merge 5bf2ca106f into eae7d7e1ed

- Unifying `name_de` description for `mountain_peak` layer.
- Update the version of PostGIS for `generate-sqltomvt` function.

Makefile

@@ -289,7 +289,7 @@ ifeq (,$(wildcard build/sql/run_last.sql))
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
 		'generate-sql $(TILESET_FILE) --dir ./build/sql \
 		&& generate-sqltomvt $(TILESET_FILE) \
-							 --key --gzip --postgis-ver 3.2.3 \
+							 --key --gzip --postgis-ver 3.3.4 \
 							 --function --fname=getmvt >> ./build/sql/run_last.sql'
 endif
 

layers/mountain_peak/mapping.yaml

@@ -58,3 +58,4 @@ tables:
       - ridge
       - cliff
       - arete
+      - valley

layers/mountain_peak/mountain_peak.yaml

@@ -10,7 +10,7 @@ layer:
   fields:
     name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the peak. Language-specific values are in `name:xx`.
     name_en: English name `name:en` if available, otherwise `name`. This is deprecated and will be removed in a future release in favor of `name:en`.
-    name_de: German name `name:de` if available, otherwise `name` or `name:en`.
+    name_de: German name `name:de` if available, otherwise `name` or `name:en`. This is deprecated and will be removed in a future release in favor of `name:de`.
     class:
       description: |
         Use the **class** to differentiate between natural objects.
@@ -21,6 +21,7 @@ layer:
       - ridge
       - cliff
       - arete
+      - valley
     ele: Elevation (`ele`) in meters.
     ele_ft: Elevation (`ele`) in feet.
     customary_ft:

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
@@ -110,35 +106,6 @@ BEGIN
     USING transportation_name.network_changes c
     WHERE c.is_old IS TRUE AND transportation_route_member_coalesced.member = c.osm_id;
 
-    -- Create GBR/IRE relations (so we can use it in the same way as other relations)
-    -- etldoc:  gbr_route_members_view ->  transportation_route_member_coalesced
-    INSERT INTO transportation_route_member_coalesced (member, network, ref, network_type, concurrency_index, osm_id)
-    SELECT member, network, coalesce(ref, '') AS ref,
-           osm_route_member_network_type(network, coalesce(ref, '')) AS network_type,
-           1 AS concurrency_index, 0 AS osm_id
-    FROM gbr_route_members_view
-    WHERE full_update OR EXISTS(
-        SELECT NULL
-        FROM transportation_name.network_changes c
-        WHERE c.is_old IS FALSE AND c.osm_id = gbr_route_members_view.member
-    )
-    GROUP BY member, network, coalesce(ref, '')
-    ON CONFLICT (member, network, ref) DO NOTHING;
-
-    -- etldoc:  ire_route_members_view ->  transportation_route_member_coalesced
-    INSERT INTO transportation_route_member_coalesced (member, network, ref, network_type, concurrency_index, osm_id)
-    SELECT member, network, coalesce(ref, '') AS ref,
-           osm_route_member_network_type(network, coalesce(ref, '')) AS network_type,
-           1 AS concurrency_index, 0 AS osm_id
-    FROM ire_route_members_view
-    WHERE full_update OR EXISTS(
-        SELECT NULL
-        FROM transportation_name.network_changes c
-        WHERE c.is_old IS FALSE AND c.osm_id = ire_route_members_view.member
-    )
-    GROUP BY member, network, coalesce(ref, '')
-    ON CONFLICT (member, network, ref) DO NOTHING;
-
     -- etldoc: osm_route_member ->  transportation_route_member_coalesced
     INSERT INTO transportation_route_member_coalesced
     SELECT
@@ -155,11 +122,13 @@ BEGIN
       END AS rank
     FROM (
         -- etldoc:  osm_route_member ->  osm_route_member
+        -- etldoc:  gbr_route_members_view ->  osm_route_member
+        -- etldoc:  ire_route_members_view ->  osm_route_member
         -- see http://wiki.openstreetmap.org/wiki/Relation:route#Road_routes
-        SELECT DISTINCT ON (member, COALESCE(network, ''), COALESCE(ref, ''))
-            member,
-            COALESCE(network, '') AS network,
-            COALESCE(ref, '') AS ref,
+        SELECT DISTINCT ON (member, COALESCE(rel.network, ''), COALESCE(rel.ref, ''))
+            rel.member,
+            COALESCE(NULLIF(rel.network,''), gb_way.network, ir_way.network, '') AS network,
+            COALESCE(rel.ref, '') AS ref,
             osm_id,
             role,
             type,
@@ -167,11 +136,13 @@ BEGIN
             osmc_symbol,
             colour,
             ref_colour
-        FROM osm_route_member
+        FROM osm_route_member rel
+        LEFT JOIN gbr_route_members_view gb_way ON (gb_way.member=rel.member)
+        LEFT JOIN ire_route_members_view ir_way ON (ir_way.member=rel.member)
         WHERE full_update OR EXISTS(
             SELECT NULL
             FROM transportation_name.network_changes c
-            WHERE c.is_old IS FALSE AND c.osm_id = osm_route_member.member
+            WHERE c.is_old IS FALSE AND c.osm_id = rel.member
         )
     ) osm_route_member_filtered
     ON CONFLICT (member, network, ref) DO UPDATE SET osm_id = EXCLUDED.osm_id, role = EXCLUDED.role,

layers/transportation/update_transportation_merge.sql

@@ -66,7 +66,8 @@ $$ LANGUAGE SQL IMMUTABLE
 
 -- etldoc: osm_highway_linestring ->  osm_transportation_name_network
 -- etldoc: transportation_route_member_coalesced ->  osm_transportation_name_network
-CREATE TABLE IF NOT EXISTS osm_transportation_name_network AS
+DROP TABLE IF EXISTS osm_transportation_name_network;
+CREATE TABLE osm_transportation_name_network AS
 SELECT
     geometry,
     osm_id,
@@ -824,7 +825,9 @@ 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'
+        ) OR 
+        (osm_national_network(network) AND network != 'gb-trunk'
         ) AND
         -- Current view: national-importance motorways and trunks
         ST_Length(geometry) > 1000