CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 13:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve military presets

Browse Source 
(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
This commit is contained in:
Bryan Housel
2016-12-27 01:07:21 -05:00
parent 0e2cd589d4
commit 0c9fb7c407
31 changed files with 911 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/map.css
+3
View File
@@ -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);
data/presets.yaml
+59 -37
View File
@@ -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: '<translate with synonyms or related terms for ''Hunting Stand'', separated by commas>'
amenity/ice_cream:
# amenity=ice_cream
@@ -2690,6 +2693,61 @@ en:
# landuse=military
name: Military Area
terms: '<translate with synonyms or related terms for ''Military Area'', separated by commas>'
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: '<translate with synonyms or related terms for ''Military Airfield'', separated by commas>'
landuse/military/barracks:
# military=barracks
name: Barracks
# 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Barracks'', separated by commas>'
landuse/military/bunker:
# military=bunker
name: Military Bunker
# 'terms: air force,army,base,fight,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Military Bunker'', separated by commas>'
landuse/military/checkpoint:
# military=checkpoint
name: Checkpoint
# 'terms: air force,army,base,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Checkpoint'', separated by commas>'
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: '<translate with synonyms or related terms for ''Danger Area'', separated by commas>'
landuse/military/naval_base:
# military=naval_base
name: Naval Base
# 'terms: base,fight,force,guard,marine,navy,ship,sub,troop,war'
terms: '<translate with synonyms or related terms for ''Naval Base'', separated by commas>'
landuse/military/nuclear_explosion_site:
# military=nuclear_explosion_site
name: Nuclear Explosion Site
# 'terms: atom,blast,bomb,detonat*,nuke,site,test'
terms: '<translate with synonyms or related terms for ''Nuclear Explosion Site'', separated by commas>'
landuse/military/obstacle_course:
# military=obstacle_course
name: Obstacle Course
# 'terms: army,base,force,guard,marine,navy,troop,war'
terms: '<translate with synonyms or related terms for ''Obstacle Course'', separated by commas>'
landuse/military/office:
# military=office
name: Military Office
# 'terms: air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war'
terms: '<translate with synonyms or related terms for ''Military Office'', separated by commas>'
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: '<translate with synonyms or related terms for ''Military Range'', separated by commas>'
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: '<translate with synonyms or related terms for ''Training Area'', separated by commas>'
landuse/orchard:
# landuse=orchard
name: Orchard
@@ -3029,42 +3087,6 @@ en:
name: Factory
# 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery'
terms: '<translate with synonyms or related terms for ''Factory'', separated by commas>'
military/airfield:
# military=airfield
name: Airfield
terms: '<translate with synonyms or related terms for ''Airfield'', separated by commas>'
military/barracks:
# military=barracks
name: Barracks
terms: '<translate with synonyms or related terms for ''Barracks'', separated by commas>'
military/bunker:
# military=bunker
name: Bunker
terms: '<translate with synonyms or related terms for ''Bunker'', separated by commas>'
military/checkpoint:
# military=checkpoint
name: Checkpoint
terms: '<translate with synonyms or related terms for ''Checkpoint'', separated by commas>'
military/danger_area:
# military=danger_area
name: Danger Area
terms: '<translate with synonyms or related terms for ''Danger Area'', separated by commas>'
military/naval_base:
# military=naval_base
name: Naval Base
terms: '<translate with synonyms or related terms for ''Naval Base'', separated by commas>'
military/obstacle_course:
# military=obstacle_course
name: Obstacle Course
terms: '<translate with synonyms or related terms for ''Obstacle Course'', separated by commas>'
military/range:
# military=range
name: Military Range
terms: '<translate with synonyms or related terms for ''Military Range'', separated by commas>'
military/training_area:
# military=training_area
name: Training area
terms: '<translate with synonyms or related terms for ''Training area'', separated by commas>'
natural:
# natural=*
name: Natural
data/presets/fields.json
+5
View File
@@ -305,6 +305,11 @@
"type": "combo",
"label": "Building"
},
"bunker_type": {
"key": "bunker_type",
"type": "combo",
"label": "Type"
},
"camera/direction": {
"key": "camera:direction",
"type": "number",
data/presets/fields/bunker_type.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "bunker_type",
"type": "combo",
"label": "Type"
}
data/presets/presets.json
+372 -110
View File
@@ -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"
data/presets/presets/amenity/hunting_stand.json
+3 -1
View File
@@ -6,8 +6,10 @@
],
"terms": [
"game",
"gun",
"lookout",
"shoot",
"rifle",
"shoot*",
"wild",
"watch"
],
data/presets/presets/landuse/military.json
+1
View File
@@ -6,5 +6,6 @@
"landuse": "military"
},
"terms": [],
"matchScore": 0.9,
"name": "Military Area"
}
data/presets/presets/landuse/military/airfield.json
+40
View File
@@ -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"
}
data/presets/presets/landuse/military/barracks.json
+33
View File
@@ -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"
}
data/presets/presets/landuse/military/bunker.json
+36
View File
@@ -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"
}
data/presets/presets/landuse/military/checkpoint.json
+30
View File
@@ -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"
}
data/presets/presets/landuse/military/danger_area.json
+35
View File
@@ -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"
}
data/presets/presets/landuse/military/naval_base.json
+30
View File
@@ -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"
}
data/presets/presets/landuse/military/nuclear_explosion_site.json
+29
View File
@@ -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"
}
data/presets/presets/landuse/military/obstacle_course.json
+28
View File
@@ -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"
}
data/presets/presets/landuse/military/office.json
+35
View File
@@ -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"
}
data/presets/presets/landuse/military/range.json
+36
View File
@@ -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"
}
data/presets/presets/landuse/military/training_area.json
+36
View File
@@ -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"
}
data/presets/presets/military/airfield.json
-13
View File
@@ -1,13 +0,0 @@
{
"icon": "airfield",
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "airfield"
},
"name": "Airfield"
}
data/presets/presets/military/barracks.json
-12
View File
@@ -1,12 +0,0 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "barracks"
},
"name": "Barracks"
}
data/presets/presets/military/bunker.json
-12
View File
@@ -1,12 +0,0 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "bunker"
},
"name": "Bunker"
}
data/presets/presets/military/checkpoint.json
-12
View File
@@ -1,12 +0,0 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "checkpoint"
},
"name": "Checkpoint"
}
data/presets/presets/military/danger_area.json
-12
View File
@@ -1,12 +0,0 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "danger_area"
},
"name": "Danger Area"
}
data/presets/presets/military/naval_base.json
-12
View File
@@ -1,12 +0,0 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "naval_base"
},
"name": "Naval Base"
}
data/presets/presets/military/obstacle_course.json
-12
View File
@@ -1,12 +0,0 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "obstacle_course"
},
"name": "Obstacle Course"
}
data/presets/presets/military/range.json
-12
View File
@@ -1,12 +0,0 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "range"
},
"name": "Military Range"
}
data/presets/presets/military/training_area.json
-12
View File
@@ -1,12 +0,0 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "training_area"
},
"name": "Training area"
}
data/taginfo.json
+44 -36
View File
@@ -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"
},
dist/locales/en.json
Vendored
+48 -37
View File
@@ -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": ""
modules/svg/areas.js
+2
View File
@@ -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;
modules/svg/tag_classes.js
+1 -1
View File
@@ -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',