expand * in terms, sort and add terms

see https://github.com/openstreetmap/id-tagging-schema/pull/648#discussion_r1033621284
2025-10-27 04:43:52 +01:00 · 2022-11-28 16:23:10 +01:00 · 2022-11-28 16:23:10 +01:00 · fffa81e7a7
commit fffa81e7a7
parent 62cf5afa1a
23 changed files with 102 additions and 74 deletions
--- a/data/presets/amenity/doctors.json
+++ b/data/presets/amenity/doctors.json
@ -23,7 +23,8 @@
        "area"
    ],
    "terms": [
-        "medic*",
+        "medic",
+        "medical doctor",
        "physician"
    ],
    "tags": {
--- 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"
--- 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"
 }
--- 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"
--- 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"
--- 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": {
--- 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"
--- 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",
--- 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"
--- 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"
--- 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"
--- 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)"
--- 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"
--- 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"
--- a/data/presets/power/plant.json
+++ b/data/presets/power/plant.json
@ -26,7 +26,7 @@
    "terms": [
        "coal",
        "gas",
-        "generat*",
+        "generator",
        "hydro",
        "nuclear",
        "power",
--- a/data/presets/shop/art.json
+++ b/data/presets/shop/art.json
@ -5,8 +5,8 @@
        "area"
    ],
    "terms": [
-        "art*",
-        "exhibit*",
+        "art",
+        "exhibition",
        "gallery"
    ],
    "tags": {
--- 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"
--- 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"
 }
--- a/data/presets/shop/curtain.json
+++ b/data/presets/shop/curtain.json
@ -5,7 +5,8 @@
        "area"
    ],
    "terms": [
-        "drape*",
+        "drape",
+        "drapery",
        "window"
    ],
    "tags": {
--- 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"
 }
--- 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"
--- 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"