Skip to content

Commit fffa81e

Browse files
committed
expand * in terms, sort and add terms
see #648 (comment)
1 parent 62cf5af commit fffa81e

23 files changed

+102
-74
lines changed

data/presets/amenity/doctors.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"area"
2424
],
2525
"terms": [
26-
"medic*",
26+
"medic",
27+
"medical doctor",
2728
"physician"
2829
],
2930
"tags": {

data/presets/amenity/hunting_stand.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@
1212
"terms": [
1313
"game",
1414
"gun",
15+
"hide",
1516
"lookout",
17+
"raised blind",
18+
"raised hide",
1619
"rifle",
17-
"shoot*",
18-
"wild",
19-
"watch"
20+
"shoot",
21+
"stance",
22+
"stand",
23+
"watch",
24+
"wild"
2025
],
2126
"tags": {
2227
"amenity": "hunting_stand"

data/presets/amenity/nightclub.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
"amenity": "nightclub"
3131
},
3232
"terms": [
33-
"disco*",
34-
"night club",
33+
"club",
34+
"dance club",
3535
"dancing",
36-
"dance club"
36+
"disco",
37+
"discotheque",
38+
"night club"
3739
],
3840
"name": "Nightclub"
3941
}

data/presets/amenity/pharmacy.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@
3939
},
4040
"terms": [
4141
"apothecary",
42+
"chemist",
43+
"dispensary",
4244
"drug store",
4345
"drugstore",
44-
"med*",
46+
"medicine",
4547
"prescription"
4648
],
4749
"name": "Pharmacy Counter"

data/presets/craft/hvac.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"area"
66
],
77
"terms": [
8-
"heat*",
9-
"vent*",
10-
"air conditioning"
8+
"air conditioning",
9+
"heating",
10+
"ventilation"
1111
],
1212
"tags": {
1313
"craft": "hvac"

data/presets/emergency/first_aid_kit.json

-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
"terms": [
1616
"bandage",
1717
"first aid",
18-
"med",
1918
"med kit",
20-
"medic*",
2119
"medkit"
2220
],
2321
"tags": {

data/presets/highway/raceway.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
"sport": "motor"
2323
},
2424
"terms": [
25-
"auto*",
2625
"formula one",
2726
"kart",
2827
"motocross",
2928
"nascar",
30-
"race*",
29+
"raceway",
3130
"track"
3231
],
3332
"name": "Motorsport Racetrack"

data/presets/landuse/military/airfield.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
"fight",
3434
"force",
3535
"guard",
36-
"heli*",
36+
"helicopter",
37+
"helipad",
3738
"jet",
3839
"marine",
3940
"navy",

data/presets/landuse/military/danger_area.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
"base",
2222
"blast",
2323
"bomb",
24-
"explo*",
24+
"explosion",
25+
"explosive",
2526
"force",
2627
"guard",
27-
"mine",
2828
"marine",
29+
"mine",
2930
"navy",
3031
"troop",
3132
"war"

data/presets/landuse/military/range.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"marine",
2727
"navy",
2828
"rifle",
29-
"shoot*",
30-
"snip*",
29+
"shooting",
30+
"sniper",
3131
"train",
3232
"troop",
3333
"war"

data/presets/landuse/military/training_area.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"marine",
2727
"navy",
2828
"rifle",
29-
"shoot*",
30-
"snip*",
29+
"shooting",
30+
"sniper",
3131
"train",
3232
"troop",
3333
"war"

data/presets/leisure/track.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"dog",
2828
"greyhound",
2929
"horse",
30-
"race*",
30+
"raceway",
3131
"track"
3232
],
3333
"name": "Racetrack (Non-Motorsport)"

data/presets/man_made/wastewater_plant.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
"area"
1818
],
1919
"terms": [
20-
"sewage*",
21-
"water treatment plant",
22-
"wastewater treatment works",
20+
"reclamation plant",
21+
"sewage",
2322
"wastewater treatment plant",
24-
"WWTP",
25-
"reclamation plant"
23+
"wastewater treatment works",
24+
"water treatment plant",
25+
"wwtp"
2626
],
2727
"tags": {
2828
"man_made": "wastewater_plant"

data/presets/military/nuclear_explosion_site.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"atom",
1919
"blast",
2020
"bomb",
21-
"detonat*",
21+
"detonation",
2222
"nuke",
2323
"site",
2424
"test"

data/presets/power/plant.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"terms": [
2727
"coal",
2828
"gas",
29-
"generat*",
29+
"generator",
3030
"hydro",
3131
"nuclear",
3232
"power",

data/presets/shop/art.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"area"
66
],
77
"terms": [
8-
"art*",
9-
"exhibit*",
8+
"art",
9+
"exhibition",
1010
"gallery"
1111
],
1212
"tags": {

data/presets/shop/chemist.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
"terms": [
1111
"apothecary",
1212
"beauty",
13+
"chemist",
14+
"dispensary",
1315
"drug store",
1416
"drugstore",
1517
"gift",
1618
"hair",
17-
"med*",
19+
"medicine",
1820
"pharmacy",
1921
"prescription",
2022
"tooth"

data/presets/shop/craft.json

+11-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,18 @@
88
"shop": "craft"
99
},
1010
"terms": [
11-
"art*",
12-
"paint*",
11+
"art",
12+
"canvas",
13+
"crafting",
14+
"crafts",
15+
"draw",
1316
"frame",
14-
"hobby"
17+
"handicraft",
18+
"hobby",
19+
"paint",
20+
"paper",
21+
"pencil",
22+
"wood"
1523
],
1624
"name": "Arts & Crafts Store"
1725
}

data/presets/shop/curtain.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"area"
66
],
77
"terms": [
8-
"drape*",
8+
"drape",
9+
"drapery",
910
"window"
1011
],
1112
"tags": {

data/presets/shop/frame.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"shop": "frame"
99
},
1010
"terms": [
11-
"art*",
12-
"paint*",
13-
"photo*",
14-
"frame"
11+
"art",
12+
"frame",
13+
"painting",
14+
"photograph"
1515
],
1616
"name": "Framing Shop"
1717
}

data/presets/tourism/gallery.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
"area"
2828
],
2929
"terms": [
30-
"art*",
31-
"exhibit*",
32-
"paint*",
33-
"photo*",
34-
"sculpt*"
30+
"art",
31+
"exhibition",
32+
"painting",
33+
"photogaph",
34+
"sculpture"
3535
],
3636
"tags": {
3737
"tourism": "gallery"

data/presets/tourism/museum.json

+14-6
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,23 @@
3434
"area"
3535
],
3636
"terms": [
37-
"art*",
38-
"exhibit*",
39-
"gallery",
37+
"archaeological",
38+
"archeological",
39+
"art",
40+
"cultural",
41+
"excavation",
42+
"exhibition",
4043
"foundation",
44+
"gallery",
4145
"hall",
46+
"history",
4247
"institution",
43-
"paint*",
44-
"photo*",
45-
"sculpt*"
48+
"nature",
49+
"painting",
50+
"photograph",
51+
"science",
52+
"sculpture",
53+
"technology"
4654
],
4755
"tags": {
4856
"tourism": "museum"

0 commit comments

Comments
 (0)