diff --git a/data/categories.txt b/data/categories.txt index ebeb120409..30544a4d50 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -4283,6 +4283,15 @@ be:Тэтрапак|Перапрацоўка тэтрапака|Утылізац ru:Тетрапак|Переработка тетрапака|Утилизация тетрапака uk:Тетрапак | Переробка тетрапака | Утилізація тетрапака +amenity-sanitary_dump_station +en:4Dump Station|2RV Dump Station|sanitary dump station|sewage|RV waste|5motorhome dump station|4camper dump station +be:4Зліў нечыстотаў|нечыстоты|каналізація|аўтадом +de:3VE-Station|4Entsorgungsstation|4Versorgungsstation|2RV Dump +fr:vidange +it:4Camper service +ru:4Слив нечистот|нечистоты|канализация|автодом +uk:4Злив нечистот|нечистоти|каналізація|автобудинок|автодім + amenity-school en:3School|U+1F392|U+1F3EB ru:3Школа diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index eb48935a05..7c26a63818 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -428,9 +428,9 @@ highway|ford;427; area:highway|path;428; railway|siding;429; highway|track|area;[highway=track][area?];;name;int_name;430; -deprecated|deprecated;431;x +amenity|sanitary_dump_station;431; railway|funicular;432; -deprecated|deprecated;433;x +amenity|waste_transfer_station;433; historic|battlefield;434; deprecated|deprecated;435;x sport|australian_football;436; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index e887f35c80..7df96e7d09 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -21,6 +21,8 @@ ruins=yes : historic=ruins drinkable=yes : amenity=drinking_water drinking_water=yes : amenity=drinking_water water_point=yes : amenity=water_point +sanitary_dump_station=yes : amenity=sanitary_dump_station +waterway=sanitary_dump_station : amenity=sanitary_dump_station building=entrance : entrance=yes ice_road=yes : highway=ice_road @@ -29,9 +31,9 @@ highway=turning_loop : highway=mini_roundabout highway=platform : highway=pedestrian -natural=marsh : natural=wetland, wetland=marsh +natural=marsh : natural=wetland, wetland=marsh natural=waterfall : waterway=waterfall -natural = forest : natural = wood +natural=forest : natural=wood # TODO # natural = ridge + cliff=yes -> natural=cliff diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 73e12bd458..644d768adf 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -2978,6 +2978,15 @@ zh-Hans = 餐馆 zh-Hant = 餐廳 + [type.amenity.sanitary_dump_station] + en = Holding Tank Dump Station + be = Зліў нечыстотаў + de = VE-Station + fr = Station de vidange + it = Camper service + ru = Слив нечистот + uk = Злив нечистот + [type.amenity.school] en = School ar = مدرسة @@ -3486,6 +3495,12 @@ zh-Hans = 大型垃圾箱 zh-Hant = 垃圾 + [type.amenity.waste_transfer_station] + en = Waste Transfer Station + be = Станцыя перавалкі адходаў + ru = Станция перевалки отходов + uk = Станція передачі сміття + [type.amenity.water_point] en = Water Point ar = نقطة مائية diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index bc586a9f58..ed2554718d 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -104,6 +104,10 @@ node[emergency=phone], node[amenity=bench], node[amenity=recycling], area[amenity=recycling], +node[amenity=sanitary_dump_station], +area[amenity=sanitary_dump_station], +node[amenity=waste_transfer_station], +area[amenity=waste_transfer_station], node[amenity=vending_machine], area[amenity=vending_machine], node[aeroway=gate], @@ -1948,7 +1952,9 @@ node|z17-[emergency=phone] {icon-image: phone-m.svg;icon-min-distance: 30;} node|z17-[amenity=recycling], -area|z17-[amenity=recycling] +area|z17-[amenity=recycling], +node|z17-[amenity=waste_transfer_station], +area|z17-[amenity=waste_transfer_station], {icon-image: recycling-m.svg;icon-min-distance: 30;} node|z17-[power=station], @@ -2423,6 +2429,8 @@ node|z14-[amenity=fuel], area|z14-[amenity=fuel], node|z14-[amenity=charging_station], area|z14-[amenity=charging_station], +node|z15-[amenity=sanitary_dump_station], +area|z15-[amenity=sanitary_dump_station], node|z17-[amenity=bicycle_parking], area|z17-[amenity=bicycle_parking], node|z17-[amenity=motorcycle_parking], @@ -2483,6 +2491,10 @@ node|z18-[amenity=car_sharing], area|z18-[amenity=car_sharing] {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 11;} +node|z15-[amenity=sanitary_dump_station], +area|z15-[amenity=sanitary_dump_station] +{icon-image: dump-station-m.svg; icon-min-distance: 20;} + /* 7.1 Parking */ node|z16[amenity=parking], diff --git a/data/styles/clear/style-clear/symbols/dump-station-m.svg b/data/styles/clear/style-clear/symbols/dump-station-m.svg new file mode 100644 index 0000000000..a9d44684b3 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/dump-station-m.svg @@ -0,0 +1,44 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dump-station-m.svg b/data/styles/clear/style-night/symbols/dump-station-m.svg new file mode 100644 index 0000000000..a9d44684b3 --- /dev/null +++ b/data/styles/clear/style-night/symbols/dump-station-m.svg @@ -0,0 +1,44 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 1a1623b3af..196a4a1f3a 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -782,7 +782,6 @@ area|z18-[amenity=place_of_worship][religion=hindu] /* 5.5 Others */ - node|z17[amenity=bank], area|z17[amenity=bank] {icon-image: bank-m.svg;font-size: 13.75; icon-min-distance: 15;} @@ -790,6 +789,12 @@ node|z18-[amenity=bank], area|z18-[amenity=bank] {icon-image: bank-m.svg;font-size: 14.5; icon-min-distance: 10;} +node|z17[amenity=police], +area|z17[amenity=police] +{icon-image: police-m.svg; font-size: 13.75; icon-min-distance: 15;} +node|z18-[amenity=police], +area|z18-[amenity=police] +{icon-image: police-m.svg; font-size: 14.5; icon-min-distance: 10;} node|z12-14[barrier=toll_booth], area|z12-14[barrier=toll_booth] @@ -806,7 +811,6 @@ node|z15-[barrier=border_control] node|z17-[barrier=border_control] {icon-image:bcontrol-m.svg;} - node|z16-[barrier=lift_gate], area|z16-[barrier=lift_gate] {icon-image: lift_gate-m.svg;icon-min-distance: 30;} @@ -817,7 +821,6 @@ node|z18-[barrier=lift_gate], area|z18-[barrier=lift_gate] {icon-image: lift_gate-m.svg;} - node|z17-[amenity=vending_machine], area|z17-[amenity=vending_machine] {icon-image: vending-m.svg;icon-min-distance: 20;} @@ -920,6 +923,8 @@ node|z12-[amenity=fuel], area|z12-[amenity=fuel], node|z14-[amenity=charging_station], area|z14-[amenity=charging_station], +node|z15-[amenity=sanitary_dump_station], +area|z15-[amenity=sanitary_dump_station], node|z17-[amenity=car_wash], area|z17-[amenity=car_wash], node|z16-[amenity=parking], @@ -972,15 +977,8 @@ area|z18-[amenity=charging_station] node|z13[highway=speed_camera] {icon-image: speedcam-s.svg; z-index: 75000;} -node|z14[highway=speed_camera] +node|z14-[highway=speed_camera] {icon-image: speedcam-m.svg; z-index: 75000;} -node|z15[highway=speed_camera] -{icon-image: speedcam-m.svg; z-index: 75000;} -node|z16-[highway=speed_camera] -{icon-image: speedcam-m.svg; z-index: 75000;} -node|z18-[highway=speed_camera] -{icon-image: speedcam-m.svg; z-index: 75000;} - node|z17[amenity=car_wash], area|z17[amenity=car_wash] @@ -997,6 +995,16 @@ node|z18-[amenity=car_sharing], area|z18-[amenity=car_sharing] {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 14.5;} +node|z15-[amenity=sanitary_dump_station], +area|z15-[amenity=sanitary_dump_station], +{icon-image: dump-station-m.svg; font-size: 12.5; icon-min-distance: 20;} +node|z17-[amenity=sanitary_dump_station], +area|z17-[amenity=sanitary_dump_station] +{font-size: 13.75; icon-min-distance: 15;} +node|z18-[amenity=sanitary_dump_station], +area|z18-[amenity=sanitary_dump_station] +{font-size: 14.5; icon-min-distance: 10;} + /* 7.1 Parking */ node|z15-16[amenity=parking],