From 698fabe1f6f7818fdaf59265cc6b0346073a162e Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Mon, 10 Jul 2023 14:10:05 -0300 Subject: [PATCH] [styles] Improve visibility and findability of highway services and rest areas Signed-off-by: Konstantin Pastbin Signed-off-by: Viktor Govako --- data/categories.txt | 48 ++++++++++++++++-------- data/styles/clear/include/Icons.mapcss | 39 ++++++++++--------- data/styles/vehicle/include/Icons.mapcss | 34 ++++++++++++++++- 3 files changed, 87 insertions(+), 34 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index f0bafb5c38..81a75a811d 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -11692,42 +11692,60 @@ sk:Garáž fa:گاراژ mr:गॅरेज -highway-rest_area -en:Highway Rest Area -en-GB:Lay By|rest area -en-AU:Rest Area|lay by -ru:Зона отдыха на трассе -bg:Почивка|магистрала|Почивна зона +highway-rest_area|highway-services +en:4Rest Area +ru:4Зона отдыха|Место отдыха ar:استراحة +be:4Зона адпачынку +bg:Почивка|магистрала|Почивна зона cs:Odpočívadlo da:Rasteplads -nl:Snelweg rustplaats|Parkeerplaats +de:Rastplatz +el:Χώρος ανάπαυσης αυτοκινητιστών +es:Área de descanso +et:Kiirtee puhkepeatus +eu:Atseden gunea fi:Levähdyspaikka fr:Aire de repos -de:Rastplatz hu:Pihenőzóna id:Tempat istirahat it:Area di sosta ja:休憩所 ko:휴게소|고속도로 휴게소|휴게소 +mr:महामार्ग विश्रांती क्षेत्र nb:Rasteplass +nl:Snelweg rustplaats|Parkeerplaats pl:Miejsce odpoczynku pt:Área de descanso pt-BR:Área de descanso ro:Zonă de odihnă -es:Área de descanso -et:Kiirtee puhkepeatus -eu:Atseden gunea +sk:Odpočívadlo sv:Viloplats th:บริเวณพักผ่อน tr:Otoyol Dinlenme Alanı -uk:Зона відпочинку +uk:4Зона відпочинку vi:Khu Vực Thụt Vào Để Đỗ Xe zh-Hans:休息区 zh-Hant:休息區 -el:Χώρος ανάπαυσης αυτοκινητιστών -sk:Odpočívadlo -mr:महामार्ग विश्रांती क्षेत्र + +highway-services +en:4Service Area|service station +be:4Зона абслугоўвання +de:Raststätte +es:Área de servicio +et:Teenindusala +fr:Aire de service +ja:サービスエリア +mr:सेवा क्षेत्र +nl:4Servicegebied +pl:Miejsce obsługi podróżnych +pt:Área de serviço +pt-BR:Área de serviços de estrada +ru:4Зона обслуживания +tr:4Servis Alanı +uk:4Зона обслуговування +zh-Hans:服务区 +zh-Hant:服務區 man_made-chimney en:Factory Chimney diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 5f58f8da7d..49abf9a54b 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -251,7 +251,7 @@ node[leisure=picnic_table], area[leisure=picnic_table], node[amenity=shelter], area[amenity=shelter], -node[highway=rest_area], +area[highway=services], area[highway=rest_area], node[amenity=bicycle_rental], area[amenity=bicycle_rental], @@ -301,8 +301,6 @@ node[shop=car_repair][service=tyres], area[shop=car_repair][service=tyres], node[shop=caravan], area[shop=caravan], -node[highway=services], -area[highway=services], node[amenity=post_office], area[amenity=post_office], node[amenity=dentist], @@ -1228,8 +1226,6 @@ node|z16-[leisure=picnic_table], area|z16-[leisure=picnic_table], node|z16-[amenity=shelter], area|z16-[amenity=shelter], -node|z16-[highway=rest_area], -area|z16-[highway=rest_area], node|z16-[tourism=caravan_site], area|z16-[tourism=caravan_site] {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;} @@ -1289,8 +1285,6 @@ area|z15-[tourism=camp_site] node|z16-[tourism=picnic_site], area|z16-[tourism=picnic_site], -node|z16-[highway=rest_area], -area|z16-[highway=rest_area] {icon-image: picnic-m.svg;icon-min-distance: 10;} node|z16-[leisure=picnic_table], area|z16-[leisure=picnic_table] @@ -2236,17 +2230,6 @@ node|z16-[man_made=survey_point] /* 6. SHOP */ -node|z15-[highway=services], -area|z15-[highway=services], -{text: name; text-color: @poi_label; text-offset: 1; font-size: 10; text-position: center;} - -node|z15[highway=services], -area|z15[highway=services], -{icon-image: car-repair-s.svg; icon-min-distance: 20;} -node|z16-[highway=services], -area|z16-[highway=services], -{icon-image: car-repair-m.svg;} - node|z16-[amenity=marketplace], area|z16-[amenity=marketplace], {text: name; text-color: @poi_label; text-offset: 1; font-size: 10;} @@ -2935,10 +2918,16 @@ area|z17-[craft=metal_construction] /* 7. CAR */ +area|z14-[highway=services], +area|z15-[highway=rest_area], +{text-position: center;} + node|z14-[amenity=fuel], area|z14-[amenity=fuel], node|z14-[amenity=charging_station][motorcar?], area|z14-[amenity=charging_station][motorcar?], +area|z14-[highway=services], +area|z15-[highway=rest_area], node|z15-[amenity=sanitary_dump_station], area|z15-[amenity=sanitary_dump_station], node|z16-[amenity=charging_station], @@ -2989,6 +2978,20 @@ node|z18-[amenity=charging_station], area|z18-[amenity=charging_station] {font-size: 11;} +area|z14[highway=services], +{icon-image: car-repair-s.svg; icon-min-distance: 20;} +area|z15[highway=services], +{icon-image: car-repair-m.svg; icon-min-distance: 10;} +area|z15[highway=rest_area] +{icon-image: picnic-m.svg; icon-min-distance: 10;} +area|z16-[highway=services], +{icon-image: car-repair-m.svg;} +area|z16-[highway=rest_area], +{icon-image: picnic-m.svg;} +area|z18-[highway=services], +area|z18-[highway=rest_area], +{font-size: 11;} + node|z17-[amenity=car_wash], area|z17-[amenity=car_wash] {icon-image: car-wash-m.svg;font-size: 11;icon-min-distance: 24;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index cc2d97d53a..5ff6ab0e19 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -126,6 +126,8 @@ node[building=hospital], area[building=hospital], node[building=university], area[building=university], +area[highway=services], +area[highway=rest_area], {z-index: 2900;} @@ -841,7 +843,6 @@ area|z18-[amenity=post_office], /* 6. SHOP */ - node|z14-[shop=mall], area|z14-[shop=mall], node|z14-[shop=supermarket], @@ -929,8 +930,14 @@ area|z18-[shop=car_repair] /* 7. CAR */ +area|z13-[highway=services], +area|z14-[highway=rest_area], +{text-position: center;} + node|z12-[amenity=fuel], area|z12-[amenity=fuel], +area|z13-[highway=services], +area|z14-[highway=rest_area], node|z14-[amenity=charging_station][motorcar?], area|z14-[amenity=charging_station][motorcar?], node|z15-[amenity=sanitary_dump_station], @@ -985,6 +992,31 @@ node|z18-[amenity=charging_station], area|z18-[amenity=charging_station] {icon-image: charging-station-m.svg;font-size: 14.75;} +area|z12[highway=services], +{icon-image: car-repair-s.svg; icon-min-distance: 20;} +area|z13-[highway=services], +{icon-image: car-repair-m.svg; icon-min-distance: 20; font-size: 11.75;} +area|z14[highway=services], +{font-size: 12.25;} +area|z14[highway=rest_area] +{icon-image: picnic-m.svg; icon-min-distance: 10; font-size: 12.25;} +area|z15[highway=services], +{icon-min-distance: 10; font-size: 12.5;} +area|z15-[highway=rest_area] +{icon-image: picnic-m.svg; font-size: 12.5;} +area|z16[highway=services], +{icon-min-distance: 10; font-size: 12.75;} +area|z16[highway=rest_area], +{font-size: 12.75;} +area|z17[highway=services], +{icon-min-distance: 0; font-size: 13.75;} +area|z17[highway=rest_area], +{font-size: 13.75;} +area|z18-[highway=services], +{icon-min-distance: 0; font-size: 14.5;} +area|z18-[highway=rest_area], +{font-size: 14.5;} + node|z13[highway=speed_camera] {icon-image: speedcam-s.svg; z-index: 75000;} node|z14-[highway=speed_camera]