From 9812cf974bb6b15934a758ea6a4fabf957c79f01 Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Mon, 20 Jan 2020 18:11:58 +0300 Subject: [PATCH] [styles][generated] Generated styles. --- data/classificator.txt | 5 - data/drules_proto.bin | Bin 210454 -> 209479 bytes data/drules_proto.txt | 292 ---------------------------- data/drules_proto_clear.bin | Bin 211066 -> 210091 bytes data/drules_proto_clear.txt | 292 ---------------------------- data/drules_proto_dark.bin | Bin 209952 -> 209017 bytes data/drules_proto_dark.txt | 292 ---------------------------- data/drules_proto_vehicle_clear.bin | Bin 135779 -> 134804 bytes data/drules_proto_vehicle_clear.txt | 292 ---------------------------- data/drules_proto_vehicle_dark.bin | Bin 135646 -> 134711 bytes data/drules_proto_vehicle_dark.txt | 292 ---------------------------- data/types.txt | 10 +- data/visibility.txt | 5 - 13 files changed, 5 insertions(+), 1475 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 704b9dbc58..01bf4c39a1 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -609,11 +609,6 @@ world + bog - marsh - {} - wood + - coniferous - - deciduous - - mixed - - {} {} noexit + motor_vehicle - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 9bea2008cd3795dc0eeb1793e4ef49ae68606816..ad16c3fa8d02064f358f29840300540d7a344c67 100644 GIT binary patch delta 21 dcmbRChUfSbo`x-qRhQd6uQP7>+bC6<&HCFbas=jW$PPt0c2jNW~5Q>+bC6<&HCFbas=jW$Pm(FC=ozB_M$UR-Mh>=@dgo9T~ zfa7Dwc~*%%&Ho{QQAlL^hD=5gCLkS<1))Dc=?U2ozCjLzz5t{JxxO-TiKEyekjZF4 rbz8nLa*3hX(wNI=PIX&8Fmef@*z&QE(U{7%w98&(+%9{OsV^A--k6FI diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 036874199f..5559507abe 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -39545,298 +39545,6 @@ cont { } } } -cont { - name: "natural-wood" - element { - scale: 10 - area { - color: 13029267 - priority: -15940 - } - } - element { - scale: 11 - area { - color: 12372094 - priority: -15940 - } - } - element { - scale: 12 - area { - color: 12372094 - priority: -15940 - } - } - element { - scale: 13 - area { - color: 11781233 - priority: -15940 - } - } - element { - scale: 14 - area { - color: 11453035 - priority: -15940 - } - } - element { - scale: 15 - area { - color: 11584112 - priority: -15940 - } - } - element { - scale: 16 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 17 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 18 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 19 - area { - color: 11190117 - priority: -15940 - } - } -} -cont { - name: "natural-wood-coniferous" - element { - scale: 10 - area { - color: 13029267 - priority: -15940 - } - } - element { - scale: 11 - area { - color: 12372094 - priority: -15940 - } - } - element { - scale: 12 - area { - color: 12372094 - priority: -15940 - } - } - element { - scale: 13 - area { - color: 11781233 - priority: -15940 - } - } - element { - scale: 14 - area { - color: 11453035 - priority: -15940 - } - } - element { - scale: 15 - area { - color: 11584112 - priority: -15940 - } - } - element { - scale: 16 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 17 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 18 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 19 - area { - color: 11190117 - priority: -15940 - } - } -} -cont { - name: "natural-wood-deciduous" - element { - scale: 10 - area { - color: 13029267 - priority: -15940 - } - } - element { - scale: 11 - area { - color: 12372094 - priority: -15940 - } - } - element { - scale: 12 - area { - color: 12372094 - priority: -15940 - } - } - element { - scale: 13 - area { - color: 11781233 - priority: -15940 - } - } - element { - scale: 14 - area { - color: 11453035 - priority: -15940 - } - } - element { - scale: 15 - area { - color: 11584112 - priority: -15940 - } - } - element { - scale: 16 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 17 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 18 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 19 - area { - color: 11190117 - priority: -15940 - } - } -} -cont { - name: "natural-wood-mixed" - element { - scale: 10 - area { - color: 13029267 - priority: -15940 - } - } - element { - scale: 11 - area { - color: 12372094 - priority: -15940 - } - } - element { - scale: 12 - area { - color: 12372094 - priority: -15940 - } - } - element { - scale: 13 - area { - color: 11781233 - priority: -15940 - } - } - element { - scale: 14 - area { - color: 11453035 - priority: -15940 - } - } - element { - scale: 15 - area { - color: 11584112 - priority: -15940 - } - } - element { - scale: 16 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 17 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 18 - area { - color: 11190117 - priority: -15940 - } - } - element { - scale: 19 - area { - color: 11190117 - priority: -15940 - } - } -} cont { name: "office" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 469544960d5991b7c8d05e5aca2e04e8adcb57e2..5502193ddfd44dab721cca7a6d9161e81bd279a2 100644 GIT binary patch delta 36 scmZ4Rg6HQ0o`x-q@#i^1xY+X3(lV1%ryE{j^lgv1%(y+~GSiU+03$~aV*mgE delta 607 zcmezQfM>xAo`x-q@#py;FmmzaC6<&HCFbas=jTs9U(Bd8ebp>RF2+66H%w*};n~yt z9|9PKgr_e|XA~9}66WBS;^%1C5g>sg`7no3H~=Uqh((e^2%DfVh9K8#MlNwA_oPhc z%w{yBz(L`ZI_MQ6ml(2xbW>83GgC^Z3uZIwQQ$6$1L_$gmk_eMrk^TiG^D^m_7nzG Od)#@(?Q!Rsq!R(KArr#@ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 35ad65ad4a..bb7e066b2d 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -39642,298 +39642,6 @@ cont { } } } -cont { - name: "natural-wood" - element { - scale: 10 - area { - color: 1251584 - priority: -15940 - } - } - element { - scale: 11 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 12 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 13 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 14 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 15 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 16 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 17 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 18 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 19 - area { - color: 1317888 - priority: -15940 - } - } -} -cont { - name: "natural-wood-coniferous" - element { - scale: 10 - area { - color: 1251584 - priority: -15940 - } - } - element { - scale: 11 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 12 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 13 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 14 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 15 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 16 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 17 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 18 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 19 - area { - color: 1317888 - priority: -15940 - } - } -} -cont { - name: "natural-wood-deciduous" - element { - scale: 10 - area { - color: 1251584 - priority: -15940 - } - } - element { - scale: 11 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 12 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 13 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 14 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 15 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 16 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 17 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 18 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 19 - area { - color: 1317888 - priority: -15940 - } - } -} -cont { - name: "natural-wood-mixed" - element { - scale: 10 - area { - color: 1251584 - priority: -15940 - } - } - element { - scale: 11 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 12 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 13 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 14 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 15 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 16 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 17 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 18 - area { - color: 1317888 - priority: -15940 - } - } - element { - scale: 19 - area { - color: 1317888 - priority: -15940 - } - } -} cont { name: "office" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 6cc70eedb835a7d544a62039f35f2e534b2f3f4b..b314b6c9c242bc6eb165c6f304ed468c2b83805a 100644 GIT binary patch delta 17 ZcmaF7gk#EFj)pCa*L1fpHDuiP002pE2rU2r delta 332 zcmbO-m*epgj)pCa*K`G5F>>+bC6<&HCFbas=jW$PZhWZAC^C8D8xbZUk;xOEgDJxo zB9pDY@=WHu!#mmOiSTp|UPhkD+ON1kN*o@5l_)+Fk>vWy$R&QkYIBAF diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 7c0cd1b8ef..613d9ae17a 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -25067,298 +25067,6 @@ cont { } } } -cont { - name: "natural-wood" - element { - scale: 10 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 11 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 12 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 13 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 14 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 15 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 16 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 17 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 18 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 19 - area { - color: 13163437 - priority: -15907 - } - } -} -cont { - name: "natural-wood-coniferous" - element { - scale: 10 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 11 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 12 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 13 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 14 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 15 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 16 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 17 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 18 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 19 - area { - color: 13163437 - priority: -15907 - } - } -} -cont { - name: "natural-wood-deciduous" - element { - scale: 10 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 11 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 12 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 13 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 14 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 15 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 16 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 17 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 18 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 19 - area { - color: 13163437 - priority: -15907 - } - } -} -cont { - name: "natural-wood-mixed" - element { - scale: 10 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 11 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 12 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 13 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 14 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 15 - area { - color: 13031851 - priority: -15907 - } - } - element { - scale: 16 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 17 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 18 - area { - color: 13163437 - priority: -15907 - } - } - element { - scale: 19 - area { - color: 13163437 - priority: -15907 - } - } -} cont { name: "place-city" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index d7dee2c29e01c2e213d13e2bed8548313ee9c67e..f9064a7d7c0b576e789fe794a94b3b36108894ca 100644 GIT binary patch delta 17 Zcmcb&m}C1Kj)pCass`K77&8jp0{}$j2NnPT delta 453 zcmdl!hvVL2j)pCass;iN7`b@z5=%;p5_5FR^Yc?C2foqf7UtlQ;^*j^ry_B8`Uh@C z5wW|?{~>@;NSK2UCO0|pfym@vZ@DIO-R0&%Rx&y9z3}9!U)+p$rx!9aicGG0%_Ye7 znvqK!#ipCj%xGbg1lKD@E-_@AbW>83GgC?@KYXS~3k$`$o-uL>p;(xkS&>S!pxmxv Iz$knV0GX!4^#A|> diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 72b8bbdf73..c958b65f87 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -25457,298 +25457,6 @@ cont { } } } -cont { - name: "natural-wood" - element { - scale: 10 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 11 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 12 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 13 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 14 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 15 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 16 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 17 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 18 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 19 - area { - color: 593674 - priority: -15907 - } - } -} -cont { - name: "natural-wood-coniferous" - element { - scale: 10 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 11 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 12 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 13 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 14 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 15 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 16 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 17 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 18 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 19 - area { - color: 593674 - priority: -15907 - } - } -} -cont { - name: "natural-wood-deciduous" - element { - scale: 10 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 11 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 12 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 13 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 14 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 15 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 16 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 17 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 18 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 19 - area { - color: 593674 - priority: -15907 - } - } -} -cont { - name: "natural-wood-mixed" - element { - scale: 10 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 11 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 12 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 13 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 14 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 15 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 16 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 17 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 18 - area { - color: 593674 - priority: -15907 - } - } - element { - scale: 19 - area { - color: 593674 - priority: -15907 - } - } -} cont { name: "place-city" element { diff --git a/data/types.txt b/data/types.txt index 94c1e3937a..eccebf5e5c 100644 --- a/data/types.txt +++ b/data/types.txt @@ -11,7 +11,7 @@ power|tower landuse|forest landuse|grass highway|secondary -natural|wood +landuse|forest landuse|residential highway|path highway|bus_stop @@ -129,7 +129,7 @@ place|suburb landuse|allotments landuse|forest|coniferous landuse|forest|mixed -natural|wood|mixed +landuse|forest|mixed sport|tennis landuse|vineyard aeroway|taxiway @@ -169,7 +169,7 @@ highway|bridleway natural|heath landuse|basin amenity|library -natural|wood|coniferous +landuse|forest|coniferous landuse|recreation_ground landuse|village_green amenity|drinking_water @@ -196,7 +196,7 @@ piste:type|nordic highway|motorway railway|crossing boundary|national_park -natural|wood|deciduous +landuse|forest|deciduous waterway|dam highway|motorway_link leisure|golf_course @@ -382,7 +382,7 @@ natural|water railway|narrow_gauge|tunnel mapswithme waterway|dock -natural|wood +landuse|forest highway|service|driveway man_made|pipeline place|city|capital diff --git a/data/visibility.txt b/data/visibility.txt index bc780b214c..565cd05518 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -609,11 +609,6 @@ world 00000000000000000000 + bog 00000000000111111111 - marsh 00000000000111111111 - {} - wood 00000000001111111111 + - coniferous 00000000001111111111 - - deciduous 00000000001111111111 - - mixed 00000000001111111111 - - {} {} noexit 00000000000000000000 + motor_vehicle 00000000000000000000 -