From 9944b67def44e66cc570c65b2fa9a159f0b1c619 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Tue, 14 May 2024 01:20:56 +0300 Subject: [PATCH] [styles] Regenerate for deprecated and moved types Signed-off-by: Konstantin Pastbin --- data/classificator.txt | 2 - data/drules_proto.bin | Bin 420656 -> 419727 bytes data/drules_proto.txt | 277 -------------------------- data/drules_proto_clear.bin | Bin 407559 -> 406630 bytes data/drules_proto_clear.txt | 277 -------------------------- data/drules_proto_dark.bin | Bin 406151 -> 405272 bytes data/drules_proto_dark.txt | 277 -------------------------- data/drules_proto_outdoors_clear.bin | Bin 423739 -> 422758 bytes data/drules_proto_outdoors_clear.txt | 287 --------------------------- data/drules_proto_outdoors_dark.bin | Bin 422212 -> 421289 bytes data/drules_proto_outdoors_dark.txt | 287 --------------------------- data/drules_proto_vehicle_clear.bin | Bin 275239 -> 274310 bytes data/drules_proto_vehicle_clear.txt | 277 -------------------------- data/drules_proto_vehicle_dark.bin | Bin 275399 -> 274520 bytes data/drules_proto_vehicle_dark.txt | 277 -------------------------- data/types.txt | 20 +- data/visibility.txt | 2 - 17 files changed, 10 insertions(+), 1973 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index ae2eae1738..b30cf00608 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -605,7 +605,6 @@ world + commercial - construction - education - - farm - farmland - farmyard - field - @@ -1417,7 +1416,6 @@ world + river + tunnel - {} - riverbank - stream + ephemeral - intermittent - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index a6f2cc784f9049fdf5dfd378e731b6a20ccfe45b..149a9c02788478c5c37445fd53bff6aff160c342 100644 GIT binary patch delta 27 icmdmRO|t*IWJ3#M3sVbo3rh>@7B;K+?YEQILOB4K5DDY} delta 631 zcmeA_FS+5GWJ3#M3sVbo3rh>@7B;JRv3cxVLgk4isYT_9mAXZlWvN9;iFw)68DBFU zS2p3`5|ZO&0D}+q0{b7{ddZ@&=Er{sU^HN~V4S`&gGrdtX?kKTn@ByXl#~F+gXQa4 zBoLxjJY4J?Tmri{PhyfdCn4m-!2>kj7z{pRH=dvw4jjBfGMuw!f zXvEnwAn=Dw6Zk=nPzJk#(E%f%kQ_0+A%RU)8|ZmE4gn!4sKc>nfx8+>gCOx5SU@&R e-x$XxB8&)rY-S1*ZzjamBE)OhZXVAT!2tmBOdj+A diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 2b41441433..f29c38640e 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -128441,283 +128441,6 @@ cont { } } } -cont { - name: "waterway-riverbank" - element { - scale: 1 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 2 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 3 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 4 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 5 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 6 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 7 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 8 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 9 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 10 - lines { - width: 1.0 - color: 1295429823 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 11 - lines { - width: 1.2 - color: 1295429823 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 12 - lines { - width: 1.2 - color: 1295429823 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 13 - lines { - width: 1.6 - color: 1295429823 - priority: -980 - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 14 - lines { - width: 1.8 - color: 1295429823 - priority: -980 - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 15 - lines { - width: 2.2 - color: 1295429823 - priority: -980 - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 16 - lines { - width: 2.2 - color: 1295429823 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 17 - lines { - width: 2.2 - color: 1295429823 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 18 - lines { - width: 2.2 - color: 1295429823 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 19 - lines { - width: 2.2 - color: 1295429823 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 3150 - } - } - element { - scale: 20 - lines { - width: 2.2 - color: 1295429823 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 3150 - } - } -} cont { name: "waterway-stream" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 79b12dbae1fbc93d6fda76bb1c9159e858549d69..6a56fbf933825165d1acaf730d49e092569eecd9 100644 GIT binary patch delta 27 jcmZqwAo1*lL_-T>3sVbo3rh>@7Pjq5+auK2)(ZjvpcD!x delta 613 zcmaF%LZbbHL_-T>3sVbo3rh>@7Pjq5qVw3fgvt|3Qj5wHD|L%9%TkMy67!}zNVA<# zHsRnBlH+6mgAeus`ybwV$)d34$A1W5G+?w~oL(r&B<$+M!3|Vs33sVbo3rh>@7Pea1?Qay=W(xuUmvIUI delta 617 zcmbPnPon*)L_-T>3sVbo3rh>@7PeYh(Kl>dLgk4isYT_9mAXZlWvN9;iFwl<#Mrjg z8*y+6$#F7(!3TSRWd~-wU{P4}<39v28ZcTgO7U?la*;rY3E6XS1N9h#!Dr(1SaEZ) zac~LToWdw^P6B8E57Yn)V`H*Ru$?X-!zNOXa1^F9QLVJ);1iPJJbMNN{$RS9uy%f+ z_E|GQfYAXKOhWK*g6p5IsKh3s3G|~ihk%e2h7Py}XrLk~7bH!&5NXPViB--5a{Kf^ TSvCF7M2#)Eo_hCw{K5oYY_$js@n@R delta 509 zcmaF%Omg=-$%Yoj7N!>F7M2#)Eo_hC#V)aP36&?7q!yJYR_YdImZcUYCFW&McYMKg zoY7?Z##lBH-Zek|Lja=zqs8=vNlYS29vs|4a-0kh;2^O7;jNb}3K;5yrxyjY38|iw z5c1&QAzHl>P`xV$uaGq7teGId3O1h+$#}3MAcjK}^8pn@+`>axF+Wgo8W;%SQamf3 pO;pyILqJFpmr77D2v3Kq6C_fd5RvMHiBu;-ggTM!598Tdg#mA!*OdSO diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index 5573cc8ce1..a04fb8c6bc 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -128764,293 +128764,6 @@ cont { } } } -cont { - name: "waterway-riverbank" - element { - scale: 1 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 2 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 3 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 4 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 5 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 6 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 7 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 8 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 9 - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 10 - lines { - width: 1.4 - color: 1295429823 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - } - element { - scale: 11 - lines { - width: 2.0 - color: 1295429823 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 10 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 12 - lines { - width: 2.0 - color: 1295429823 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 10 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 13 - lines { - width: 2.7 - color: 3584191 - priority: -980 - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 10 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 14 - lines { - width: 3.5 - color: 3584191 - priority: -980 - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 10 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 15 - lines { - width: 4.6 - color: 3584191 - priority: -980 - cap: BUTTCAP - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 16 - lines { - width: 4.6 - color: 3584191 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 17 - lines { - width: 4.6 - color: 3584191 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 18 - lines { - width: 4.6 - color: 3584191 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 19 - lines { - width: 4.6 - color: 3584191 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } - element { - scale: 20 - lines { - width: 4.6 - color: 3584191 - priority: -980 - } - area { - color: 9163744 - priority: -980 - } - path_text { - primary { - height: 12 - color: 4495803 - stroke_color: 2164260863 - } - priority: 3150 - } - } -} cont { name: "waterway-stream" element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 6c15855106904824fe881ea73d401d0e94b5bc8a..21ef12b4763f289b18ed4203aeca4adcfd7997c2 100644 GIT binary patch delta 27 jcmX@|NOI+E$%Yoj7N!>F7M2#)Eo^>K+h4}AMGFG}pRNj1 delta 577 zcmZ2^Tk^;w$%Yoj7N!>F7M2#)Eo^>KVl&vegvt|3Qj5wHD|L%9%TkMy67#aBZ@kX5 zHO+{FOGu704Gg~73oJV@;{}VtnjilmfYE@_f>DZ(W08vlLQKe&gBz%a0RkL|(KB5z zl1^TI4BycH)1{qwbAn{6th*v61yiyT@O1A^ORUr%jvoZ6| diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index a481300782..3cf21cf2cb 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -128979,293 +128979,6 @@ cont { } } } -cont { - name: "waterway-riverbank" - element { - scale: 1 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 2 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 3 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 4 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 5 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 6 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 7 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 8 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 9 - area { - color: 8738 - priority: -980 - } - } - element { - scale: 10 - lines { - width: 1.4 - color: 1292247078 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 8738 - priority: -980 - } - } - element { - scale: 11 - lines { - width: 2.0 - color: 1292247078 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 10 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 12 - lines { - width: 2.0 - color: 1292247078 - priority: -980 - join: BEVELJOIN - cap: BUTTCAP - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 10 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 13 - lines { - width: 2.7 - color: 401446 - priority: -980 - cap: BUTTCAP - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 10 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 14 - lines { - width: 3.5 - color: 401446 - priority: -980 - cap: BUTTCAP - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 10 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 15 - lines { - width: 4.6 - color: 401446 - priority: -980 - cap: BUTTCAP - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 12 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 16 - lines { - width: 4.6 - color: 401446 - priority: -980 - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 12 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 17 - lines { - width: 4.6 - color: 401446 - priority: -980 - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 12 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 18 - lines { - width: 4.6 - color: 401446 - priority: -980 - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 12 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 19 - lines { - width: 4.6 - color: 401446 - priority: -980 - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 12 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } - element { - scale: 20 - lines { - width: 4.6 - color: 401446 - priority: -980 - } - area { - color: 8738 - priority: -980 - } - path_text { - primary { - height: 12 - color: 19033 - stroke_color: 2147878400 - } - priority: 3150 - } - } -} cont { name: "waterway-stream" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 1957187780f28b62342f7a502cdd34ceb9705e81..04dfb6bec29d27e021ea4760362cdd6618c6c7a2 100644 GIT binary patch delta 23 ecmZ4fOrY()Ktl^-3sVd878Y^U?K?DB^0@$UAP6l0 delta 611 zcmZp>FR=WXKtl^-3sVd878Y?;v3cxVLgk4isYT_9mAXZlWvN9;iFw)66ZbP7S2p3` z5|ZO&0D}+q0{b7{+Q_D`=Er{sU^HN~V4NH%SoTe8jvxw9qFEi6w}w})u56mtOpe;El7 delta 626 zcmccdK;Zaufrb{w7N!>FEi6w}Mc=S-36&?7q!yJYR_YdImZcUYCFV^J+{(DE-iU)s zNRE>M3_jQkEITk`1DnE{AO9hM(SXr{QHqaak&6UEOvs*t8>q(^3_cU5$BLVaje}F* z<`hPWJ|3U}JWvDbjg84N!IpzpNQQIPOc3~q=>$wiqdLHrgAb_v?3puhXU?4YLymra zxb=(<7@-EYe)>XH7I8Ie4gn!4sAI9HhK4Uptsn_%g-B2