diff --git a/css/app.css b/css/app.css index 934dc26c3..32c935332 100644 --- a/css/app.css +++ b/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; } diff --git a/css/map.css b/css/map.css index fe5df7290..f11515c66 100644 --- a/css/map.css +++ b/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; } diff --git a/data/presets.yaml b/data/presets.yaml index 3eba22a4f..dbaf32194 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1118,6 +1118,9 @@ en: landuse/meadow: name: Meadow terms: "" + landuse/military: + name: Military + terms: "" landuse/orchard: name: Orchard terms: "" diff --git a/data/presets/categories.json b/data/presets/categories.json index cfe5a2ed8..20e9ea3d7 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -39,7 +39,8 @@ "landuse/farmyard", "landuse/forest", "landuse/meadow", - "landuse/cemetery" + "landuse/cemetery", + "landuse/military" ] }, "category-path": { diff --git a/data/presets/categories/landuse.json b/data/presets/categories/landuse.json index 206ca7110..3be891ee9 100644 --- a/data/presets/categories/landuse.json +++ b/data/presets/categories/landuse.json @@ -11,6 +11,7 @@ "landuse/farmyard", "landuse/forest", "landuse/meadow", - "landuse/cemetery" + "landuse/cemetery", + "landuse/military" ] } \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index 35b9f28c4..a95c41ba7 100644 --- a/data/presets/presets.json +++ b/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" diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json index a51d4628e..d7610d78e 100644 --- a/data/presets/presets/landuse/commercial.json +++ b/data/presets/presets/landuse/commercial.json @@ -1,4 +1,5 @@ { + "icon": "commercial", "geometry": [ "point", "area" diff --git a/data/presets/presets/landuse/military.json b/data/presets/presets/landuse/military.json new file mode 100644 index 000000000..e3937f1dc --- /dev/null +++ b/data/presets/presets/landuse/military.json @@ -0,0 +1,10 @@ +{ + "geometry": [ + "area" + ], + "tags": { + "landuse": "military" + }, + "terms": [], + "name": "Military" +} \ No newline at end of file diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json index e4199c240..ef0b5e31a 100644 --- a/data/presets/presets/landuse/residential.json +++ b/data/presets/presets/landuse/residential.json @@ -1,4 +1,5 @@ { + "icon": "building", "geometry": [ "point", "area" diff --git a/dist/locales/en.json b/dist/locales/en.json index 7882c9751..916b221b8 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1927,6 +1927,10 @@ "name": "Meadow", "terms": "" }, + "landuse/military": { + "name": "Military", + "terms": "" + }, "landuse/orchard": { "name": "Orchard", "terms": "" diff --git a/js/id/svg/areas.js b/js/id/svg/areas.js index c47551aad..972ebc403 100644 --- a/js/id/svg/areas.js +++ b/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',