Skip to content

Commit

Permalink
Add historic:civilization field to some historic presets
Browse files Browse the repository at this point in the history
(re: #3439)
  • Loading branch information
bhousel committed Mar 2, 2017
1 parent 0c1194b commit 4d64028
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 4 deletions.
3 changes: 3 additions & 0 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,9 @@ en:
historic:
# historic=*
label: Type
historic/civilization:
# 'historic:civilization=*'
label: Historic Civilization
hoops:
# hoops=*
label: Hoops
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,11 @@
"type": "typeCombo",
"label": "Type"
},
"historic/civilization": {
"key": "historic:civilization",
"type": "combo",
"label": "Historic Civilization"
},
"hoops": {
"key": "hoops",
"type": "number",
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields/historic/civilization.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "historic:civilization",
"type": "combo",
"label": "Historic Civilization"
}
9 changes: 8 additions & 1 deletion data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -5818,6 +5818,9 @@
"name": "Historic Site"
},
"historic/archaeological_site": {
"fields": [
"historic/civilization"
],
"geometry": [
"point",
"vertex",
Expand All @@ -5842,7 +5845,8 @@
"icon": "castle",
"fields": [
"castle_type",
"building_area"
"building_area",
"historic/civilization"
],
"geometry": [
"point",
Expand Down Expand Up @@ -5878,6 +5882,9 @@
"name": "Monument"
},
"historic/ruins": {
"fields": [
"historic/civilization"
],
"geometry": [
"point",
"vertex",
Expand Down
5 changes: 4 additions & 1 deletion data/presets/presets/historic/archaeological_site.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"fields": [
"historic/civilization"
],
"geometry": [
"point",
"vertex",
Expand All @@ -8,4 +11,4 @@
"historic": "archaeological_site"
},
"name": "Archaeological Site"
}
}
3 changes: 2 additions & 1 deletion data/presets/presets/historic/castle.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"icon": "castle",
"fields": [
"castle_type",
"building_area"
"building_area",
"historic/civilization"
],
"geometry": [
"point",
Expand Down
5 changes: 4 additions & 1 deletion data/presets/presets/historic/ruins.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"fields": [
"historic/civilization"
],
"geometry": [
"point",
"vertex",
Expand All @@ -8,4 +11,4 @@
"historic": "ruins"
},
"name": "Ruins"
}
}
3 changes: 3 additions & 0 deletions dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,9 @@
"historic": {
"label": "Type"
},
"historic/civilization": {
"label": "Historic Civilization"
},
"hoops": {
"label": "Hoops",
"placeholder": "1, 2, 4..."
Expand Down

0 comments on commit 4d64028

Please sign in to comment.