Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed farm preset name, added farm_auxiliary preset (#4826) #4839

Merged
merged 1 commit into from
Mar 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2567,6 +2567,10 @@ en:
name: Entrance/Exit
building/farm:
# building=farm
name: Farm House
terms: '<translate with synonyms or related terms for ''Farm House'', separated by commas>'
building/farm_auxiliary:
# building=farm_auxiliary
name: Farm Building
terms: '<translate with synonyms or related terms for ''Farm Building'', separated by commas>'
building/garage:
Expand Down
18 changes: 17 additions & 1 deletion data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -4497,6 +4497,22 @@
"matchScore": 0.5,
"name": "Dormitory"
},
"building/farm_auxiliary": {
"icon": "farm",
"fields": [
"name",
"address",
"levels"
],
"geometry": [
"area"
],
"tags": {
"building": "farm_auxiliary"
},
"matchScore": 0.5,
"name": "Farm Building"
},
"building/farm": {
"icon": "farm",
"fields": [
Expand All @@ -4511,7 +4527,7 @@
"building": "farm"
},
"matchScore": 0.5,
"name": "Farm Building"
"name": "Farm House"
},
"building/garage": {
"icon": "warehouse",
Expand Down
2 changes: 1 addition & 1 deletion data/presets/presets/building/farm.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
"building": "farm"
},
"matchScore": 0.5,
"name": "Farm Building"
"name": "Farm House"
}
16 changes: 16 additions & 0 deletions data/presets/presets/building/farm_auxiliary.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"icon": "farm",
"fields": [
"name",
"address",
"levels"
],
"geometry": [
"area"
],
"tags": {
"building": "farm_auxiliary"
},
"matchScore": 0.5,
"name": "Farm Building"
}
4 changes: 4 additions & 0 deletions data/taginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,10 @@
"key": "building",
"value": "dormitory"
},
{
"key": "building",
"value": "farm_auxiliary"
},
{
"key": "building",
"value": "farm"
Expand Down
6 changes: 5 additions & 1 deletion dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -3513,10 +3513,14 @@
"name": "Dormitory",
"terms": ""
},
"building/farm": {
"building/farm_auxiliary": {
"name": "Farm Building",
"terms": ""
},
"building/farm": {
"name": "Farm House",
"terms": ""
},
"building/garage": {
"name": "Garage",
"terms": ""
Expand Down