From fffa81e7a72475ddfac45f2b00339a9efc31ccc9 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 28 Nov 2022 16:23:10 +0100 Subject: [PATCH] expand * in terms, sort and add terms see https://github.com/openstreetmap/id-tagging-schema/pull/648#discussion_r1033621284 --- data/presets/amenity/doctors.json | 3 +- data/presets/amenity/hunting_stand.json | 11 +++-- data/presets/amenity/nightclub.json | 8 ++-- data/presets/amenity/pharmacy.json | 4 +- data/presets/craft/hvac.json | 6 +-- data/presets/emergency/first_aid_kit.json | 2 - data/presets/highway/raceway.json | 3 +- data/presets/landuse/military/airfield.json | 3 +- .../presets/landuse/military/danger_area.json | 5 ++- data/presets/landuse/military/range.json | 4 +- .../landuse/military/training_area.json | 4 +- data/presets/leisure/track.json | 2 +- data/presets/man_made/wastewater_plant.json | 10 ++--- .../military/nuclear_explosion_site.json | 2 +- data/presets/power/plant.json | 2 +- data/presets/shop/art.json | 4 +- data/presets/shop/chemist.json | 4 +- data/presets/shop/craft.json | 14 ++++-- data/presets/shop/curtain.json | 3 +- data/presets/shop/frame.json | 8 ++-- data/presets/tourism/gallery.json | 10 ++--- data/presets/tourism/museum.json | 20 ++++++--- interim/source_strings.yaml | 44 +++++++++---------- 23 files changed, 102 insertions(+), 74 deletions(-) diff --git a/data/presets/amenity/doctors.json b/data/presets/amenity/doctors.json index 0607c625..f8117597 100644 --- a/data/presets/amenity/doctors.json +++ b/data/presets/amenity/doctors.json @@ -23,7 +23,8 @@ "area" ], "terms": [ - "medic*", + "medic", + "medical doctor", "physician" ], "tags": { diff --git a/data/presets/amenity/hunting_stand.json b/data/presets/amenity/hunting_stand.json index 654924e8..6a873e65 100644 --- a/data/presets/amenity/hunting_stand.json +++ b/data/presets/amenity/hunting_stand.json @@ -12,11 +12,16 @@ "terms": [ "game", "gun", + "hide", "lookout", + "raised blind", + "raised hide", "rifle", - "shoot*", - "wild", - "watch" + "shoot", + "stance", + "stand", + "watch", + "wild" ], "tags": { "amenity": "hunting_stand" diff --git a/data/presets/amenity/nightclub.json b/data/presets/amenity/nightclub.json index c82c10bc..8bccc702 100644 --- a/data/presets/amenity/nightclub.json +++ b/data/presets/amenity/nightclub.json @@ -30,10 +30,12 @@ "amenity": "nightclub" }, "terms": [ - "disco*", - "night club", + "club", + "dance club", "dancing", - "dance club" + "disco", + "discotheque", + "night club" ], "name": "Nightclub" } diff --git a/data/presets/amenity/pharmacy.json b/data/presets/amenity/pharmacy.json index 600d62da..f823af76 100644 --- a/data/presets/amenity/pharmacy.json +++ b/data/presets/amenity/pharmacy.json @@ -39,9 +39,11 @@ }, "terms": [ "apothecary", + "chemist", + "dispensary", "drug store", "drugstore", - "med*", + "medicine", "prescription" ], "name": "Pharmacy Counter" diff --git a/data/presets/craft/hvac.json b/data/presets/craft/hvac.json index fb9a0dc9..9482859f 100644 --- a/data/presets/craft/hvac.json +++ b/data/presets/craft/hvac.json @@ -5,9 +5,9 @@ "area" ], "terms": [ - "heat*", - "vent*", - "air conditioning" + "air conditioning", + "heating", + "ventilation" ], "tags": { "craft": "hvac" diff --git a/data/presets/emergency/first_aid_kit.json b/data/presets/emergency/first_aid_kit.json index e5ddc5fa..19b22634 100644 --- a/data/presets/emergency/first_aid_kit.json +++ b/data/presets/emergency/first_aid_kit.json @@ -15,9 +15,7 @@ "terms": [ "bandage", "first aid", - "med", "med kit", - "medic*", "medkit" ], "tags": { diff --git a/data/presets/highway/raceway.json b/data/presets/highway/raceway.json index 2cc157c3..7051363c 100644 --- a/data/presets/highway/raceway.json +++ b/data/presets/highway/raceway.json @@ -22,12 +22,11 @@ "sport": "motor" }, "terms": [ - "auto*", "formula one", "kart", "motocross", "nascar", - "race*", + "raceway", "track" ], "name": "Motorsport Racetrack" diff --git a/data/presets/landuse/military/airfield.json b/data/presets/landuse/military/airfield.json index c289dad4..f7c9b093 100644 --- a/data/presets/landuse/military/airfield.json +++ b/data/presets/landuse/military/airfield.json @@ -33,7 +33,8 @@ "fight", "force", "guard", - "heli*", + "helicopter", + "helipad", "jet", "marine", "navy", diff --git a/data/presets/landuse/military/danger_area.json b/data/presets/landuse/military/danger_area.json index 9386d506..6c38b435 100644 --- a/data/presets/landuse/military/danger_area.json +++ b/data/presets/landuse/military/danger_area.json @@ -21,11 +21,12 @@ "base", "blast", "bomb", - "explo*", + "explosion", + "explosive", "force", "guard", - "mine", "marine", + "mine", "navy", "troop", "war" diff --git a/data/presets/landuse/military/range.json b/data/presets/landuse/military/range.json index d627d4ad..602dc351 100644 --- a/data/presets/landuse/military/range.json +++ b/data/presets/landuse/military/range.json @@ -26,8 +26,8 @@ "marine", "navy", "rifle", - "shoot*", - "snip*", + "shooting", + "sniper", "train", "troop", "war" diff --git a/data/presets/landuse/military/training_area.json b/data/presets/landuse/military/training_area.json index 03049508..f1d6caa9 100644 --- a/data/presets/landuse/military/training_area.json +++ b/data/presets/landuse/military/training_area.json @@ -26,8 +26,8 @@ "marine", "navy", "rifle", - "shoot*", - "snip*", + "shooting", + "sniper", "train", "troop", "war" diff --git a/data/presets/leisure/track.json b/data/presets/leisure/track.json index 1842bb37..45962ee1 100644 --- a/data/presets/leisure/track.json +++ b/data/presets/leisure/track.json @@ -27,7 +27,7 @@ "dog", "greyhound", "horse", - "race*", + "raceway", "track" ], "name": "Racetrack (Non-Motorsport)" diff --git a/data/presets/man_made/wastewater_plant.json b/data/presets/man_made/wastewater_plant.json index ba828951..8220c453 100644 --- a/data/presets/man_made/wastewater_plant.json +++ b/data/presets/man_made/wastewater_plant.json @@ -17,12 +17,12 @@ "area" ], "terms": [ - "sewage*", - "water treatment plant", - "wastewater treatment works", + "reclamation plant", + "sewage", "wastewater treatment plant", - "WWTP", - "reclamation plant" + "wastewater treatment works", + "water treatment plant", + "wwtp" ], "tags": { "man_made": "wastewater_plant" diff --git a/data/presets/military/nuclear_explosion_site.json b/data/presets/military/nuclear_explosion_site.json index 19083abf..2d5a9039 100644 --- a/data/presets/military/nuclear_explosion_site.json +++ b/data/presets/military/nuclear_explosion_site.json @@ -18,7 +18,7 @@ "atom", "blast", "bomb", - "detonat*", + "detonation", "nuke", "site", "test" diff --git a/data/presets/power/plant.json b/data/presets/power/plant.json index abed3c92..860b6a0c 100644 --- a/data/presets/power/plant.json +++ b/data/presets/power/plant.json @@ -26,7 +26,7 @@ "terms": [ "coal", "gas", - "generat*", + "generator", "hydro", "nuclear", "power", diff --git a/data/presets/shop/art.json b/data/presets/shop/art.json index e35506aa..7e998cce 100644 --- a/data/presets/shop/art.json +++ b/data/presets/shop/art.json @@ -5,8 +5,8 @@ "area" ], "terms": [ - "art*", - "exhibit*", + "art", + "exhibition", "gallery" ], "tags": { diff --git a/data/presets/shop/chemist.json b/data/presets/shop/chemist.json index 287d7a13..f3583285 100644 --- a/data/presets/shop/chemist.json +++ b/data/presets/shop/chemist.json @@ -10,11 +10,13 @@ "terms": [ "apothecary", "beauty", + "chemist", + "dispensary", "drug store", "drugstore", "gift", "hair", - "med*", + "medicine", "pharmacy", "prescription", "tooth" diff --git a/data/presets/shop/craft.json b/data/presets/shop/craft.json index 07bfa79e..709f828b 100644 --- a/data/presets/shop/craft.json +++ b/data/presets/shop/craft.json @@ -8,10 +8,18 @@ "shop": "craft" }, "terms": [ - "art*", - "paint*", + "art", + "canvas", + "crafting", + "crafts", + "draw", "frame", - "hobby" + "handicraft", + "hobby", + "paint", + "paper", + "pencil", + "wood" ], "name": "Arts & Crafts Store" } diff --git a/data/presets/shop/curtain.json b/data/presets/shop/curtain.json index b7a6bc06..ae535726 100644 --- a/data/presets/shop/curtain.json +++ b/data/presets/shop/curtain.json @@ -5,7 +5,8 @@ "area" ], "terms": [ - "drape*", + "drape", + "drapery", "window" ], "tags": { diff --git a/data/presets/shop/frame.json b/data/presets/shop/frame.json index 50f5948f..6f46d8a8 100644 --- a/data/presets/shop/frame.json +++ b/data/presets/shop/frame.json @@ -8,10 +8,10 @@ "shop": "frame" }, "terms": [ - "art*", - "paint*", - "photo*", - "frame" + "art", + "frame", + "painting", + "photograph" ], "name": "Framing Shop" } diff --git a/data/presets/tourism/gallery.json b/data/presets/tourism/gallery.json index dd379573..4755b087 100644 --- a/data/presets/tourism/gallery.json +++ b/data/presets/tourism/gallery.json @@ -27,11 +27,11 @@ "area" ], "terms": [ - "art*", - "exhibit*", - "paint*", - "photo*", - "sculpt*" + "art", + "exhibition", + "painting", + "photogaph", + "sculpture" ], "tags": { "tourism": "gallery" diff --git a/data/presets/tourism/museum.json b/data/presets/tourism/museum.json index 27fe10e1..16e9293e 100644 --- a/data/presets/tourism/museum.json +++ b/data/presets/tourism/museum.json @@ -34,15 +34,23 @@ "area" ], "terms": [ - "art*", - "exhibit*", - "gallery", + "archaeological", + "archeological", + "art", + "cultural", + "excavation", + "exhibition", "foundation", + "gallery", "hall", + "history", "institution", - "paint*", - "photo*", - "sculpt*" + "nature", + "painting", + "photograph", + "science", + "sculpture", + "technology" ], "tags": { "tourism": "museum" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index f868fe79..47965f6e 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -4774,7 +4774,7 @@ en: amenity/doctors: # amenity=doctors | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Doctor - # 'terms: medic*,physician' + # 'terms: medic,medical doctor,physician' terms: amenity/doctors/gynaecology: # amenity=doctors + healthcare=doctor + healthcare:speciality=gynaecology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -4932,7 +4932,7 @@ en: amenity/hunting_stand: # amenity=hunting_stand | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Hunting Stand - # 'terms: game,gun,lookout,rifle,shoot*,wild,watch' + # 'terms: game,gun,hide,lookout,rifle,raised hide,raised blind,shoot,stand,stance,wild,watch' terms: amenity/ice_cream: # amenity=ice_cream | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -5029,7 +5029,7 @@ en: amenity/nightclub: # amenity=nightclub | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Nightclub - # 'terms: disco*,night club,dancing,dance club' + # 'terms: club,disco,discotheque,night club,dancing,dance club' terms: amenity/nightclub/lgbtq: # amenity=nightclub + lgbtq=primary | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -5096,7 +5096,7 @@ en: amenity/pharmacy: # amenity=pharmacy | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Pharmacy Counter - # 'terms: apothecary,drug store,drugstore,med*,prescription' + # 'terms: apothecary,chemist,dispensary,drug store,drugstore,medicine,prescription' terms: amenity/photo_booth: # amenity=photo_booth | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -6425,7 +6425,7 @@ en: craft/hvac: # craft=hvac | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: HVAC Workplace - # 'terms: heat*,vent*,air conditioning' + # 'terms: heating,ventilation,air conditioning' terms: craft/insulator: # craft=insulation | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -6629,7 +6629,7 @@ en: emergency/first_aid_kit: # emergency=first_aid_kit | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: First Aid Kit - # 'terms: bandage,first aid,med,med kit,medic*,medkit' + # 'terms: bandage,first aid,med,med kit,medkit' terms: emergency/landing_site: # emergency=landing_site | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -7121,7 +7121,7 @@ en: highway/raceway: # highway=raceway | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Motorsport Racetrack - # 'terms: auto*,formula one,kart,motocross,nascar,race*,track' + # 'terms: formula one,kart,motocross,nascar,raceway,track' terms: highway/raceway/karting: # highway=raceway + sport=karting | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -7554,7 +7554,7 @@ en: landuse/military/airfield: # military=airfield | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Military Airfield - # 'terms: aerodrome,aeroway,air force,airplane,airport,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war' + # 'terms: aerodrome,aeroway,air force,airplane,airport,army,base,bomb,fight,force,guard,helicopter,helipad,jet,marine,navy,plane,troop,war' terms: landuse/military/barracks: # military=barracks | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -7574,7 +7574,7 @@ en: landuse/military/danger_area: # military=danger_area | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Danger Area - # 'terms: air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war' + # 'terms: air force,army,base,blast,bomb,explosion,explosive,force,guard,mine,marine,navy,troop,war' terms: landuse/military/obstacle_course: # military=obstacle_course | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -7584,12 +7584,12 @@ en: landuse/military/range: # military=range | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Military Range - # 'terms: air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war' + # 'terms: air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shooting,sniper,train,troop,war' terms: landuse/military/training_area: # military=training_area | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Military Training Area - # 'terms: air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war' + # 'terms: air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shooting,sniper,train,troop,war' terms: landuse/orchard: # landuse=orchard | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -8133,7 +8133,7 @@ en: leisure/track: # leisure=track | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Racetrack (Non-Motorsport) - # 'terms: cycle,dog,greyhound,horse,race*,track' + # 'terms: cycle,dog,greyhound,horse,raceway,track' terms: leisure/track/cycling: # leisure=track + sport=cycling | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -8518,7 +8518,7 @@ en: man_made/wastewater_plant: # man_made=wastewater_plant | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Wastewater Plant - # 'terms: sewage*,water treatment plant,wastewater treatment works,wastewater treatment plant,wwtp,reclamation plant' + # 'terms: sewage,water treatment plant,wastewater treatment works,wastewater treatment plant,wwtp,reclamation plant' terms: man_made/water_tap: # man_made=water_tap | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -8594,7 +8594,7 @@ en: military/nuclear_explosion_site: # military=nuclear_explosion_site | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Nuclear Explosion Site - # 'terms: atom,blast,bomb,detonat*,nuke,site,test' + # 'terms: atom,blast,bomb,detonation,nuke,site,test' terms: military/office: # military=office | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -9469,7 +9469,7 @@ en: power/plant: # power=plant | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Power Station Grounds - # 'terms: coal,gas,generat*,hydro,nuclear,power,station' + # 'terms: coal,gas,generator,hydro,nuclear,power,station' terms: power/plant/source/coal: # power=plant + plant:source=coal | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -9962,7 +9962,7 @@ en: shop/art: # shop=art | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Art Store - # 'terms: art*,exhibit*,gallery' + # 'terms: art,exhibition,gallery' terms: shop/baby_goods: # shop=baby_goods | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -10099,7 +10099,7 @@ en: shop/chemist: # shop=chemist | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Drugstore - # 'terms: apothecary,beauty,drug store,gift,hair,med*,pharmacy,prescription,tooth' + # 'terms: apothecary,beauty,chemist,dispensary,drug store,gift,hair,medicine,pharmacy,prescription,tooth' terms: shop/chocolate: # shop=chocolate | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -10177,12 +10177,12 @@ en: shop/craft: # shop=craft | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Arts & Crafts Store - # 'terms: art*,paint*,frame,hobby' + # 'terms: art,canvas,crafting,crafts,draw,frame,handicraft,hobby,paint,pencil,paper,wood' terms: shop/curtain: # shop=curtain | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Curtain Store - # 'terms: drape*,window' + # 'terms: drape,drapery,window' terms: shop/dairy: # shop=dairy | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -10277,7 +10277,7 @@ en: shop/frame: # shop=frame | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Framing Shop - # 'terms: art*,paint*,photo*,frame' + # 'terms: art,frame,painting,photograph' terms: shop/frozen_food: # shop=frozen_food | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -10865,7 +10865,7 @@ en: tourism/gallery: # tourism=gallery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Art Gallery - # 'terms: art*,exhibit*,paint*,photo*,sculpt*' + # 'terms: art,exhibition,painting,photogaph,sculpture' terms: tourism/guest_house: # tourism=guest_house | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -10926,7 +10926,7 @@ en: tourism/museum: # tourism=museum | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Museum - # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*' + # 'terms: archaeological,archeological,art,cultural,excavation,exhibition,foundation,gallery,hall,history,institution,nature,painting,photograph,science,sculpture,technology' terms: tourism/museum/history: # tourism=museum + museum=history | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).