Merge branch 'pull/5196'

diff --combined config/key.yml
index 032a2470465df5ad9d3b271b9e748da2aaf41c77,dce65d53a67079fb95996a3f2999a1897cebd176..798d9ca546db80f0b82960bb79f0db13078615f0
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -88,15 -88,10 +88,15 @@@ mapnik
    - { min_zoom: 14, name: building, width: 10, height: 10, fill: "#ab9793" }
    - { min_zoom: 15, name: building, width: 10, height: 10, fill: "#b9a99c", border: "#a99a8d" }
    - { min_zoom: 16, name: building, width: 10, height: 10, fill: "#c4b6ab", border: "#a99a8d" }
 -  # 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" }
 +  # stations: stations.mss, amenity-points.mss
 +  - { min_zoom: 12, max_zoom: 12, name: station, width: 4, height: 4, fill: "#7981b0" }
 +  - { min_zoom: 13, max_zoom: 13, name: station, width: 6, height: 6, fill: "#7981b0" }
 +  - { min_zoom: 13, max_zoom: 13, name: railway_halt, width: 4, height: 4, fill: "#7981b0" }
 +  - { min_zoom: 14, max_zoom: 14, name: [station, subway_station], width: 6, height: 6, fill: "#7981b0" }
 +  - { min_zoom: 14, max_zoom: 14, name: [railway_halt, tram_stop], width: 4, height: 4, fill: "#7981b0" }
    - { min_zoom: 15, name: station, width: 9, height: 9, fill: "#7981b0" }
 +  - { min_zoom: 15, name: [railway_halt, subway_station, tram_stop], width: 6, height: 6, fill: "#7981b0" }
 +  - { min_zoom: 16, name: bus_stop, width: 6, height: 6, fill: "#0092da" }
    # other
    - { min_zoom: 11, name: [summit, peak], image: summit.svg } # amenity-points.mss
    - { min_zoom: 13, name: tunnel, width: 50, height: 5, casing: grey, casing-dasharray: "4 2", casing-dashoffset: 1 } # roads.mss
@@@ -158,57 -153,3 +158,3 @@@ cyclemap
    - { min_zoom: 15, name: bicycle_parking, image: bicycle_parking.png }
    - { min_zoom: 16, name: bicycle_parking_small, image: bicycle_parking_small.svg }
    - { min_zoom: 16, name: toilets, image: toilets.png }
- opnvkarte:
-   - { 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, width: 52, height: 3, fill: "#868686", line: "#eeeeee", line-dasharray: 10, line-dashoffset: 9 }
-   - { min_zoom: 15, name: rail, width: 52, height: 4, fill: "#868686", line: "#eeeeee", line-dasharray: 10, line-dashoffset: 9, line-width: 2 }
-   - { min_zoom: 17, name: rail, image: rail17.svg }
-   - { 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, width: 52, height:  3, fill: "#3333fe" }
-   - { min_zoom: 12, name: tram, width: 52, height:  4, fill: "#3333fe" }
-   - { min_zoom: 14, name: tram, width: 52, height:  8, fill: "#3333fe" }
-   - { min_zoom: 16, name: tram, 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:  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, name: stop, image: stop13.svg }
-   - { min_zoom: 15, name: stop, image: stop15.svg }
-   - { min_zoom:  8, name: motorway, width: 52, height:  4, fill: "#dddddd", casing: "#6d6d6d" }
-   - { min_zoom: 13, name: motorway, width: 52, height:  8, fill: "#dddddd", casing: "#6d6d6d" }
-   - { min_zoom: 15, name: motorway, width: 52, height: 13, fill: "#dddddd", casing: "#6d6d6d", line: "#ffffff", line-dasharray: 12, line-dashoffset: 4 }
-   - { min_zoom: 17, name: motorway, width: 52, height: 17, fill: "#dddddd", casing: "#6d6d6d", line: "#ffffff", line-dasharray: 12, line-dashoffset: 4, casing-width: 2 }
-   - { min_zoom:  8, name: main_road, width: 52, height:  1, fill: "#5c6d6d88" }
-   - { min_zoom: 11, name: main_road, width: 52, height:  4, fill: "#dddddd", casing: "#a1968b" }
-   - { min_zoom: 13, name: main_road, width: 52, height:  8, fill: "#dddddd", casing: "#a1968b" }
-   - { min_zoom: 15, name: main_road, width: 52, height: 13, fill: "#dddddd", casing: "#a1968b" }
-   - { min_zoom: 17, name: main_road, width: 52, height: 17, fill: "#dddddd", casing: "#a1968b" }
-   # landcover
-   - { min_zoom:  0, name: [lake, reservoir], width: 26, height: 10, fill: "#a1cbea" }
-   - { min_zoom:  8, name: [lake, reservoir], width: 26, height: 10, fill: "#bfd3ef" }
-   - { min_zoom:  4, name: [forest, wood], width: 26, height: 10, fill: "#b9c5a3" }
-   - { min_zoom:  4, name: built_up, width: 26, height: 10, fill: "#d8d8d8" }
-   - { min_zoom:  9, name: farmland, width: 26, height: 10, fill: "#eae8d6" }
-   - { min_zoom: 12, name: [park, allotments], width: 26, height: 10, fill: "#c2d89a" }

diff --combined config/locales/en.yml
index feacfcf12d613a24c1942652f631bbd77d57d910,545e03eb0344427972f01628f125ca8736b734ce..faf9a89852325c8643c866371f36327501338e9e
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -38,6 -38,8 +38,6 @@@ en
    activerecord:
      errors:
        messages:
 -        invalid_email_address: does not appear to be a valid e-mail address
 -        email_address_not_routable: is not routable
          display_name_is_user_n: can't be user_n unless n is your user id
        models:
          user_mute:
@@@ -2373,9 -2375,6 +2373,9 @@@
            hospital: "Hospital"
            building: "Significant building"
            station: "Railway station"
 +          railway_halt: "Railway halt"
 +          subway_station: "Subway station"
 +          tram_stop: "Tram stop"
            summit: "Summit"
            peak: "Peak"
            tunnel: "Dashed casing = tunnel"
@@@ -2384,7 -2383,6 +2384,6 @@@
            destination: "Destination access"
            construction: "Roads under construction"
            bus_stop: "Bus stop"
-           stop: "Stop"
            bicycle_shop: "Bicycle shop"
            bicycle_rental: "Bicycle rental"
            bicycle_parking: "Bicycle parking"