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

diff --git a/app/assets/images/key/cyclemap/beach.png b/app/assets/images/key/cyclemap/beach.png
new file mode 100644 (file)
index 0000000..256732b
Binary files /dev/null and b/app/assets/images/key/cyclemap/beach.png differ

diff --git a/config/key.yml b/config/key.yml
index a70ca19244911bea7b86dab158cb7de04a255bb4..a78dbb282b482a28db3f4fd81fea6ec9430c3612 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -138,6 +138,15 @@ cyclemap:
   - { min_zoom: 10, name: meadow, width: 26, height: 10, fill: "#c0de9c" }
   - { min_zoom: 10, name: park, width: 26, height: 10, fill: "#cbe4c4" }
   - { min_zoom: 10, name: common, width: 26, height: 10, fill: "#d4f0d1" }
+  - { min_zoom: 10, name: heathland, width: 26, height: 10, fill: "#eaf0d6" }
+  - { min_zoom: 11, max_zoom: 13, name: resident, width: 26, height: 10, fill: "#e2e2e2" }
+  - { min_zoom: 11, name: industrial, width: 26, height: 10, fill: "#f1dede" }
+  - { min_zoom: 11, name: allotments, width: 26, height: 10, fill: "#d7d7b1" }
+  - { min_zoom: 12, name: cemetery, width: 26, height: 10, fill: "#abcfb1" }
+  - { min_zoom: 12, name: pitch, width: 26, height: 10, fill: "#ade0c5" }
+  - { min_zoom: 13, name: centre, width: 26, height: 10, fill: "#b4e9cd" }
+  - { min_zoom: 13, name: beach, image: beach.png }
+  - { min_zoom: 13, name: [school, university], width: 26, height: 10, fill: "#f0f0d8" }
   - { min_zoom: 14, name: bicycle_shop, image: bicycle_shop.png }
   - { min_zoom: 15, name: bicycle_rental, image: bicycle_rental_small.svg }
   - { min_zoom: 17, name: bicycle_rental, image: bicycle_rental.png }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0c5b57c18db6f389bd9410bcb769636e3f990f2a..653e363a67bcfb6d39927c5df0c99457a4e09192 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2356,6 +2356,7 @@ en:
           allotments: "Allotments"
           pitch: "Sports pitch"
           centre: "Sports centre"
+          beach: "Beach"
           reserve: "Nature reserve"
           military: "Military area"
           school: "School"