From d64ec8f3ce218a69c665195991693691b6a543f5 Mon Sep 17 00:00:00 2001 From: archpdx Date: Fri, 23 Jun 2023 05:25:40 -0700 Subject: [PATCH 1/9] Add support for `building=house` + `house=*` (#921) --- data/fields/house.json | 5 ++++ data/presets/building/house.json | 4 +++ data/presets/building/house/_detached.json | 17 +++++++++++ .../building/house/_semi-detached.json | 17 +++++++++++ data/presets/building/house/_terrace.json | 17 +++++++++++ data/presets/building/house/terraced.json | 29 +++++++++++++++++++ data/presets/building/terrace.json | 11 ++++--- interim/source_strings.yaml | 21 ++++++++++++-- 8 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 data/fields/house.json create mode 100644 data/presets/building/house/_detached.json create mode 100644 data/presets/building/house/_semi-detached.json create mode 100644 data/presets/building/house/_terrace.json create mode 100644 data/presets/building/house/terraced.json diff --git a/data/fields/house.json b/data/fields/house.json new file mode 100644 index 00000000..4507d5e2 --- /dev/null +++ b/data/fields/house.json @@ -0,0 +1,5 @@ +{ + "key": "house", + "type": "combo", + "label": "House Type" +} diff --git a/data/presets/building/house.json b/data/presets/building/house.json index 1c4636ab..87c937de 100644 --- a/data/presets/building/house.json +++ b/data/presets/building/house.json @@ -3,6 +3,10 @@ "geometry": [ "area" ], + "fields": [ + "{building}", + "house" + ], "tags": { "building": "house" }, diff --git a/data/presets/building/house/_detached.json b/data/presets/building/house/_detached.json new file mode 100644 index 00000000..b20361cb --- /dev/null +++ b/data/presets/building/house/_detached.json @@ -0,0 +1,17 @@ +{ + "icon": "maki-home", + "geometry": [ + "area" + ], + "tags": { + "building": "house", + "house": "detached" + }, + "reference": { + "key": "house", + "value": "detached" + }, + "matchScore": 0.5, + "name": "{building/detached}", + "searchable": false +} diff --git a/data/presets/building/house/_semi-detached.json b/data/presets/building/house/_semi-detached.json new file mode 100644 index 00000000..57ada385 --- /dev/null +++ b/data/presets/building/house/_semi-detached.json @@ -0,0 +1,17 @@ +{ + "icon": "maki-home", + "geometry": [ + "area" + ], + "tags": { + "building": "house", + "house": "semi-detached" + }, + "reference": { + "key": "house", + "value": "semi-detached" + }, + "matchScore": 0.5, + "name": "{building/semidetached_house}", + "searchable": false +} diff --git a/data/presets/building/house/_terrace.json b/data/presets/building/house/_terrace.json new file mode 100644 index 00000000..753c8714 --- /dev/null +++ b/data/presets/building/house/_terrace.json @@ -0,0 +1,17 @@ +{ + "icon": "temaki-row_houses", + "geometry": [ + "area" + ], + "tags": { + "building": "house", + "house": "terrace" + }, + "reference": { + "key": "house", + "value": "terrace" + }, + "matchScore": 0.5, + "name": "{building/terrace}", + "searchable": false +} diff --git a/data/presets/building/house/terraced.json b/data/presets/building/house/terraced.json new file mode 100644 index 00000000..e99640b4 --- /dev/null +++ b/data/presets/building/house/terraced.json @@ -0,0 +1,29 @@ +{ + "icon": "temaki-row_houses", + "geometry": [ + "area" + ], + "tags": { + "building": "house", + "house": "terraced" + }, + "reference": { + "key": "house", + "value": "terraced" + }, + "terms": [ + "brownstone", + "dwelling", + "family", + "home", + "residence", + "row home", + "terrace", + "townhome" + ], + "matchScore": 0.5, + "name": "Townhouse", + "aliases": [ + "Row House" + ] +} diff --git a/data/presets/building/terrace.json b/data/presets/building/terrace.json index 0de9a9f7..fbd8b410 100644 --- a/data/presets/building/terrace.json +++ b/data/presets/building/terrace.json @@ -7,13 +7,16 @@ "building": "terrace" }, "terms": [ - "home", - "terrace", "brownstone", + "dwelling", "family", + "home", "residence", - "dwelling" + "row home", + "row house", + "terrace", + "townhome" ], "matchScore": 0.5, - "name": "Row Houses" + "name": "Row of Townhouses" } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 14e38861..7fe02b17 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2652,6 +2652,9 @@ en: hot_water: # hot_water=* label: Hot Water + house: + # house=* + label: House iata: # iata=* label: IATA Airport Code @@ -7591,6 +7594,20 @@ en: name: House # 'terms: home,family,residence,dwelling' terms: + building/house/detached: + # building=house + house=detached | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Detached House + building/house/semi-detached: + # building=house + house=semi-detached | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Semi-Detached House + building/house/terrace: + # building=terrace | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Row Houses (Whole Building) + building/house/terraced: + # building=house + house=terraced | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Row House (Individual Unit) + # 'terms: home,terrace,brownstone,family,residence,dwelling' + terms: building/houseboat: # building=houseboat | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Houseboat @@ -7698,9 +7715,9 @@ en: terms: building/terrace: # building=terrace | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Row Houses + name: Row Houses (Whole Building) # 'terms: home,terrace,brownstone,family,residence,dwelling' - terms: + terms: building/train_station: # building=train_station | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Train Station Building From 2ac469addba25ee08cc211372c678e8bf9b84062 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Fri, 23 Jun 2023 12:26:01 +0000 Subject: [PATCH 2/9] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@d64ec8f3ce218a69c665195991693691b6a543f?= =?UTF-8?q?5=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 7fe02b17..810dbc87 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2654,7 +2654,7 @@ en: label: Hot Water house: # house=* - label: House + label: House Type iata: # iata=* label: IATA Airport Code @@ -7596,18 +7596,15 @@ en: terms: building/house/detached: # building=house + house=detached | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Detached House building/house/semi-detached: # building=house + house=semi-detached | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Semi-Detached House building/house/terrace: - # building=terrace | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Row Houses (Whole Building) + # building=house + house=terrace | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). building/house/terraced: - # building=house + house=terraced | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Row House (Individual Unit) - # 'terms: home,terrace,brownstone,family,residence,dwelling' - terms: + # building=house + house=terraced | Row House | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Townhouse + # 'terms: brownstone,dwelling,family,home,residence,row home,terrace,townhome' + terms: building/houseboat: # building=houseboat | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Houseboat @@ -7715,9 +7712,9 @@ en: terms: building/terrace: # building=terrace | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Row Houses (Whole Building) - # 'terms: home,terrace,brownstone,family,residence,dwelling' - terms: + name: Row of Townhouses + # 'terms: brownstone,dwelling,family,home,residence,row home,row house,terrace,townhome' + terms: building/train_station: # building=train_station | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Train Station Building From b15c86649543286a2aedd0db59e8ac64f41ced44 Mon Sep 17 00:00:00 2001 From: archpdx Date: Fri, 23 Jun 2023 05:29:52 -0700 Subject: [PATCH 3/9] Add Milk Churn Stand preset (#926) --- data/presets/man_made/milk_churn_stand.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 data/presets/man_made/milk_churn_stand.json diff --git a/data/presets/man_made/milk_churn_stand.json b/data/presets/man_made/milk_churn_stand.json new file mode 100644 index 00000000..66472826 --- /dev/null +++ b/data/presets/man_made/milk_churn_stand.json @@ -0,0 +1,19 @@ +{ + "icon": "temaki-milk_jug", + "fields": [ + "material" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "creamery stand", + "milk can stand", + "milk stand" + ], + "tags": { + "man_made": "milk_churn_stand" + }, + "name": "Milk Churn Stand" +} From 2042b19c67e763e3f13c21315261d7ea5767da6b Mon Sep 17 00:00:00 2001 From: tyrasd Date: Fri, 23 Jun 2023 12:30:15 +0000 Subject: [PATCH 4/9] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@b15c86649543286a2aedd0db59e8ac64f41ced4?= =?UTF-8?q?4=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 810dbc87..dfd1dc17 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -9936,6 +9936,11 @@ en: name: Lighting Mast # 'terms: flood light,lighting,stadium lights,stadium lighting,headlight' terms: + man_made/milk_churn_stand: + # man_made=milk_churn_stand | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Milk Churn Stand + # 'terms: creamery stand,milk can stand,milk stand' + terms: man_made/mineshaft: # man_made=mineshaft | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Mineshaft From 6cc48e7e6cb3e496086d40db0e776b1886f8d99d Mon Sep 17 00:00:00 2001 From: archpdx Date: Fri, 23 Jun 2023 05:31:49 -0700 Subject: [PATCH 5/9] Allow Drinking Water preset on vertices (#927) --- data/presets/amenity/drinking_water.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/presets/amenity/drinking_water.json b/data/presets/amenity/drinking_water.json index e538ca99..aff82d0b 100644 --- a/data/presets/amenity/drinking_water.json +++ b/data/presets/amenity/drinking_water.json @@ -16,7 +16,8 @@ "lit" ], "geometry": [ - "point" + "point", + "vertex" ], "tags": { "amenity": "drinking_water" From 49832a898f1c12c379fee9105ffdd80ee069e636 Mon Sep 17 00:00:00 2001 From: kjonosm <51236777+kjonosm@users.noreply.github.com> Date: Fri, 23 Jun 2023 15:09:02 +0200 Subject: [PATCH 6/9] Add translatable strings to tomb field (#924) --- data/fields/tomb.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/data/fields/tomb.json b/data/fields/tomb.json index c47d819d..a95524f5 100644 --- a/data/fields/tomb.json +++ b/data/fields/tomb.json @@ -1,5 +1,21 @@ { "key": "tomb", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "columbarium": "Columbarium", + "crypt": "Crypt", + "dolmen": "Dolmen", + "hypogeum": "Hypogeum", + "mausoleum": "Mausoleum", + "pyramid": "Pyramid", + "rock-cut": "Rock-cut Tomb", + "sarcophagus": "Sarcophagus", + "table": "Table", + "tumulus": "Tumulus", + "vault": "Vault", + "war_grave": "Single War Grave" + } + } } From 656213b5c0c16e87eb1593f5cacdcec25a21ea6f Mon Sep 17 00:00:00 2001 From: tyrasd Date: Fri, 23 Jun 2023 13:09:35 +0000 Subject: [PATCH 7/9] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@49832a898f1c12c379fee9105ffdd80ee069e63?= =?UTF-8?q?6=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index dfd1dc17..f949a91c 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -5089,6 +5089,31 @@ en: tomb: # tomb=* label: Type + options: + # tomb=columbarium + columbarium: Columbarium + # tomb=crypt + crypt: Crypt + # tomb=dolmen + dolmen: Dolmen + # tomb=hypogeum + hypogeum: Hypogeum + # tomb=mausoleum + mausoleum: Mausoleum + # tomb=pyramid + pyramid: Pyramid + # tomb=rock-cut + rock-cut: Rock-cut Tomb + # tomb=sarcophagus + sarcophagus: Sarcophagus + # tomb=table + table: Table + # tomb=tumulus + tumulus: Tumulus + # tomb=vault + vault: Vault + # tomb=war_grave + war_grave: Single War Grave tourism: # tourism=* label: Type From e7cf81e954866c40a010eb3121007885ebe0ab06 Mon Sep 17 00:00:00 2001 From: kjonosm <51236777+kjonosm@users.noreply.github.com> Date: Fri, 23 Jun 2023 15:28:01 +0200 Subject: [PATCH 8/9] Add translatable strings to vending field (#923) --- data/fields/vending.json | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/data/fields/vending.json b/data/fields/vending.json index 0c8fcec6..216319db 100644 --- a/data/fields/vending.json +++ b/data/fields/vending.json @@ -1,5 +1,32 @@ { "key": "vending", "type": "semiCombo", - "label": "Types of Goods" + "label": "Types of Goods", + "strings": { + "options": { + "bicycle_tube": "Bicycle Tubes", + "bread": "Bread", + "cigarettes": "Cigarettes", + "coffee": "Coffee", + "condoms": "Condoms", + "drinks": "Drinks", + "eggs": "Eggs", + "electronics": "Electronics", + "elongated_coin": "Souvenir Coins", + "excrement_bags": "Excrement Bags", + "feminine_hygiene": "Feminine Hygiene Products", + "food": "Food", + "fuel": "Fuel", + "ice_cream": "Ice Cream", + "ice_cubes": "Ice Cubes", + "milk": "Milk", + "newspapers": "Newspapers", + "parking_tickets": "Parking Tickets", + "pizza": "Pizza", + "public_transport_tickets": "Public Transport Tickets", + "stamps": "Postage Stamps", + "sweets": "Sweets", + "water": "Drinking Water" + } + } } From 993b6b093571b5cfd3b647e6153e115a01d9bc26 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Fri, 23 Jun 2023 13:28:23 +0000 Subject: [PATCH 9/9] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@e7cf81e954866c40a010eb3121007885ebe0ab0?= =?UTF-8?q?6=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index f949a91c..e0406ac3 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -5396,6 +5396,53 @@ en: vending: # vending=* label: Types of Goods + options: + # vending=bicycle_tube + bicycle_tube: Bicycle Tubes + # vending=bread + bread: Bread + # vending=cigarettes + cigarettes: Cigarettes + # vending=coffee + coffee: Coffee + # vending=condoms + condoms: Condoms + # vending=drinks + drinks: Drinks + # vending=eggs + eggs: Eggs + # vending=electronics + electronics: Electronics + # vending=elongated_coin + elongated_coin: Souvenir Coins + # vending=excrement_bags + excrement_bags: Excrement Bags + # vending=feminine_hygiene + feminine_hygiene: Feminine Hygiene Products + # vending=food + food: Food + # vending=fuel + fuel: Fuel + # vending=ice_cream + ice_cream: Ice Cream + # vending=ice_cubes + ice_cubes: Ice Cubes + # vending=milk + milk: Milk + # vending=newspapers + newspapers: Newspapers + # vending=parking_tickets + parking_tickets: Parking Tickets + # vending=pizza + pizza: Pizza + # vending=public_transport_tickets + public_transport_tickets: Public Transport Tickets + # vending=stamps + stamps: Postage Stamps + # vending=sweets + sweets: Sweets + # vending=water + water: Drinking Water vhf: # vhf=* label: VHF Channel