add province, increase scalerank + labelrank (#1306)

Add `province` (next to `state`) tag into `osm_state_point`

layers/place/mapping.yaml

@@ -124,6 +124,9 @@ tables:
     - *name_de
     - name: tags
       type: hstore_tags
+    - name: place
+      key: place
+      type: string
     - name: is_in_country
       key: is_in:country
       type: string
@@ -140,6 +143,7 @@ tables:
     mapping:
       place:
       - state
+      - province
 
   # etldoc: imposm3 -> osm_city_point
   city_point:

layers/place/place.sql

@@ -70,7 +70,7 @@ FROM (
              COALESCE(NULLIF(name_en, ''), name) AS name_en,
              COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
              tags,
-             'state' AS class,
+             place::text AS class,
              "rank",
              NULL::int AS capital,
              NULL::text AS iso_a2

layers/place/place.yaml

@@ -32,6 +32,7 @@ layer:
       - continent
       - country
       - state
+      - province
       - city
       - town
       - village

layers/place/update_state_point.sql

@@ -29,8 +29,8 @@ $$
           -- because name matching is difficult
             ST_Within(osm.geometry, ne.geometry)
           -- We leave out leess important states
-          AND ne.scalerank <= 3
-          AND ne.labelrank <= 2
+          AND ne.scalerank <= 6
+          AND ne.labelrank <= 7
     )
     UPDATE osm_state_point AS osm
         -- Normalize both scalerank and labelrank into a ranking system from 1 to 6.