Add landfill fill pattern, farmyard pattern (and remove farm pattern), implement vineyard fill pattern

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,

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',

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')