From d6d7a33bdfd993d072c274090f550c48218a1e20 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Tue, 25 Feb 2025 12:03:22 +0700 Subject: [PATCH] [styles] Regenerate for power towers and lines Signed-off-by: Konstantin Pastbin --- data/classificator.txt | 2 + data/colors.txt | 1 + data/drules_proto.bin | Bin 431152 -> 431969 bytes data/drules_proto.txt | 248 ++++++++++++++++ data/drules_proto_outdoors_dark.bin | Bin 433500 -> 434305 bytes data/drules_proto_outdoors_dark.txt | 274 +++++++++++++++++- data/drules_proto_outdoors_light.bin | Bin 434968 -> 435773 bytes data/drules_proto_outdoors_light.txt | 274 +++++++++++++++++- .../outdoors/include/priorities_3_FG.prio.txt | 8 +- .../include/priorities_4_overlays.prio.txt | 8 +- data/types.txt | 8 +- data/visibility.txt | 2 + 12 files changed, 781 insertions(+), 44 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index f06b49867e..84fdc265aa 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -719,6 +719,7 @@ world + tower + communication - {} + utility_pole - wastewater_plant - water_tap + drinking_water_no - @@ -883,6 +884,7 @@ world + solar - wind - {} + pole - station - substation - tower - diff --git a/data/colors.txt b/data/colors.txt index f970ee2285..5801c34d74 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -412,6 +412,7 @@ 1294740506 1295200045 1295200561 +1295201075 1295397940 1295429823 1295523604 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 2d42a39b0e672e137d57d2cc4ffa296336b76136..a38049abc84c946ebe0ef2d0a4b66fd562e8d9b4 100644 GIT binary patch delta 683 zcmdn6Lh9iT9_~a})F8a}!fibxTV!b23XR;|ub0Qib?A_?5W1*m4t# zOLTK3o-qOi1keQp(FKIi1%%NBL{J2{w%43sDn28~!o^jPU!Gc|o0FNBDrCpOJ8den zJtH58-2Q(Ga~-4RDrPPLh?3mQy!@hgutFyeejyD`1~3qC5NKO{YYW?S!KuvRx)zK= zB2bAB_7Dk$drUx4Ck_G9wFr`~MTm4Q!lY{v!LCIDm-n~VOk?(7t}lWGHyvYoKO+|} qBm#@KpP$KW%*fx%$i)p2DFMa(bglzTjqQ!InSq#Pd*f`@^*;a-7_RgH delta 80 zcmaF3PHMvnsfHHDElf2hw*NlCRD6b)nTx9+zdW@_HzzYMb^GtB%#DoOHD@xrGjD$~ ehuMyiua=7&B3}Yh)$TZt8Hic7JI-TO_z3_&_#e3d diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 395dfbc17f..8001306a03 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -57141,6 +57141,51 @@ cont { } } } +cont { + name: "man_made-utility_pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "man_made-water_tap" element { @@ -73848,6 +73893,40 @@ cont { } cont { name: "power-line" + element { + scale: 13 + lines { + width: 4.0 + color: 2157352326 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 2576782726 + priority: 350 + } + } + element { + scale: 14 + lines { + width: 4.0 + color: 2157352326 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 2576782726 + priority: 350 + } + } element { scale: 15 lines { @@ -73951,6 +74030,123 @@ cont { } } } +cont { + name: "power-minor_line" + element { + scale: 15 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 17 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 1721144710 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1721144710 + priority: 350 + cap: BUTTCAP + } + } +} cont { name: "power-plant" element { @@ -74210,6 +74406,51 @@ cont { } } } +cont { + name: "power-pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "power-station" element { @@ -74314,6 +74555,13 @@ cont { } cont { name: "power-tower" + element { + scale: 13 + symbol { + name: "dot-m" + priority: 450 + } + } element { scale: 14 symbol { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 06285bc01b35409fef4de9ccf094bbac587f0335..81804c31040726a34e0c967858afa4b005f9de6f 100644 GIT binary patch delta 828 zcmcb!ORDjpR6`5n7N#}F>T9_~a})F8a}!fibxTV!b23XR;|ub0Qib?A_?5W1*m4t# zOLTK3o-qOi1keQp(FKIi1%%NBL{J2{wy!zH#D7|50xK6+L4J8^k#0_AUaF822d|I@ zr!g3CPuHKsET?9{C?vu;YbFT1v=`X?>`Wtv!aXLSs1pYtP%Q%(2u!b^%q%(m!$f8= z>5Xg<`7jQCxV(@9NaxGRADM-xf0)F~Dh4+7>=_XF0ygy}3sBeeiK`h!rpr%a=4VIK zA;R>MWqRBsW-UgzAuu7S>1QS}3t$shn2cS#1XFz7WM&DaY0O*#kif{z%*!u|hXx74 z8(?qBP5(NPSx^+_O*;+&AvNS+P?U#+$p^5%z{-T|I0T7NBt(oNVPX`CpeYi>aMSjq zlbJo3>x*FVPsg;kpOK3f63)fjC8jeQGjbhc1hA} delta 256 zcmZoXD0OF-R6`5n7N#}Fwrd|};y zooSpb$SgcPe-bm-^u3dqd6*hGrt?o`R%1t#Wfc?>g6jKV57x&qJ#h-N)b#qv%mUND zOktLs9x#QOpJ^i-SeRQ#NDZo7X!`pp%yKBQ)77V7(WHf8jQIA{Y0MtX+ZAUq+cENQ dW#r<9c%=m7q4xUO%s|Wn#H`!vXR|S}0syS*PqP33 diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 56f0edd1c7..2183650c31 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -57393,6 +57393,51 @@ cont { } } } +cont { + name: "man_made-utility_pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "man_made-water_tap" element { @@ -74441,9 +74486,9 @@ cont { cont { name: "power-line" element { - scale: 15 + scale: 13 lines { - width: 4.0 + width: 3.4 color: 2150839091 dashdot { dd: 1.0 @@ -74453,11 +74498,49 @@ cont { cap: BUTTCAP } lines { - width: 1.0 + width: 0.8 color: 2150839091 priority: 350 cap: BUTTCAP } + } + element { + scale: 14 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 50.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 4.5 + color: 1295201075 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 1295201075 + priority: 350 + cap: BUTTCAP + } path_text { primary { height: 10 @@ -74470,17 +74553,17 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 2150839091 + width: 4.5 + color: 1295201075 dashdot { dd: 1.0 - dd: 50.0 + dd: 80.0 } priority: 340 } lines { - width: 1.0 - color: 2150839091 + width: 1.3 + color: 1295201075 priority: 350 } path_text { @@ -74496,7 +74579,7 @@ cont { scale: 17 lines { width: 4.5 - color: 1714631475 + color: 1295201075 dashdot { dd: 1.0 dd: 80.0 @@ -74505,7 +74588,7 @@ cont { } lines { width: 1.3 - color: 1714631475 + color: 1295201075 priority: 350 } path_text { @@ -74521,7 +74604,7 @@ cont { scale: 18 lines { width: 4.5 - color: 1714631475 + color: 1295201075 dashdot { dd: 1.0 dd: 80.0 @@ -74530,7 +74613,7 @@ cont { } lines { width: 1.3 - color: 1714631475 + color: 1295201075 priority: 350 } path_text { @@ -74546,7 +74629,7 @@ cont { scale: 19 lines { width: 4.5 - color: 1714631475 + color: 1295201075 dashdot { dd: 1.0 dd: 80.0 @@ -74555,7 +74638,7 @@ cont { } lines { width: 1.3 - color: 1714631475 + color: 1295201075 priority: 350 } path_text { @@ -74571,7 +74654,7 @@ cont { scale: 20 lines { width: 4.5 - color: 1714631475 + color: 1295201075 dashdot { dd: 1.0 dd: 80.0 @@ -74580,7 +74663,7 @@ cont { } lines { width: 1.3 - color: 1714631475 + color: 1295201075 priority: 350 } path_text { @@ -74593,6 +74676,113 @@ cont { } } } +cont { + name: "power-minor_line" + element { + scale: 15 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + cap: BUTTCAP + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + } + } + element { + scale: 17 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + } + } + element { + scale: 18 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + } + } + element { + scale: 20 + lines { + width: 4.0 + color: 1714631475 + dashdot { + dd: 1.0 + dd: 80.0 + } + priority: 340 + } + lines { + width: 1.0 + color: 1714631475 + priority: 350 + } + } +} cont { name: "power-plant" element { @@ -74852,6 +75042,51 @@ cont { } } } +cont { + name: "power-pole" + element { + scale: 15 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 17 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 18 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 19 + symbol { + name: "mast-m" + priority: 230 + } + } + element { + scale: 20 + symbol { + name: "mast-m" + priority: 230 + } + } +} cont { name: "power-station" element { @@ -74956,6 +75191,13 @@ cont { } cont { name: "power-tower" + element { + scale: 13 + symbol { + name: "mast-m" + priority: 450 + } + } element { scale: 14 symbol { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index edc607b653342d3272589472dd6fbfafbb756bda..12c4d5840c59f97f8679b29038d88e360cc2147d 100644 GIT binary patch delta 857 zcmbPnOlt2LsfHHDEliF_>ub40a})F8a}!fibxTV!b23XR;|ub0Qib?A_?5W1*m4t# zOLTK3o-qOi1keQp(FKIi1%%NBL{J2{wmTkWx_3cl0xK6+L4J8^k#0_AUaF822d|I@ zr!g3CPq&`NtgJX|CJ4N=7ie33tA#`19+L$lP#GUk83PyyOz)r0EIB=78nc-67B+}{ z7zaOGUdREY^UdUs%)-;AGqZ{TwTp0`Jp%$?z=pnI0cx7wIFnIC>;=0}5Ql(}8q{c1 zts+csSf=lr&MY%3~-Kvf~hh`w)*JAz~B>6Qf83O_3mmo3?AtVD@0H zFM_27I;O+@j9k2sFfZO-Gn?6%QQ;UP7dJ$t1e7p=$)6V~=^kQk-!}(@S%8>z`@T7B GQEULj)aqRT delta 275 zcmdmcMry_}sfHHDEliF_w;wplbnk*v2MZThL4J8^k#0_AUaC+S2fvU8Cj%G=I0&?@ zzSS~WkXd-T_;hA5))o$hdrZ?CXEKUR@0!lc&yJ*k(R2F7nasjWEgaJeXD~}~3ks=0 zO%a;@ZyK}Y^bIqaIi~Z^VCG@k!Uk3{-FybKz;x#6%pw?aTG)l9rr*b@MST0oS