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

diff --git a/app/assets/images/key/cyclemap/pedestrian.svg b/app/assets/images/key/cyclemap/pedestrian.svg
new file mode 100644 (file)
index 0000000..af8fce1
--- /dev/null
+++ b/app/assets/images/key/cyclemap/pedestrian.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='50' height='4'>
+<rect x='-.5' y='.5' width='51' height='3' fill='#e2e3e2' stroke='#9a9a9a' />
+</svg>

diff --git a/config/key.yml b/config/key.yml
index c524a9098d042e73c4e66dc48e563e57f7307233..f099a5f47465a91c0bae409ab22be7ca5756c1d1 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -93,6 +93,7 @@ cyclemap:
   - { min_zoom: 12, max_zoom: 19, name: primary, image: primary12.png }
   - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png }
   - { min_zoom: 12, max_zoom: 19, name: secondary, image: secondary12.png }
+  - { min_zoom: 15, name: pedestrian, image: pedestrian.svg }
   - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }
   - { min_zoom: 8, max_zoom: 19, name: cycleway, image: cycleway.png }
   - { min_zoom: 5, max_zoom: 12, name: cycleway_national, image: cycleway_national.png }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c06ff3cebdfe40c6151e102c99779d6e7e734d77..18beafa1355a0062daaf5cf53f6d3008f409e82a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2282,6 +2282,7 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
+          pedestrian: "Pedestrian way"
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"