drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-23 06:33:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/yannikbloscheck-greenery' into test/2025.07.10

Browse Source 
# Conflicts:
#    data/drules_proto.bin
#    data/drules_proto_default_dark.bin
#    data/drules_proto_default_light.bin
#    data/drules_proto_outdoors_dark.bin
#    data/drules_proto_outdoors_light.bin


Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond
2025-07-10 21:47:23 +01:00
parent f7e4fdad6a fae8849869
commit c287dde93f
15 changed files with 2009 additions and 2100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
data/colors.txt
View File

@@ -22,22 +22,20 @@
328965 328965
352205 352205
394752 394752
401446
462602 462602
593674 593674
854541 854541
855309 855309
929809 929809
988160
990018 990018
1118464 1118464
1118481 1118481
1184274 1184274
1251584
1272880 1272880
1317888 1317888
1359565 1359565
1381632 1381632
1449728
1642503 1642503
1643545 1643545
1643785 1643785
@@ -146,7 +144,6 @@
6164237 6164237
6173981 6173981
6247213 6247213
6272197
6291544 6291544
6381914 6381914
6381921 6381921
@@ -220,52 +217,69 @@
10426903 10426903
10592406 10592406
10790054 10790054
10796367
11053224 11053224
11057133 11057133
11058780 11058773
11112295 11112295
11184810 11184810
11250586 11250586
11387999 11321948
11579812 11579812
11585379 11650146
11650917
11711154 11711154
11716458
11720246 11720246
11720952 11720952
11770767 11770767
11836942 11836942
11841150 11841150
11846761
11848043
11898395 11898395
11979115
12000284 12000284
12039862 12039862
12105912 12105912
12110705
12373110
12504182 12504182
12517551 12517551
12837073 12837073
12895428 12895428
12898689 12898689
13030021
13031851 13031851
13161612
13163437 13163437
13227146
13229526 13229526
13407549 13407549
13420474 13420474
13424014
13538264 13538264
13555607 13555607
13621402
13685196 13685196
13818270
13947850 13947850
13949600
13952918 13952918
14013333
14014162 14014162
14015375
14079128
14081171
14209512 14209512
14210459
14212247
14212502
14275263 14275263
14409117
14560552 14560552
14802147 14802147
14806505 14806505
14933676
14934482 14934482
14951168 14951168
14999725
15001506 15001506
15014691 15014691
15022389 15022389
@@ -281,9 +295,12 @@
15263939 15263939
15265772 15265772
15524822 15524822
15590858
15590859
15592411 15592411
15592899 15592899
15656370 15656370
15656651
15658734 15658734
15690752 15690752
15754290 15754290
@@ -338,10 +355,12 @@
16776442 16776442
16776958 16776958
16777215 16777215
218112546
221978645 221978645
222898459 222898459
223036995 223036995
223300167 223300167
227203303
233867264 233867264
234004016 234004016
234880250 234880250
@@ -377,11 +396,9 @@
452984831 452984831
609045837 609045837
654706176 654706176
655629312
658186261 658186261
659106075 659106075
659244611 659244611
666290539
670074880 670074880
670211632 670211632
670398976 670398976
@@ -453,10 +470,10 @@
1090519039 1090519039
1216522952 1216522952
1291845632 1291845632
1291854370
1291855390 1291855390
1292174597 1292174597
1292240384 1292240384
1292247078
1292700173 1292700173
1292700941 1292700941
1292964096 1292964096
@@ -498,7 +515,6 @@
1297898588 1297898588
1298019613 1298019613
1298092845 1298092845
1298117829
1298131758 1298131758
1298227553 1298227553
1298283903 1298283903
@@ -512,6 +528,7 @@
1300267136 1300267136
1300332657 1300332657
1300793480 1300793480
1300945127
1300990719 1300990719
1301043238 1301043238
1301056384 1301056384
@@ -561,7 +578,6 @@
1711276032 1711276032
1711670784 1711670784
1711677478 1711677478
1712264192
1713184029 1713184029
1714046273 1714046273
1714104359 1714104359
@@ -595,16 +611,15 @@
1721782290 1721782290
1724152575 1724152575
1724368575 1724368575
1724437644
1725290194 1725290194
1727174424 1727174424
1728053247 1728053247
1931024665 1931024665
1943327690 1943327690
2147483648 2147483648
2147492386
2147812613 2147812613
2147878400 2147878400
2147885094
2148141581 2148141581
2148214779 2148214779
2149069336 2149069336
@@ -622,7 +637,6 @@
2152615485 2152615485
2153076053 2153076053
2153536593 2153536593
2153755845
2153769774 2153769774
2153921919 2153921919
2153997148 2153997148
@@ -632,6 +646,7 @@
2155839359 2155839359
2155905152 2155905152
2156431496 2156431496
2156583143
2156681254 2156681254
2156694400 2156694400
2157291602 2157291602
@@ -654,7 +669,6 @@
2566914048 2566914048
2567571981 2567571981
2567645179 2567645179
2567902208
2568240148 2568240148
2568499736 2568499736
2568822045 2568822045
@@ -675,7 +689,6 @@
2576782726 2576782726
2579790591 2579790591
2580006591 2580006591
2580075660
2582553856 2582553856
2583432731 2583432731
2583691006 2583691006

BIN
data/drules_proto.bin
View File

Binary file not shown.

862
data/drules_proto.txt
View File

File diff suppressed because it is too large Load Diff

BIN
data/drules_proto_default_dark.bin
View File

Binary file not shown.

713
data/drules_proto_default_dark.txt
View File

File diff suppressed because it is too large Load Diff

BIN
data/drules_proto_default_light.bin
View File

Binary file not shown.

844
data/drules_proto_default_light.txt
View File

File diff suppressed because it is too large Load Diff

BIN
data/drules_proto_outdoors_dark.bin
View File

Binary file not shown.

613
data/drules_proto_outdoors_dark.txt
View File

File diff suppressed because it is too large Load Diff

BIN
data/drules_proto_outdoors_light.bin
View File

Binary file not shown.

744
data/drules_proto_outdoors_light.txt
View File

File diff suppressed because it is too large Load Diff

42
data/styles/default/dark/colors.mapcss
View File

@@ -41,7 +41,6 @@
@glacier: #111111; @glacier: #111111;
@water: #002222; @water: #002222;
@water_bad: #00261e; @water_bad: #00261e;
@river: #062026;
@wetland: #001919; @wetland: #001919;
@beach: #28281A; @beach: #28281A;
@barerock: #302A2A; @barerock: #302A2A;
@@ -50,17 +49,38 @@
/*3.2 Vegetation*/ /*3.2 Vegetation*/
@forest: #141C00; @residential_garden: #000000;
@heath: #0F1400; @residential_garden_13: #000000;
@green0: #0F1400; @residential_garden_12: #000000;
@green1: #131900; @park: #000000;
@green1b: #141C00; @park_13: #000000;
@green2: #141C00; @park_12: #000000;
@green3: #141C00; @park_11: #000000;
@green4: #141C00; @park_10: #000000;
@green5: #141C00; @heath: #141C00;
@green6: #2F4000; @heath_13: #141C00;
@heath_12: #141C00;
@heath_11: #141C00;
@grass: #141C00;
@grass_13: #141C00;
@grass_12: #141C00;
@grass_11: #141C00;
@flowers: #141C00; @flowers: #141C00;
@allotments: #141C00;
@allotments_13: #141C00;
@allotments_12: #141C00;
@scrubs: #141C00;
@scrubs_13: #141C00;
@scrubs_12: #141C00;
@scrubs_11: #141C00;
@woods: #161F00;
@woods_13: #161F00;
@woods_12: #161F00;
@woods_11: #161F00;
@woods_10: #161F00;
@protected_nature: #2F4000;
/* 4.LANDUSE */ /* 4.LANDUSE */
/*4.1 Main landuse*/ /*4.1 Main landuse*/

189
data/styles/default/include/Basemap.mapcss
View File

@@ -115,81 +115,108 @@ area|z14-[leisure=miniature_golf],
area|z16-[landuse=flowerbed], area|z16-[landuse=flowerbed],
{fill-opacity: 1;} {fill-opacity: 1;}
area|z10-12[leisure=park], area|z10[leisure=park],
{fill-color: @green0;} {fill-color: @park_10;}
area|z13-15[leisure=park], area|z11[leisure=park],
{fill-color: @green1;} {fill-color: @park_11;}
area|z14-15[natural=scrub], area|z12[leisure=park],
{fill-color: @green1;} {fill-color: @park_12;}
area|z16-[leisure=park], area|z13[leisure=park],
{fill-color: @green2;} {fill-color: @park_13;}
area|z16-[natural=scrub], area|z14-[leisure=park],
{fill-color: @green3;} {fill-color: @park;}
area|z11[natural=heath],
{fill-color: @heath_11;}
area|z12[natural=heath],
{fill-color: @heath_12;}
area|z13[natural=heath],
{fill-color: @heath_13;}
area|z14-[natural=heath],
{fill-color: @heath;}
area|z11[landuse=grass],
area|z11[natural=grassland],
area|z11[landuse=meadow],
{fill-color: @grass_11;}
area|z12[landuse=grass],
area|z12[natural=grassland],
area|z12[leisure=golf_course],
area|z12[landuse=meadow],
area|z12[landuse=recreation_ground],
area|z12[landuse=village_green],
{fill-color: @grass_12;}
area|z13[landuse=grass],
area|z13[natural=grassland],
area|z13[leisure=golf_course],
area|z13[landuse=meadow],
area|z13[landuse=recreation_ground],
area|z13[landuse=village_green],
{fill-color: @grass_13;}
area|z14-[landuse=grass],
area|z14-[natural=grassland],
area|z14-[leisure=golf_course],
area|z14-[landuse=meadow],
area|z14-[landuse=recreation_ground],
area|z14-[landuse=village_green],
area|z14-[leisure=miniature_golf],
{fill-color: @grass;}
area|z16-[landuse=flowerbed], area|z16-[landuse=flowerbed],
{fill-color: @flowers;} {fill-color: @flowers;}
area|z14-15[landuse=grass], area|z12[leisure=garden],
{fill-color: @green0;} area|z12[landuse=allotments],
area|z10[landuse=forest], area|z12[landuse=orchard],
area|z16-[landuse=grass], area|z12[landuse=plant_nursery],
area|z14-15[natural=grassland], area|z12[landuse=vineyard],
area|z14-[leisure=golf_course], {fill-color: @allotments_12;}
area|z14-[leisure=miniature_golf], area|z13[leisure=garden],
area|z13[landuse=allotments],
area|z13[landuse=orchard],
area|z13[landuse=plant_nursery],
area|z13[landuse=vineyard],
{fill-color: @allotments_13;}
area|z14-[leisure=garden],
area|z14-[landuse=allotments], area|z14-[landuse=allotments],
area|z14-[landuse=orchard], area|z14-[landuse=orchard],
area|z14-[landuse=plant_nursery], area|z14-[landuse=plant_nursery],
area|z14-[landuse=vineyard], area|z14-[landuse=vineyard],
area|z14-15[landuse=meadow], {fill-color: @allotments;}
area|z14-[landuse=recreation_ground],
area|z14-[landuse=village_green], area|z12[leisure=garden][garden:type=residential],
{fill-color: @green1;} {fill-color: @residential_garden_12;}
area|z13[leisure=garden][garden:type=residential],
{fill-color: @residential_garden_13;}
area|z14-[leisure=garden][garden:type=residential],
{fill-color: @residential_garden;}
area|z11[natural=scrub],
{fill-color: @scrubs_11;}
area|z12[natural=scrub],
{fill-color: @scrubs_12;}
area|z13[natural=scrub],
{fill-color: @scrubs_13;}
area|z14-[natural=scrub],
{fill-color: @scrubs;}
area|z10[landuse=forest],
{fill-color: @woods_10;}
area|z11[landuse=forest], area|z11[landuse=forest],
area|z16-[natural=grassland], {fill-color: @woods_11;}
area|z16-[landuse=meadow],
{fill-color: @green1b;}
area|z12[landuse=forest], area|z12[landuse=forest],
area|z12[leisure=garden], {fill-color: @woods_12;}
{fill-color: @green2;}
area|z13[landuse=forest], area|z13[landuse=forest],
area|z13[leisure=garden], {fill-color: @woods_13;}
{fill-color: @green3;} area|z14-[landuse=forest],
area|z14[landuse=forest], {fill-color: @woods;}
area|z14[leisure=garden],
{fill-color: @green4;}
area|z15[landuse=forest],
area|z15[leisure=garden],
{fill-color: @green5;}
area|z16-[landuse=forest],
area|z16-[leisure=garden],
{fill-color: @forest;}
area|z12-[leisure=garden][garden:type=residential],
{fill-color: @green0;}
area|z16-[leisure=garden][garden:type=residential],
{fill-color: @green1;}
area|z17-[leisure=garden][garden:type=residential],
{fill-color: @green2;}
area|z11-[natural=heath],
{fill-color: @heath;}
area|z11-13[landuse=grass],
area|z11-13[natural=grassland],
area|z12-13[leisure=golf_course],
area|z12-13[landuse=allotments],
area|z12-13[landuse=orchard],
area|z12-13[landuse=plant_nursery],
area|z12-13[landuse=vineyard],
area|z11-13[landuse=meadow],
area|z12-13[landuse=recreation_ground],
area|z12-13[landuse=village_green],
area|z11-13[natural=scrub],
{fill-color: @green0;}
/* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */ /* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */
area|z10-17[leisure=nature_reserve], area|z10-17[leisure=nature_reserve],
area|z10-17[boundary=national_park], area|z10-17[boundary=national_park],
area|z10-17[boundary=protected_area][protect_class=1], area|z10-17[boundary=protected_area][protect_class=1],
{fill-opacity: 0.2; fill-color: @green6;} {fill-opacity: 0.2; fill-color: @protected_nature;}
area|z10-16[boundary=aboriginal_lands], area|z10-16[boundary=aboriginal_lands],
{fill-opacity: 0.07; fill-color: @indigenous_lands;} {fill-opacity: 0.07; fill-color: @indigenous_lands;}
@@ -250,7 +277,7 @@ line|z13-[waterway=stream],
line|z13-[waterway=canal], line|z13-[waterway=canal],
line|z13-[waterway=fish_pass], line|z13-[waterway=fish_pass],
line|z13-[natural=strait], line|z13-[natural=strait],
{opacity: 0.7; color: @river;} {opacity: 0.95; color: @water;}
/* 6.1 Area water(lake,pond etc.) */ /* 6.1 Area water(lake,pond etc.) */
@@ -280,47 +307,47 @@ area|z11-[natural=wetland]
/* 6.2 Line water(river,canal etc.) */ /* 6.2 Line water(river,canal etc.) */
line|z10[waterway=river], line|z10[waterway=river],
{width: 1;}
line|z11-12[waterway=river],
{width: 1.2;} {width: 1.2;}
line|z11-12[waterway=river],
{width: 1.4;}
line|z13[waterway=river], line|z13[waterway=river],
{width: 1.6;} {width: 1.7;}
line|z13[waterway=stream], line|z13[waterway=stream],
line|z13[waterway=canal], line|z13[waterway=canal],
line|z13[waterway=fish_pass], line|z13[waterway=fish_pass],
line|z13[natural=strait], line|z13[natural=strait],
{width: 0.7;} {width: 0.9;}
line|z13[waterway=stream][intermittent=yes] line|z13[waterway=stream][intermittent=yes]
{width: 0.7;dashes: 2.7,2.7;} {width: 0.9;dashes: 2.7,2.7;}
line|z14[waterway=river], line|z14[waterway=river],
{width: 1.8;} {width: 2.0;}
line|z14[waterway=stream], line|z14[waterway=stream],
line|z14[waterway=canal], line|z14[waterway=canal],
line|z14[waterway=fish_pass], line|z14[waterway=fish_pass],
line|z14[natural=strait], line|z14[natural=strait],
{width: 1;} {width: 1.2;}
line|z14[waterway=stream][intermittent=yes] line|z14[waterway=stream][intermittent=yes]
{width: 1;dashes: 2.7,2.7;} {width: 1.2;dashes: 2.7,2.7;}
line|z15-[waterway=river], line|z15-[waterway=river],
{width: 2.2;} {width: 2.4;}
line|z15-[waterway=stream], line|z15-[waterway=stream],
line|z15-[waterway=canal], line|z15-[waterway=canal],
line|z15-[waterway=fish_pass], line|z15-[waterway=fish_pass],
line|z15-[natural=strait], line|z15-[natural=strait],
{width: 1.6;} {width: 1.8;}
line|z15-[waterway=stream][intermittent=yes] line|z15-[waterway=stream][intermittent=yes]
{width: 1.4;dashes: 4.95,4.95;} {width: 1.6;dashes: 4.95,4.95;}
node|z16-[waterway=lock_gate], node|z16-[waterway=lock_gate],
{icon-image: dot-m.svg;} {icon-image: dot-m.svg;}
line|z13-[waterway=ditch], line|z13-[waterway=ditch],
line|z13-[waterway=drain], line|z13-[waterway=drain],
{opacity: 0.7; color: @water_bad; width: 1.5; dashes: 2.7,2.7;} {opacity: 0.7; color: @water_bad; width: 1.7; dashes: 2.7,2.7;}
line|z16-[waterway=ditch], line|z16-[waterway=ditch],
line|z16-[waterway=drain], line|z16-[waterway=drain],
{width: 3;} {width: 3;}
@@ -399,17 +426,9 @@ area|z14-[piste:type=snow_park],
/* 7.4 Cemetery */ /* 7.4 Cemetery */
area|z14[landuse=cemetery], area|z14-[landuse=cemetery],
area|z14[amenity=grave_yard] area|z14-[amenity=grave_yard]
{fill-color: @green2;fill-opacity: 0.85;} {fill-color: @flowers;}
area|z15-[amenity=grave_yard],
area|z15-[landuse=cemetery]
{fill-color: @green2;}
area|z16-[amenity=grave_yard],
area|z16-[landuse=cemetery]
{fill-color: @green3;}
/* 7.5 Pedestrian areas */ /* 7.5 Pedestrian areas */
@@ -562,7 +581,7 @@ line|z19-[waterway=weir],
{width: 8;} {width: 8;}
line|z14-[man_made=cutline], line|z14-[man_made=cutline],
{width: 1;color: @green0; opacity: 0.4;} {width: 1;color: @grass;}
line|z15[man_made=cutline], line|z15[man_made=cutline],
{width: 1.5;} {width: 1.5;}
line|z16[man_made=cutline], line|z16[man_made=cutline],

43
data/styles/default/light/colors.mapcss
View File

@@ -41,7 +41,6 @@
@glacier: #FFFFFF; @glacier: #FFFFFF;
@water: #8AD8E7; @water: #8AD8E7;
@water_bad: #95C5B8; @water_bad: #95C5B8;
@river: #5FB4C5;
@wetland: #C3E0D1; @wetland: #C3E0D1;
@beach: #FADDA0; @beach: #FADDA0;
@barerock: #D9D2BF; @barerock: #D9D2BF;
@@ -50,17 +49,37 @@
/*3.2 Vegetation*/ /*3.2 Vegetation*/
@residential_garden: #EDE5CA;
@residential_garden_13: #EDE5CB;
@residential_garden_12: #EEE6CB;
@park: #D5DB8F;
@park_13: #D6DC93;
@park_12: #D8DD96;
@park_11: #D8DC97;
@park_10: #DBDD9D;
@heath: #CED797; @heath: #CED797;
@green0: #C8D48C; @heath_13: #CFD89A;
@green1: #C4D181; @heath_12: #D2D99E;
@green1b: #BECC76; @heath_11: #D4DAA0;
@green2: #B6C96B; @grass: #C4D181;
@green3: #B0C763; @grass_13: #C6D285;
@green4: #B2C76A; @grass_12: #C9D48A;
@green5: #ADC45F; @grass_11: #CCD58E;
@forest: #A8BE5C; @flowers: #BECC76;
@green6: #7B8F35; @allotments: #D5D395;
@flowers: #B6C96B; @allotments_13: #D6D498;
@allotments_12: #D8D59B;
@scrubs: #B1C765;
@scrubs_13: #B4C96B;
@scrubs_12: #B8CB71;
@scrubs_11: #BCCC76;
@woods: #A4BD4F;
@woods_13: #A8BE55;
@woods_12: #ACC25C;
@woods_11: #B1C462;
@woods_10: #B4C469;
@protected_nature: #7B8F35;
/* 4.LANDUSE */ /* 4.LANDUSE */
/*4.1 Main landuse*/ /*4.1 Main landuse*/
@@ -79,7 +98,7 @@
@parking: #E8EFEC; @parking: #E8EFEC;
@military: #DE2D28; @military: #DE2D28;
@prison: #727272; @prison: #727272;
@farmland: #E4E0AD; @farmland: #E3DEAC;
@farmyard: #E6D6AF; @farmyard: #E6D6AF;
/*4.2 Aerodrome*/ /*4.2 Aerodrome*/

4
data/styles/outdoors/include/Basemap.mapcss
View File

@@ -11,7 +11,7 @@ line|z12-[waterway=stream],
line|z13-[waterway=fish_pass], line|z13-[waterway=fish_pass],
line|z15-[waterway=ditch], line|z15-[waterway=ditch],
line|z15-[waterway=drain], line|z15-[waterway=drain],
{opacity: 1; color: @river;} {opacity: 1; color: @water;}
/* 6.2 Line water(river,canal etc.) */ /* 6.2 Line water(river,canal etc.) */
@@ -74,7 +74,7 @@ line[waterway][tunnel]
line|z13-[man_made=cutline], line|z13-[man_made=cutline],
{width: 1.7; color: @green0; opacity: 0.6;} {width: 1.7; color: @grass;}
line|z14[man_made=cutline], line|z14[man_made=cutline],
{width: 2.2;} {width: 2.2;}
line|z15[man_made=cutline], line|z15[man_made=cutline],