From b92592b6b45f1eaf39fd039f0d1e8221b0d78ff9 Mon Sep 17 00:00:00 2001
From: RudyTheDev <RudyTheDev@gmail.com>
Date: Sat, 15 Dec 2018 15:32:48 +0200
Subject: [PATCH] Add fill pattern for reservoir

---
 css/25_areas.css           |   1 +
 dist/img/pattern/lines.png | Bin 0 -> 18607 bytes
 modules/svg/areas.js       |   2 ++
 modules/svg/defs.js        |   1 +
 4 files changed, 4 insertions(+)
 create mode 100644 dist/img/pattern/lines.png

diff --git a/css/25_areas.css b/css/25_areas.css
index f2bb3184f..2c27c0607 100644
--- a/css/25_areas.css
+++ b/css/25_areas.css
@@ -104,6 +104,7 @@ path.fill.tag-natural-water {
     background-color: rgba(119, 211, 222, 0.3);
 }
 .pattern-color-waves,
+.pattern-color-water,
 .pattern-color-pond {
     fill: rgba(119, 211, 222, 0.3);
 }
diff --git a/dist/img/pattern/lines.png b/dist/img/pattern/lines.png
new file mode 100644
index 0000000000000000000000000000000000000000..d58ff64c752de149d348d8e4947dbeddb6742259
GIT binary patch
literal 18607
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

literal 0
HcmV?d00001

diff --git a/modules/svg/areas.js b/modules/svg/areas.js
index 3192d7fd6..4c1072a2e 100644
--- a/modules/svg/areas.js
+++ b/modules/svg/areas.js
@@ -41,6 +41,7 @@ export function svgAreas(projection, context) {
             meadow: 'meadow',
             military: 'construction',
             orchard: 'orchard',
+            reservoir: 'water',
             quarry: 'quarry',
             vineyard: 'vineyard'
         },
@@ -51,6 +52,7 @@ export function svgAreas(projection, context) {
             scrub: 'scrub',
             water: [
                 { water: 'pond', pattern: 'pond' },
+                { water: 'reservoir', pattern: 'water' },
                 { pattern: 'waves' }
             ],
             wetland: [
diff --git a/modules/svg/defs.js b/modules/svg/defs.js
index 726ea7b29..a6eb14b39 100644
--- a/modules/svg/defs.js
+++ b/modules/svg/defs.js
@@ -125,6 +125,7 @@ export function svgDefs(context) {
                 ['quarry', 'quarry'],
                 ['scrub', 'bushes'],
                 ['vineyard', 'vineyard'],
+                ['water', 'lines'],
                 ['waves', 'waves'],
                 ['wetland', 'wetland'],
                 ['wetland_marsh', 'wetland_marsh'],