From b18dfb40301c60317e20539fcf06ef6ecb3363f6 Mon Sep 17 00:00:00 2001
From: RudyTheDev <RudyTheDev@gmail.com>
Date: Sun, 18 Nov 2018 21:39:09 +0200
Subject: [PATCH] Add landfill fill pattern, farmyard pattern (and remove farm
 pattern), implement vineyard fill pattern

---
 css/25_areas.css              |  14 +++++++++++---
 dist/img/pattern/farmyard.png | Bin 0 -> 340 bytes
 dist/img/pattern/landfill.png | Bin 0 -> 479 bytes
 modules/svg/areas.js          |   6 ++++--
 modules/svg/defs.js           |  25 ++++++++++++++-----------
 5 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 dist/img/pattern/farmyard.png
 create mode 100644 dist/img/pattern/landfill.png

diff --git a/css/25_areas.css b/css/25_areas.css
index 9ad600961..fe8413940 100644
--- a/css/25_areas.css
+++ b/css/25_areas.css
@@ -181,6 +181,11 @@ path.fill.tag-landuse-military {
     border-color: rgb(214, 136, 26);
     background-color: rgba(214, 136, 26, 0.3);
 }
+.pattern-color-landfill
+{
+    fill: rgba(214, 136, 26, 0.3);
+}
+
 
 /* Pink things */
 path.stroke.tag-landuse-industrial,
@@ -221,22 +226,22 @@ path.stroke.tag-natural-wetland {
 .pattern-color-cemetery_muslim,
 .pattern-color-cemetery_jewish,
 .pattern-color-orchard,
+.pattern-color-vineyard,
 .pattern-color-meadow,
-.pattern-color-farm,
 .pattern-color-farmland {
     fill: rgba(191, 232, 63, 0.2);
 }
 path.stroke.tag-landuse-cemetery,
 path.stroke.tag-landuse-orchard,
+path.stroke.tag-landuse-vineyard,
 path.stroke.tag-landuse-meadow,
-path.stroke.tag-landuse-farm,
 path.stroke.tag-landuse-farmland {
     stroke: rgb(191, 232, 63);
 }
 .preset-icon-fill-area.tag-landuse-cemetery,
 .preset-icon-fill-area.tag-landuse-orchard,
+.preset-icon-fill-area.tag-landuse-vineyard,
 .preset-icon-fill-area.tag-landuse-meadow,
-.preset-icon-fill-area.tag-landuse-farm,
 .preset-icon-fill-area.tag-landuse-farmland {
     background-color: rgba(191, 232, 63, 0.2);
 }
@@ -253,6 +258,9 @@ path.fill.tag-landuse-farmyard {
     border-color: rgb(226, 177, 111);
     background: rgba(245, 220, 186, 0.3);
 }
+.pattern-color-farmyard {
+    fill: rgba(245, 220, 186, 0.3);
+}
 
 /* Dark Gray things */
 path.stroke.tag-amenity-parking,
diff --git a/dist/img/pattern/farmyard.png b/dist/img/pattern/farmyard.png
new file mode 100644
index 0000000000000000000000000000000000000000..88bee9a07b72dbe865c44d927272a30fa9b64483
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy9sxcfu0Z<#|NlUeLXgS-uoY;8
zL`jfeFarZ46Eh1d8#@Ol7dOADxrLRrjjf%%!|rJ*n}KQ;d%8G=RK)GQyqmAtK)~f<
zqCCqdKDP7!|7W(uxLnioI(}vOhHs}N{=KnT(3-MWf%QPcp;}Yc-|KQ_7cyvFR|`_m
zdcEk$qcxfa*C##={BkzZXhE9t>+D+|-i<S?r&rIlyTY6hmUrjc&zZ~}4rg4CiaIcT
z<Gkg!wo^o53vd6sTW$ik*nsH5)?OfgLH26FFS)`3w~jggy~T8bpLNCJw{!OYWMzEK
Vr&l`T>o!oRc)I$ztaD0e0s!SIXygC@

literal 0
HcmV?d00001

diff --git a/dist/img/pattern/landfill.png b/dist/img/pattern/landfill.png
new file mode 100644
index 0000000000000000000000000000000000000000..84b86279d0385f7c1073074d9f5d7727e1138b86
GIT binary patch
literal 479
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjR8I(u0Z<#|NlU8pn$<~bzPv{
z+9g4L!3+$HOw25-Z0sDIT--c-{DMLv5>m4A8oGLB7M9jFwssDVPR_1wo?bq_$tRRP
z0JS~xba4!+h+BH;blxEYf!2qIdGea>vT1BlUDy~WJmY))0W<OFRV8PZ{ZAA7mvT}n
z*|7Cf536=lLDeo^h8_o-yyj1Te(*5`?RfuAf<Zui0^<t%*GlXq*X5**Uz;sD6u0r+
z+bri=*3^Xjjm-^>W{tNTIXG@>{kS^egS3I_<rB=yKX0_FQDD6G>8opljK}PU41C51
zgjn|c<W7r<o5Jv4SMbGWaYhXRMh3QHm!2&65o=Rq?-gP;cc$s_vgJG)tM0X}yS84k
zK}Khry2FE4EKzmMYuaj7Y-?<=&t_*-4m{5I{{I8^HTQ(2%8s=afFj7#)z4*}Q$iB}
DG--nP

literal 0
HcmV?d00001

diff --git a/modules/svg/areas.js b/modules/svg/areas.js
index 20a66830f..d9423e4e3 100644
--- a/modules/svg/areas.js
+++ b/modules/svg/areas.js
@@ -27,8 +27,8 @@ export function svgAreas(projection, context) {
                 { pattern: 'cemetery' }
             ],
             construction: 'construction',
-            farm: 'farmland',
             farmland: 'farmland',
+            farmyard: 'farmyard',
             forest: [
                 { leaf_type: 'broadleaved', pattern: 'forest_broadleaved' },
                 { leaf_type: 'needleleaved', pattern: 'forest_needleleaved' },
@@ -37,10 +37,12 @@ export function svgAreas(projection, context) {
             ],
             grave_yard: 'cemetery',
             grass: 'grass',
+            landfill: 'landfill',
             meadow: 'meadow',
             military: 'construction',
             orchard: 'orchard',
-            quarry: 'quarry'
+            quarry: 'quarry',
+            vineyard: 'vineyard'
         },
         natural: {
             beach: 'beach',
diff --git a/modules/svg/defs.js b/modules/svg/defs.js
index 9c6104125..a37037a43 100644
--- a/modules/svg/defs.js
+++ b/modules/svg/defs.js
@@ -72,28 +72,31 @@ export function svgDefs(context) {
         var patterns = defs.selectAll('pattern')
             .data([
                 // pattern name, pattern image name
-                ['wetland', 'wetland'],
-                ['wetland_marsh', 'wetland_marsh'],
-                ['wetland_swamp', 'wetland_swamp'],
-                ['wetland_bog', 'wetland_bog'],
-                ['wetland_reedbed', 'wetland_reedbed'],
-                ['scrub', 'bushes'],
+                ['beach', 'dots'],
                 ['construction', 'construction'],
                 ['cemetery', 'cemetery'],
                 ['cemetery_christian', 'cemetery_christian'],
                 ['cemetery_buddhist', 'cemetery_buddhist'],
                 ['cemetery_muslim', 'cemetery_muslim'],
                 ['cemetery_jewish', 'cemetery_jewish'],
-                ['orchard', 'orchard'],
                 ['farmland', 'farmland'],
-                ['beach', 'dots'],
-                ['meadow', 'grass'],
-                ['grass', 'grass'],
+                ['farmyard', 'farmyard'],
                 ['forest', 'forest'],
                 ['forest_broadleaved', 'forest_broadleaved'],
                 ['forest_needleleaved', 'forest_needleleaved'],
                 ['forest_leafless', 'forest_leafless'],
-                ['quarry', 'quarry']
+                ['grass', 'grass'],
+                ['landfill', 'landfill'],
+                ['meadow', 'grass'],
+                ['orchard', 'orchard'],
+                ['quarry', 'quarry'],
+                ['scrub', 'bushes'],
+                ['vineyard', 'vineyard'],
+                ['wetland', 'wetland'],
+                ['wetland_marsh', 'wetland_marsh'],
+                ['wetland_swamp', 'wetland_swamp'],
+                ['wetland_bog', 'wetland_bog'],
+                ['wetland_reedbed', 'wetland_reedbed']
             ])
             .enter()
             .append('pattern')