From 0a8367084b2b968ad269b4baadfb0fdf59f80e5d Mon Sep 17 00:00:00 2001 From: Harry Bond Date: Tue, 22 Aug 2023 17:53:18 +0100 Subject: [PATCH] [styles] [classificator] further parking icon improvements Signed-off-by: Harry Bond --- data/mapcss-mapping.csv | 8 ++--- data/strings/types_strings.txt | 10 +++++- data/styles/clear/include/Icons.mapcss | 36 +++++++++++++------ .../include/priorities_4_overlays.prio.txt | 5 +-- .../clear/style-clear/symbols/bicycle-m.svg | 10 ------ .../style-clear/symbols/bicycle-parking-m.svg | 7 ++-- .../style-clear/symbols/bicycle-rental.svg | 11 +++++- .../symbols/bicycle-repair-station.svg | 5 ++- .../symbols/parking-disabled-m.svg | 17 ++------- .../clear/style-clear/symbols/parking-s.svg | 8 ++--- .../style-clear/symbols/parking_pay-s.svg | 7 ++-- .../symbols/parking_underground-m.svg | 4 +++ .../style-clear/symbols/shop-bicycle-m.svg | 12 +++---- .../clear/style-night/symbols/bicycle-m.svg | 10 ------ .../style-night/symbols/bicycle-parking-m.svg | 7 ++-- .../style-night/symbols/bicycle-rental.svg | 18 +++++----- .../symbols/bicycle-repair-station.svg | 5 ++- .../symbols/parking-disabled-m.svg | 17 ++------- .../clear/style-night/symbols/parking-s.svg | 6 +++- .../style-night/symbols/parking_pay-s.svg | 7 ++-- .../symbols/parking_underground-m.svg | 4 +++ .../style-night/symbols/shop-bicycle-m.svg | 13 +++---- data/styles/vehicle/include/Icons.mapcss | 13 +++++++ .../include/priorities_4_overlays.prio.txt | 2 ++ 24 files changed, 127 insertions(+), 115 deletions(-) delete mode 100644 data/styles/clear/style-clear/symbols/bicycle-m.svg create mode 100644 data/styles/clear/style-clear/symbols/parking_underground-m.svg delete mode 100644 data/styles/clear/style-night/symbols/bicycle-m.svg create mode 100644 data/styles/clear/style-night/symbols/parking_underground-m.svg diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index eeca3c8403..bede19339f 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -428,7 +428,7 @@ highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354; natural|volcano;355; deprecated:amenity|parking|underground|fee:01.2020;[amenity=parking][location=underground][fee?],[amenity=parking][parking=underground][fee?];x;name;int_name;356;amenity|parking|underground amenity|parking|underground;[amenity=parking][location=underground],[amenity=parking][parking=underground];;name;int_name;357; -amenity|parking|street_side;[amenity=parking][parking=street_side];;name;int_name;358; +amenity|parking|street_side;[amenity=parking][parking=street_side][!fee];;name;int_name;358; amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359; leisure|recreation_ground;360; highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361; @@ -438,7 +438,7 @@ sport|9pin;364; sport|10pin;365; piste:type|downhill|novice;[piste:type=downhill][piste:difficulty=novice];;name;int_name;366; railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367; -amenity|parking|lane;[amenity=parking][parking=lane];;name;int_name;368; +amenity|parking|lane;[amenity=parking][parking=lane][!fee];;name;int_name;368; railway|rail|main|tunnel;[railway=rail][usage=main][!highspeed][!service][tunnel?];;name;int_name;369; highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370; railway|construction;371; @@ -513,8 +513,8 @@ healthcare|speech_therapist;438; deprecated|deprecated;439;x deprecated|deprecated;440;x aerialway|t-bar;441; -deprecated|deprecated;442;x -deprecated|deprecated;443;x +amenity|parking|fee|lane;[amenity=parking][fee?][parking=lane];;name;int_name;442; +amenity|parking|fee|street_side;[amenity=parking][fee?][parking=street_side];;name;int_name;443; highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444; earthquake:damage|spontaneous_camp;445; deprecated|deprecated;446;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 17d14c97b1..f95b42ccf1 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -2879,10 +2879,18 @@ [type.amenity.parking.street_side] ref = type.amenity.parking en = Street-Side Parking - + + [type.amenity.parking.fee.street_side] + ref = type.amenity.parking + en = Paid Street-Side Parking + [type.amenity.parking.lane] ref = type.amenity.parking en = Roadside Lane Parking + + [type.amenity.parking.fee.lane] + ref = type.amenity.parking + en = Paid Roadside Lane Parking [type.amenity.parking_entrance] en = Parking Entrance diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index a62a38deff..8cae8107fa 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -2523,6 +2523,17 @@ node|z17-[amenity=parking], area|z17-[amenity=parking], {icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10} +node|z16-[amenity=parking][location=underground], +area|z16-[amenity=parking][location=underground], +{icon-image:parking_underground-m.svg;} + +node|z16-[amenity=parking][fee?], +area|z16-[amenity=parking][fee?], +{icon-image: parking_pay-s.svg;} +node|z17-[amenity=parking][fee?], +area|z17-[amenity=parking][fee?], +{icon-image: parking_pay-m.svg;} + /* no icon as these subtypes should display later */ node|z16-[amenity=parking][access=private], area|z16-[amenity=parking][access=private], @@ -2533,21 +2544,24 @@ area|z16-[amenity=parking][parking=lane], /* =no doesn't work in kothic */ /* node|z16-[amenity=parking][access=no], */ /* area|z16-[amenity=parking][access=no], */ +node|z16-[amenity=parking][parking=street_side][fee?], +area|z16-[amenity=parking][parking=street_side][fee?], +node|z16-[amenity=parking][parking=lane][fee?], +area|z16-[amenity=parking][parking=lane][fee?], {icon-image: none; icon-min-distance: 0;} -node|z16-[amenity=parking][fee?], -area|z16-[amenity=parking][fee?], -{icon-image: parking_pay-s.svg;} -node|z17-[amenity=parking][fee?], -area|z17-[amenity=parking][fee?], -{icon-image: parking_pay-m.svg} - -node|z17-[amenity=parking][parking=street_side], -area|z17-[amenity=parking][parking=street_side], -node|z17-[amenity=parking][parking=lane], -area|z17-[amenity=parking][parking=lane], +node|z18-[amenity=parking][parking=street_side], +area|z18-[amenity=parking][parking=street_side], +node|z18-[amenity=parking][parking=lane], +area|z18-[amenity=parking][parking=lane], {icon-image: parking-s.svg;} +node|z18-[amenity=parking][parking=street_side][fee?], +area|z18-[amenity=parking][parking=street_side][fee?], +node|z18-[amenity=parking][parking=lane][fee?], +area|z18-[amenity=parking][parking=lane][fee?], +{icon-image: parking_pay-s.svg;} + node|z17-[amenity=parking_entrance], area|z17-[amenity=parking_entrance], {icon-image: parking_entrance-m.svg;} diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 88c06b14b6..aba7f7f987 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -1212,18 +1212,19 @@ leisure-garden-residential # caption z18- (also has are entrance-main # icon z18- (also has caption(optional) z18-) === 170 +amenity-parking-fee-lane # icon z17- (also has caption(optional) z18-, area z15-) +amenity-parking-fee-street_side # icon z17- (also has caption(optional) z18-, area z15-) amenity-parking-lane # icon z17- (also has caption(optional) z18-, area z15-) amenity-parking-street_side # icon z17- (also has caption(optional) z18-, area z15-) === 150 amenity-parking-no-access # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking-private # icon z18- (also has caption(optional) z18-, area z15-) -amenity-parking_entrance-private # WARNING: no style defined (the type will be not included into map data) === 100 # # All automatic optional captions priorities are below 0. -# They follow the order of their correspoding icons. +# They follow the order of their corresponding icons. # # aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-) diff --git a/data/styles/clear/style-clear/symbols/bicycle-m.svg b/data/styles/clear/style-clear/symbols/bicycle-m.svg deleted file mode 100644 index 2e6c53a929..0000000000 --- a/data/styles/clear/style-clear/symbols/bicycle-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - bicycle-m - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/bicycle-parking-m.svg b/data/styles/clear/style-clear/symbols/bicycle-parking-m.svg index 7e1d13875d..d734a14baa 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-parking-m.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-parking-m.svg @@ -1,5 +1,4 @@ - - - - + + + diff --git a/data/styles/clear/style-clear/symbols/bicycle-rental.svg b/data/styles/clear/style-clear/symbols/bicycle-rental.svg index cfa79bc588..72851df029 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-rental.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-rental.svg @@ -1 +1,10 @@ -bike-parking-m + + + bike-parking-m + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bicycle-repair-station.svg b/data/styles/clear/style-clear/symbols/bicycle-repair-station.svg index 7388f874ac..f2bd2e7437 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-repair-station.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-repair-station.svg @@ -1 +1,4 @@ -america-football-m + + + + diff --git a/data/styles/clear/style-clear/symbols/parking-disabled-m.svg b/data/styles/clear/style-clear/symbols/parking-disabled-m.svg index 734c20ad86..eb9da67b58 100644 --- a/data/styles/clear/style-clear/symbols/parking-disabled-m.svg +++ b/data/styles/clear/style-clear/symbols/parking-disabled-m.svg @@ -1,15 +1,4 @@ - - parking-disabled-m - - - - - - - - - parking-disabled-m - - - + + parking-disabled-m + diff --git a/data/styles/clear/style-clear/symbols/parking-s.svg b/data/styles/clear/style-clear/symbols/parking-s.svg index 6360376725..a50c1a02fd 100644 --- a/data/styles/clear/style-clear/symbols/parking-s.svg +++ b/data/styles/clear/style-clear/symbols/parking-s.svg @@ -1,5 +1,5 @@ - - parking-m - - + + parking-m + + diff --git a/data/styles/clear/style-clear/symbols/parking_pay-s.svg b/data/styles/clear/style-clear/symbols/parking_pay-s.svg index 2b2311a8a1..929ccad5dc 100644 --- a/data/styles/clear/style-clear/symbols/parking_pay-s.svg +++ b/data/styles/clear/style-clear/symbols/parking_pay-s.svg @@ -1,5 +1,4 @@ - - - - + + + diff --git a/data/styles/clear/style-clear/symbols/parking_underground-m.svg b/data/styles/clear/style-clear/symbols/parking_underground-m.svg new file mode 100644 index 0000000000..a5997677c9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/parking_underground-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg index 27de9401eb..45d389b2b5 100644 --- a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg +++ b/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg @@ -1,10 +1,6 @@ - shop-bicycle-m - - - - - - - + bicycle-m + + + diff --git a/data/styles/clear/style-night/symbols/bicycle-m.svg b/data/styles/clear/style-night/symbols/bicycle-m.svg deleted file mode 100644 index c5b47b4bd5..0000000000 --- a/data/styles/clear/style-night/symbols/bicycle-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - bicycle-m - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/bicycle-parking-m.svg b/data/styles/clear/style-night/symbols/bicycle-parking-m.svg index 82156e85fc..7552ea2df5 100644 --- a/data/styles/clear/style-night/symbols/bicycle-parking-m.svg +++ b/data/styles/clear/style-night/symbols/bicycle-parking-m.svg @@ -1,5 +1,4 @@ - - - - + + + diff --git a/data/styles/clear/style-night/symbols/bicycle-rental.svg b/data/styles/clear/style-night/symbols/bicycle-rental.svg index 4be2a89035..3870cd2c7e 100644 --- a/data/styles/clear/style-night/symbols/bicycle-rental.svg +++ b/data/styles/clear/style-night/symbols/bicycle-rental.svg @@ -1,10 +1,10 @@ -bike-parking-m - - - - - - - - + + + bike-parking-m + + + + + + diff --git a/data/styles/clear/style-night/symbols/bicycle-repair-station.svg b/data/styles/clear/style-night/symbols/bicycle-repair-station.svg index 0e09d7af55..89faa8b9a9 100644 --- a/data/styles/clear/style-night/symbols/bicycle-repair-station.svg +++ b/data/styles/clear/style-night/symbols/bicycle-repair-station.svg @@ -1 +1,4 @@ -america-football-m + + + + diff --git a/data/styles/clear/style-night/symbols/parking-disabled-m.svg b/data/styles/clear/style-night/symbols/parking-disabled-m.svg index 9260b669c5..fc266a9ea7 100644 --- a/data/styles/clear/style-night/symbols/parking-disabled-m.svg +++ b/data/styles/clear/style-night/symbols/parking-disabled-m.svg @@ -1,15 +1,4 @@ - - parking-disabled-m - - - - - - - - - parking-disabled-m - - - + + parking-disabled-m + diff --git a/data/styles/clear/style-night/symbols/parking-s.svg b/data/styles/clear/style-night/symbols/parking-s.svg index 4894a21ca5..d4d311c2f8 100644 --- a/data/styles/clear/style-night/symbols/parking-s.svg +++ b/data/styles/clear/style-night/symbols/parking-s.svg @@ -1 +1,5 @@ - + + parking-m + + + diff --git a/data/styles/clear/style-night/symbols/parking_pay-s.svg b/data/styles/clear/style-night/symbols/parking_pay-s.svg index 793a295393..05ed92bfe8 100644 --- a/data/styles/clear/style-night/symbols/parking_pay-s.svg +++ b/data/styles/clear/style-night/symbols/parking_pay-s.svg @@ -1,5 +1,4 @@ - - - - + + + diff --git a/data/styles/clear/style-night/symbols/parking_underground-m.svg b/data/styles/clear/style-night/symbols/parking_underground-m.svg new file mode 100644 index 0000000000..9f3fa29c12 --- /dev/null +++ b/data/styles/clear/style-night/symbols/parking_underground-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg b/data/styles/clear/style-night/symbols/shop-bicycle-m.svg index 95e125119f..1a35ebaf12 100644 --- a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg +++ b/data/styles/clear/style-night/symbols/shop-bicycle-m.svg @@ -1,10 +1,7 @@ + - shop-bicycle-m - - - - - - - + bicycle-m + + + diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 616d465fa4..009579ca74 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -899,6 +899,10 @@ node|z18-[amenity=parking], area|z18-[amenity=parking], {font-size: 14.5;} +node|z16-[amenity=parking][location=underground], +area|z16-[amenity=parking][location=underground], +{icon-image:parking_underground-m.svg;} + /* no icon as these subtypes should display later */ node|z15-[amenity=parking][access=private], area|z15-[amenity=parking][access=private], @@ -906,6 +910,10 @@ node|z15-[amenity=parking][parking=street_side], area|z15-[amenity=parking][parking=street_side], node|z15-[amenity=parking][parking=lane], area|z15-[amenity=parking][parking=lane], +node|z15-[amenity=parking][parking=street_side][fee?], +area|z15-[amenity=parking][parking=street_side][fee?], +node|z15-[amenity=parking][parking=lane][fee?], +area|z15-[amenity=parking][parking=lane][fee?], {icon-image: none; text: none;} node|z15-[amenity=parking][fee?], @@ -921,6 +929,11 @@ area|z17-[amenity=parking][parking=street_side], node|z17-[amenity=parking][parking=lane], area|z17-[amenity=parking][parking=lane], {icon-image: parking-s.svg;} +node|z17-[amenity=parking][parking=street_side][fee?], +area|z17-[amenity=parking][parking=street_side][fee?], +node|z17-[amenity=parking][parking=lane][fee?], +area|z17-[amenity=parking][parking=lane][fee?], +{icon-image: parking_pay-s.svg;} node|z16-[amenity=parking_entrance], area|z16-[amenity=parking_entrance], diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 89d601c3bb..d6a735f73b 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -195,6 +195,8 @@ amenity-parking_entrance # icon z16- amenity-parking_entrance-permissive # icon z16- === 2530 +amenity-parking-fee-lane # icon z17- (also has area z15-) +amenity-parking-fee-street_side # icon z17- (also has area z15-) amenity-parking-lane # icon z17- (also has area z15-) amenity-parking-street_side # icon z17- (also has area z15-) === 2520