From 88d0ef3f563a1eeece359f4df77d5cf8d6bba4ca Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Mon, 25 Nov 2019 13:27:19 +0300 Subject: [PATCH] Regenerated drules. --- data/colors.txt | 17 ++--- data/drules_proto.bin | Bin 215876 -> 215528 bytes data/drules_proto.txt | 84 +-------------------- data/drules_proto_clear.bin | Bin 216137 -> 215790 bytes data/drules_proto_clear.txt | 110 +++++----------------------- data/drules_proto_dark.bin | Bin 214654 -> 214655 bytes data/drules_proto_dark.txt | 26 +++---- data/drules_proto_vehicle_clear.bin | Bin 137383 -> 137384 bytes data/drules_proto_vehicle_clear.txt | 26 +++---- data/drules_proto_vehicle_dark.bin | Bin 137229 -> 137230 bytes data/drules_proto_vehicle_dark.txt | 26 +++---- 11 files changed, 66 insertions(+), 223 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index 6f90aa3c51..d70244d032 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -7,14 +7,13 @@ 19738 19776 21569 +26316 26972 -28359 34815 -38280 39468 +42380 49061 87963 -113876 145999 152955 160412 @@ -37,6 +36,7 @@ 1251584 1272880 1317888 +1359565 1512724 1643545 1643785 @@ -92,7 +92,6 @@ 3677972 3681605 3684408 -3706428 3773998 3832097 3881273 @@ -135,7 +134,6 @@ 6173981 6286126 6291544 -6323595 6381914 6381921 6438271 @@ -144,10 +142,10 @@ 6645086 6645094 6687291 +6699455 6702131 6702352 6710886 -6765239 6834797 7224647 7353344 @@ -156,9 +154,7 @@ 7551546 7565931 7566195 -7697781 7829367 -7951688 8000018 8026746 8033996 @@ -166,7 +162,6 @@ 8079449 8163038 8263442 -8306489 8327953 8355711 8391449 @@ -188,8 +183,8 @@ 9868950 10066329 10167040 +10167474 10197647 -10233776 10242335 10400608 10426903 @@ -281,8 +276,8 @@ 16747109 16748864 16749632 +16750080 16750592 -16752640 16752972 16756055 16760320 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index ac66725485f7647c680fe7d5048e4bd8d5da6d06..04d1a7d50094917c3b31680d3cdd69e1339e78b7 100644 GIT binary patch delta 141 zcmX>yjrYZ5-i8*&Ele}sFdcH*KI;ur7VGpqY|I+lbv`leWS(yIk4bR5?>8nM7Kmu$ zFOXyF#q@)$%yNw3(;a1*g||C= zVp_^P{rX3y(CNy*nS{50`^v<_g07f3oI`NB{wF5U=?+ZH&f8mmF~u=YfBKb4aQd^K zOfK6W{$-NKrbh^@XFE{OLgwk08JR=3-)CjUR0(v-L7-En1D(PGv7nKQIhuL;JyvFs Y=`TJqIWuwnnXV|nEVBI*FY`BR04G*V_5c6? diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 33306d7d50..cad075db89 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -63407,8 +63407,8 @@ cont { } priority: 15781 } - apply_if: "rating>=8" apply_if: "extra_tag=tourism=apartment" + apply_if: "rating>=8" } element { scale: 16 @@ -63633,25 +63633,6 @@ cont { } apply_if: "extra_tag=tourism=apartment" } - element { - scale: 16 - symbol { - name: "apartment-m" - priority: 16781 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 1 - } - priority: 15781 - } - apply_if: "extra_tag=tourism=apartment" - apply_if: "rating>=8" - } element { scale: 17 symbol { @@ -63896,8 +63877,8 @@ cont { } priority: 15781 } - apply_if: "rating>=8" apply_if: "extra_tag=tourism=apartment" + apply_if: "rating>=8" } element { scale: 17 @@ -64122,25 +64103,6 @@ cont { } apply_if: "extra_tag=tourism=apartment" } - element { - scale: 17 - symbol { - name: "apartment-m" - priority: 16781 - min_distance: 16 - } - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 1 - } - priority: 15781 - } - apply_if: "extra_tag=tourism=apartment" - apply_if: "rating>=8" - } element { scale: 18 symbol { @@ -64385,8 +64347,8 @@ cont { } priority: 15781 } - apply_if: "rating>=8" apply_if: "extra_tag=tourism=apartment" + apply_if: "rating>=8" } element { scale: 18 @@ -64611,25 +64573,6 @@ cont { } apply_if: "extra_tag=tourism=apartment" } - element { - scale: 18 - symbol { - name: "apartment-m" - priority: 16781 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 1 - } - priority: 15781 - } - apply_if: "extra_tag=tourism=apartment" - apply_if: "rating>=8" - } element { scale: 19 symbol { @@ -64874,8 +64817,8 @@ cont { } priority: 15781 } - apply_if: "rating>=8" apply_if: "extra_tag=tourism=apartment" + apply_if: "rating>=8" } element { scale: 19 @@ -65100,25 +65043,6 @@ cont { } apply_if: "extra_tag=tourism=apartment" } - element { - scale: 19 - symbol { - name: "apartment-m" - priority: 16781 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 1 - } - priority: 15781 - } - apply_if: "extra_tag=tourism=apartment" - apply_if: "rating>=8" - } } cont { name: "sponsored-partner1" diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 1d5e182891b4f0043fce9c4c55b7cf0164d0a0a9..0eb0868849590c56081f36f9e13f30f47d6e6494 100644 GIT binary patch delta 264 zcmX>(gZJH3-i8*&ElerTm<~B@PkY9c#X9}odnOI$a1Md#0biIzw+p;sTF5+|?FW`_b}~cVWry#Moz>62WTZJBybPrvBG{G92`+3CAn znGG4&On>9bJWKrS-ykkwE*_`+{OsJsqHOn~#7cqB&(2Pt>jqRiPWWZT@+$igKt-N2h!gyqxDNsQawy_uO90iY;m AIsgCw delta 350 zcmaDimG|Tf-i8*&ElerTnC7`|PkY9c#mdE5lvt9Pmu_ckF@55DCb{iDUNh}vp1$}s zQ|R{f@0sLTFcf_I3{tT0GgIjFw||&~w;%Y<#Dk%VF?@QWIJ59{t}jgP+x`DA#W7D` z|D8#2`i9?3F4JGL0A+yM+_thXA7jR_;1e_RHs_C8keuW#M8N9bK89GtGH4UCWJG6Jl_<8}n4AU(DOz xxiQBuF>g5kVY;s;bEE8uRZp3@#JL1vCirBgXOuYQl%@)Nxy-lyjVCh`BLJ3qh}8f9 diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 2003a02d3c..f496294ced 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -62879,8 +62879,8 @@ cont { } priority: 15781 } - apply_if: "rating>=8" apply_if: "extra_tag=tourism=apartment" + apply_if: "rating>=8" } element { scale: 16 @@ -63105,25 +63105,6 @@ cont { } apply_if: "extra_tag=tourism=apartment" } - element { - scale: 16 - symbol { - name: "apartment-m" - priority: 16781 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 1 - } - priority: 15781 - } - apply_if: "extra_tag=tourism=apartment" - apply_if: "rating>=8" - } element { scale: 17 symbol { @@ -63368,8 +63349,8 @@ cont { } priority: 15781 } - apply_if: "rating>=8" apply_if: "extra_tag=tourism=apartment" + apply_if: "rating>=8" } element { scale: 17 @@ -63594,25 +63575,6 @@ cont { } apply_if: "extra_tag=tourism=apartment" } - element { - scale: 17 - symbol { - name: "apartment-m" - priority: 16781 - min_distance: 16 - } - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 1 - } - priority: 15781 - } - apply_if: "extra_tag=tourism=apartment" - apply_if: "rating>=8" - } element { scale: 18 symbol { @@ -63857,8 +63819,8 @@ cont { } priority: 15781 } - apply_if: "rating>=8" apply_if: "extra_tag=tourism=apartment" + apply_if: "rating>=8" } element { scale: 18 @@ -64083,25 +64045,6 @@ cont { } apply_if: "extra_tag=tourism=apartment" } - element { - scale: 18 - symbol { - name: "apartment-m" - priority: 16781 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 1 - } - priority: 15781 - } - apply_if: "extra_tag=tourism=apartment" - apply_if: "rating>=8" - } element { scale: 19 symbol { @@ -64346,8 +64289,8 @@ cont { } priority: 15781 } - apply_if: "rating>=8" apply_if: "extra_tag=tourism=apartment" + apply_if: "rating>=8" } element { scale: 19 @@ -64572,25 +64515,6 @@ cont { } apply_if: "extra_tag=tourism=apartment" } - element { - scale: 19 - symbol { - name: "apartment-m" - priority: 16781 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 1 - } - priority: 15781 - } - apply_if: "extra_tag=tourism=apartment" - apply_if: "rating>=8" - } } cont { name: "sponsored-partner1" @@ -69912,7 +69836,7 @@ colors { } value { name: "BookmarkDeepOrange" - color: 6323595 + color: 15754290 } value { name: "RoadShieldOrangeBackground" @@ -69920,7 +69844,7 @@ colors { } value { name: "BookmarkDeepPurple" - color: 6765239 + color: 6699455 } value { name: "RouteOutline" @@ -69932,7 +69856,7 @@ colors { } value { name: "BookmarkTeal" - color: 38280 + color: 42380 } value { name: "TransitMarkSecondaryText" @@ -69969,7 +69893,7 @@ colors { } value { name: "BookmarkBlue" - color: 28359 + color: 26316 } value { name: "MyPositionAccuracy" @@ -69977,7 +69901,7 @@ colors { } value { name: "BookmarkOrange" - color: 16752640 + color: 16750080 } value { name: "TrafficArrowLight" @@ -70001,11 +69925,11 @@ colors { } value { name: "BookmarkCyan" - color: 113876 + color: 1359565 } value { name: "BookmarkGray" - color: 7697781 + color: 7566195 } value { name: "TransitBackground" @@ -70039,7 +69963,7 @@ colors { } value { name: "BookmarkGreen" - color: 3706428 + color: 3968060 } value { name: "TrafficG3" @@ -70047,7 +69971,7 @@ colors { } value { name: "BookmarkBlueGray" - color: 6323595 + color: 5862272 } value { name: "TrafficG1" @@ -70075,7 +69999,7 @@ colors { } value { name: "BookmarkLime" - color: 8306489 + color: 9682745 } value { name: "RouteBicycle" @@ -70168,7 +70092,7 @@ colors { } value { name: "BookmarkPurple" - color: 10233776 + color: 10167474 } value { name: "TransitMarkPrimaryText" @@ -70187,11 +70111,11 @@ colors { } value { name: "BookmarkBrown" - color: 7951688 + color: 8406579 } value { name: "BookmarkLightBlue" - color: 240116 + color: 2399474 } value { name: "RatingNormal" diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 2e749563a2de9ffe31671f538bf2b65e7f75ae1f..3dd469f31588d99fe35bda247dd7f24798d2408e 100644 GIT binary patch delta 166 zcmey@!~4I7x1oixg=q`(EL+CM(`VZBWTs%(s`PsRNMcM8}iIoDMpPik4&H<=)#;56f z9GNv)8lFF8n*P#}c>>cpmhII}%rQ*Nn@+x&e#?cqRc>=nBMX-VmmtgppUm`(5~rNf RRDn-BCoyiXab;#=1OR(1LfHTS delta 165 zcmez0!~3s?x1oixg=q`(EL+A$(`VZ-HzFkdHdHn(+}G*+cI^mp3Y>? z{D$fH-RU3fnGG2aOjmMXo+^IjCmWYA7mrhZes*qRQMP+gVx_>>S68Q>a{#KH^Jw}W zM`lfkaW5U2CouhD-d^p*9K*!C;rxf`w_KQ8WlyYn%FHFsB?vRYCo?^x#3`pVRp85I LzU{TH%uI{`1$aVj diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 2b33c09bac..4308747a8f 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -69923,7 +69923,7 @@ colors { } value { name: "BookmarkDeepOrange" - color: 6323595 + color: 15754290 } value { name: "RoadShieldOrangeBackground" @@ -69931,7 +69931,7 @@ colors { } value { name: "BookmarkDeepPurple" - color: 6765239 + color: 6699455 } value { name: "RouteOutline" @@ -69943,7 +69943,7 @@ colors { } value { name: "BookmarkTeal" - color: 38280 + color: 42380 } value { name: "TransitMarkSecondaryText" @@ -69981,7 +69981,7 @@ colors { } value { name: "BookmarkBlue" - color: 28359 + color: 26316 } value { name: "MyPositionAccuracy" @@ -69989,7 +69989,7 @@ colors { } value { name: "BookmarkOrange" - color: 16752640 + color: 16750080 } value { name: "TrafficArrowLight" @@ -70012,11 +70012,11 @@ colors { } value { name: "BookmarkCyan" - color: 113876 + color: 1359565 } value { name: "BookmarkGray" - color: 7697781 + color: 7566195 } value { name: "TransitBackground" @@ -70051,7 +70051,7 @@ colors { } value { name: "BookmarkGreen" - color: 3706428 + color: 3968060 } value { name: "TrafficG3" @@ -70059,7 +70059,7 @@ colors { } value { name: "BookmarkBlueGray" - color: 6323595 + color: 5862272 } value { name: "TrafficG1" @@ -70086,7 +70086,7 @@ colors { } value { name: "BookmarkLime" - color: 8306489 + color: 9682745 } value { name: "RouteBicycle" @@ -70179,7 +70179,7 @@ colors { } value { name: "BookmarkPurple" - color: 10233776 + color: 10167474 } value { name: "TransitMarkPrimaryText" @@ -70199,11 +70199,11 @@ colors { } value { name: "BookmarkBrown" - color: 7951688 + color: 8406579 } value { name: "BookmarkLightBlue" - color: 240116 + color: 2399474 } value { name: "RatingNormal" diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 8c5d4ade13c56b7d645d6dcce84e7634cade2dbc..b81d7c3f41585914f92deaa6da7376aeba972fa2 100644 GIT binary patch delta 164 zcmZ3!kz>V1j)oS-ElkJx8ShU&!O!%ZWz&g+?9(?3Fj+D0|2$**2LUEqrk>N&^#z%p zGo3j*T|$V-ka5j)FCnH`;%EN`aS3zrIOXSO=Oz|qyB8%^3VeQccKUB2pxPOqrauv8 z(qw6P{*-CDpa|1crgJRYSBNmhFfngB`DQx1I8&qC=AK3tE(tC{mzs{NdL4e7YsblqYeL<$@ zOvmp|mk?qyWIQn4ONeQf_?4e*T*6#DPWk!Sxrs&D?nQ}}0$*QUo&H-0sCLey=}&~2 zG$FCD;b^@2=>jBBQE6l9tze)ew=moOKPQ+|GSZemfkdr@Mgz~^UYr^gBb)z0`d-CLMR zlcnMLQ>N(^!b}sG&arIg5@CvAV%~J}&Gbw$rdGMlJ&i0}5?q2X6MQn$GfJFtN>c?s O?VQB8om-rVi4g#(XFH7m delta 163 zcmeC%z|p&bqoIXy3zH^4t^PZtwlvSi-=b9ImUwR0X#_ZDW- zgcw&L%rt@N7xQ*55vCX><_+gROwSZ!YLz{)>M1jqIF}&I1fR_Gj1s4u(o}&jm-)8y Jh%+%U0suK*J0So7 diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 9d0aeac1fa..7ba4b91a88 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -43573,7 +43573,7 @@ colors { } value { name: "BookmarkDeepOrange" - color: 6323595 + color: 15754290 } value { name: "RoadShieldOrangeBackground" @@ -43581,7 +43581,7 @@ colors { } value { name: "BookmarkDeepPurple" - color: 6765239 + color: 6699455 } value { name: "RouteOutline" @@ -43593,7 +43593,7 @@ colors { } value { name: "BookmarkTeal" - color: 38280 + color: 42380 } value { name: "TransitMarkSecondaryText" @@ -43631,7 +43631,7 @@ colors { } value { name: "BookmarkBlue" - color: 28359 + color: 26316 } value { name: "MyPositionAccuracy" @@ -43639,7 +43639,7 @@ colors { } value { name: "BookmarkOrange" - color: 16752640 + color: 16750080 } value { name: "TrafficArrowLight" @@ -43662,11 +43662,11 @@ colors { } value { name: "BookmarkCyan" - color: 113876 + color: 1359565 } value { name: "BookmarkGray" - color: 7697781 + color: 7566195 } value { name: "TransitBackground" @@ -43701,7 +43701,7 @@ colors { } value { name: "BookmarkGreen" - color: 3706428 + color: 3968060 } value { name: "TrafficG3" @@ -43709,7 +43709,7 @@ colors { } value { name: "BookmarkBlueGray" - color: 6323595 + color: 5862272 } value { name: "TrafficG1" @@ -43736,7 +43736,7 @@ colors { } value { name: "BookmarkLime" - color: 8306489 + color: 9682745 } value { name: "RouteBicycle" @@ -43829,7 +43829,7 @@ colors { } value { name: "BookmarkPurple" - color: 10233776 + color: 10167474 } value { name: "TransitMarkPrimaryText" @@ -43849,11 +43849,11 @@ colors { } value { name: "BookmarkBrown" - color: 7951688 + color: 8406579 } value { name: "BookmarkLightBlue" - color: 240116 + color: 2399474 } value { name: "RatingNormal"