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

layers/poi/class.sql

@@ -76,6 +76,8 @@ CREATE OR REPLACE FUNCTION poi_class(subclass text, mapping_key text, subtype te
     RETURNS text AS
 $$
 SELECT CASE
+           -- Special case subclass collision between office=university and amenity=university
+           WHEN mapping_key = 'amenity' AND subclass = 'university' THEN 'college'
            %%FIELD_MAPPING: class %%
            ELSE subclass
            END;