From 0c9fb7c40712e4d3209690b17b692f5100b0b342 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 27 Dec 2016 01:07:21 -0500 Subject: [PATCH] Improve military presets (closes #3663) * Add Nuclear Explosion Site and Military Office presets * Add Bunker Type field * Improve styling rules for preset icons * Improve search terms for all military presets * Nest military presets under `landuse=military` * Add ref, iata, icao fields to Military Airfield * Don't set area pattern fills on buildings --- css/map.css | 3 + data/presets.yaml | 96 ++-- data/presets/fields.json | 5 + data/presets/fields/bunker_type.json | 5 + data/presets/presets.json | 482 ++++++++++++++---- .../presets/amenity/hunting_stand.json | 4 +- data/presets/presets/landuse/military.json | 1 + .../presets/landuse/military/airfield.json | 40 ++ .../presets/landuse/military/barracks.json | 33 ++ .../presets/landuse/military/bunker.json | 36 ++ .../presets/landuse/military/checkpoint.json | 30 ++ .../presets/landuse/military/danger_area.json | 35 ++ .../presets/landuse/military/naval_base.json | 30 ++ .../military/nuclear_explosion_site.json | 29 ++ .../landuse/military/obstacle_course.json | 28 + .../presets/landuse/military/office.json | 35 ++ .../presets/landuse/military/range.json | 36 ++ .../landuse/military/training_area.json | 36 ++ data/presets/presets/military/airfield.json | 13 - data/presets/presets/military/barracks.json | 12 - data/presets/presets/military/bunker.json | 12 - data/presets/presets/military/checkpoint.json | 12 - .../presets/presets/military/danger_area.json | 12 - data/presets/presets/military/naval_base.json | 12 - .../presets/military/obstacle_course.json | 12 - data/presets/presets/military/range.json | 12 - .../presets/military/training_area.json | 12 - data/taginfo.json | 80 +-- dist/locales/en.json | 85 +-- modules/svg/areas.js | 2 + modules/svg/tag_classes.js | 2 +- 31 files changed, 911 insertions(+), 331 deletions(-) create mode 100644 data/presets/fields/bunker_type.json create mode 100644 data/presets/presets/landuse/military/airfield.json create mode 100644 data/presets/presets/landuse/military/barracks.json create mode 100644 data/presets/presets/landuse/military/bunker.json create mode 100644 data/presets/presets/landuse/military/checkpoint.json create mode 100644 data/presets/presets/landuse/military/danger_area.json create mode 100644 data/presets/presets/landuse/military/naval_base.json create mode 100644 data/presets/presets/landuse/military/nuclear_explosion_site.json create mode 100644 data/presets/presets/landuse/military/obstacle_course.json create mode 100644 data/presets/presets/landuse/military/office.json create mode 100644 data/presets/presets/landuse/military/range.json create mode 100644 data/presets/presets/landuse/military/training_area.json delete mode 100644 data/presets/presets/military/airfield.json delete mode 100644 data/presets/presets/military/barracks.json delete mode 100644 data/presets/presets/military/bunker.json delete mode 100644 data/presets/presets/military/checkpoint.json delete mode 100644 data/presets/presets/military/danger_area.json delete mode 100644 data/presets/presets/military/naval_base.json delete mode 100644 data/presets/presets/military/obstacle_course.json delete mode 100644 data/presets/presets/military/range.json delete mode 100644 data/presets/presets/military/training_area.json diff --git a/css/map.css b/css/map.css index 513d86feb..efeb2abf8 100644 --- a/css/map.css +++ b/css/map.css @@ -352,13 +352,16 @@ path.stroke.tag-landuse.tag-status { background-color: rgba(196, 189, 25, 0.2); } +path.stroke.tag-military, path.stroke.tag-landuse-military { stroke: rgb(214, 136, 26); } +path.fill.tag-military, path.fill.tag-landuse-military { stroke: rgba(214, 136, 26, 0.2); fill: rgba(214, 136, 26, 0.2); } +.preset-icon-fill-area.tag-military, .preset-icon-fill-area.tag-landuse-military { border-color: rgb(214, 136, 26); background-color: rgba(214, 136, 26, 0.2); diff --git a/data/presets.yaml b/data/presets.yaml index 163477b6c..c2ddb18cf 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -222,6 +222,9 @@ en: building_area: # building=* label: Building + bunker_type: + # bunker_type=* + label: Type camera/direction: # 'camera:direction=*' label: Direction (Degrees Clockwise) @@ -1555,7 +1558,7 @@ en: amenity/hunting_stand: # amenity=hunting_stand name: Hunting Stand - # 'terms: game,lookout,shoot,wild,watch' + # 'terms: game,gun,lookout,rifle,shoot*,wild,watch' terms: '' amenity/ice_cream: # amenity=ice_cream @@ -2690,6 +2693,61 @@ en: # landuse=military name: Military Area terms: '' + landuse/military/airfield: + # military=airfield + name: Military Airfield + # 'terms: air force,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war' + terms: '' + landuse/military/barracks: + # military=barracks + name: Barracks + # 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war' + terms: '' + landuse/military/bunker: + # military=bunker + name: Military Bunker + # 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war' + terms: '' + landuse/military/checkpoint: + # military=checkpoint + name: Checkpoint + # 'terms: air force,army,base,force,guard,marine,navy,troop,war' + terms: '' + landuse/military/danger_area: + # military=danger_area + name: Danger Area + # 'terms: air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war' + terms: '' + landuse/military/naval_base: + # military=naval_base + name: Naval Base + # 'terms: base,fight,force,guard,marine,navy,ship,sub,troop,war' + terms: '' + landuse/military/nuclear_explosion_site: + # military=nuclear_explosion_site + name: Nuclear Explosion Site + # 'terms: atom,blast,bomb,detonat*,nuke,site,test' + terms: '' + landuse/military/obstacle_course: + # military=obstacle_course + name: Obstacle Course + # 'terms: army,base,force,guard,marine,navy,troop,war' + terms: '' + landuse/military/office: + # military=office + name: Military Office + # 'terms: air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war' + terms: '' + landuse/military/range: + # military=range + name: Military Range + # 'terms: air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war' + terms: '' + landuse/military/training_area: + # military=training_area + name: Training Area + # 'terms: air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war' + terms: '' landuse/orchard: # landuse=orchard name: Orchard @@ -3029,42 +3087,6 @@ en: name: Factory # 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery' terms: '' - military/airfield: - # military=airfield - name: Airfield - terms: '' - military/barracks: - # military=barracks - name: Barracks - terms: '' - military/bunker: - # military=bunker - name: Bunker - terms: '' - military/checkpoint: - # military=checkpoint - name: Checkpoint - terms: '' - military/danger_area: - # military=danger_area - name: Danger Area - terms: '' - military/naval_base: - # military=naval_base - name: Naval Base - terms: '' - military/obstacle_course: - # military=obstacle_course - name: Obstacle Course - terms: '' - military/range: - # military=range - name: Military Range - terms: '' - military/training_area: - # military=training_area - name: Training area - terms: '' natural: # natural=* name: Natural diff --git a/data/presets/fields.json b/data/presets/fields.json index 85ae33ee7..ffe867115 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -305,6 +305,11 @@ "type": "combo", "label": "Building" }, + "bunker_type": { + "key": "bunker_type", + "type": "combo", + "label": "Type" + }, "camera/direction": { "key": "camera:direction", "type": "number", diff --git a/data/presets/fields/bunker_type.json b/data/presets/fields/bunker_type.json new file mode 100644 index 000000000..472571836 --- /dev/null +++ b/data/presets/fields/bunker_type.json @@ -0,0 +1,5 @@ +{ + "key": "bunker_type", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index c2e294012..bc329aae5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1344,8 +1344,10 @@ ], "terms": [ "game", + "gun", "lookout", - "shoot", + "rifle", + "shoot*", "wild", "watch" ], @@ -5998,8 +6000,377 @@ "landuse": "military" }, "terms": [], + "matchScore": 0.9, "name": "Military Area" }, + "landuse/military/airfield": { + "icon": "airfield", + "fields": [ + "ref", + "iata", + "icao" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "airfield" + }, + "addTags": { + "landuse": "military", + "military": "airfield" + }, + "removeTags": { + "landuse": "military", + "military": "airfield" + }, + "terms": [ + "air force", + "army", + "base", + "bomb", + "fight", + "force", + "guard", + "heli*", + "jet", + "marine", + "navy", + "plane", + "troop", + "war" + ], + "name": "Military Airfield" + }, + "landuse/military/barracks": { + "fields": [ + "building_area" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "barracks" + }, + "addTags": { + "landuse": "military", + "military": "barracks" + }, + "removeTags": { + "landuse": "military", + "military": "barracks" + }, + "terms": [ + "air force", + "army", + "base", + "fight", + "force", + "guard", + "marine", + "navy", + "troop", + "war" + ], + "name": "Barracks" + }, + "landuse/military/bunker": { + "fields": [ + "bunker_type", + "building_area" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "bunker" + }, + "addTags": { + "building": "bunker", + "landuse": "military", + "military": "bunker" + }, + "removeTags": { + "building": "bunker", + "landuse": "military", + "military": "bunker" + }, + "terms": [ + "air force", + "army", + "base", + "fight", + "force", + "guard", + "marine", + "navy", + "troop", + "war" + ], + "name": "Military Bunker" + }, + "landuse/military/checkpoint": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "military": "checkpoint" + }, + "addTags": { + "landuse": "military", + "military": "checkpoint" + }, + "removeTags": { + "landuse": "military", + "military": "checkpoint" + }, + "terms": [ + "air force", + "army", + "base", + "force", + "guard", + "marine", + "navy", + "troop", + "war" + ], + "name": "Checkpoint" + }, + "landuse/military/danger_area": { + "icon": "danger", + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "military": "danger_area" + }, + "addTags": { + "landuse": "military", + "military": "danger_area" + }, + "removeTags": { + "landuse": "military", + "military": "danger_area" + }, + "terms": [ + "air force", + "army", + "base", + "blast", + "bomb", + "explo*", + "force", + "guard", + "mine", + "marine", + "navy", + "troop", + "war" + ], + "name": "Danger Area" + }, + "landuse/military/naval_base": { + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "naval_base" + }, + "addTags": { + "landuse": "military", + "military": "naval_base" + }, + "removeTags": { + "landuse": "military", + "military": "naval_base" + }, + "terms": [ + "base", + "fight", + "force", + "guard", + "marine", + "navy", + "ship", + "sub", + "troop", + "war" + ], + "name": "Naval Base" + }, + "landuse/military/nuclear_explosion_site": { + "icon": "danger", + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "military": "nuclear_explosion_site" + }, + "addTags": { + "landuse": "military", + "military": "nuclear_explosion_site" + }, + "removeTags": { + "landuse": "military", + "military": "nuclear_explosion_site" + }, + "terms": [ + "atom", + "blast", + "bomb", + "detonat*", + "nuke", + "site", + "test" + ], + "name": "Nuclear Explosion Site" + }, + "landuse/military/obstacle_course": { + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "obstacle_course" + }, + "addTags": { + "landuse": "military", + "military": "obstacle_course" + }, + "removeTags": { + "landuse": "military", + "military": "obstacle_course" + }, + "terms": [ + "army", + "base", + "force", + "guard", + "marine", + "navy", + "troop", + "war" + ], + "name": "Obstacle Course" + }, + "landuse/military/office": { + "fields": [ + "building_area" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "office" + }, + "addTags": { + "landuse": "military", + "military": "office" + }, + "removeTags": { + "landuse": "military", + "military": "office" + }, + "terms": [ + "air force", + "army", + "base", + "enlist", + "fight", + "force", + "guard", + "marine", + "navy", + "recruit", + "troop", + "war" + ], + "name": "Military Office" + }, + "landuse/military/range": { + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "range" + }, + "addTags": { + "landuse": "military", + "military": "range" + }, + "removeTags": { + "landuse": "military", + "military": "range" + }, + "terms": [ + "air force", + "army", + "base", + "fight", + "fire", + "force", + "guard", + "gun", + "marine", + "navy", + "rifle", + "shoot*", + "snip*", + "train", + "troop", + "war" + ], + "name": "Military Range" + }, + "landuse/military/training_area": { + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "training_area" + }, + "addTags": { + "landuse": "military", + "military": "training_area" + }, + "removeTags": { + "landuse": "military", + "military": "training_area" + }, + "terms": [ + "air force", + "army", + "base", + "fight", + "fire", + "force", + "guard", + "gun", + "marine", + "navy", + "rifle", + "shoot*", + "snip*", + "train", + "troop", + "war" + ], + "name": "Training Area" + }, "landuse/orchard": { "icon": "park2", "fields": [ @@ -7279,115 +7650,6 @@ }, "name": "Factory" }, - "military/airfield": { - "icon": "airfield", - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "airfield" - }, - "name": "Airfield" - }, - "military/barracks": { - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "barracks" - }, - "name": "Barracks" - }, - "military/bunker": { - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "bunker" - }, - "name": "Bunker" - }, - "military/checkpoint": { - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "checkpoint" - }, - "name": "Checkpoint" - }, - "military/danger_area": { - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "danger_area" - }, - "name": "Danger Area" - }, - "military/naval_base": { - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "naval_base" - }, - "name": "Naval Base" - }, - "military/obstacle_course": { - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "obstacle_course" - }, - "name": "Obstacle Course" - }, - "military/range": { - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "range" - }, - "name": "Military Range" - }, - "military/training_area": { - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "training_area" - }, - "name": "Training area" - }, "natural": { "fields": [ "natural" diff --git a/data/presets/presets/amenity/hunting_stand.json b/data/presets/presets/amenity/hunting_stand.json index 32ae6f802..703ccff88 100644 --- a/data/presets/presets/amenity/hunting_stand.json +++ b/data/presets/presets/amenity/hunting_stand.json @@ -6,8 +6,10 @@ ], "terms": [ "game", + "gun", "lookout", - "shoot", + "rifle", + "shoot*", "wild", "watch" ], diff --git a/data/presets/presets/landuse/military.json b/data/presets/presets/landuse/military.json index 132ca89c0..f2e68bb80 100644 --- a/data/presets/presets/landuse/military.json +++ b/data/presets/presets/landuse/military.json @@ -6,5 +6,6 @@ "landuse": "military" }, "terms": [], + "matchScore": 0.9, "name": "Military Area" } diff --git a/data/presets/presets/landuse/military/airfield.json b/data/presets/presets/landuse/military/airfield.json new file mode 100644 index 000000000..708f40be4 --- /dev/null +++ b/data/presets/presets/landuse/military/airfield.json @@ -0,0 +1,40 @@ +{ + "icon": "airfield", + "fields": [ + "ref", + "iata", + "icao" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "airfield" + }, + "addTags": { + "landuse": "military", + "military": "airfield" + }, + "removeTags": { + "landuse": "military", + "military": "airfield" + }, + "terms": [ + "air force", + "army", + "base", + "bomb", + "fight", + "force", + "guard", + "heli*", + "jet", + "marine", + "navy", + "plane", + "troop", + "war" + ], + "name": "Military Airfield" +} diff --git a/data/presets/presets/landuse/military/barracks.json b/data/presets/presets/landuse/military/barracks.json new file mode 100644 index 000000000..e8b694590 --- /dev/null +++ b/data/presets/presets/landuse/military/barracks.json @@ -0,0 +1,33 @@ +{ + "fields": [ + "building_area" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "barracks" + }, + "addTags": { + "landuse": "military", + "military": "barracks" + }, + "removeTags": { + "landuse": "military", + "military": "barracks" + }, + "terms": [ + "air force", + "army", + "base", + "fight", + "force", + "guard", + "marine", + "navy", + "troop", + "war" + ], + "name": "Barracks" +} diff --git a/data/presets/presets/landuse/military/bunker.json b/data/presets/presets/landuse/military/bunker.json new file mode 100644 index 000000000..a524adec7 --- /dev/null +++ b/data/presets/presets/landuse/military/bunker.json @@ -0,0 +1,36 @@ +{ + "fields": [ + "bunker_type", + "building_area" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "bunker" + }, + "addTags": { + "building": "bunker", + "landuse": "military", + "military": "bunker" + }, + "removeTags": { + "building": "bunker", + "landuse": "military", + "military": "bunker" + }, + "terms": [ + "air force", + "army", + "base", + "fight", + "force", + "guard", + "marine", + "navy", + "troop", + "war" + ], + "name": "Military Bunker" +} diff --git a/data/presets/presets/landuse/military/checkpoint.json b/data/presets/presets/landuse/military/checkpoint.json new file mode 100644 index 000000000..443829174 --- /dev/null +++ b/data/presets/presets/landuse/military/checkpoint.json @@ -0,0 +1,30 @@ +{ + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "military": "checkpoint" + }, + "addTags": { + "landuse": "military", + "military": "checkpoint" + }, + "removeTags": { + "landuse": "military", + "military": "checkpoint" + }, + "terms": [ + "air force", + "army", + "base", + "force", + "guard", + "marine", + "navy", + "troop", + "war" + ], + "name": "Checkpoint" +} diff --git a/data/presets/presets/landuse/military/danger_area.json b/data/presets/presets/landuse/military/danger_area.json new file mode 100644 index 000000000..1734f6d74 --- /dev/null +++ b/data/presets/presets/landuse/military/danger_area.json @@ -0,0 +1,35 @@ +{ + "icon": "danger", + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "military": "danger_area" + }, + "addTags": { + "landuse": "military", + "military": "danger_area" + }, + "removeTags": { + "landuse": "military", + "military": "danger_area" + }, + "terms": [ + "air force", + "army", + "base", + "blast", + "bomb", + "explo*", + "force", + "guard", + "mine", + "marine", + "navy", + "troop", + "war" + ], + "name": "Danger Area" +} diff --git a/data/presets/presets/landuse/military/naval_base.json b/data/presets/presets/landuse/military/naval_base.json new file mode 100644 index 000000000..5bb75009a --- /dev/null +++ b/data/presets/presets/landuse/military/naval_base.json @@ -0,0 +1,30 @@ +{ + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "naval_base" + }, + "addTags": { + "landuse": "military", + "military": "naval_base" + }, + "removeTags": { + "landuse": "military", + "military": "naval_base" + }, + "terms": [ + "base", + "fight", + "force", + "guard", + "marine", + "navy", + "ship", + "sub", + "troop", + "war" + ], + "name": "Naval Base" +} diff --git a/data/presets/presets/landuse/military/nuclear_explosion_site.json b/data/presets/presets/landuse/military/nuclear_explosion_site.json new file mode 100644 index 000000000..a3e19737e --- /dev/null +++ b/data/presets/presets/landuse/military/nuclear_explosion_site.json @@ -0,0 +1,29 @@ +{ + "icon": "danger", + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "military": "nuclear_explosion_site" + }, + "addTags": { + "landuse": "military", + "military": "nuclear_explosion_site" + }, + "removeTags": { + "landuse": "military", + "military": "nuclear_explosion_site" + }, + "terms": [ + "atom", + "blast", + "bomb", + "detonat*", + "nuke", + "site", + "test" + ], + "name": "Nuclear Explosion Site" +} diff --git a/data/presets/presets/landuse/military/obstacle_course.json b/data/presets/presets/landuse/military/obstacle_course.json new file mode 100644 index 000000000..b17bfca61 --- /dev/null +++ b/data/presets/presets/landuse/military/obstacle_course.json @@ -0,0 +1,28 @@ +{ + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "obstacle_course" + }, + "addTags": { + "landuse": "military", + "military": "obstacle_course" + }, + "removeTags": { + "landuse": "military", + "military": "obstacle_course" + }, + "terms": [ + "army", + "base", + "force", + "guard", + "marine", + "navy", + "troop", + "war" + ], + "name": "Obstacle Course" +} diff --git a/data/presets/presets/landuse/military/office.json b/data/presets/presets/landuse/military/office.json new file mode 100644 index 000000000..290071f7f --- /dev/null +++ b/data/presets/presets/landuse/military/office.json @@ -0,0 +1,35 @@ +{ + "fields": [ + "building_area" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "office" + }, + "addTags": { + "landuse": "military", + "military": "office" + }, + "removeTags": { + "landuse": "military", + "military": "office" + }, + "terms": [ + "air force", + "army", + "base", + "enlist", + "fight", + "force", + "guard", + "marine", + "navy", + "recruit", + "troop", + "war" + ], + "name": "Military Office" +} diff --git a/data/presets/presets/landuse/military/range.json b/data/presets/presets/landuse/military/range.json new file mode 100644 index 000000000..f5b90c2e4 --- /dev/null +++ b/data/presets/presets/landuse/military/range.json @@ -0,0 +1,36 @@ +{ + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "range" + }, + "addTags": { + "landuse": "military", + "military": "range" + }, + "removeTags": { + "landuse": "military", + "military": "range" + }, + "terms": [ + "air force", + "army", + "base", + "fight", + "fire", + "force", + "guard", + "gun", + "marine", + "navy", + "rifle", + "shoot*", + "snip*", + "train", + "troop", + "war" + ], + "name": "Military Range" +} diff --git a/data/presets/presets/landuse/military/training_area.json b/data/presets/presets/landuse/military/training_area.json new file mode 100644 index 000000000..9713f4831 --- /dev/null +++ b/data/presets/presets/landuse/military/training_area.json @@ -0,0 +1,36 @@ +{ + "geometry": [ + "point", + "area" + ], + "tags": { + "military": "training_area" + }, + "addTags": { + "landuse": "military", + "military": "training_area" + }, + "removeTags": { + "landuse": "military", + "military": "training_area" + }, + "terms": [ + "air force", + "army", + "base", + "fight", + "fire", + "force", + "guard", + "gun", + "marine", + "navy", + "rifle", + "shoot*", + "snip*", + "train", + "troop", + "war" + ], + "name": "Training Area" +} diff --git a/data/presets/presets/military/airfield.json b/data/presets/presets/military/airfield.json deleted file mode 100644 index 7cde1e8ce..000000000 --- a/data/presets/presets/military/airfield.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "icon": "airfield", - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "airfield" - }, - "name": "Airfield" -} diff --git a/data/presets/presets/military/barracks.json b/data/presets/presets/military/barracks.json deleted file mode 100644 index 1e5281e64..000000000 --- a/data/presets/presets/military/barracks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "barracks" - }, - "name": "Barracks" -} diff --git a/data/presets/presets/military/bunker.json b/data/presets/presets/military/bunker.json deleted file mode 100644 index fef0f0f11..000000000 --- a/data/presets/presets/military/bunker.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "bunker" - }, - "name": "Bunker" -} diff --git a/data/presets/presets/military/checkpoint.json b/data/presets/presets/military/checkpoint.json deleted file mode 100644 index eb36b2b75..000000000 --- a/data/presets/presets/military/checkpoint.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "checkpoint" - }, - "name": "Checkpoint" -} \ No newline at end of file diff --git a/data/presets/presets/military/danger_area.json b/data/presets/presets/military/danger_area.json deleted file mode 100644 index 8b17fa513..000000000 --- a/data/presets/presets/military/danger_area.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "danger_area" - }, - "name": "Danger Area" -} \ No newline at end of file diff --git a/data/presets/presets/military/naval_base.json b/data/presets/presets/military/naval_base.json deleted file mode 100644 index c627a3b2b..000000000 --- a/data/presets/presets/military/naval_base.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "naval_base" - }, - "name": "Naval Base" -} \ No newline at end of file diff --git a/data/presets/presets/military/obstacle_course.json b/data/presets/presets/military/obstacle_course.json deleted file mode 100644 index b07aaff5a..000000000 --- a/data/presets/presets/military/obstacle_course.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "obstacle_course" - }, - "name": "Obstacle Course" -} \ No newline at end of file diff --git a/data/presets/presets/military/range.json b/data/presets/presets/military/range.json deleted file mode 100644 index b1e61deb7..000000000 --- a/data/presets/presets/military/range.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "range" - }, - "name": "Military Range" -} diff --git a/data/presets/presets/military/training_area.json b/data/presets/presets/military/training_area.json deleted file mode 100644 index 31e1b1310..000000000 --- a/data/presets/presets/military/training_area.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "geometry": [ - "point", - "vertex", - "area" - ], - "terms": [], - "tags": { - "military": "training_area" - }, - "name": "Training area" -} \ No newline at end of file diff --git a/data/taginfo.json b/data/taginfo.json index 801c1c79c..e8f419cb0 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1324,6 +1324,50 @@ "key": "landuse", "value": "military" }, + { + "key": "military", + "value": "airfield" + }, + { + "key": "military", + "value": "barracks" + }, + { + "key": "military", + "value": "bunker" + }, + { + "key": "military", + "value": "checkpoint" + }, + { + "key": "military", + "value": "danger_area" + }, + { + "key": "military", + "value": "naval_base" + }, + { + "key": "military", + "value": "nuclear_explosion_site" + }, + { + "key": "military", + "value": "obstacle_course" + }, + { + "key": "military", + "value": "office" + }, + { + "key": "military", + "value": "range" + }, + { + "key": "military", + "value": "training_area" + }, { "key": "landuse", "value": "orchard" @@ -1622,42 +1666,6 @@ "key": "man_made", "value": "works" }, - { - "key": "military", - "value": "airfield" - }, - { - "key": "military", - "value": "barracks" - }, - { - "key": "military", - "value": "bunker" - }, - { - "key": "military", - "value": "checkpoint" - }, - { - "key": "military", - "value": "danger_area" - }, - { - "key": "military", - "value": "naval_base" - }, - { - "key": "military", - "value": "obstacle_course" - }, - { - "key": "military", - "value": "range" - }, - { - "key": "military", - "value": "training_area" - }, { "key": "natural" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index 381849664..2e877fc5a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -911,6 +911,9 @@ "building": { "label": "Building" }, + "bunker_type": { + "label": "Type" + }, "camera/direction": { "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270" @@ -2067,7 +2070,7 @@ }, "amenity/hunting_stand": { "name": "Hunting Stand", - "terms": "game,lookout,shoot,wild,watch" + "terms": "game,gun,lookout,rifle,shoot*,wild,watch" }, "amenity/ice_cream": { "name": "Ice Cream Shop", @@ -3101,6 +3104,50 @@ "name": "Military Area", "terms": "" }, + "landuse/military/airfield": { + "name": "Military Airfield", + "terms": "air force,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war" + }, + "landuse/military/barracks": { + "name": "Barracks", + "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war" + }, + "landuse/military/bunker": { + "name": "Military Bunker", + "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war" + }, + "landuse/military/checkpoint": { + "name": "Checkpoint", + "terms": "air force,army,base,force,guard,marine,navy,troop,war" + }, + "landuse/military/danger_area": { + "name": "Danger Area", + "terms": "air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war" + }, + "landuse/military/naval_base": { + "name": "Naval Base", + "terms": "base,fight,force,guard,marine,navy,ship,sub,troop,war" + }, + "landuse/military/nuclear_explosion_site": { + "name": "Nuclear Explosion Site", + "terms": "atom,blast,bomb,detonat*,nuke,site,test" + }, + "landuse/military/obstacle_course": { + "name": "Obstacle Course", + "terms": "army,base,force,guard,marine,navy,troop,war" + }, + "landuse/military/office": { + "name": "Military Office", + "terms": "air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war" + }, + "landuse/military/range": { + "name": "Military Range", + "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war" + }, + "landuse/military/training_area": { + "name": "Training Area", + "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war" + }, "landuse/orchard": { "name": "Orchard", "terms": "fruit" @@ -3405,42 +3452,6 @@ "name": "Factory", "terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery" }, - "military/airfield": { - "name": "Airfield", - "terms": "" - }, - "military/barracks": { - "name": "Barracks", - "terms": "" - }, - "military/bunker": { - "name": "Bunker", - "terms": "" - }, - "military/checkpoint": { - "name": "Checkpoint", - "terms": "" - }, - "military/danger_area": { - "name": "Danger Area", - "terms": "" - }, - "military/naval_base": { - "name": "Naval Base", - "terms": "" - }, - "military/obstacle_course": { - "name": "Obstacle Course", - "terms": "" - }, - "military/range": { - "name": "Military Range", - "terms": "" - }, - "military/training_area": { - "name": "Training area", - "terms": "" - }, "natural": { "name": "Natural", "terms": "" diff --git a/modules/svg/areas.js b/modules/svg/areas.js index be33de4db..b9c7c4afd 100644 --- a/modules/svg/areas.js +++ b/modules/svg/areas.js @@ -27,6 +27,8 @@ export function svgAreas(projection, context) { function setPattern(d) { for (var i = 0; i < patternKeys.length; i++) { + if (d.tags.building && d.tags.building !== 'no') continue; + if (patterns.hasOwnProperty(d.tags[patternKeys[i]])) { this.style.fill = this.style.stroke = 'url("#pattern-' + patterns[d.tags[patternKeys[i]]] + '")'; return; diff --git a/modules/svg/tag_classes.js b/modules/svg/tag_classes.js index f359dd9e7..cd08c48ba 100644 --- a/modules/svg/tag_classes.js +++ b/modules/svg/tag_classes.js @@ -6,7 +6,7 @@ export function svgTagClasses() { var primaries = [ 'building', 'highway', 'railway', 'waterway', 'aeroway', 'motorway', 'boundary', 'power', 'amenity', 'natural', 'landuse', - 'leisure', 'place' + 'leisure', 'military', 'place' ], statuses = [ 'proposed', 'construction', 'disused', 'abandoned', 'dismantled',