Fixing addr:unit database style

kocio-pl · Sep 16, 2017 · 27f0618 · 27f0618
1 parent 664609c
commit 27f0618
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/openstreetmap-carto.style b/openstreetmap-carto.style
@@ -10,7 +10,6 @@ node,way   access       text         linear
 node,way   addr:housename      text  linear
 node,way   addr:housenumber    text  linear
 way        addr:interpolation  text  linear
-node,way   addr:unit    text         linear
 node,way   admin_level  text         linear
 node,way   aerialway    text         linear
 node,way   aeroway      text         polygon

diff --git a/project.mml b/project.mml
@@ -2168,20 +2168,20 @@ Layer:
             way,
             "addr:housenumber" AS addr_housenumber,
             "addr:housename" AS addr_housename,
-            "addr:unit" AS addr_unit,
+            tags->'addr:unit' AS addr_unit,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
-          WHERE (("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR ("addr:unit" IS NOT NULL))
+          WHERE (("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR (tags->'addr:unit' IS NOT NULL))
             AND building IS NOT NULL
         UNION ALL
         SELECT
             way,
             "addr:housenumber" AS addr_housenumber,
             "addr:housename" AS addr_housename,
-            "addr:unit" AS addr_unit,
+            tags->'addr:unit' AS addr_unit,
             NULL AS way_pixels
           FROM planet_osm_point
-          WHERE ("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR ("addr:unit" IS NOT NULL)
+          WHERE ("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR (tags->'addr:unit' IS NOT NULL)
           ORDER BY way_pixels DESC NULLS LAST
         ) AS addresses
     properties: