From c0396e96c67c49b6bc70ba7cfdbaf034eea1df6b Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Sat, 25 Oct 2025 12:29:09 +0200 Subject: [PATCH] [styles] Work around missing support for `=no` Signed-off-by: Yannik Bloscheck --- data/mapcss-mapping.csv | 18 +++++++++--------- data/styles/default/include/Icons.mapcss | 9 ++++----- .../include/priorities_1_BG-by-size.prio.txt | 2 +- .../include/priorities_4_overlays.prio.txt | 4 ++-- .../include/priorities_1_BG-by-size.prio.txt | 2 +- .../include/priorities_4_overlays.prio.txt | 4 ++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 8bf702368..ed401933e 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -620,7 +620,7 @@ waterway|fish_pass|tunnel;[waterway=fish_pass][tunnel?];;name;int_name;497; natural|water|lock;[natural=water][water=lock];;name;int_name;498; deprecated:waterway|lock:06.2022;499;waterway|canal fee|yes;[fee?];;name;int_name;500; -fee|no;[fee=no];;name;int_name;501; +fee|no;[fee=not],[fee=no];;name;int_name;501; toilets|yes;502; highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503; drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504; @@ -860,7 +860,7 @@ tourism|motel;735; deprecated:boundary|administrative|4|state:01.2022;[boundary=administrative][admin_level=4][border_type=state];x;name;int_name;736;boundary|administrative|4 place|state|USA;[place=state][addr:country=US],[place=state][is_in=USA],[place=state][is_in:country=USA],[place=state][is_in:country_code=us];;name;int_name;737; building|address;[addr:housenumber][addr:street];;addr:housenumber;name;738; -amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739; +amenity|parking|no-access;[amenity=parking][access=not],[amenity=parking][access=no];;name;int_name;739; barrier|swing_gate;740; barrier|chain;741; sport|climbing;742; @@ -944,10 +944,10 @@ deprecated|deprecated;817;x deprecated|deprecated;818;x deprecated|deprecated;819;x deprecated|deprecated;820;x -highway|track|grade3|no-access;[highway=track][tracktype=grade3][access=no];x;name;int_name;821;highway|track -highway|track|grade4|no-access;[highway=track][tracktype=grade4][access=no];x;name;int_name;822;highway|track -highway|track|grade5|no-access;[highway=track][tracktype=grade5][access=no];x;name;int_name;823;highway|track -highway|track|no-access;[highway=track][access=no];;name;int_name;824; +highway|track|grade3|no-access;[highway=track][tracktype=grade3][access=not],[highway=track][tracktype=grade3][access=no];x;name;int_name;821;highway|track +highway|track|grade4|no-access;[highway=track][tracktype=grade4][access=not],[highway=track][tracktype=grade4][access=no];x;name;int_name;822;highway|track +highway|track|grade5|no-access;[highway=track][tracktype=grade4][access=not],[highway=track][tracktype=grade5][access=no];x;name;int_name;823;highway|track +highway|track|no-access;[highway=track][access=not],[highway=track][access=no];;name;int_name;824; deprecated|deprecated;825;x deprecated|deprecated;826;x deprecated|deprecated;827;x @@ -970,7 +970,7 @@ deprecated|deprecated;843;x deprecated|deprecated;844;x deprecated|deprecated;845;x deprecated|deprecated;846;x -leisure|park|no-access;[leisure=park][access=no];;name;int_name;847; +leisure|park|no-access;[leisure=park][access=not],[leisure=park][access=no];;name;int_name;847; deprecated|deprecated;848;x deprecated|deprecated;849;x deprecated|deprecated;850;x @@ -1729,8 +1729,8 @@ craft;[craft?];;name;int_name;1600; emergency|emergency_ward_entrance;1601; amenity|dojo;1602; leisure|sports_hall;1603; -man_made|water_tap|drinking_water_no;[man_made=water_tap][drinking_water=not],[man_made=water_tap][drinking_water=no],[man_made=water_tap][drinking_water:legal=no];;;;1604; -man_made|water_well|drinking_water_no;[man_made=water_well][drinking_water=not],[man_made=water_well][drinking_water=no],[man_made=water_well][drinking_water:legal=no];;;;1605; +man_made|water_tap|drinking_water_no;[man_made=water_tap][drinking_water=not],[man_made=water_tap][drinking_water=no],[man_made=water_tap][drinking_water:legal=not],[man_made=water_tap][drinking_water:legal=no];;;;1604; +man_made|water_well|drinking_water_no;[man_made=water_well][drinking_water=not],[man_made=water_well][drinking_water=no],[man_made=water_well][drinking_water:legal=not],[man_made=water_well][drinking_water:legal=no];;;;1605; natural|spring|drinking_water_no;[natural=spring][drinking_water=not],[natural=spring][drinking_water=no];;;;1606; amenity|water_point|drinking_water_no;[amenity=water_point][drinking_water=not],[amenity=water_point][drinking_water=no];;;;1607; shop|pasta;1608; diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 4c2f6d0fb..cf5cce2cf 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -2192,9 +2192,8 @@ node|z16-[amenity=parking][location=underground][fee?], node|z16-[amenity=parking][access=private], node|z16-[amenity=parking][parking=street_side], node|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][access=not], +area|z16-[amenity=parking][access=not], node|z16-[amenity=parking][parking=street_side][fee?], node|z16-[amenity=parking][parking=lane][fee?], {icon-image: none; icon-min-distance: 0;} @@ -2215,8 +2214,8 @@ node|z19-[amenity=parking_entrance][access=private], {icon-image: parking_entrance_private-m.svg; text: name;} node|z18-[amenity=parking][access=private], -/* node|z18-[amenity=parking][access=no], */ -/* area|z18-[amenity=parking][access=no], */ +node|z18-[amenity=parking][access=not], +area|z18-[amenity=parking][access=not], {icon-image:parking_private-m.svg;} node|z18-[amenity=parking][location=underground][access=private], {icon-image:parking_underground_private-m.svg;} diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 83c9922d3..2f4d81604 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -148,7 +148,7 @@ amenity-parking-lane-fee # area z17- (also has icon z amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-no-access # area z15- (also has icon z16-, caption(optional) z18-) +amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index db4e22de5..72ba3af19 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1324,7 +1324,7 @@ power-generator-wind # icon z15- (also has captio === 120 amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) -amenity-parking-no-access # icon z16- (also has caption(optional) z18-, area z15-) +amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) @@ -2278,7 +2278,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9880 # amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) -# amenity-parking-no-access # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-no-access # caption(optional) z18- (also has icon z18-, area z15-) # amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) # amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) # amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index 432b738bd..8e1c646ed 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -148,7 +148,7 @@ amenity-parking-lane-fee # area z17- (also has icon z amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-no-access # area z15- (also has icon z16-, caption(optional) z18-) +amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 518e91c8f..fcb250543 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1327,7 +1327,7 @@ power-generator-wind # icon z13- (also has captio === 120 amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) -amenity-parking-no-access # icon z16- (also has caption(optional) z18-, area z15-) +amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) @@ -2284,7 +2284,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9880 # amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) -# amenity-parking-no-access # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-no-access # caption(optional) z18- (also has icon z18-, area z15-) # amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) # amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) # amenity-parking-underground-private # caption(optional) z18- (also has icon z18-)