Improve place label density from z6 to z9

osm2vectortiles.tm2source/data.yml

@@ -634,12 +634,12 @@ Layer:
             coalesce(NULLIF(name_fr, ''), name) AS name_fr,
             coalesce(NULLIF(name_de, ''), name) AS name_de,
             coalesce(NULLIF(name_ru, ''), name) AS name_ru,
-            coalesce(NULLIF(name_zh, ''), name) AS name_zh, 
+            coalesce(NULLIF(name_zh, ''), name) AS name_zh,
             type,
             capital,
             NULL AS ldir,
             normalize_scalerank(scalerank) AS scalerank,
-            rank() OVER (PARTITION BY LabelGrid(geometry, 200 * !pixel_width!)
+            row_number() OVER (PARTITION BY LabelGrid(geometry, 85 * !pixel_width!)
                          ORDER BY scalerank ASC NULLS LAST,
                                   population DESC NULLS LAST
             ) AS localrank
@@ -676,7 +676,12 @@ Layer:
               ) AS place_label
             WHERE geometry && !bbox!
             ORDER BY population DESC NULLS LAST
-        ) AS t WHERE z(!scale_denominator!) > 7 OR localrank < 40
+        ) AS t WHERE z(!scale_denominator!) >= 10
+                  OR (z(!scale_denominator!) = 9 AND localrank < 8)
+                  OR (z(!scale_denominator!) = 8 AND localrank < 12)
+                  OR (z(!scale_denominator!) = 7 AND localrank < 12)
+                  OR (z(!scale_denominator!) = 6 AND localrank < 8)
+                  OR z(!scale_denominator!) <= 5
         ) AS data
       type: postgis
       user: osm

src/import-sql/layers/place_label.sql

@@ -37,7 +37,7 @@ CREATE OR REPLACE VIEW place_label_z8 AS (
 CREATE OR REPLACE VIEW place_label_z9 AS (
     SELECT * FROM osm_place_point
     WHERE name <> ''
-      AND type IN ('island', 'islet', 'aboriginal_lands', 'city', 'town')
+      AND type IN ('island', 'islet', 'aboriginal_lands', 'city', 'town', 'village')
 );
 
 CREATE OR REPLACE VIEW place_label_z10 AS (