Move where condition from osm_transportation_name_linestring to mater…

…ialized view osm_transportation_name_network
openmaptiles · Sep 18, 2020 · bbaf724 · bbaf724
1 parent 550b1f8
commit bbaf724
Showing 1 changed file with 43 additions and 27 deletions.
diff --git a/layers/transportation_name/update_transportation_name.sql b/layers/transportation_name/update_transportation_name.sql
@@ -7,30 +7,49 @@
 -- etldoc: osm_highway_linestring ->  osm_transportation_name_network
 -- etldoc: osm_route_member ->  osm_transportation_name_network
 CREATE TABLE IF NOT EXISTS osm_transportation_name_network AS
-SELECT hl.geometry,
-       hl.osm_id,
-       CASE WHEN length(hl.name) > 15 THEN osml10n_street_abbrev_all(hl.name) ELSE hl.name END AS "name",
-       CASE WHEN length(hl.name_en) > 15 THEN osml10n_street_abbrev_en(hl.name_en) ELSE hl.name_en END AS "name_en",
-       CASE WHEN length(hl.name_de) > 15 THEN osml10n_street_abbrev_de(hl.name_de) ELSE hl.name_de END AS "name_de",
-       hl.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 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
-         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 hl.name END AS "name",
+        CASE WHEN length(hl.name_en) > 15 THEN osml10n_street_abbrev_en(hl.name_en) ELSE hl.name_en END AS "name_en",
+        CASE WHEN length(hl.name_de) > 15 THEN osml10n_street_abbrev_de(hl.name_de) ELSE hl.name_de END AS "name_de",
+        hl.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 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
+            LEFT JOIN osm_route_member rm ON
+        rm.member = hl.osm_id
+) AS t
+WHERE ("rank" = 1 OR "rank" IS NULL)
+  AND (name <> '' OR ref <> '')
+  AND NULLIF(highway, '') IS NOT NULL;
 CREATE INDEX IF NOT EXISTS osm_transportation_name_network_osm_id_idx ON osm_transportation_name_network (osm_id);
 CREATE INDEX IF NOT EXISTS osm_transportation_name_network_geometry_idx ON osm_transportation_name_network USING gist (geometry);
 
@@ -69,9 +88,6 @@ FROM (
                 network_type,
                 min(z_order) AS z_order
          FROM osm_transportation_name_network
-         WHERE ("rank" = 1 OR "rank" IS NULL)
-           AND (name <> '' OR ref <> '')
-           AND NULLIF(highway, '') IS NOT NULL
          GROUP BY name, name_en, name_de, ref, highway, construction, "level", layer, indoor, network_type
      ) AS highway_union
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */;