From 47cdfc2c8b5c9e33711a8b8989e095ce434ba21e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= <fred.rodrigo@gmail.com>
Date: Wed, 23 Sep 2020 10:10:59 +0200
Subject: [PATCH] Move where condition from osm_transportation_name_linestring
 to materialized view osm_transportation_name_network (fix) (#993)

On PR #991 the differential update was not updated like the main code.

Make similar change to the update code.
---
 .../update_transportation_name.sql            | 70 ++++++++++++-------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/layers/transportation_name/update_transportation_name.sql b/layers/transportation_name/update_transportation_name.sql
index e3a55b2..bf47539 100644
--- a/layers/transportation_name/update_transportation_name.sql
+++ b/layers/transportation_name/update_transportation_name.sql
@@ -250,31 +250,51 @@ BEGIN
     WHERE n.osm_id = c.osm_id;
 
     INSERT INTO osm_transportation_name_network
-    SELECT hl.geometry,
-           hl.osm_id,
-           CASE WHEN length(hl.name) > 15 THEN osml10n_street_abbrev_all(hl.name) ELSE NULLIF(hl.name, '') END AS "name",
-           CASE WHEN length(hl.name_en) > 15 THEN osml10n_street_abbrev_en(hl.name_en) ELSE NULLIF(hl.name_en, '') END AS "name_en",
-           CASE WHEN length(hl.name_de) > 15 THEN osml10n_street_abbrev_de(hl.name_de) ELSE NULLIF(hl.name_de, '') END AS "name_de",
-           slice_language_tags(hl.tags) AS tags,
-           rm.network_type,
-           CASE
-               WHEN rm.network_type IS NOT NULL AND NULLIF(rm.ref::text, '') IS NOT NULL
-                   THEN rm.ref::text
-               ELSE NULLIF(hl.ref, '')
-               END AS ref,
-           hl.highway,
-           hl.construction,
-           CASE WHEN highway IN ('footway', 'steps') THEN layer END AS layer,
-           CASE WHEN highway IN ('footway', 'steps') THEN "level" END AS "level",
-           CASE WHEN highway IN ('footway', 'steps') THEN indoor END AS indoor,
-           ROW_NUMBER() OVER (PARTITION BY hl.osm_id
-               ORDER BY rm.network_type) AS "rank",
-           hl.z_order
-    FROM osm_highway_linestring hl
-             JOIN transportation_name.network_changes AS c ON
-        hl.osm_id = c.osm_id
-             LEFT JOIN osm_route_member rm ON
-        rm.member = hl.osm_id;
+    SELECT
+        geometry,
+        osm_id,
+        name,
+        name_en,
+        name_de,
+        tags,
+        ref,
+        highway,
+        construction,
+        level,
+        layer,
+        indoor,
+        network_type,
+        z_order
+    FROM (
+        SELECT hl.geometry,
+            hl.osm_id,
+            CASE WHEN length(hl.name) > 15 THEN osml10n_street_abbrev_all(hl.name) ELSE NULLIF(hl.name, '') END AS name,
+            CASE WHEN length(hl.name_en) > 15 THEN osml10n_street_abbrev_en(hl.name_en) ELSE NULLIF(hl.name_en, '') END AS name_en,
+            CASE WHEN length(hl.name_de) > 15 THEN osml10n_street_abbrev_de(hl.name_de) ELSE NULLIF(hl.name_de, '') END AS name_de,
+            slice_language_tags(hl.tags) AS tags,
+            rm.network_type,
+            CASE
+                WHEN rm.network_type IS NOT NULL AND NULLIF(rm.ref::text, '') IS NOT NULL
+                    THEN rm.ref::text
+                ELSE NULLIF(hl.ref, '')
+                END AS ref,
+            hl.highway,
+            hl.construction,
+            CASE WHEN highway IN ('footway', 'steps') THEN layer END AS layer,
+            CASE WHEN highway IN ('footway', 'steps') THEN level END AS level,
+            CASE WHEN highway IN ('footway', 'steps') THEN indoor END AS indoor,
+            ROW_NUMBER() OVER (PARTITION BY hl.osm_id
+                ORDER BY rm.network_type) AS "rank",
+            hl.z_order
+        FROM osm_highway_linestring hl
+                JOIN transportation_name.network_changes AS c ON
+            hl.osm_id = c.osm_id
+                LEFT JOIN osm_route_member rm ON
+            rm.member = hl.osm_id
+        WHERE (hl.name <> '' OR hl.ref <> '')
+          AND NULLIF(hl.highway, '') IS NOT NULL
+    ) AS t
+    WHERE ("rank" = 1 OR "rank" IS NULL);
 
     REFRESH MATERIALIZED VIEW osm_transportation_name_linestring;
     REFRESH MATERIALIZED VIEW osm_transportation_name_linestring_gen1;