diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 7570bd104..731da2a9b 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -179,7 +179,7 @@ Bivouac Hut - Lean-to Shelter + Lean-to Sleep Shelter Public Bath Shower Stripclub @@ -198,7 +198,7 @@ Food Dispenser Newspaper Dispenser Parking Meter - Ticket Machine + Public Transport Ticket Machine Sweets Dispenser Excrement Bags Dispenser Parcel Locker diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index b1f3c5331..0581a8ca7 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -81,6 +81,9 @@ "amenity-townhall": "3Town Hall|townhall|city hall|guildhall|village hall|4municipal hall|civic centre", "tourism-attraction|@category_tourism": "4Attraction|U+1F3A0|U+1F3A1|U+1F3A2|U+1F3AA", "tourism-artwork": "3Artwork|U+1F3A8", +"tourism-artwork-sculpture": "Sculpture|Artwork|U+1F3A8", +"tourism-artwork-statue": "Statue|Artwork|U+1F3A8", +"tourism-artwork-painting": "Painting|Artwork|U+1F3A8", "tourism-viewpoint|@category_tourism": "4Viewpoint|Vista", "tourism-information": "4Tourist Information|4information|U+1F481", "tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picnic Site|picnic|Barbecue Grill|Picnic Table|bbq|Barbec", @@ -197,7 +200,7 @@ "amenity-school": "3School|U+1F392|U+1F3EB", "amenity-shelter": "4Shelter|refuge", "amenity-shelter-basic_hut": "basic hut|3Bivouac Hut|Bivvy|Bothy|Hut", -"amenity-shelter-lean_to": "3Lean-to Shelter|4Shelter|Refuge|lean shelter|shelter", +"amenity-shelter-lean_to": "3Lean-to Sleep Shelter|4Shelter|Refuge|lean shelter|Lean-to Shelter", "amenity-stripclub": "Stripclub|strip club", "amenity-telephone": "2Phone|U+260E|U+1F4DE|5Telephone", "@category_toilet": "3Toilet|toilets|4Restroom|potty|WC|water closet", @@ -365,20 +368,21 @@ "shop-pet|@shop": "3Pet", "tourism-zoo|@category_tourism|@category_children": "2Zoo", "attraction-animal": "Animal Enclosure", -"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourism office|6Ranger station", -"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station", +"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourist Office|Tourism office|6Ranger station|Information", +"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station|Information", "amenity-community_centre": "4Community centre", "amenity-compressed_air": "6Compressed air", "amenity-courthouse": "4Courthouse", -"amenity-vending_machine-cigarettes": "4Cigarette dispenser", -"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee", -"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat", -"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages", -"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks", +"amenity-vending_machine": "Vending Machine", +"amenity-vending_machine-cigarettes": "4Cigarette dispenser|Vending Machine", +"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee|Vending Machine", +"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat|Vending Machine", +"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages|Vending Machine", +"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks|Vending Machine", "amenity-vending_machine-parking_tickets|@category_parking": "4Parking tickets|3Pay and Display|Parkomat|Parking Meter", -"amenity-vending_machine-public_transport_tickets|@category_transport": "6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing", +"amenity-vending_machine-public_transport_tickets|@category_transport": "4Public Transport Ticket Machine|6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing|Vending Machine", "amenity-vending_machine-newspapers": "4Newspaper Dispenser|Newspapers", -"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies", +"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies|Vending Machine", "amenity-vending_machine-excrement_bags": "5Excrement Bags Dispenser|4Poop Bags|3Dog Poop Bags|Animal Waste", "amenity-parcel_locker|@category_post": "4Parcel Locker|4Parcel Pickup", "shop-outpost": "4Pickup Point|4Parcel Pickup", @@ -398,6 +402,7 @@ "tourism-chalet|@category_hotel": "5Holiday Cottage|5vacation home|4Chalet", "tourism-information-board": "Information Board", "tourism-information-map": "Tourist map|map|4Information", +"tourism-information-guidepost": "Guidepost", "aerialway-station": "Aerialway Station|5Cable car station", "aeroway-helipad": "4Helipad", "barrier-border_control": "4Border Control", @@ -499,6 +504,7 @@ "leisure-track": "Track", "leisure-bandstand": "5Bandstand", "power-plant": "Power Plant", +"power-generator-wind": "Wind Generator", "shop-auction|@category_secondhand": "4Auction|Auctioneer|Auction House", "shop-collector|@category_shopping|@category_secondhand": "Collectables|Collector", "man_made-cairn": "4Cairn", diff --git a/data/editor.config b/data/editor.config index 469270948..33631225e 100644 --- a/data/editor.config +++ b/data/editor.config @@ -9,7 +9,7 @@ --> + --> @@ -122,10 +122,10 @@ - - - - + + + + @@ -135,9 +135,9 @@ - - - + + + @@ -175,10 +175,10 @@ - - - - + + + + @@ -236,11 +236,11 @@ - + - + @@ -512,7 +512,7 @@ - + @@ -625,23 +625,23 @@ - + - + - + - + - + @@ -689,7 +689,7 @@ - + @@ -710,7 +710,7 @@ - + @@ -719,7 +719,7 @@ - + @@ -729,8 +729,8 @@ - - + + @@ -738,10 +738,9 @@ - + - - + @@ -771,7 +770,7 @@ - + + @@ -1108,13 +1113,22 @@ + + + + + + + + + - + @@ -1178,6 +1192,12 @@ + + + + + + @@ -1375,6 +1395,9 @@ + + + @@ -1399,7 +1422,7 @@ - + @@ -1426,10 +1449,14 @@ + + + + @@ -1557,9 +1584,6 @@ - diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 70b7dbeae..e50a7b762 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -101,7 +101,7 @@ natural|wetland;33; deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track # ~1M usages. power|minor_line;[power=minor_line][!location];;;;35; -amenity|school;[amenity=school],[education=school];;name;int_name;36; +amenity|school;[amenity=school][education=school],[amenity=school],[education=school];;;;36; # Dedicated/segregated cycleways (e.g. segregated paths are converted into cycleways + footways, see osm2type.cpp). highway|cycleway;37; # ~16M usages. @@ -202,7 +202,7 @@ landuse|commercial;111; moved:railway|station:05.2024;112;railway|station deprecated:highway|path|hiking:04.2024;[highway=path][route=hiking],[highway=path][sac_scale=hiking];x;name;int_name;113;highway|path # ~200k usages. -amenity|hospital;114; +amenity|hospital;[amenity=hospital][healthcare=hospital],[amenity=hospital],[healthcare=hospital];;;;114; # TODO: merge with "intermittent". waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115; highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116; @@ -210,7 +210,7 @@ highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116; amenity|post_office;117; # ~230k usages. landuse|quarry;118; -amenity|pharmacy;119; +amenity|pharmacy;[amenity=pharmacy][healthcare=pharmacy],[amenity=pharmacy],[healthcare=pharmacy];;;;119; man_made|pier;120; # ~220k usages. highway|motorway_junction;121; @@ -276,7 +276,7 @@ deprecated:natural|wood|coniferous:01.2020;[natural=wood][wood=coniferous],[natu landuse|recreation_ground;173; landuse|village_green;174; amenity|drinking_water;175; -amenity|university;[amenity=university],[education=university];;name;int_name;176; +amenity|university;[amenity=university][education=university],[amenity=university],[education=university];;;;176; highway|secondary_link;177; power|substation;178; railway|tram_stop;179; @@ -309,7 +309,7 @@ power|portal;204; # Marsh 500K usages, wet_meadow 160K natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205; leisure|stadium;206; -amenity|doctors;207; +amenity|doctors;[amenity=doctors][healthcare=doctor],[amenity=doctors],[healthcare=doctor];;;;207; railway|disused;208; aeroway|runway;209; railway|halt;210; @@ -327,7 +327,7 @@ sport|swimming;220; leisure|track;221; sport|skateboard;222; barrier|retaining_wall;223; -amenity|college;[amenity=college],[education=college];;name;int_name;224; +amenity|college;[amenity=college][education=college],[amenity=college],[education=college];;;;224; sport|baseball;225; highway|service|area;[highway=service][area?];;name;int_name;226; highway|residential|area;[highway=residential][area?];;name;int_name;227; @@ -625,9 +625,9 @@ toilets|yes;502; highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503; drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504; drinking_water|no;505; -amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506; -amenity|flight_school;[amenity=flight_school],[education=flight_school];;name;int_name;507; -amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508; +amenity|sailing_school;[amenity=sailing_school][education=sailing_school],[amenity=sailing_school],[education=sailing_school];;;;506; +amenity|flight_school;[amenity=flight_school][education=flight_school],[amenity=flight_school],[education=flight_school];;;;507; +amenity|prep_school;[amenity=prep_school][education=prep_school],[amenity=prep_school],[education=prep_school];;;;508; amenity|car_pooling;509; social_facility|soup_kitchen;510; social_facility|food_bank;511; @@ -1160,8 +1160,8 @@ railway|subway_entrance|madrid;[railway=subway_entrance][city=madrid];;name;int_ railway|subway_entrance|roma;[railway=subway_entrance][city=roma];;name;int_name;1033; railway|subway_entrance|spb;[railway=subway_entrance][city=spb];;name;int_name;1034; aerialway|drag_lift;1035; -amenity|dentist;1036; -amenity|clinic;1037; +amenity|dentist;[amenity=dentist][healthcare=dentist],[amenity=dentist],[healthcare=dentist];;;;1036; +amenity|clinic;[amenity=clinic][healthcare=clinic],[amenity=clinic],[healthcare=clinic];;;;1037; barrier|entrance;1038; barrier|border_control;1039; shop|laundry;1040; @@ -1257,8 +1257,8 @@ amenity|vending_machine|food;[amenity=vending_machine][vending=food];;name;int_n amenity|vending_machine|newspapers;[amenity=vending_machine][vending=newspapers];;name;int_name;1130; amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;int_name;1131; leisure|dance;[leisure=dance],[amenity=dancing_school];;;;1132; -amenity|music_school;[amenity=music_school],[education=music_school];;name;int_name;1133; -amenity|language_school;[amenity=language_school],[education=language_school];;name;int_name;1134; +amenity|music_school;[amenity=music_school][education=music_school],[amenity=music_school],[education=music_school];;;;1133; +amenity|language_school;[amenity=language_school][education=language_school],[amenity=language_school],[education=language_school];;;;1134; historic|city_gate;1135; sport|padel;1136; sport|futsal;1137; @@ -1285,7 +1285,7 @@ shop|charity;1157; hwtag|toll;1158; amenity|arts_centre;1159; amenity|biergarten;1160; -amenity|driving_school;[amenity=driving_school],[education=driving_school];;name;int_name;1161; +amenity|driving_school;[amenity=driving_school][education=driving_school],[amenity=driving_school],[education=driving_school];;;;1161; amenity|food_court;1162; amenity|ice_cream;1163; amenity|internet_cafe;1164; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 436f96b7a..e3c761661 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -189,7 +189,7 @@ "type.amenity.shelter.basic_hut" = "Bivouac Hut"; /* A traditional 3-walled shelter (one side open), suitable for overnight camping. */ -"type.amenity.shelter.lean_to" = "Lean-to Shelter"; +"type.amenity.shelter.lean_to" = "Lean-to Sleep Shelter"; "type.amenity.public_bath" = "Public Bath"; "type.amenity.shower" = "Shower"; "type.amenity.stripclub" = "Stripclub"; @@ -208,7 +208,7 @@ "type.amenity.vending_machine.food" = "Food Dispenser"; "type.amenity.vending_machine.newspapers" = "Newspaper Dispenser"; "type.amenity.vending_machine.parking_tickets" = "Parking Meter"; -"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine"; +"type.amenity.vending_machine.public_transport_tickets" = "Public Transport Ticket Machine"; "type.amenity.vending_machine.sweets" = "Sweets Dispenser"; "type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser"; "type.amenity.parcel_locker" = "Parcel Locker";