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

diff --combined config/key.yml
index 1aca2942b393e9a2d56163f3ecd82d5801da49f4,4e7b29c198797af76d3b651105278c72949bf304..f64ab8b372a306e911e4ff055810c0283e42e044
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -1,5 -1,5 +1,5 @@@
  mapnik:
-   # transportation
+   # transportation: roads.mss
    - { min_zoom: 6, max_zoom: 19, name: motorway, image: motorway.png }
    - { min_zoom: 6, max_zoom: 7, name: main_road, image: mainroad.png }
    - { min_zoom: 8, max_zoom: 11, name: main_road, image: mainroad8.png }
@@@ -8,10 -8,17 +8,17 @@@
    - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }
    - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png }
    - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }
-   - { min_zoom: 8, max_zoom: 11, name: rail, image: rail.png }
-   - { min_zoom: 12, max_zoom: 19, name: rail, image: rail12.png }
-   - { min_zoom: 13, max_zoom: 19, name: subway, image: subway.png }
-   - { min_zoom: 13, max_zoom: 19, name: tram, image: tram.png }
+   - { min_zoom:  8, name: rail, width: 52, height: 1, fill: "#787878" }
+   - { min_zoom: 12, name: rail, image: rail12.svg }
+   - { min_zoom: 18, name: rail, image: rail18.svg }
+   - { min_zoom: 12, name: subway, width: 52, height: 2, fill: "#999" }
+   - { min_zoom:  8, name: light_rail, width: 52, height: 1, fill: "#ccc" }
+   - { min_zoom: 10, name: light_rail, width: 52, height: 1, fill: "#aaa" }
+   - { min_zoom: 13, name: light_rail, width: 52, height: 2, fill: "#666" }
+   - { min_zoom: 12, name: tram_only, width: 52, height: 1, fill: "#6e6e6eaa" }
+   - { min_zoom: 14, name: tram_only, width: 52, height: 1, fill: "#6e6e6e" }
+   - { min_zoom: 15, name: tram_only, image: tram15.svg }
+   - { min_zoom: 17, name: tram_only, width: 52, height: 2, fill: "#6e6e6e" }
    - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png }
    - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png }
    - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }
@@@ -19,11 -26,8 +26,11 @@@
    - { 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" }
@@@ -61,19 -65,13 +68,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 a3c99d024216f526011530823dc9cc38b123b4ce,3499244b67aa2cf6071cfd36b3225fcdd7dff0f4..31563243ad0f209cfa4027c28e6af392ad39ce51
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2293,9 -2293,6 +2293,6 @@@ en
            train: "Train"
            subway: "Subway"
            ferry: "Ferry"
-           tram:
-             - Light rail
-             - tram
            light_rail: "Light rail"
            tram_only: "Tram"
            trolleybus: "Trolleybus"
@@@ -2338,10 -2335,7 +2335,10 @@@
            lake:
              - Lake
              - reservoir
 +          intermittent_water: "Intermittent waterbody"
            glacier: "Glacier"
 +          reef: "Reef"
 +          wetland: "Wetland"
            farm: "Farm"
            brownfield: "Brownfield site"
            cemetery: "Cemetery"
@@@ -2353,7 -2347,6 +2350,7 @@@
            school:
              - School
              - university
 +            - hospital
            building: "Significant building"
            station: "Railway station"
            summit: