Skip to content

Commit

Permalink
Add Building Height and Building Levels field to some POI presets if …
Browse files Browse the repository at this point in the history
…they are buildings (close #6238)
  • Loading branch information
quincylvania committed Apr 29, 2019
1 parent 9b37461 commit 9837af3
Show file tree
Hide file tree
Showing 18 changed files with 73 additions and 13 deletions.
8 changes: 8 additions & 0 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,11 @@ en:
building:
# building=*
label: Building
building/levels_building:
# 'building:levels=*'
label: Building Levels
# building/levels_building field placeholder
placeholder: '2, 4, 6...'
building/material:
# 'building:material=*'
label: Material
Expand Down Expand Up @@ -792,6 +797,9 @@ en:
height:
# height=*
label: Height (Meters)
height_building:
# height=*
label: Building Height (Meters)
highspeed:
# highspeed=*
label: High-Speed
Expand Down
2 changes: 2 additions & 0 deletions data/presets/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"bridge/support": {"key": "bridge:support", "type": "combo", "label": "Type"},
"building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": "area", "label": "Building"},
"building": {"key": "building", "type": "combo", "label": "Building"},
"building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
"building/material": {"key": "building:material", "type": "combo", "label": "Material"},
"bunker_type": {"key": "bunker_type", "type": "combo", "label": "Type"},
"cables": {"key": "cables", "type": "number", "minValue": 1, "label": "Cables", "placeholder": "1, 2, 3..."},
Expand Down Expand Up @@ -153,6 +154,7 @@
"hashtags": {"key": "hashtags", "type": "semiCombo", "label": "Suggested Hashtags", "placeholder": "#example"},
"healthcare": {"key": "healthcare", "type": "typeCombo", "label": "Type"},
"healthcare/speciality": {"key": "healthcare:speciality", "type": "semiCombo", "reference": {"key": "healthcare"}, "label": "Specialties"},
"height_building": {"key": "height", "minValue": 0, "type": "number", "label": "Building Height (Meters)", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
"height": {"key": "height", "minValue": 0, "type": "number", "label": "Height (Meters)"},
"highspeed": {"key": "highspeed", "type": "check", "label": "High-Speed"},
"highway": {"key": "highway", "type": "typeCombo", "label": "Type"},
Expand Down
11 changes: 11 additions & 0 deletions data/presets/fields/building/levels_building.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"key": "building:levels",
"type": "number",
"minValue": 0,
"label": "Building Levels",
"placeholder": "2, 4, 6...",
"prerequisiteTag": {
"key": "building",
"valueNot": "no"
}
}
10 changes: 10 additions & 0 deletions data/presets/fields/height_building.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"key": "height",
"minValue": 0,
"type": "number",
"label": "Building Height (Meters)",
"prerequisiteTag": {
"key": "building",
"valueNot": "no"
}
}
22 changes: 11 additions & 11 deletions data/presets/presets.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions data/presets/presets/club.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
],
"moreFields": [
"access_simple",
"building/levels_building",
"height_building",
"email",
"fax",
"internet_access",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/craft.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
],
"moreFields": [
"air_conditioning",
"building/levels_building",
"height_building",
"email",
"fax",
"internet_access",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/healthcare.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"building_area"
],
"moreFields": [
"building/levels_building",
"height_building",
"opening_hours",
"payment_multi",
"brand",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/office.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
],
"moreFields": [
"air_conditioning",
"building/levels_building",
"height_building",
"email",
"fax",
"internet_access",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/shop.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"moreFields": [
"air_conditioning",
"brand",
"building/levels_building",
"height_building",
"currency_multi",
"email",
"fax",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/tourism/apartment.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"internet_access/fee"
],
"moreFields" : [
"building/levels_building",
"height_building",
"email",
"fax",
"internet_access/ssid",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/tourism/chalet.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
],
"moreFields" : [
"air_conditioning",
"building/levels_building",
"height_building",
"smoking",
"payment_multi",
"internet_access/ssid",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/tourism/guest_house.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
],
"moreFields" : [
"air_conditioning",
"building/levels_building",
"height_building",
"smoking",
"payment_multi",
"internet_access/ssid",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/tourism/information/office.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"internet_access/fee"
],
"moreFields": [
"building/levels_building",
"height_building",
"email",
"fax",
"internet_access/ssid",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/tourism/motel.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
],
"moreFields" : [
"air_conditioning",
"building/levels_building",
"height_building",
"email",
"fax",
"internet_access/ssid",
Expand Down
2 changes: 2 additions & 0 deletions data/presets/presets/tourism/museum.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
],
"moreFields": [
"air_conditioning",
"building/levels_building",
"height_building",
"fee",
"internet_access",
"internet_access/fee",
Expand Down
4 changes: 2 additions & 2 deletions data/taginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -1192,6 +1192,7 @@
{"key": "brand", "description": "🄵 Brand"},
{"key": "brewery", "description": "🄵 Draft Beers"},
{"key": "bridge", "description": "🄵 Type, 🄵 Structure"},
{"key": "building:levels", "description": "🄵 Building Levels, 🄵 Levels"},
{"key": "building:material", "description": "🄵 Material"},
{"key": "bunker_type", "description": "🄵 Type"},
{"key": "cables", "description": "🄵 Cables"},
Expand Down Expand Up @@ -1347,7 +1348,7 @@
{"key": "handrail", "description": "🄵 Handrail"},
{"key": "hashtags", "description": "🄵 Suggested Hashtags"},
{"key": "healthcare:speciality", "description": "🄵 Specialties"},
{"key": "height", "description": "🄵 Height (Meters)"},
{"key": "height", "description": "🄵 Building Height (Meters), 🄵 Height (Meters)"},
{"key": "highspeed", "description": "🄵 High-Speed"},
{"key": "historic:civilization", "description": "🄵 Historic Civilization"},
{"key": "wreck:date_sunk", "description": "🄵 Date Sunk"},
Expand Down Expand Up @@ -1396,7 +1397,6 @@
{"key": "leaf_type", "value": "mixed", "description": "🄵 Leaf Type"},
{"key": "length", "description": "🄵 Length (Meters)"},
{"key": "level", "description": "🄵 Level"},
{"key": "building:levels", "description": "🄵 Levels"},
{"key": "liaison", "description": "🄵 Type"},
{"key": "lit", "description": "🄵 Lit"},
{"key": "location", "value": "outdoor", "description": "🄵 Location"},
Expand Down
7 changes: 7 additions & 0 deletions dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2559,6 +2559,10 @@
"building": {
"label": "Building"
},
"building/levels_building": {
"label": "Building Levels",
"placeholder": "2, 4, 6..."
},
"building/material": {
"label": "Material"
},
Expand Down Expand Up @@ -3001,6 +3005,9 @@
"healthcare/speciality": {
"label": "Specialties"
},
"height_building": {
"label": "Building Height (Meters)"
},
"height": {
"label": "Height (Meters)"
},
Expand Down

0 comments on commit 9837af3

Please sign in to comment.