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

diff --git a/app/assets/images/key/mapnik/intermittent_water.svg b/app/assets/images/key/mapnik/intermittent_water.svg
new file mode 100644 (file)
index 0000000..ab728ce
--- /dev/null
+++ b/app/assets/images/key/mapnik/intermittent_water.svg
@@ -0,0 +1,8 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='26' height='10'>
+<defs>
+<pattern id='stripes' width='8' height='4' patternUnits='userSpaceOnUse'>
+<line x2='8' y1='1' y2='1' stroke='#aad3df' stroke-width='2' />
+</pattern>
+</defs>
+<rect width='100%' height='100%' fill='url(#stripes)' />
+</svg>

diff --git a/app/assets/images/key/mapnik/reef.png b/app/assets/images/key/mapnik/reef.png
new file mode 100644 (file)
index 0000000..713ac86
Binary files /dev/null and b/app/assets/images/key/mapnik/reef.png differ

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

diff --git a/config/key.yml b/config/key.yml
index cdd070131e5073702be80ea3a2063d7da2af7a45..1aca2942b393e9a2d56163f3ecd82d5801da49f4 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -19,8 +19,11 @@ mapnik:
   - { 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" }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2e13fe13c0b787081f66a38a6916020d055975e3..a3c99d024216f526011530823dc9cc38b123b4ce 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2338,7 +2338,10 @@ en:
           lake:
             - Lake
             - reservoir
+          intermittent_water: "Intermittent waterbody"
           glacier: "Glacier"
+          reef: "Reef"
+          wetland: "Wetland"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"