From 8e6840d85d350b6151762f6d8079c303d24e4694 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 21 Jun 2025 13:54:12 +0700 Subject: [PATCH] [styles] Regenerate for natural landuse changes Signed-off-by: Konstantin Pastbin --- data/classificator.txt | 1 - data/drules_proto.bin | Bin 434657 -> 434573 bytes data/drules_proto.txt | 108 +++++++----------- data/drules_proto_default_dark.bin | Bin 416978 -> 416898 bytes data/drules_proto_default_dark.txt | 108 +++++++----------- data/drules_proto_default_light.bin | Bin 418344 -> 418260 bytes data/drules_proto_default_light.txt | 108 +++++++----------- data/drules_proto_outdoors_dark.bin | Bin 436983 -> 436903 bytes data/drules_proto_outdoors_dark.txt | 108 +++++++----------- data/drules_proto_outdoors_light.bin | Bin 438460 -> 438376 bytes data/drules_proto_outdoors_light.txt | 108 +++++++----------- data/drules_proto_vehicle_dark.bin | Bin 279987 -> 279780 bytes data/drules_proto_vehicle_dark.txt | 66 ----------- data/drules_proto_vehicle_light.bin | Bin 279802 -> 279586 bytes data/drules_proto_vehicle_light.txt | 66 ----------- .../include/priorities_1_BG-by-size.prio.txt | 12 +- .../include/priorities_4_overlays.prio.txt | 2 +- .../include/priorities_1_BG-by-size.prio.txt | 12 +- .../include/priorities_4_overlays.prio.txt | 2 +- data/types.txt | 2 +- data/visibility.txt | 1 - 21 files changed, 225 insertions(+), 479 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index dcad65f43..4c357b529 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -627,7 +627,6 @@ world + education - farmland - farmyard - - field - flowerbed - forest + coniferous - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3a0118e93e902c2975b181a7cfe332fe141fff5c..44fe04c56b10743124ab1d7e24d86b3d07875d70 100644 GIT binary patch delta 244 zcmaEOSgQB1R6`5n7N!po+fPI?*$9cgX5`|{Nz6+rEl$- zNKGus0Bde|&m_9N{yozSE|3hrL}?O8SW1ASXXRoxiA^8>LjYsD#xEuyW(H!G?Ha#W HcPmA7Gc`9g zF(tozS_zZ$cA&93nW86|xCHYOOG=9pb99pui&Eo@@{_Z-f4j-VEFyW65g`XQ9%KrN z73;uGfa%XjO)SX($xnOFB)VPuJyR2xAjpX@`QqfF(xmn)Kbe4-8Hic7U-`+pb2$K0 CrC_1} diff --git a/data/drules_proto.txt b/data/drules_proto.txt index f5f7f5efc..65ef26a51 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -48267,72 +48267,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 12898689 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -49650,6 +49584,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -50049,6 +49990,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 13161612 + priority: -1920 + } + } element { scale: 12 area { @@ -58540,6 +58488,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 14275263 + priority: -1920 + } + } element { scale: 12 area { @@ -60270,6 +60225,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -60336,6 +60298,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 13555607 + priority: -1880 + } + } element { scale: 12 area { @@ -61195,6 +61164,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 13161612 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 17ab4bd886844333a2b7482ede4fadeebedcf3b3..c31280e050022bbda728bdf533c24554b280a9ad 100644 GIT binary patch delta 297 zcmcb#Q?hBNWJ3$%7N%hH?MfC*PXt9DGIH_eB<7`*7N_c_7bO-K3kh>@PY*o6B*Mr8 zrltoRV3OMI>BTgKMeGqH7avSvGO#I= z+HQG}se;1@e$evXC}HWHiQZU74Mzyzmn3}+H)e{_-wh?#+yW&5L( ItRE%;0OoaUH2?qr delta 262 zcmZqLDS2t9WJ3$%7N%fxfisL;yg7+^DW%1!x@noIIn)1#F*#1JE@a}GZXd@~vOU4~5qva0l=#Ny)V`}Q*#ZSVJFn!+M;u~j)0L5$Sdsy@c{sZ9zFmmz1wB)8HrsS7{^h{UuVG^CrY{C??J*QGRkZSmnVrOrqNltYHcf(tgi~Pz1IfWH4?g9G|Xrf{ADP wpZ!c6jNH==4*<X)C{04vxe4z0cFmJaK+FupEZa3tvi_d|04PXiZWC;=1l+R$K*2oLNrs$_V>n2HbSDv z3et-bi;IOsIC!QzxG{-N->{#FWqLpW6YKQT`$i)XUFgGb# z12t^i&m_7XXzf1^u)FdSOG=9pb99T7i%OHg?s|WMNwodl2__(B24a@&?@q8jn*jhD C8e22~ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 899a8bf7a..ecfcd66a7 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -45400,72 +45400,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 12898689 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -46783,6 +46717,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -47182,6 +47123,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 13161612 + priority: -1920 + } + } element { scale: 12 area { @@ -54954,6 +54902,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 14275263 + priority: -1920 + } + } element { scale: 12 area { @@ -56540,6 +56495,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -56606,6 +56568,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 13555607 + priority: -1880 + } + } element { scale: 12 area { @@ -57338,6 +57307,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 13161612 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 35a42ad75c054f1b86153e0957456c54a8f5a83f..fe6615a5c5eb57b7804656c2a9db64d5585cbaf3 100644 GIT binary patch delta 259 zcmexWaQ$_Nz6+rEl$-+HR7`l*J?pArZhJ-F(tnotk$p&sP;$*Q{;A@JSM>$rgqlp^0%18 z*tw+yI96RbF#Y3CCgJUtx0w1xC7&{K3Fal1loloCKr90phhpJwu!CS~GEx&uGEn68 zw*wvYj8hHdY?!LzGy!wqO0lsZWC;=1f0O%H%lRJC{jjx=<}s()JA@ zOdi65$g0wd5{rws%VjVfV-Y&b$i)ZKotv7Nl3zakU@4QscA$RU9LbL?T!MLtC8b4) zIl4)SMXB*c`N`QrA{;!^C*EWd-oEQ5Q@yC@1xAD-u+bp%rUQ*Pnm+YCQxDi`m?0Ud yi6t2zxtQsx8B7Ax&%bA4-M-@k({fG}WyQ%wrAh6rznFlS8Hic7xBg;P+5i9?CtS$@ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index bce8d2f1b..05c023b4a 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -48203,72 +48203,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 988160 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 988160 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 1251584 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 1251584 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -49678,6 +49612,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -50077,6 +50018,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 988160 + priority: -1920 + } + } element { scale: 12 area { @@ -58900,6 +58848,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 3156522 + priority: -1920 + } + } element { scale: 12 area { @@ -60783,6 +60738,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -60849,6 +60811,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 988160 + priority: -1880 + } + } element { scale: 12 area { @@ -61680,6 +61649,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 988160 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 79e36124e4f8618c8b6c707355eb4d8ceacc121b..17cba79b3b8a6934cd270178a8741eb1a3cb6a53 100644 GIT binary patch delta 297 zcmdni?4C^fz)KRFwuTuOjr|I+7d5)B{!LjdFU3pbeFiZZ^RzV98AI3uR* z(}A`NPM;9S#5$epJySo}%`l@gQWHxuz^?f49_(fiwf*pWrW`JHkl$eHij#{#;2cyki-Qc8WtLH jl8o&R@0nV;P{fOqi%OH)-~40(VrC#_+5YAyYt1$Q`qWcE diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index 6259b5f07..aaaa54dd3 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -47939,72 +47939,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 13 - area { - color: 13161612 - priority: -1920 - } - } - element { - scale: 14 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 15 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 16 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 17 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 18 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 19 - area { - color: 12898689 - priority: -1920 - } - } - element { - scale: 20 - area { - color: 12898689 - priority: -1920 - } - } -} cont { name: "landuse-flowerbed" element { @@ -49414,6 +49348,13 @@ cont { } cont { name: "landuse-grass" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -49813,6 +49754,13 @@ cont { } cont { name: "landuse-meadow" + element { + scale: 11 + area { + color: 13161612 + priority: -1920 + } + } element { scale: 12 area { @@ -58654,6 +58602,13 @@ cont { } cont { name: "natural-bare_rock" + element { + scale: 11 + area { + color: 14275263 + priority: -1920 + } + } element { scale: 12 area { @@ -60537,6 +60492,13 @@ cont { } cont { name: "natural-grassland" + element { + scale: 11 + area { + color: 13161612 + priority: -1880 + } + } element { scale: 12 area { @@ -60603,6 +60565,13 @@ cont { } cont { name: "natural-heath" + element { + scale: 11 + area { + color: 13555607 + priority: -1880 + } + } element { scale: 12 area { @@ -61454,6 +61423,13 @@ cont { } cont { name: "natural-scrub" + element { + scale: 11 + area { + color: 13161612 + priority: -1870 + } + } element { scale: 12 area { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index d634a7b123be2b9d657583dda1a318d94d349a50..262274f1c97ccdfada4dd88c9d7e0126f62c9a19 100644 GIT binary patch delta 25 fcmdnoE%>BUuwe`1r;zr8p^QMxwEbWx^QZR!n#&9~ delta 47 zcmaFTDY&^?uwe`1rx1ZNj9k1qiFqld#i_b!nW;I`9rGCXw|@#@1Y)M`pF)^Fy$1l% CAryK5 diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index db8796559..45730b3cd 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -27409,72 +27409,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 13 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 14 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 15 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 16 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 17 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 18 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 19 - area { - color: 593674 - priority: -1930 - } - } - element { - scale: 20 - area { - color: 593674 - priority: -1930 - } - } -} cont { name: "landuse-forest" element { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index 302b94c0dc5cfe8227a6b4f5ebbeffff832b6645..7d24c8a31f50f47bacb6aaf2b76b46fc7bc11555 100644 GIT binary patch delta 25 fcmey>DY&RZuwe^hlTUk;FC!2$ZIAM0Uho|Nh!_eg delta 48 zcmZ3~A^59Puwe^hlaJt4MlRl*#JrT!;#A$V%+#Ee=?(de$J?8H7=f5+dy^0Ig6{yz CZxaXr diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt index 12cb644ee..0e3a523b3 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -26869,72 +26869,6 @@ cont { } } } -cont { - name: "landuse-field" - element { - scale: 12 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 13 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 14 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 15 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 16 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 17 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 18 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 19 - area { - color: 13031851 - priority: -1930 - } - } - element { - scale: 20 - area { - color: 13031851 - priority: -1930 - } - } -} cont { name: "landuse-forest" element { 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 204547d6a..b1287d7e8 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 @@ -65,12 +65,12 @@ leisure-miniature_golf # area z14- (also has icon z === 140 landuse-flowerbed # area z16- -natural-scrub # area z12- +natural-scrub # area z11- === 130 -landuse-grass # area z12- -natural-grassland # area z12- -natural-heath # area z12- +landuse-grass # area z11- +natural-grassland # area z11- +natural-heath # area z11- === 120 area:highway-footway # area z14- (also has caption z15-) @@ -106,13 +106,13 @@ landuse-farmyard # area z10- (also has captio landuse-allotments # area z12- (also has caption z15-) landuse-farmland # area z10- (also has caption z15-) -landuse-meadow # area z12- +landuse-meadow # area z11- landuse-orchard # area z12- (also has caption z15-) landuse-recreation_ground # area z12- (also has caption z15-) landuse-village_green # area z12- landuse-vineyard # area z12- (also has caption z15-) leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) -natural-bare_rock # area z12- (also has caption z14-) +natural-bare_rock # area z11- (also has caption z14-) natural-scree # area z11- natural-shingle # area z12- === 80 diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 140b04f2b..abfdbf799 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -560,7 +560,7 @@ highway-motorway_junction # caption z15- leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) === 3300 -natural-bare_rock # caption z14- (also has area z12-) +natural-bare_rock # caption z14- (also has area z11-) natural-bay # caption z14- natural-beach # caption z15- (also has area z10-) natural-beach-gravel # caption z15- (also has area z10-) 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 9fc8a2eac..f306a68de 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 @@ -65,12 +65,12 @@ leisure-miniature_golf # area z14- (also has icon z === 140 landuse-flowerbed # area z16- -natural-scrub # area z12- +natural-scrub # area z11- === 130 -landuse-grass # area z12- -natural-grassland # area z12- -natural-heath # area z12- +landuse-grass # area z11- +natural-grassland # area z11- +natural-heath # area z11- === 120 area:highway-footway # area z14- (also has caption z15-) @@ -106,13 +106,13 @@ landuse-farmyard # area z10- (also has captio landuse-allotments # area z12- (also has caption z15-) landuse-farmland # area z10- (also has caption z15-) -landuse-meadow # area z12- +landuse-meadow # area z11- landuse-orchard # area z12- (also has caption z15-) landuse-recreation_ground # area z12- (also has caption z15-) landuse-village_green # area z12- landuse-vineyard # area z12- (also has caption z15-) leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) -natural-bare_rock # area z12- (also has caption z13-) +natural-bare_rock # area z11- (also has caption z13-) natural-scree # area z11- natural-shingle # area z12- === 80 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 5a730a268..3a9529933 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -560,7 +560,7 @@ highway-motorway_junction # caption z15- leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) === 3300 -natural-bare_rock # caption z13- (also has area z12-) +natural-bare_rock # caption z13- (also has area z11-) natural-bay # caption z14- natural-beach # caption z14- (also has area z10-) natural-beach-gravel # caption z14- (also has area z10-) diff --git a/data/types.txt b/data/types.txt index 80570fbab..d537dc37f 100644 --- a/data/types.txt +++ b/data/types.txt @@ -315,7 +315,7 @@ highway|path *aeroway|gate *railway|preserved *highway|path|horse -*landuse|field +mapswithme *hwtag|nocycleway *leisure|water_park *natural|wetland|bog diff --git a/data/visibility.txt b/data/visibility.txt index f442cadb6..c678a9ac5 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -627,7 +627,6 @@ world 000000000000000000000 + education 000000000000000000000 - farmland 000000000000001111111 - farmyard 000000000000001111111 - - field 000000000000111111111 - flowerbed 000000000000000000000 - forest 000000000011111111111 + coniferous 000000000011111111111 -