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.

Sign up for GitHub

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

Adds fields to the Flagpole preset #5316

Merged
merged 4 commits into from
Sep 18, 2018
Merged

Adds fields to the Flagpole preset #5316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e7b34d
Adds the Operator, Country, Lit, Height, and new Flag Type fields to …
quincylvania Sep 17, 2018
abdcf19
Adds the vertex geometry type to the Flagpole preset
quincylvania Sep 17, 2018
d509649
Merge branch 'master' into add-flagpole-preset-fields
quincylvania Sep 17, 2018
5b482d1
Renames and moves flag_type.json preset field file to flag/type.json
quincylvania Sep 17, 2018
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
3 changes: 3 additions & 0 deletions data/presets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,9 @@ en:
fixme:
# fixme=*
label: Fix Me
flag/type:
# 'flag:type=*'
label: Flag Type
ford:
# ford=*
label: Type
Expand Down
1 change: 1 addition & 0 deletions data/presets/fields.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"},
"fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
"fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true},
"flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
"ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
"frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"},
"fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"},
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields/flag/type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "flag:type",
"type": "combo",
"label": "Flag Type"
}
2 changes: 1 addition & 1 deletion data/presets/presets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@
"man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
"man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
"man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
"man_made/flagpole": {"icon": "maki-embassy", "geometry": ["point"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
"man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
"man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
"man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
"man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"},
Expand Down
10 changes: 9 additions & 1 deletion data/presets/presets/man_made/flagpole.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
{
"icon": "maki-embassy",
"fields": [
"operator",
"flag/type",
"country",
"lit",
"height"
],
"geometry": [
"point"
"point",
"vertex"
],
"tags": {
"man_made": "flagpole"
Expand Down
1 change: 1 addition & 0 deletions data/taginfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6654,6 +6654,7 @@
{"key": "fireplace", "description": "Fireplace"},
{"key": "fitness_station", "description": "Equipment Type"},
{"key": "fixme", "description": "Fix Me"},
{"key": "flag:type", "description": "Flag Type"},
{"key": "ford", "description": "Type"},
{"key": "frequency", "description": "Operating Frequency"},
{"key": "fuel:", "description": "Fuel Types"},
Expand Down
3 changes: 3 additions & 0 deletions dist/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1972,6 +1972,9 @@
"fixme": {
"label": "Fix Me"
},
"flag/type": {
"label": "Flag Type"
},
"ford": {
"label": "Type",
"placeholder": "Default"
Expand Down