From ff8723e194236b30917d6cdb3239484778a42ca5 Mon Sep 17 00:00:00 2001
From: RudyTheDev <RudyTheDev@gmail.com>
Date: Sun, 18 Nov 2018 22:12:40 +0200
Subject: [PATCH] Add water waves fill pattern and pond-specific pattern

---
 css/25_areas.css           |   4 ++++
 dist/img/pattern/pond.png  | Bin 0 -> 401 bytes
 dist/img/pattern/waves.png | Bin 0 -> 190 bytes
 modules/svg/areas.js       |   4 ++++
 modules/svg/defs.js        |   2 ++
 5 files changed, 10 insertions(+)
 create mode 100644 dist/img/pattern/pond.png
 create mode 100644 dist/img/pattern/waves.png

diff --git a/css/25_areas.css b/css/25_areas.css
index fe8413940..2d160d5fe 100644
--- a/css/25_areas.css
+++ b/css/25_areas.css
@@ -94,6 +94,10 @@ path.fill.tag-natural-water {
     border-color: rgb(119, 211, 222);
     background-color: rgba(119, 211, 222, 0.3);
 }
+.pattern-color-waves,
+.pattern-color-pond {
+    fill: rgba(119, 211, 222, 0.3);
+}
 
 /* Yellow things */
 .pattern-color-beach,
diff --git a/dist/img/pattern/pond.png b/dist/img/pattern/pond.png
new file mode 100644
index 0000000000000000000000000000000000000000..880857d5df15de29a14308bb4c8e83d77780fe93
GIT binary patch
literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dynE^f_u0Z<#|NlUe)<E(_00+<x
z<&q%3U<L+8CT12^Hg*n9E^Z!PJ^?`yNhujwIb}^PZ5>@beFH<IZSt=Rfy%ddx;TbZ
z#2vkSH|wwgPus)oTOX%n-b%Uo>;92{MgPTj_KNc4g!yxcZt9c!!Q-?>?#gP0_sV(v
zt_B%u9;pF$xA1i{z6fdEVR*oA&(T-)2g;on2c~S$vDcR_aF>1Y{(-(??Uqi9sY+p6
zGQ;jf)gQPX!0;rqF+E@STi>$9JSLUrvUm$h<HY0H4&N-@r1VQ<hY6d*Vy68H`D)Gc
zny;i!I4SEh@k^zb+Yz%YzqO1Dz6CI>-+xxW`wwqj2=A09pdj^h^>bP0l+XkKZRBmF

literal 0
HcmV?d00001

diff --git a/dist/img/pattern/waves.png b/dist/img/pattern/waves.png
new file mode 100644
index 0000000000000000000000000000000000000000..97136705501c1aa43930f92ab762bd9b064aba1c
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$efS0MfW|9>D^e5|<;NHLcL
z`2{mD7`rZ8dIHEz^mK6ysff!xr^v@($iW&I_9bpc)foxD_M6puy!I<^u8(sQ;CXv!
zZPtgBSw|U5YR~fei7qJI)^g8v>I6*(pSwpw!vD5D+hy{fhvEIJZD#W{@6?wifBDV-
iLVksi(c*=i9~cA83=7Xq`|ks^jKR~@&t;ucLK6UI8$xve

literal 0
HcmV?d00001

diff --git a/modules/svg/areas.js b/modules/svg/areas.js
index d9423e4e3..ca8041923 100644
--- a/modules/svg/areas.js
+++ b/modules/svg/areas.js
@@ -49,6 +49,10 @@ export function svgAreas(projection, context) {
             grassland: 'grass',
             sand: 'beach',
             scrub: 'scrub',
+            water: [
+                { water: 'pond', pattern: 'pond' },
+                { pattern: 'waves' }
+            ],
             wetland: [
                 { wetland: 'marsh', pattern: 'wetland_marsh' },
                 { wetland: 'swamp', pattern: 'wetland_swamp' },
diff --git a/modules/svg/defs.js b/modules/svg/defs.js
index a37037a43..52ec2f8c8 100644
--- a/modules/svg/defs.js
+++ b/modules/svg/defs.js
@@ -89,9 +89,11 @@ export function svgDefs(context) {
                 ['landfill', 'landfill'],
                 ['meadow', 'grass'],
                 ['orchard', 'orchard'],
+                ['pond', 'pond'],
                 ['quarry', 'quarry'],
                 ['scrub', 'bushes'],
                 ['vineyard', 'vineyard'],
+                ['waves', 'waves'],
                 ['wetland', 'wetland'],
                 ['wetland_marsh', 'wetland_marsh'],
                 ['wetland_swamp', 'wetland_swamp'],