Merge pull request #2802 from arunasank/master

Add military presets (fixes #2177)
This commit is contained in:
Bryan Housel
2015-10-20 23:10:45 -04:00
9 changed files with 180 additions and 0 deletions
+20
View File
@@ -2591,10 +2591,30 @@ en:
# 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
+60
View File
@@ -5925,6 +5925,54 @@
},
"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",
@@ -5937,6 +5985,18 @@
},
"name": "Military Range"
},
"military/training_area": {
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "training_area"
},
"name": "Training area"
},
"natural": {
"fields": [
"natural"
@@ -0,0 +1,12 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "checkpoint"
},
"name": "Checkpoint"
}
@@ -0,0 +1,12 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "danger_area"
},
"name": "Danger Area"
}
@@ -0,0 +1,12 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "naval_base"
},
"name": "Naval Base"
}
@@ -0,0 +1,12 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "obstacle_course"
},
"name": "Obstacle Course"
}
@@ -0,0 +1,12 @@
{
"geometry": [
"point",
"vertex",
"area"
],
"terms": [],
"tags": {
"military": "training_area"
},
"name": "Training area"
}
+20
View File
@@ -1378,10 +1378,30 @@
"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"
},
+20
View File
@@ -2859,10 +2859,30 @@
"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": ""