Merge remote-tracking branch 'github/master' into merge-gh-2025

# Conflicts: # layers/boundary/mapping.yaml # layers/mountain_peak/style.json # layers/place/style.json # layers/poi/poi.yaml
2025-06-10 21:05:25 +02:00
parent c38c7af17d f70ae783b2
commit 592e7f3c39
84 changed files with 1714 additions and 874 deletions
--- a/layers/place/area_rank.sql
+++ b/layers/place/area_rank.sql
@@ -0,0 +1,14 @@
+CREATE OR REPLACE FUNCTION area_rank(area real) RETURNS int AS
+$$
+SELECT CASE
+           WHEN area > 640000000 THEN 1
+           WHEN area > 160000000 THEN 2
+           WHEN area > 40000000 THEN 3
+           WHEN area > 15000000 THEN 4
+           WHEN area > 10000000 THEN 5
+           WHEN area > 0 THEN 6
+           ELSE 7
+           END;
+$$ LANGUAGE SQL IMMUTABLE
+                STRICT
+                PARALLEL SAFE;
--- a/layers/place/etl_diagram.png
+++ b/layers/place/etl_diagram.png
--- a/layers/place/island_rank.sql
+++ b/layers/place/island_rank.sql
@@ -1,12 +0,0 @@
-CREATE OR REPLACE FUNCTION island_rank(area real) RETURNS int AS
-$$
-SELECT CASE
-           WHEN area < 10000000 THEN 6
-           WHEN area BETWEEN 1000000 AND 15000000 THEN 5
-           WHEN area BETWEEN 15000000 AND 40000000 THEN 4
-           WHEN area > 40000000 THEN 3
-           ELSE 7
-           END;
-$$ LANGUAGE SQL IMMUTABLE
-                STRICT
-                PARALLEL SAFE;
--- a/layers/place/place.sql
+++ b/layers/place/place.sql
@@ -109,17 +109,39 @@ FROM (
             COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
             tags,
             'island' AS class,
-             island_rank(area) AS "rank",
+             area_rank(area) AS "rank",
             NULL::int AS capital,
             NULL::text AS iso_a2
         FROM osm_island_polygon
         WHERE geometry && bbox
-           AND ((zoom_level = 8 AND island_rank(area) <= 3)
-             OR (zoom_level = 9 AND island_rank(area) <= 4)
+           AND ((zoom_level = 8 AND area_rank(area) <= 3)
+             OR (zoom_level = 9 AND area_rank(area) <= 4)
             OR (zoom_level >= 10))

         UNION ALL

+         SELECT
+             -- etldoc: osm_boundary_polygon  -> layer_place:z6_11
+             -- etldoc: osm_boundary_polygon  -> layer_place:z12_14
+             osm_id * 10 AS osm_id,
+             geometry_point,
+             name,
+             NULL::text AS name_en, -- deprecated
+             NULL::text AS name_de, -- deprecated
+             tags,
+             'aboriginal_lands' AS class,
+             area_rank(area) AS "rank",
+             NULL::int AS capital,
+             NULL::text AS iso_a2
+         FROM osm_boundary_polygon
+         WHERE geometry_point && bbox
+           AND ((zoom_level = 6 AND area_rank(area) <= 1)
+             OR (zoom_level = 7 AND area_rank(area) <= 2)
+             OR (zoom_level = 8 AND area_rank(area) <= 3)
+             OR (zoom_level = 9 AND area_rank(area) <= 4)
+             OR (zoom_level >= 10))
+         UNION ALL
+
         SELECT
             -- etldoc: layer_city          -> layer_place:z0_3
             -- etldoc: layer_city          -> layer_place:z4_7
--- a/layers/place/place.yaml
+++ b/layers/place/place.yaml
@@ -5,6 +5,8 @@ layer:
      - ne_10m_admin_1_states_provinces
      - ne_10m_admin_0_countries
      - ne_10m_populated_places
+    layers:
+      - boundary
  description: |
      The place layer consists out of [countries](http://wiki.openstreetmap.org/wiki/Tag:place%3Dcountry),
      [states](http://wiki.openstreetmap.org/wiki/Tag:place%3Dstate), [cities](http://wiki.openstreetmap.org/wiki/Key:place)
@@ -12,9 +14,9 @@ layer:
      Apart from the roads this is also one of the more important layers to create a beautiful map.
      We suggest you use different font styles and sizes to create a text hierarchy.
  fields:
-    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the POI.
-    name_en: English name `name:en` if available, otherwise `name`.
-    name_de: German name `name:de` if available, otherwise `name` or `name:en`.
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the place. Language-specific values are in `name:xx`.
+    name_en: English name `name:en` if available, otherwise `name`. This is deprecated and will be removed in a future release in favor of `name:en`.
+    name_de: German name `name:de` if available, otherwise `name` or `name:en`. This is deprecated and will be removed in a future release in favor of `name:de`.
    capital:
      description: |
          The **capital** field marks the
@@ -28,7 +30,9 @@ layer:
          Distinguish between continents, countries, states, islands and
          places like settlements or smaller entities.
          Use **class** to separately style the different places and build
-          a text hierarchy according to their importance.
+          a text hierarchy according to their importance. For places derived 
+          from boundaries, the original value of the 
+          [`boundary`](http://wiki.openstreetmap.org/wiki/Key:boundary) tag.
      values:
      - continent
      - country
@@ -44,6 +48,7 @@ layer:
      - neighbourhood
      - isolated_dwelling
      - island
+      - aboriginal_lands
    iso_a2:
      description: |
          Two-letter country code [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). Available only for `class=country`.
@@ -75,7 +80,7 @@ schema:
  - ./types.sql
  - ./capital.sql
  - ./city.sql
-  - ./island_rank.sql
+  - ./area_rank.sql
  - ./update_continent_point.sql
  - ./update_country_point.sql
  - ./update_island_polygon.sql
--- a/layers/place/style.json
+++ b/layers/place/style.json
@@ -129,7 +129,7 @@
          "village"
        ]
      ],
-      "order": 193
+      "order": 199
    },
    {
      "id": "place_town",
@@ -177,7 +177,7 @@
          "town"
        ]
      ],
-      "order": 194
+      "order": 200
    },
    {
      "id": "place_state",
@@ -228,7 +228,7 @@
          3
        ]
      ],
-      "order": 195
+      "order": 201
    },
    {
      "id": "place_city",
@@ -311,7 +311,7 @@
          1
        ]
      ],
-      "order": 196
+      "order": 202
    },
    {
      "id": "place_capital",
@@ -396,7 +396,7 @@
          2
        ]
      ],
-      "order": 197
+      "order": 203
    },
    {
      "id": "country_other",
@@ -449,7 +449,7 @@
          "iso_a2"
        ]
      ],
-      "order": 198
+      "order": 204
    },
    {
      "id": "country_3",
@@ -518,7 +518,7 @@
          "iso_a2"
        ]
      ],
-      "order": 199
+      "order": 205
    },
    {
      "id": "country_2",
@@ -587,7 +587,7 @@
          "iso_a2"
        ]
      ],
-      "order": 200
+      "order": 206
    },
    {
      "id": "country_1",
@@ -656,7 +656,7 @@
          "iso_a2"
        ]
      ],
-      "order": 201
+      "order": 207
    }
  ]
 }
--- a/layers/place/update_city_point.sql
+++ b/layers/place/update_city_point.sql
@@ -49,8 +49,6 @@ $$ LANGUAGE SQL;

 SELECT update_osm_city_point(true);

-CREATE INDEX IF NOT EXISTS osm_city_point_rank_idx ON osm_city_point ("rank");
-
 -- Handle updates

 CREATE OR REPLACE FUNCTION place_city.store() RETURNS trigger AS
@@ -101,12 +99,14 @@ CREATE TRIGGER trigger_store
    AFTER INSERT OR UPDATE
    ON osm_city_point
    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_city.store();

 CREATE TRIGGER trigger_flag
    AFTER INSERT OR UPDATE
    ON osm_city_point
    FOR EACH STATEMENT
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_city.flag();

 CREATE CONSTRAINT TRIGGER trigger_refresh
--- a/layers/place/update_continent_point.sql
+++ b/layers/place/update_continent_point.sql
@@ -71,12 +71,14 @@ CREATE TRIGGER trigger_store
    AFTER INSERT OR UPDATE
    ON osm_continent_point
    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_continent_point.store();

 CREATE TRIGGER trigger_flag
    AFTER INSERT OR UPDATE
    ON osm_continent_point
    FOR EACH STATEMENT
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_continent_point.flag();

 CREATE CONSTRAINT TRIGGER trigger_refresh
--- a/layers/place/update_country_point.sql
+++ b/layers/place/update_country_point.sql
@@ -98,8 +98,6 @@ $$ LANGUAGE SQL;

 SELECT update_osm_country_point(true);

-CREATE INDEX IF NOT EXISTS osm_country_point_rank_idx ON osm_country_point ("rank");
-
 -- Handle updates

 CREATE OR REPLACE FUNCTION place_country.store() RETURNS trigger AS
@@ -150,12 +148,14 @@ CREATE TRIGGER trigger_store
    AFTER INSERT OR UPDATE
    ON osm_country_point
    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_country.store();

 CREATE TRIGGER trigger_flag
    AFTER INSERT OR UPDATE
    ON osm_country_point
    FOR EACH STATEMENT
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_country.flag();

 CREATE CONSTRAINT TRIGGER trigger_refresh
--- a/layers/place/update_island_point.sql
+++ b/layers/place/update_island_point.sql
@@ -71,12 +71,14 @@ CREATE TRIGGER trigger_store
    AFTER INSERT OR UPDATE
    ON osm_island_point
    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_island_point.store();

 CREATE TRIGGER trigger_flag
    AFTER INSERT OR UPDATE
    ON osm_island_point
    FOR EACH STATEMENT
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_island_point.flag();

 CREATE CONSTRAINT TRIGGER trigger_refresh
--- a/layers/place/update_island_polygon.sql
+++ b/layers/place/update_island_polygon.sql
@@ -78,12 +78,14 @@ CREATE TRIGGER trigger_store
    AFTER INSERT OR UPDATE
    ON osm_island_polygon
    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_island_polygon.store();

 CREATE TRIGGER trigger_flag
    AFTER INSERT OR UPDATE
    ON osm_island_polygon
    FOR EACH STATEMENT
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_island_polygon.flag();

 CREATE CONSTRAINT TRIGGER trigger_refresh
--- a/layers/place/update_state_point.sql
+++ b/layers/place/update_state_point.sql
@@ -60,8 +60,6 @@ $$ LANGUAGE SQL;

 SELECT update_osm_state_point(true);

-CREATE INDEX IF NOT EXISTS osm_state_point_rank_idx ON osm_state_point ("rank");
-
 -- Handle updates

 CREATE OR REPLACE FUNCTION place_state.store() RETURNS trigger AS
@@ -112,12 +110,14 @@ CREATE TRIGGER trigger_store
    AFTER INSERT OR UPDATE
    ON osm_state_point
    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_state.store();

 CREATE TRIGGER trigger_flag
    AFTER INSERT OR UPDATE
    ON osm_state_point
    FOR EACH STATEMENT
+    WHEN (pg_trigger_depth() < 1)
 EXECUTE PROCEDURE place_state.flag();

 CREATE CONSTRAINT TRIGGER trigger_refresh