From 54ccba8de35b83f3dab94dc40c4ec93deca738b4 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Sat, 21 Oct 2023 09:19:30 +0200 Subject: [PATCH] [styles] Add amenity=compressed_air icon Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- data/categories.txt | 39 +++++++++++++++++++ data/mapcss-mapping.csv | 1 + data/replaced_tags.txt | 4 ++ data/strings/types_strings.txt | 39 +++++++++++++++++++ data/styles/clear/include/Icons.mapcss | 4 ++ .../include/priorities_4_overlays.prio.txt | 2 + .../style-clear/symbols/compressed_air-m.svg | 9 +++++ .../style-night/symbols/compressed_air-m.svg | 9 +++++ data/styles/vehicle/include/Icons.mapcss | 4 ++ .../include/priorities_4_overlays.prio.txt | 1 + 10 files changed, 112 insertions(+) create mode 100644 data/styles/clear/style-clear/symbols/compressed_air-m.svg create mode 100644 data/styles/clear/style-night/symbols/compressed_air-m.svg diff --git a/data/categories.txt b/data/categories.txt index 4893b84c73..c5678eedeb 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -11844,6 +11844,45 @@ sk:3Dom kultúry fa:مرکزاجتماعی mr:समुदाय केंद्र +amenity-compressed_air +en:Compressed Air +ar:هواء مضغوط +be:Сціснутае паветра +bg:Сгъстен въздух +ca:Aire comprimit +cs:Stlačený vzduch +da:Trykluft +de:Pressluft +el:Πεπιεσμένος αέρας +es:Aire comprimido|Compresor|Hinchador +et:Suruõhk +eu:Aire konprimitua +fa:هوای فشرده +fi:Paineilma +fr:Air comprimé +he:אוויר דחוס +hu:Sűrített levegő +id:Udara terkompresi +it:Aria compressa +ja:圧縮空気 +ko:압축 공기 +mr:संकुचित हवा +nb:Komprimert luft +nl:Samengeperste lucht +pl:Sprężone powietrze +pt:Ar comprimido +ro:Aer comprimat +ru:Сжатый воздух +sk:Stlačený vzduch +sv:Tryckluft +sw:Air compressed +th:อากาศอัด +tr:Basınçlı hava +uk:Стиснене повітря +vi:Khí nén +zh-Hans:压缩空气 +zh-Hant:壓縮的空氣 + amenity-courthouse en:4Courthouse ru:Суд diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 9207d4e930..81542c501a 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1670,3 +1670,4 @@ amenity|place_of_worship|christian|jehovahs_witness;[amenity=place_of_worship][r amenity|parking|underground|private;[amenity=parking][location=underground][access=private],[amenity=parking][parking=underground][access=private];;name;int_name;1589; amenity|parking|street_side|private;[amenity=parking][parking=street_side][access=private];;name;int_name;1590; amenity|parking|lane|private;[amenity=parking][parking=lane][access=private];;name;int_name;1591; +amenity|compressed_air;1592; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 262bed169b..869eab111a 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -65,7 +65,11 @@ sanitary_dump_station=yes : amenity=sanitary_dump_station sanitary_dump_station=customers : amenity=sanitary_dump_station sanitary_dump_station=public : amenity=sanitary_dump_station waterway=sanitary_dump_station : amenity=sanitary_dump_station + +compressed_air=yes : amenity=compressed_air + amenity=monastery : amenity=place_of_worship + vending=parcel_pickup;parcel_mail_in : amenity=parcel_locker | u vending=parcel_pickup : amenity=parcel_locker | u vending=water : vending=drinks diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index e694c6645e..8fdf6de220 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -1577,6 +1577,45 @@ zh-Hans = 社区活动中心 zh-Hant = 社區活動中心 + [type.amenity.compressed_air] + en = Compressed Air + ar = هواء مضغوط + be = Сціснутае паветра + bg = Сгъстен въздух + ca = Aire comprimit + cs = Stlačený vzduch + da = Trykluft + de = Pressluft + el = Πεπιεσμένος αέρας + es = Aire comprimido + et = Suruõhk + eu = Aire konprimitua + fa = هوای فشرده + fi = Paineilma + fr = Air comprimé + he = אוויר דחוס + hu = Sűrített levegő + id = Udara terkompresi + it = Aria compressa + ja = 圧縮空気 + ko = 압축 공기 + mr = संकुचित हवा + nb = Komprimert luft + nl = Samengeperste lucht + pl = Sprężone powietrze + pt = Ar comprimido + ro = Aer comprimat + ru = Сжатый воздух + sk = Stlačený vzduch + sv = Tryckluft + sw = Air compressed + th = อากาศอัด + tr = Basınçlı hava + uk = Стиснене повітря + vi = Khí nén + zh-Hans = 压缩空气 + zh-Hant = 壓縮的空氣 + [type.amenity.conference_centre] en = Conference Center en-GB = Conference Centre diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 4f2b84ad42..31fefaf5d1 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -2629,6 +2629,10 @@ node|z15-[amenity=sanitary_dump_station], area|z15-[amenity=sanitary_dump_station] {icon-image: dump-station-m.svg; icon-min-distance: 20;} +node|z18-[amenity=compressed_air], +area|z18-[amenity=compressed_air], +{icon-image: compressed_air-m.svg;} + /* 7.1 Parking */ node|z16-[amenity=parking], diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 1a271a8312..ea061d3862 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -1037,6 +1037,7 @@ sport-skiing # icon z17- (also has captio sport-tennis # icon z17- (also has caption(optional) z17-) === 1450 +amenity-compressed_air # icon z18- (also has caption(optional) z19-) sport-american_football # icon z17- (also has caption(optional) z17-) sport-athletics # icon z17- (also has caption(optional) z17-) sport-badminton # icon z17- (also has caption(optional) z17-) @@ -1977,6 +1978,7 @@ amenity-parking_entrance-private # icon z19- (also has captio # sport-tennis # caption(optional) z17- (also has icon z17-) # === -8550 +# amenity-compressed_air # caption(optional) z19- (also has icon z18-) # sport-american_football # caption(optional) z17- (also has icon z17-) # sport-athletics # caption(optional) z17- (also has icon z17-) # sport-badminton # caption(optional) z17- (also has icon z17-) diff --git a/data/styles/clear/style-clear/symbols/compressed_air-m.svg b/data/styles/clear/style-clear/symbols/compressed_air-m.svg new file mode 100644 index 0000000000..ea938a93fb --- /dev/null +++ b/data/styles/clear/style-clear/symbols/compressed_air-m.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/compressed_air-m.svg b/data/styles/clear/style-night/symbols/compressed_air-m.svg new file mode 100644 index 0000000000..607d288679 --- /dev/null +++ b/data/styles/clear/style-night/symbols/compressed_air-m.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index d6109e3cf0..0cb5072a01 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -888,6 +888,10 @@ node|z18-[amenity=sanitary_dump_station], area|z18-[amenity=sanitary_dump_station] {font-size: 14.5; icon-min-distance: 10;} +node|z18-[amenity=compressed_air], +area|z18-[amenity=compressed_air], +{icon-image: compressed_air-m.svg;} + node|z16-[amenity=water_point], area|z16-[amenity=water_point], {icon-image: drinking-water-m.svg; icon-min-distance: 20;} diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 54182e47ab..401231cd9f 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -223,6 +223,7 @@ shop-car_repair # icon z17- shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) === 2650 +amenity-compressed_air # icon z18- amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) shop-caravan # icon z17- === 2600