Add fence and wall type fields, add height field to some barriers

(closes #3602)
This commit is contained in:
Bryan Housel
2016-11-20 21:04:33 -05:00
parent e3212e6ea4
commit 8fe66fa65d
10 changed files with 60 additions and 0 deletions

View File

@@ -386,6 +386,9 @@ en:
fee:
# fee=*
label: Fee
fence_type:
# fence=*
label: Type
fire_hydrant/type:
# 'fire_hydrant:type=*'
label: Type
@@ -1159,6 +1162,9 @@ en:
house: Up to 5m (16ft)
# visibility=street
street: 5 to 20m (16 to 65ft)
wall:
# wall=*
label: Type
water:
# water=*
label: Type

View File

@@ -537,6 +537,11 @@
"type": "check",
"label": "Fee"
},
"fence_type": {
"key": "fence",
"type": "combo",
"label": "Type"
},
"fire_hydrant/type": {
"key": "fire_hydrant:type",
"type": "combo",
@@ -1561,6 +1566,11 @@
}
}
},
"wall": {
"key": "wall",
"type": "combo",
"label": "Type"
},
"water_point": {
"key": "water_point",
"type": "check",

View File

@@ -0,0 +1,5 @@
{
"key": "fence",
"type": "combo",
"label": "Type"
}

View File

@@ -0,0 +1,5 @@
{
"key": "wall",
"type": "combo",
"label": "Type"
}

View File

@@ -2669,6 +2669,9 @@
},
"barrier/city_wall": {
"icon": "prison",
"fields": [
"height"
],
"geometry": [
"line",
"area"
@@ -2704,6 +2707,10 @@
},
"barrier/fence": {
"icon": "prison",
"fields": [
"fence_type",
"height"
],
"geometry": [
"line"
],
@@ -2728,6 +2735,9 @@
"name": "Gate"
},
"barrier/hedge": {
"fields": [
"height"
],
"geometry": [
"line",
"area"
@@ -2803,6 +2813,10 @@
},
"barrier/wall": {
"icon": "prison",
"fields": [
"wall",
"height"
],
"geometry": [
"line",
"area"

View File

@@ -1,5 +1,8 @@
{
"icon": "prison",
"fields": [
"height"
],
"geometry": [
"line",
"area"

View File

@@ -1,5 +1,9 @@
{
"icon": "prison",
"fields": [
"fence_type",
"height"
],
"geometry": [
"line"
],

View File

@@ -1,4 +1,7 @@
{
"fields": [
"height"
],
"geometry": [
"line",
"area"

View File

@@ -1,5 +1,9 @@
{
"icon": "prison",
"fields": [
"wall",
"height"
],
"geometry": [
"line",
"area"

View File

@@ -979,6 +979,9 @@
"fee": {
"label": "Fee"
},
"fence_type": {
"label": "Type"
},
"fire_hydrant/type": {
"label": "Type",
"options": {
@@ -1606,6 +1609,9 @@
"area": "Over 20m (65ft)"
}
},
"wall": {
"label": "Type"
},
"water_point": {
"label": "Water Point"
},