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

diff --combined config/key.yml
index dfc2f4025b932ca6f55f52dafda82a83bc9cf2c0,8314533377663004d616869945c04dcbe61fe16c..5ee24e9137428bdf3efc7c181a9a8d253f388e44
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -1,4 -1,5 +1,5 @@@
  mapnik:
+   # transportation
    - { 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 }
@@@ -14,26 -15,50 +15,50 @@@
    - { 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 }
-   - { min_zoom: 0, max_zoom: 19, name: admin, image: admin.png }
-   - { min_zoom: 5, max_zoom: 19, name: forest, image: forest.png }
-   - { min_zoom: 5, max_zoom: 19, name: wood, image: wood.png }
-   - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png }
-   - { min_zoom: 10, max_zoom: 19, name: park, image: park.png }
-   - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png }
-   - { min_zoom: 5, max_zoom: 19, name: common, image: common.png }
-   - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png }
-   - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }
-   - { min_zoom: 10, max_zoom: 19, name: commercial, image: commercial.png }
-   - { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.png }
-   - { min_zoom: 0, max_zoom: 19, name: lake, width: 26, height: 10, fill: "#aad3df" }
-   - { min_zoom: 10, max_zoom: 19, name: farm, image: farm.png }
-   - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png }
-   - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png }
-   - { min_zoom: 11, max_zoom: 19, name: allotments, image: allotments.png }
-   - { min_zoom: 11, max_zoom: 19, name: pitch, image: pitch.png }
-   - { min_zoom: 11, max_zoom: 19, name: centre, image: centre.png }
-   - { min_zoom: 11, max_zoom: 19, name: reserve, image: reserve.png }
-   - { min_zoom: 11, max_zoom: 19, name: military, image: military.png }
+   # administrative boundaries: admin.mss
+   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
+   # landcover z5: landcover.mss, water.mss
+   - { name: lake, width: 26, height: 10, fill: "#aad3df" }
+   - { min_zoom: 5, max_zoom: 9, name: glacier, image: glacier5.svg }
+   - { min_zoom: 10, name: glacier, image: glacier10.svg }
+   - { 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" }
+   - { min_zoom: 12, name: orchard, width: 26, height: 10, fill: "#aedfa3" }
+   - { min_zoom: 5, max_zoom: 11, name: grass, width: 26, height: 10, fill: "#d7efc0" }
+   - { min_zoom: 12, name: grass, width: 26, height: 10, fill: "#cdebb0" }
+   - { min_zoom: 5, max_zoom: 11, name: farmland, width: 26, height: 10, fill: "#f1f3dd" }
+   - { min_zoom: 12, name: farmland, width: 26, height: 10, fill: "#eef0d5" }
+   - { min_zoom: 5, max_zoom: 11, name: heathland, width: 26, height: 10, fill: "#dee1b2" }
+   - { min_zoom: 12, name: heathland, width: 26, height: 10, fill: "#d6d99f" }
+   - { min_zoom: 5, max_zoom: 11, name: scrubland, width: 26, height: 10, fill: "#d3dfbc" }
+   - { min_zoom: 12, name: scrubland, width: 26, height: 10, fill: "#c8d7ab" }
+   - { min_zoom: 5, max_zoom: 11, name: bare_rock, width: 26, height: 10, fill: "#f1eae3" }
+   - { min_zoom: 12, name: bare_rock, width: 26, height: 10, fill: "#eee5dc" }
+   - { min_zoom: 5, max_zoom: 11, name: sand, width: 26, height: 10, fill: "#f7edd1" }
+   - { min_zoom: 12, name: sand, width: 26, height: 10, fill: "#f5e9c6" }
+   # landuse z8, z10: landcover.mss
+   - { min_zoom: 10, name: park, width: 26, height: 10, fill: "#c8facc" }
+   - { min_zoom: 10, name: golf, width: 26, height: 10, fill: "#def6c0" }
+   - { min_zoom: 8, max_zoom: 11, name: built_up, width: 26, height: 10, fill: "#d9d9d9" }
+   - { min_zoom: 12, max_zoom: 12, name: built_up, width: 26, height: 10, fill: "#dddddd" }
+   - { min_zoom: 13, name: resident, width: 26, height: 10, fill: "#e0dfdf" }
+   - { min_zoom: 13, name: retail, width: 26, height: 10, fill: "#ffd6d1" }
+   - { min_zoom: 13, name: commercial, width: 26, height: 10, fill: "#f2dad9" }
+   - { min_zoom: 13, name: industrial, width: 26, height: 10, fill: "#ebdbe8" }
+   - { min_zoom: 10, max_zoom: 11, name: farm, width: 26, height: 10, fill: "#f7e3c8" }
+   - { min_zoom: 12, name: farm, width: 26, height: 10, fill: "#f5dcba" }
+   - { min_zoom: 10, max_zoom: 11, name: brownfield, width: 26, height: 10, fill: "#d2d2c3" }
+   - { min_zoom: 12, name: brownfield, width: 26, height: 10, fill: "#c7c7b4" }
+   - { min_zoom: 10, max_zoom: 11, name: cemetery, width: 26, height: 10, fill: "#bbd5be" }
+   - { min_zoom: 12, name: cemetery, width: 26, height: 10, fill: "#aacbaf" }
+   - { min_zoom: 10, max_zoom: 11, name: allotments, width: 26, height: 10, fill: "#d4e6cc" }
+   - { min_zoom: 12, name: allotments, width: 26, height: 10, fill: "#c9e1bf" }
+   - { min_zoom: 11, name: pitch, width: 26, height: 10, fill: "#88e0be" }
+   - { 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 }
+   # 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 }
@@@ -70,40 -95,25 +95,40 @@@ cyclemap
    - { min_zoom: 14, max_zoom: 19, name: bicycle_parking, image: bicycle_parking.png }
    - { min_zoom: 16, max_zoom: 19, name: toilets, image: toilets.png }
  opnvkarte:
 -  - { min_zoom: 6, max_zoom: 7, name: rail, width: 52, height: 1, fill: "#868686" }
 -  - { min_zoom: 8, max_zoom: 10, name: rail, width: 52, height: 2, fill: "#868686" }
 -  - { min_zoom: 11, max_zoom: 14, name: rail, image: rail11.svg }
 -  - { min_zoom: 15, max_zoom: 16, name: rail, image: rail15.svg }
 +  - { min_zoom:  6, name: rail, width: 52, height: 1, fill: "#868686" }
 +  - { min_zoom:  8, name: rail, width: 52, height: 2, fill: "#868686" }
 +  - { min_zoom: 11, name: rail, image: rail11.svg }
 +  - { min_zoom: 15, name: rail, image: rail15.svg }
    - { min_zoom: 17, name: rail, image: rail17.svg }
 -  - { min_zoom: 6, max_zoom: 9, name: train, width: 52, height: 2, fill: "#ffc366" }
 -  - { min_zoom: 10, max_zoom: 11, name: train, width: 52, height: 3, fill: "#ffc366" }
 -  - { min_zoom: 12, name: train, width: 52, height: 4, fill: "#ffc366" }
 -  - { min_zoom: 10, name: light_rail, width: 52, height: 4, fill: "#66ff66" }
 -  - { min_zoom: 10, name: tram_only, width: 52, height: 4, fill: "#3333fe" }
 -  - { min_zoom: 10, name: subway, width: 52, height: 4, fill: "#33339f" }
 -  - { min_zoom: 9, max_zoom: 13, name: ferry, width: 52, height: 2, fill: "#9f339f" }
 +  - { min_zoom:  6, name: train, width: 52, height:  2, fill: "#ffc366" }
 +  - { min_zoom: 10, name: train, width: 52, height:  3, fill: "#ffc366" }
 +  - { min_zoom: 12, name: train, width: 52, height:  4, fill: "#ffc366" }
 +  - { min_zoom: 14, name: train, width: 52, height:  8, fill: "#ffc366" }
 +  - { min_zoom: 16, name: train, width: 52, height: 10, fill: "#ffc366" }
 +  - { min_zoom: 10, name: light_rail, width: 52, height:  3, fill: "#66ff66" }
 +  - { min_zoom: 12, name: light_rail, width: 52, height:  4, fill: "#66ff66" }
 +  - { min_zoom: 14, name: light_rail, width: 52, height:  8, fill: "#66ff66" }
 +  - { min_zoom: 16, name: light_rail, width: 52, height: 10, fill: "#66ff66" }
 +  - { min_zoom: 10, name: tram_only, width: 52, height:  3, fill: "#3333fe" }
 +  - { min_zoom: 12, name: tram_only, width: 52, height:  4, fill: "#3333fe" }
 +  - { min_zoom: 14, name: tram_only, width: 52, height:  8, fill: "#3333fe" }
 +  - { min_zoom: 16, name: tram_only, width: 52, height: 10, fill: "#3333fe" }
 +  - { min_zoom: 10, name: subway, width: 52, height:  3, fill: "#33339f" }
 +  - { min_zoom: 12, name: subway, width: 52, height:  4, fill: "#33339f" }
 +  - { min_zoom: 14, name: subway, width: 52, height:  8, fill: "#33339f" }
 +  - { min_zoom: 16, name: subway, width: 52, height: 10, fill: "#33339f" }
 +  - { min_zoom:  9, name: ferry, width: 52, height: 2, fill: "#9f339f" }
    - { min_zoom: 14, name: ferry, width: 52, height: 3, fill: "#9f339f" }
 -  - { min_zoom: 10, name: trolleybus, width: 52, height: 4, fill: "#9f3333" }
 -  - { min_zoom: 11, max_zoom: 11, name: bus, width: 52, height: 1, fill: "#fe3333" }
 -  - { min_zoom: 12, max_zoom: 12, name: bus, width: 52, height: 2, fill: "#fe3333" }
 -  - { min_zoom: 13, max_zoom: 13, name: bus, width: 52, height: 3, fill: "#fe3333" }
 -  - { min_zoom: 14, name: bus, width: 52, height: 4, fill: "#fe3333" }
 -  - { min_zoom: 13, max_zoom: 14, name: bus_stop, image: bus_stop13.svg }
 +  - { min_zoom: 10, name: trolleybus, width: 52, height:  3, fill: "#9f3333" }
 +  - { min_zoom: 12, name: trolleybus, width: 52, height:  4, fill: "#9f3333" }
 +  - { min_zoom: 14, name: trolleybus, width: 52, height:  8, fill: "#9f3333" }
 +  - { min_zoom: 16, name: trolleybus, width: 52, height: 10, fill: "#9f3333" }
 +  - { min_zoom: 11, name: bus, width: 52, height:  1, fill: "#fe3333" }
 +  - { min_zoom: 12, name: bus, width: 52, height:  2, fill: "#fe3333" }
 +  - { min_zoom: 13, name: bus, width: 52, height:  3, fill: "#fe3333" }
 +  - { min_zoom: 14, name: bus, width: 52, height:  4, fill: "#fe3333" }
 +  - { min_zoom: 16, name: bus, width: 52, height: 10, fill: "#fe3333" }
 +  - { min_zoom: 13, name: bus_stop, image: bus_stop13.svg }
    - { min_zoom: 15, name: bus_stop, image: bus_stop15.svg }
 -  - { min_zoom: 13, max_zoom: 14, name: stop, image: stop13.svg }
 +  - { min_zoom: 13, name: stop, image: stop13.svg }
    - { min_zoom: 15, name: stop, image: stop15.svg }