From a0c89a06f9c06fd05b26188609acfbe61d404d6f Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Fri, 7 Oct 2022 13:54:41 +0300 Subject: [PATCH] [classifier] Added amenity-charging_station-motorcar. Signed-off-by: Viktor Govako --- data/mapcss-mapping.csv | 2 +- data/styles/clear/include/Icons.mapcss | 14 ++++++++------ data/styles/vehicle/include/Icons.mapcss | 14 ++++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 5db42bab3b..1e280f4da1 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -198,7 +198,7 @@ railway|crossing;197; boundary|national_park;198; natural|wood|deciduous;[natural=wood][wood=deciduous],[natural=wood][leaf_type=deciduous],[natural=wood][leaf_cycle=deciduous];x;name;int_name;199;landuse|forest|deciduous waterway|dam;200; -deprecated|deprecated;201;x +amenity|charging_station|motorcar;[amenity=charging_station][motorcar?];;name;int_name;201; leisure|golf_course;202; highway|service|bridge;[highway=service][bridge?];;name;int_name;203; power|minor_line;204; diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index e94c83d727..3480f62bbb 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -2615,10 +2615,12 @@ area|z17-[craft=plumber] node|z14-[amenity=fuel], area|z14-[amenity=fuel], -node|z14-[amenity=charging_station], -area|z14-[amenity=charging_station], +node|z14-[amenity=charging_station][motorcar?], +area|z14-[amenity=charging_station][motorcar?], node|z15-[amenity=sanitary_dump_station], area|z15-[amenity=sanitary_dump_station], +node|z16-[amenity=charging_station], +area|z16-[amenity=charging_station], node|z17-[amenity=bicycle_parking], area|z17-[amenity=bicycle_parking], node|z17-[amenity=motorcycle_parking], @@ -2649,11 +2651,11 @@ node|z18-[amenity=fuel], area|z18-[amenity=fuel] {font-size: 11;} -node|z14[amenity=charging_station], -area|z14[amenity=charging_station] +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;} -node|z15[amenity=charging_station], -area|z15[amenity=charging_station] +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;} node|z16[amenity=charging_station], area|z16[amenity=charging_station] diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 6aa882ee16..db911aacc0 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -939,10 +939,12 @@ area|z18-[shop=car_repair] node|z12-[amenity=fuel], area|z12-[amenity=fuel], -node|z14-[amenity=charging_station], -area|z14-[amenity=charging_station], +node|z14-[amenity=charging_station][motorcar?], +area|z14-[amenity=charging_station][motorcar?], node|z15-[amenity=sanitary_dump_station], area|z15-[amenity=sanitary_dump_station], +node|z16-[amenity=charging_station], +area|z16-[amenity=charging_station], node|z16-[amenity=parking], area|z16-[amenity=parking], node|z17-[amenity=car_wash], @@ -975,11 +977,11 @@ node|z18-[amenity=fuel], area|z18-[amenity=fuel] {icon-image: fuel-m.svg;font-size: 14.5;} -node|z14[amenity=charging_station], -area|z14[amenity=charging_station] +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;} -node|z15[amenity=charging_station], -area|z15[amenity=charging_station] +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;} node|z16[amenity=charging_station], area|z16[amenity=charging_station]