Merge remote-tracking branch 'upstream/pull/4397'

diff --combined config/key.yml
index cdd070131e5073702be80ea3a2063d7da2af7a45,d58de2110b2c6ac588cbbd5f319a0650b3c07034..1aca2942b393e9a2d56163f3ecd82d5801da49f4
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -19,8 -19,11 +19,11 @@@ mapnik
    - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
    # landcover z5: landcover.mss, water.mss
    - { name: lake, width: 26, height: 10, fill: "#aad3df" }
+   - { name: intermittent_water, image: intermittent_water.svg }
    - { min_zoom: 5, max_zoom: 9, name: glacier, image: glacier5.svg }
    - { min_zoom: 10, name: glacier, image: glacier10.svg }
+   - { min_zoom: 10, name: reef, image: reef.png }
+   - { min_zoom: 10, name: wetland, image: wetland.png }
    - { min_zoom: 5, max_zoom: 11, name: forest, width: 26, height: 10, fill: "#bddab1" }
    - { min_zoom: 12, name: forest, width: 26, height: 10, fill: "#add19e" }
    - { min_zoom: 5, max_zoom: 11, name: orchard, width: 26, height: 10, fill: "#bee5b5" }
@@@ -58,19 -61,13 +61,19 @@@
    - { min_zoom: 11, name: centre, width: 26, height: 10, fill: "#dffce2" }
    - { min_zoom: 10, name: reserve, image: reserve.svg } # admin.mss
    - { min_zoom: 8, name: military, image: military.svg }
 +  - { min_zoom: 13, name: school, image: school.svg }
 +  # buildings: buildings.mss
 +  - { min_zoom: 14, name: building, width: 10, height: 10, fill: "#ab9793" }
 +  - { min_zoom: 15, name: building, image: building15.svg }
 +  - { min_zoom: 16, name: building, image: building16.svg }
 +  # stations: stations.mss
 +  - { min_zoom: 12, name: station, width: 4, height: 4, fill: "#7981b0" }
 +  - { min_zoom: 13, name: station, width: 6, height: 6, fill: "#7981b0" }
 +  - { min_zoom: 15, name: station, width: 9, height: 9, fill: "#7981b0" }
    # other
 -  - { min_zoom: 12, max_zoom: 19, name: school, image: school.png }
 -  - { min_zoom: 12, max_zoom: 19, name: building, image: building.png }
 -  - { min_zoom: 12, max_zoom: 19, name: station, image: station.png }
 -  - { min_zoom: 11, max_zoom: 19, name: summit, image: summit.png }
 -  - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png }
 -  - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png }
 +  - { min_zoom: 11, name: summit, image: summit.svg } # amenity-points.mss
 +  - { min_zoom: 13, name: tunnel, image: tunnel.svg } # roads.mss
 +  - { min_zoom: 13, name: bridge, image: bridge.svg } # roads.mss
    - { min_zoom: 15, max_zoom: 19, name: private, image: private.png }
    - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png }
    - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png }

diff --combined config/locales/en.yml
index 2e13fe13c0b787081f66a38a6916020d055975e3,c897cdaa5534c62d4a06b356a157f80ec9e066f0..a3c99d024216f526011530823dc9cc38b123b4ce
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2338,7 -2338,10 +2338,10 @@@ en
            lake:
              - Lake
              - reservoir
+           intermittent_water: "Intermittent waterbody"
            glacier: "Glacier"
+           reef: "Reef"
+           wetland: "Wetland"
            farm: "Farm"
            brownfield: "Brownfield site"
            cemetery: "Cemetery"
@@@ -2350,7 -2353,6 +2353,7 @@@
            school:
              - School
              - university
 +            - hospital
            building: "Significant building"
            station: "Railway station"
            summit: