From eb5657ba9be25f938ea3f375a917975359afcab3 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 16 Feb 2023 10:05:37 +0000 Subject: [PATCH] [styles] Fix fuel and charging stations priorities Signed-off-by: Konstantin Pastbin --- data/styles/clear/include/Icons.mapcss | 12 ++++++------ data/styles/vehicle/include/Icons.mapcss | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index d59c274c92..931f7e1dca 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -2903,13 +2903,13 @@ area|z18-[amenity=car_sharing] node|z14[amenity=fuel], area|z14[amenity=fuel] -{icon-image: fuel-s.svg;text-offset: 1;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;} node|z15[amenity=fuel], area|z15[amenity=fuel] -{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: fuel-m.svg; icon-min-distance: 20;} node|z16[amenity=fuel], area|z16[amenity=fuel] -{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;} +{icon-image: fuel-m.svg; icon-min-distance: 10;} node|z17-[amenity=fuel], area|z17-[amenity=fuel] {icon-image: fuel-m.svg;} @@ -2919,13 +2919,13 @@ area|z18-[amenity=fuel] node|z14[amenity=charging_station][motorcar?], area|z14[amenity=charging_station][motorcar?], -{icon-image: charging-station-s.svg;text-offset: 1;font-size: 10;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: charging-station-s.svg;text-offset: 1;font-size: 10;icon-min-distance: 20;} node|z15[amenity=charging_station][motorcar?], area|z15[amenity=charging_station][motorcar?], -{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: charging-station-m.svg;icon-min-distance: 20;} node|z16[amenity=charging_station], area|z16[amenity=charging_station] -{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;} +{icon-image: charging-station-m.svg;icon-min-distance: 10;} node|z17-[amenity=charging_station], area|z17-[amenity=charging_station] {icon-image: charging-station-m.svg;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 9e59e28265..836f88c2d2 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -935,19 +935,19 @@ area|z18-[amenity=car_sharing] node|z12[amenity=fuel], area|z12[amenity=fuel] -{icon-image: fuel-s.svg;text-offset: 1;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;} node|z13[amenity=fuel], area|z13[amenity=fuel] -{icon-image: fuel-m.svg;text-offset: 1;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 11.75;} +{icon-image: fuel-m.svg; text-offset: 1; icon-min-distance: 20; font-size: 11.75;} node|z14[amenity=fuel], area|z14[amenity=fuel] -{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.25;} +{icon-image: fuel-m.svg; icon-min-distance: 20; font-size: 12.25;} node|z15[amenity=fuel], area|z15[amenity=fuel] -{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.5;} +{icon-image: fuel-m.svg; icon-min-distance: 20; font-size: 12.5;} node|z16[amenity=fuel], area|z16[amenity=fuel] -{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;} +{icon-image: fuel-m.svg; icon-min-distance: 10; font-size: 12.75;} node|z17[amenity=fuel], area|z17[amenity=fuel] {icon-image: fuel-m.svg;font-size: 13.75;} @@ -957,13 +957,13 @@ area|z18-[amenity=fuel] node|z14[amenity=charging_station][motorcar?], area|z14[amenity=charging_station][motorcar?], -{icon-image: charging-station-m.svg;text-offset: 1;font-size: 12.25;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: charging-station-m.svg;text-offset: 1;font-size: 12.25;icon-min-distance: 20;} node|z15[amenity=charging_station][motorcar?], area|z15[amenity=charging_station][motorcar?], -{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.5;} +{icon-image: charging-station-m.svg;icon-min-distance: 20;font-size: 12.5;} node|z16[amenity=charging_station], area|z16[amenity=charging_station] -{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;} +{icon-image: charging-station-m.svg;icon-min-distance: 10;font-size: 12.75;} node|z17[amenity=charging_station], area|z17[amenity=charging_station] {icon-image: charging-station-m.svg; font-size: 13.75;}