Refinements in POI_Ranking

layers/poi/layer.sql

@@ -54,7 +54,7 @@ SELECT osm_id_hash                                  AS osm_id,
                 subclass,
                 mapping_key,
                 subtype
-            )) END ASC
+            ), subclass) END ASC
            )::int                                   AS "rank"
 FROM (
     -- Intermediate mapping for subtype and filtering out nameless industrial/office buildings
@@ -118,9 +118,9 @@ FROM (
          FROM osm_poi_polygon
          WHERE geometry && bbox
            AND zoom_level >= 14
-     ) AS poi_union
+     ) AS poi_union_raw
     WHERE NOT (mapping_key = 'building' AND (subclass = 'office' OR subclass = 'industrial') AND coalesce(name, name_en, '') = '')
-)
+) AS poi_union
 ORDER BY "rank"
 $$ LANGUAGE SQL STABLE
                 PARALLEL SAFE;