Merge branch 'refs/heads/military-feature-fill'

css/app.css

@@ -939,7 +939,10 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 }
 
 .preset-icon-fill.tag-shop,
-.preset-icon-fill.tag-building {
+.preset-icon-fill.tag-building,
+.preset-icon-fill.tag-landuse.tag-landuse-residential,
+.preset-icon-fill.tag-landuse.tag-landuse-construction,
+.preset-icon-fill.tag-landuse.tag-landuse-military {
     background:transparent url(img/sprite.svg) no-repeat 0 -80px;
 }
 

css/map.css

@@ -245,6 +245,7 @@ path.stroke.tag-landuse-landfill {
     stroke: #ff9933;
 }
 
+path.stroke.tag-landuse-military,
 path.stroke.tag-landuse-residential,
 path.stroke.tag-landuse-construction {
     stroke: #e06e5f;
@@ -393,9 +394,15 @@ path.fill.tag-landuse-industrial {
     fill: #e4a4f5;
 }
 
+path.fill.tag-landuse-military {
+    fill: url(#pattern-construction);
+    opacity: 1;
+}
+
 path.stroke.tag-amenity-parking {
     stroke: #aaa;
 }
+
 path.fill.tag-amenity-parking {
     fill: #aaa;
 }

data/presets.yaml

@@ -1118,6 +1118,9 @@ en:
       landuse/meadow: 
         name: Meadow
         terms: "<translate with synonyms or related terms for 'Meadow', separated by commas>"
+      landuse/military: 
+        name: Military
+        terms: "<translate with synonyms or related terms for 'Military', separated by commas>"
       landuse/orchard: 
         name: Orchard
         terms: "<translate with synonyms or related terms for 'Orchard', separated by commas>"

data/presets/categories.json

@@ -39,7 +39,8 @@
             "landuse/farmyard",
             "landuse/forest",
             "landuse/meadow",
-            "landuse/cemetery"
+            "landuse/cemetery",
+            "landuse/military"
         ]
     },
     "category-path": {

data/presets/categories/landuse.json

@@ -11,6 +11,7 @@
         "landuse/farmyard",
         "landuse/forest",
         "landuse/meadow",
-        "landuse/cemetery"
+        "landuse/cemetery",
+        "landuse/military"
     ]
 }

data/presets/presets.json

@@ -4435,6 +4435,7 @@
         "name": "Cemetery"
     },
     "landuse/commercial": {
+        "icon": "commercial",
         "geometry": [
             "point",
             "area"
@@ -4567,6 +4568,16 @@
         "terms": [],
         "name": "Meadow"
     },
+    "landuse/military": {
+        "geometry": [
+            "area"
+        ],
+        "tags": {
+            "landuse": "military"
+        },
+        "terms": [],
+        "name": "Military"
+    },
     "landuse/orchard": {
         "fields": [
             "trees"
@@ -4594,6 +4605,7 @@
         "name": "Quarry"
     },
     "landuse/residential": {
+        "icon": "building",
         "geometry": [
             "point",
             "area"

data/presets/presets/landuse/commercial.json

@@ -1,4 +1,5 @@
 {
+    "icon": "commercial",
     "geometry": [
         "point",
         "area"

data/presets/presets/landuse/military.json

@@ -0,0 +1,10 @@
+{
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "landuse": "military"
+    },
+    "terms": [],
+    "name": "Military"
+}

data/presets/presets/landuse/residential.json

@@ -1,4 +1,5 @@
 {
+    "icon": "building",
     "geometry": [
         "point",
         "area"

dist/locales/en.json

@@ -1927,6 +1927,10 @@
                 "name": "Meadow",
                 "terms": ""
             },
+            "landuse/military": {
+                "name": "Military",
+                "terms": ""
+            },
             "landuse/orchard": {
                 "name": "Orchard",
                 "terms": ""

js/id/svg/areas.js

@@ -6,6 +6,7 @@ iD.svg.Areas = function(projection) {
         beach: 'beach',
         scrub: 'scrub',
         construction: 'construction',
+        military: 'construction',
         cemetery: 'cemetery',
         grave_yard: 'cemetery',
         meadow: 'meadow',