From 9ee13a377b0b3a91f5f2d0ba2faaa8083a8f383e Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Tue, 20 Jan 2026 17:33:33 +0100 Subject: [PATCH] Update Kothic submodule Signed-off-by: Yannik Bloscheck --- .../include/priorities_1_BG-by-size.prio.txt | 12 ++++---- .../include/priorities_4_overlays.prio.txt | 28 +++++++++---------- .../include/priorities_4_overlays.prio.txt | 8 +++--- tools/kothic | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) 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 df516c731..28be29a66 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 @@ -192,12 +192,12 @@ natural-shingle # area z12- === 80 landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) -leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) +leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) leisure-garden-residential # area z12- -leisure-park # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-) +leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) === 70 landuse-forest # area z10- (also has icon z13-, caption(optional) z14-) @@ -234,7 +234,7 @@ amenity-college # area z13- (also has icon z amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) amenity-school # area z13- (also has icon z16-, caption(optional) z16-) -amenity-university # area z13- (also has icon z14-, caption(optional) z14-) +amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) === 40 aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 1ca4a9f00..b6444d421 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -114,7 +114,7 @@ natural-water-reservoir # caption z10- (also has are barrier-toll_booth # icon z16- (also has caption(optional) z16-) === 6600 -historic-ruins # icon z17- (also has caption(optional) z17-) +historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) === 6551 historic-castle # icon z12- (also has caption(optional) z12-) @@ -326,13 +326,13 @@ tourism-zoo # icon z13- (also has captio === 5200 amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) -amenity-university # icon z14- (also has caption(optional) z14-, area z13-) +amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) === 5100 leisure-marina # icon z16- (also has caption(optional) z16-) -leisure-park # icon z14- (also has caption(optional) z14-, area z10-) -leisure-park-permissive # icon z14- (also has caption(optional) z14-, area z10-) +leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) mountain_pass # icon z14- (also has caption(optional) z15-) place-square # caption z16- === 5050 @@ -838,7 +838,7 @@ highway-living_street-bridge # pathtext z14- (also has li highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-) landuse-plant_nursery # icon z17- (also has caption(optional) z17-, area z12-) leisure-bowling_alley # icon z17- (also has caption(optional) z17-) -leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) +leisure-garden # icon z16- and caption z17- (also has caption(optional) z16-, area z12-) leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) tourism-zoo-petting # icon z15- (also has caption(optional) z15-) @@ -1396,8 +1396,8 @@ amenity-parking-private # icon z18- (also has captio 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-) amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) -leisure-park-no-access # icon z14- (also has caption(optional) z14-, area z10-) -leisure-park-private # icon z14- (also has caption(optional) z14-, area z10-) +leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) === 100 @@ -1434,7 +1434,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # barrier-toll_booth # caption(optional) z16- (also has icon z16-) # === -3400 -# historic-ruins # caption(optional) z17- (also has icon z17-) +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) # === -3449 # historic-castle # caption(optional) z12- (also has icon z12-) @@ -1604,13 +1604,13 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -4800 # amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) -# amenity-university # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) # leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) # === -4900 # leisure-marina # caption(optional) z16- (also has icon z16-) -# leisure-park # caption(optional) z14- (also has icon z14-, area z10-) -# leisure-park-permissive # caption(optional) z14- (also has icon z14-, area z10-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) # mountain_pass # caption(optional) z15- (also has icon z14-) # === -4950 @@ -1934,7 +1934,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # attraction-roller_coaster # caption(optional) z17- (also has icon z17-) # landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) # leisure-bowling_alley # caption(optional) z17- (also has icon z17-) -# leisure-garden # caption(optional) z16- (also has icon z16-, area z12-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) # leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) # office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) # tourism-zoo-petting # caption(optional) z15- (also has icon z15-) @@ -2394,8 +2394,8 @@ xmas-tree # icon z18- # 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-) # amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) -# leisure-park-no-access # caption(optional) z14- (also has icon z14-, area z10-) -# leisure-park-private # caption(optional) z14- (also has icon z14-, area z10-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) # leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) # === -9900 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index ae261e6c8..0ca69c7fc 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -280,7 +280,7 @@ boundary-protected_area-6 # icon z12- (also has captio leisure-nature_reserve # icon z12- (also has caption(optional) z12-, area z10-) === 2500 -historic-ruins # icon z17- (also has caption(optional) z17-) +historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) === 2451 historic-castle # icon z12- (also has caption(optional) z15-) @@ -525,7 +525,7 @@ amenity-cafe # icon z15- (also has captio amenity-theatre # icon z15- (also has caption(optional) z15-) === 1100 -amenity-university # icon z15- (also has caption(optional) z15-) +amenity-university # icon z15- and caption z15- (also has caption(optional) z15-) === 1050 amenity-hospital # icon z15- (also has caption(optional) z15-) @@ -872,7 +872,7 @@ entrance-emergency # icon z19- (also has captio # leisure-nature_reserve # caption(optional) z12- (also has icon z12-, area z10-) # === -7500 -# historic-ruins # caption(optional) z17- (also has icon z17-) +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) # === -7549 # historic-castle # caption(optional) z15- (also has icon z12-) @@ -1071,7 +1071,7 @@ entrance-emergency # icon z19- (also has captio # amenity-theatre # caption(optional) z15- (also has icon z15-) # === -8900 -# amenity-university # caption(optional) z15- (also has icon z15-) +# amenity-university # caption(optional) z15- (also has icon z15-, caption z15-) # === -8950 # amenity-hospital # caption(optional) z15- (also has icon z15-) diff --git a/tools/kothic b/tools/kothic index 6e1746357..287babf20 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit 6e1746357549ca4b09ee1560e9bf25e3fcce20ea +Subproject commit 287babf20a28640f920391b0c31b8bd9b0fc0f24