diff --git a/data/presets/presets.json b/data/presets/presets.json index de6ef4697..25801a0ef 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6238,6 +6238,7 @@ "name": "Meadow" }, "landuse/military": { + "icon": "poi-military", "geometry": [ "area" ], @@ -6289,6 +6290,7 @@ "name": "Military Airfield" }, "landuse/military/barracks": { + "icon": "poi-military", "fields": [ "building_area" ], @@ -6322,6 +6324,7 @@ "name": "Barracks" }, "landuse/military/bunker": { + "icon": "poi-military", "fields": [ "bunker_type", "building_area" @@ -6424,6 +6427,7 @@ "name": "Danger Area" }, "landuse/military/naval_base": { + "icon": "poi-military", "geometry": [ "point", "area" @@ -6483,7 +6487,7 @@ "name": "Nuclear Explosion Site" }, "landuse/military/obstacle_course": { - "icon": "pitch", + "icon": "poi-military", "geometry": [ "point", "area" @@ -6512,6 +6516,7 @@ "name": "Obstacle Course" }, "landuse/military/office": { + "icon": "poi-military", "fields": [ "building_area" ], @@ -6547,6 +6552,7 @@ "name": "Military Office" }, "landuse/military/range": { + "icon": "poi-military", "geometry": [ "point", "area" @@ -6583,6 +6589,7 @@ "name": "Military Range" }, "landuse/military/training_area": { + "icon": "poi-military", "geometry": [ "point", "area" diff --git a/data/presets/presets/landuse/military.json b/data/presets/presets/landuse/military.json index f2e68bb80..17f681451 100644 --- a/data/presets/presets/landuse/military.json +++ b/data/presets/presets/landuse/military.json @@ -1,4 +1,5 @@ { + "icon": "poi-military", "geometry": [ "area" ], diff --git a/data/presets/presets/landuse/military/barracks.json b/data/presets/presets/landuse/military/barracks.json index e8b694590..b6cd840e6 100644 --- a/data/presets/presets/landuse/military/barracks.json +++ b/data/presets/presets/landuse/military/barracks.json @@ -1,4 +1,5 @@ { + "icon": "poi-military", "fields": [ "building_area" ], diff --git a/data/presets/presets/landuse/military/bunker.json b/data/presets/presets/landuse/military/bunker.json index a524adec7..7eb503739 100644 --- a/data/presets/presets/landuse/military/bunker.json +++ b/data/presets/presets/landuse/military/bunker.json @@ -1,4 +1,5 @@ { + "icon": "poi-military", "fields": [ "bunker_type", "building_area" diff --git a/data/presets/presets/landuse/military/naval_base.json b/data/presets/presets/landuse/military/naval_base.json index 5bb75009a..d3cc5efb1 100644 --- a/data/presets/presets/landuse/military/naval_base.json +++ b/data/presets/presets/landuse/military/naval_base.json @@ -1,4 +1,5 @@ { + "icon": "poi-military", "geometry": [ "point", "area" diff --git a/data/presets/presets/landuse/military/obstacle_course.json b/data/presets/presets/landuse/military/obstacle_course.json index 79d98123f..197a896be 100644 --- a/data/presets/presets/landuse/military/obstacle_course.json +++ b/data/presets/presets/landuse/military/obstacle_course.json @@ -1,5 +1,5 @@ { - "icon": "pitch", + "icon": "poi-military", "geometry": [ "point", "area" diff --git a/data/presets/presets/landuse/military/office.json b/data/presets/presets/landuse/military/office.json index 290071f7f..45d3b2344 100644 --- a/data/presets/presets/landuse/military/office.json +++ b/data/presets/presets/landuse/military/office.json @@ -1,4 +1,5 @@ { + "icon": "poi-military", "fields": [ "building_area" ], diff --git a/data/presets/presets/landuse/military/range.json b/data/presets/presets/landuse/military/range.json index f5b90c2e4..23c698fe9 100644 --- a/data/presets/presets/landuse/military/range.json +++ b/data/presets/presets/landuse/military/range.json @@ -1,4 +1,5 @@ { + "icon": "poi-military", "geometry": [ "point", "area" diff --git a/data/presets/presets/landuse/military/training_area.json b/data/presets/presets/landuse/military/training_area.json index 9713f4831..e954bdfec 100644 --- a/data/presets/presets/landuse/military/training_area.json +++ b/data/presets/presets/landuse/military/training_area.json @@ -1,4 +1,5 @@ { + "icon": "poi-military", "geometry": [ "point", "area" diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json index 0948eb720..ee12be95d 100644 --- a/svg/iD-sprite.json +++ b/svg/iD-sprite.json @@ -287,6 +287,7 @@ "poi-street-lamp": { "viewBox": "490 335 15 15" }, "poi-tool": { "viewBox": "505 335 15 15" }, "poi-tower": { "viewBox": "520 335 15 15" }, + "poi-military": { "viewBox": "535 335 15 15" }, "poi-vending-machine-shape": { "fill": "currentColor" }, "poi-dice-shape": { "fill": "currentColor" }, @@ -297,6 +298,7 @@ "poi-street-lamp-shape": { "fill": "currentColor" }, "poi-tool-shape": { "fill": "currentColor" }, "poi-tower-shape": { "fill": "currentColor" }, + "poi-military-shape": { "fill": "currentColor" }, "turn-yes": { "viewBox": "200 320 44 24" }, "turn-no": { "viewBox": "244 320 44 24" }, diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw index f5a69de95..87876259e 100644 Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg index a7a5df36d..28659b64d 100644 --- a/svg/iD-sprite.src.svg +++ b/svg/iD-sprite.src.svg @@ -232,6 +232,9 @@ + + +