diff --git a/data/categories.txt b/data/categories.txt index 70338a95ec..b3cecca9a6 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -8040,6 +8040,38 @@ sw:Uwanja wa gofu|michezo fa:زمین گلف mr:गोल्फचे मैदान +leisure-miniature_golf +en:4Minigolf|Miniature Golf|Putt Putt +be:Мінігольф +bg:Миниголф +ca:Minigolf +cs:Minigolf +da:Minigolf +de:Minigolf +es:Minigolf +et:Minigolf +eu:Minigolf +fi:Minigolf +fr:Minigolf +hu:Minigolf +it:Minigolf +ja:ミニゴルフ +ko:미니골프 +mr:मिनीगोल्फ +nb:Minigolf +nl:Minigolf +pl:Minigolf +pt:Minigolfe +ro:Minigolf +ru:Минигольф +sk:Minigolf +sv:Minigolf +sw:Minigofu +th:มินิกอล์ฟ +tr:Minigolf +uk:Мінігольф +zh-Hans:迷你高尔夫 + leisure-hackerspace en:4Hackerspace ar:هاكرزبيس diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index e3c48c34e1..6568ee8026 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1684,3 +1684,4 @@ railway|station|subway|singapore;[railway=station][transport=subway][city=singap railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;name;int_name;1595; railway|station|subway|boston;[railway=station][transport=subway][city=boston],[railway=station][station=subway][city=boston];;name;int_name;1596; railway|subway_entrance|boston;[railway=subway_entrance][city=boston];;name;int_name;1597; +leisure|miniature_golf;1598; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 005dd622ae..fa791cbf08 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -16789,6 +16789,40 @@ zh-Hans = 高尔夫球场 zh-Hant = 高爾夫球場 + [type.leisure.miniature_golf] + en = Minigolf + af = Minigolf + az = Minigolf + be = Мінігольф + bg = Миниголф + ca = Minigolf + cs = Minigolf + da = Minigolf + de = Minigolf + es = Minigolf + et = Minigolf + eu = Minigolf + fi = Minigolf + fr = Minigolf + hu = Minigolf + it = Minigolf + ja = ミニゴルフ + ko = 미니골프 + mr = मिनीगोल्फ + nb = Minigolf + nl = Minigolf + pl = Minigolf + pt = Minigolfe + ro = Minigolf + ru = Минигольф + sk = Minigolf + sv = Minigolf + sw = Minigofu + th = มินิกอล์ฟ + tr = Minigolf + uk = Мінігольф + zh-Hans = 迷你高尔夫 + [type.leisure.hackerspace] en = Hackerspace ar = هاكرزبيس diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index 90a4b652e2..db661f5f52 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -107,6 +107,7 @@ area|z12-[landuse=recreation_ground], area|z12-[landuse=village_green], area|z12-[landuse=field], area|z12-[natural=scrub], +area|z14-[leisure=miniature_golf], area|z16-[landuse=flowerbed], {fill-opacity: 1;} @@ -128,6 +129,7 @@ area|z10[landuse=forest], area|z16-[landuse=grass], area|z14-[natural=grassland], area|z14-[leisure=golf_course], +area|z14-[leisure=miniature_golf], area|z14-[natural=heath], area|z14-[landuse=allotments], area|z14-[landuse=orchard], diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index d1f39046ed..1b3d9bdd53 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -1242,6 +1242,8 @@ area|z17-[leisure=swimming_pool][access=private] {icon-image: zero-icon.svg;} node|z15-[leisure=golf_course], area|z15-[leisure=golf_course], +node|z17-[leisure=miniature_golf], +area|z17-[leisure=miniature_golf], {icon-image: golf-m.svg;icon-min-distance: 10;} node|z17-[sport], diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt index 44531fe622..92c4b254b2 100644 --- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt @@ -64,6 +64,7 @@ aeroway-terminal # area z14- (also has captio === 150 leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +leisure-miniature_golf # area z14- (also has icon z17-, caption(optional) z17-) === 140 landuse-flowerbed # area z16- diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 914f0d6749..f979ae1d12 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -882,6 +882,7 @@ landuse-military-danger_area # icon z16- (also has captio amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +leisure-miniature_golf # icon z17- (also has caption(optional) z17-, area z14-) natural-wetland # caption z16- (also has area z11-) natural-wetland-bog # caption z16- (also has area z11-) natural-wetland-marsh # caption z16- (also has area z11-) @@ -1799,6 +1800,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) # leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-) +# leisure-miniature_golf # caption(optional) z17- (also has icon z17-, area z14-) # tourism-picnic_site # caption(optional) z16- (also has icon z16-) # === -8200 diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 6dc8dac68a..93f67fcdcc 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -64,6 +64,7 @@ aeroway-terminal # area z14- (also has captio === 150 leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +leisure-miniature_golf # area z14- (also has icon z17-, caption(optional) z17-) === 140 landuse-flowerbed # area z16- diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index f5a7d35c81..3ead5e97e0 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -882,6 +882,7 @@ landuse-military-danger_area # icon z16- (also has captio amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +leisure-miniature_golf # icon z17- (also has caption(optional) z17-, area z14-) natural-wetland # caption z16- (also has area z11-) natural-wetland-bog # caption z16- (also has area z11-) natural-wetland-marsh # caption z16- (also has area z11-) @@ -1799,6 +1800,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) # leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-) +# leisure-miniature_golf # caption(optional) z17- (also has icon z17-, area z14-) # tourism-picnic_site # caption(optional) z14- (also has icon z14-) # === -8200 diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 0c51613d02..1840fd9d78 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -93,6 +93,7 @@ area|z12-[leisure=garden], area|z14-[landuse=grass], area|z14-[natural=grassland], area|z14-[leisure=golf_course], +area|z14-[leisure=miniature_golf], area|z14-[natural=heath], area|z14-[landuse=allotments], area|z14-[natural=scrub], @@ -109,9 +110,9 @@ area|z10[landuse=forest], area|z14-[landuse=grass], area|z14-[natural=grassland], +area|z14-[leisure=miniature_golf], area|z14-[leisure=golf_course], area|z14-[natural=heath], - area|z14-[landuse=allotments], area|z14-[natural=scrub], area|z14-[landuse=orchard], diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index 8e9e30c7c4..236f695f39 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -47,6 +47,7 @@ leisure-swimming_pool-private # area z13- === 100 leisure-golf_course # area z14- +leisure-miniature_golf # area z14- natural-wetland # area z11- (also has caption z16-) natural-wetland-bog # area z11- (also has caption z16-) natural-wetland-marsh # area z11- (also has caption z16-)