diff --git a/data/categories.txt b/data/categories.txt index 577e4894f7..78c9ff3cd0 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -5101,6 +5101,48 @@ sk:3Autopožičovňa|požičovňa áut sw:Kodi ya gari|gari|kodi fa:مکان اجاره ماشین +amenity-motorcycle_rental +en:4Motorcycle Rental|bike|hire|4scooter +ar:تأجير الدراجات النارية +be:Пракат матацыклаў +bg:Мотоциклети под наем +ca:Lloguer de motos +cs:Půjčovna motocyklů +da:Udlejning af motorcykler +de:Motorradvermietung +el:Ενοικίαση μοτοσικλέτας +es:Alquiler de motos +et:Mootorratta rentimine +eu:Motorren alokairua +fa:اجاره موتور سیکلت +fi:Moottoripyörän vuokraus +fr:Location de motos +he:השכרת אופנועים +hi:मटरसइकल करय +hu:Motorkerékpár bérlés +id:Penyewaan Sepeda Motor +it:Noleggio moto +ja:レンタルバイク +ko:오토바이 대여 +lv:Motociklu noma +mr:मटरसयकल भडयन +nb:Utleie av motorsykkel +nl:Motorverhuur +pl:Wynajem motocykli +pt:Aluguer de motociclos +pt-BR:Aluguel de motocicletas +ro:Închiriere motociclete +ru:5Прокат мотоциклов|аренда|скутеров +sk:Požičovňa motocyklov +sv:Motorcykeluthyrning +sw:Kukodisha pikipiki +th:รถมอเตอรไซค +tr:Motosiklet Kiralama +uk:Оренда мотоциклів +vi:Cho thuê xe máy +zh-Hans:摩托车租赁 +zh-Hant:摩托車租賃 + amenity-cinema|@category_entertainment en:3Cinema|U+1F3A6|U+1F3AC ru:Кинотеатр|3кино diff --git a/data/editor.config b/data/editor.config index 31a5809b9b..e37d37a7fa 100644 --- a/data/editor.config +++ b/data/editor.config @@ -250,6 +250,10 @@ + + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 3cad0b995f..b84f574a19 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1017,7 +1017,7 @@ deprecated|deprecated;901;x railway|subway|gray;[railway=subway][colour=gray];x;name;int_name;902;railway|subway|tunnel deprecated|deprecated;903;x railway|subway|lightblue;[railway=subway][colour=lightblue];x;name;int_name;904;railway|subway|tunnel -deprecated|deprecated;905;x +amenity|motorcycle_rental;[amenity=motorcycle_rental],[shop=motorcycle][motorcycle:rental=yes],[shop=motorcycle][rental=yes],[amenity=scooter_rental];;;;905; railway|subway|lightgreen;[railway=subway][colour=lightgreen];x;name;int_name;906;railway|subway|tunnel place|quarter;907; railway|subway|violet;[railway=subway][colour=violet];x;name;int_name;908;railway|subway|tunnel diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 7953ee2f66..1b4213ba45 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -1180,6 +1180,51 @@ zh-Hans = 汽车出租์ zh-Hant = 租車 + [type.amenity.motorcycle_rental] + en = Motorcycle Rental + af = Motorfietshuur + ar = تأجير الدراجات النارية + az = Motosiklet Kirayəsi + be = Пракат матацыклаў + bg = Мотоциклети под наем + ca = Lloguer de motos + cs = Půjčovna motocyklů + da = Udlejning af motorcykler + de = Motorradvermietung + el = Ενοικίαση μοτοσικλέτας + es = Alquiler de motos + et = Mootorratta rentimine + eu = Motorren alokairua + fa = اجاره موتور سیکلت + fi = Moottoripyörän vuokraus + fr = Location de motos + he = השכרת אופנועים + hi = मटरसइकल करय + hu = Motorkerékpár bérlés + id = Penyewaan Sepeda Motor + it = Noleggio moto + ja = レンタルバイク + ko = 오토바이 대여 + lt = Motociklų nuoma + lv = Motociklu noma + mr = मटरसयकल भडयन + nb = Utleie av motorsykkel + nl = Motorverhuur + pl = Wynajem motocykli + pt = Aluguer de motociclos + pt-BR = Aluguel de motocicletas + ro = Închiriere motociclete + ru = Прокат мотоциклов + sk = Požičovňa motocyklov + sv = Motorcykeluthyrning + sw = Kukodisha pikipiki + th = รถมอเตอรไซค + tr = Motosiklet Kiralama + uk = Оренда мотоциклів + vi = Cho thuê xe máy + zh-Hans = 摩托车租赁 + zh-Hant = 摩托車租賃 + [type.amenity.car_sharing] en = Car Sharing af = Motordeel diff --git a/data/styles/default/dark/symbols/motorcycle_rental-m.svg b/data/styles/default/dark/symbols/motorcycle_rental-m.svg new file mode 100644 index 0000000000..26ddbf4496 --- /dev/null +++ b/data/styles/default/dark/symbols/motorcycle_rental-m.svg @@ -0,0 +1,11 @@ + + motorcycle_rental-m + + + + + + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 854e8ef55e..6a05256924 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1022,6 +1022,7 @@ node|z17-[amenity=payment_terminal], area|z17-[amenity=payment_terminal], node|z17-[amenity=shower], area|z17-[amenity=shower], +node|z17-[amenity=motorcycle_rental], node|z17-[amenity=bicycle_rental], area|z17-[amenity=bicycle_rental], node|z17-[amenity=bicycle_repair_station], @@ -1671,6 +1672,11 @@ node|z18-[office=diplomatic], area|z18-[office=diplomatic], {font-size: 11;} +node|z17-[amenity=motorcycle_rental], +{icon-image: motorcycle_rental-m.svg;} +node|z18-[amenity=motorcycle_rental], +{font-size: 11;} + node|z17-[amenity=bicycle_rental], area|z17-[amenity=bicycle_rental] {icon-image: bicycle-rental.svg;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index f1bef3c174..b7c4487202 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -795,6 +795,7 @@ shop-seafood # icon z16- (also has captio aeroway-helipad # icon z16- (also has caption(optional) z16-) amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) amenity-car_rental # icon z18- (also has caption(optional) z18-) +amenity-motorcycle_rental === 2500 amenity-cinema # icon z17- (also has caption(optional) z17-) diff --git a/data/styles/default/light/symbols/motorcycle_rental-m.svg b/data/styles/default/light/symbols/motorcycle_rental-m.svg new file mode 100644 index 0000000000..9b1f4177b5 --- /dev/null +++ b/data/styles/default/light/symbols/motorcycle_rental-m.svg @@ -0,0 +1,11 @@ + + motorcycle_rental-m + + + + + + + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 70a1edd3a0..1831c80cbc 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -795,6 +795,7 @@ shop-seafood # icon z16- (also has captio aeroway-helipad # icon z16- (also has caption(optional) z16-) amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) amenity-car_rental # icon z18- (also has caption(optional) z18-) +amenity-motorcycle_rental === 2500 amenity-cinema # icon z17- (also has caption(optional) z17-) diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 4ccd75cb7c..e3748e820a 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -801,6 +801,7 @@ area|z16-[amenity=parking], node|z17-[amenity=car_wash], area|z17-[amenity=car_wash], node|z17-[amenity=toilets], +node|z18-[amenity=motorcycle_rental], node|z18-[amenity=car_rental], area|z18-[amenity=car_rental], node|z18-[amenity=car_sharing], @@ -887,6 +888,9 @@ node|z17-[amenity=toilets], node|z18-[amenity=toilets], {font-size: 14.5;} +node|z18-[amenity=motorcycle_rental], +{icon-image: motorcycle_rental-m.svg; font-size: 14.5;} + node|z18-[amenity=car_rental], area|z18-[amenity=car_rental] {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 14.5;} diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 36bfa648fb..6e60221e78 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -277,6 +277,7 @@ historic-fort # icon z12- (also has captio amenity-car_rental # icon z18- (also has caption(optional) z18-) amenity-car_sharing # icon z18- (also has caption(optional) z18-) +amenity-motorcycle_rental shop-car # icon z17- === 2400 diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index cb103726a9..b62259e787 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2232,6 +2232,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"amenity", "library"}, {"amenity", "marketplace"}, {"amenity", "motorcycle_parking"}, + {"amenity", "motorcycle_rental"}, {"amenity", "nightclub"}, {"amenity", "nursing_home"}, {"amenity", "parking"},