From 6e7b34d39ab594c13bd4cddbf878c462ff9ef538 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 16 Sep 2018 20:26:41 -0700 Subject: [PATCH 1/3] Adds the Operator, Country, Lit, Height, and new Flag Type fields to the Flagpole preset --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/flag_type.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/man_made/flagpole.json | 7 +++++++ data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 7 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/flag_type.json diff --git a/data/presets.yaml b/data/presets.yaml index e26d7c53f2..59be78908d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -601,6 +601,9 @@ en: fixme: # fixme=* label: Fix Me + flag_type: + # 'flag:type=*' + label: Flag Type ford: # ford=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index dbba6487ea..2295f12f5e 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -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"}, diff --git a/data/presets/fields/flag_type.json b/data/presets/fields/flag_type.json new file mode 100644 index 0000000000..9f9978a491 --- /dev/null +++ b/data/presets/fields/flag_type.json @@ -0,0 +1,5 @@ +{ + "key": "flag:type", + "type": "combo", + "label": "Flag Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 3034694791..ad053bc948 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -544,7 +544,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"], "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"}, diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json index 19472e84dd..f625581df4 100644 --- a/data/presets/presets/man_made/flagpole.json +++ b/data/presets/presets/man_made/flagpole.json @@ -1,5 +1,12 @@ { "icon": "maki-embassy", + "fields": [ + "operator", + "flag_type", + "country", + "lit", + "height" + ], "geometry": [ "point" ], diff --git a/data/taginfo.json b/data/taginfo.json index 166e9e314a..0aa2a0afb7 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6647,6 +6647,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"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 61a0c74ed9..aaebd403dc 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1972,6 +1972,9 @@ "fixme": { "label": "Fix Me" }, + "flag_type": { + "label": "Flag Type" + }, "ford": { "label": "Type", "placeholder": "Default" From abdcf19773c7dbdcd24abd36e5b12e4da9b79a97 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 16 Sep 2018 20:32:43 -0700 Subject: [PATCH 2/3] Adds the vertex geometry type to the Flagpole preset --- data/presets/presets.json | 2 +- data/presets/presets/man_made/flagpole.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index ad053bc948..16da6a61da 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -544,7 +544,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", "fields": ["operator", "flag_type", "country", "lit", "height"], "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"}, diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json index f625581df4..06aaac0796 100644 --- a/data/presets/presets/man_made/flagpole.json +++ b/data/presets/presets/man_made/flagpole.json @@ -8,7 +8,8 @@ "height" ], "geometry": [ - "point" + "point", + "vertex" ], "tags": { "man_made": "flagpole" From 5b482d1ad45f9bcd0e796c3cefd4b5d0030af0fe Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 17 Sep 2018 16:44:21 -0700 Subject: [PATCH 3/3] Renames and moves flag_type.json preset field file to flag/type.json --- data/presets.yaml | 2 +- data/presets/fields.json | 2 +- data/presets/fields/{flag_type.json => flag/type.json} | 0 data/presets/presets.json | 2 +- data/presets/presets/man_made/flagpole.json | 2 +- dist/locales/en.json | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename data/presets/fields/{flag_type.json => flag/type.json} (100%) diff --git a/data/presets.yaml b/data/presets.yaml index ab91773a93..b536997699 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -601,7 +601,7 @@ en: fixme: # fixme=* label: Fix Me - flag_type: + flag/type: # 'flag:type=*' label: Flag Type ford: diff --git a/data/presets/fields.json b/data/presets/fields.json index db79b5b4d3..4abeb8afc5 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -102,7 +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"}, + "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"}, diff --git a/data/presets/fields/flag_type.json b/data/presets/fields/flag/type.json similarity index 100% rename from data/presets/fields/flag_type.json rename to data/presets/fields/flag/type.json diff --git a/data/presets/presets.json b/data/presets/presets.json index 4365dd31eb..9e2d1cb92f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -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", "fields": ["operator", "flag_type", "country", "lit", "height"], "geometry": ["point", "vertex"], "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"}, diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json index 06aaac0796..8cac99475c 100644 --- a/data/presets/presets/man_made/flagpole.json +++ b/data/presets/presets/man_made/flagpole.json @@ -2,7 +2,7 @@ "icon": "maki-embassy", "fields": [ "operator", - "flag_type", + "flag/type", "country", "lit", "height" diff --git a/dist/locales/en.json b/dist/locales/en.json index 31c5467b1a..9583a67273 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1972,7 +1972,7 @@ "fixme": { "label": "Fix Me" }, - "flag_type": { + "flag/type": { "label": "Flag Type" }, "ford": {