From d9fde91674e5f7e536ce6d04c154fac06d643bec Mon Sep 17 00:00:00 2001 From: Maksim Andrianov Date: Tue, 24 Sep 2019 14:25:16 +0300 Subject: [PATCH] [styles] Updated styles. --- data/classificator.txt | 5 + data/drules_proto.bin | Bin 214644 -> 215339 bytes data/drules_proto.txt | 232 +++++++++++++++++ data/drules_proto_clear.bin | Bin 214993 -> 215600 bytes data/drules_proto_clear.txt | 200 +++++++++++++++ data/drules_proto_dark.bin | Bin 213884 -> 214491 bytes data/drules_proto_dark.txt | 200 +++++++++++++++ data/drules_proto_vehicle_clear.bin | Bin 135904 -> 137113 bytes data/drules_proto_vehicle_clear.txt | 380 ++++++++++++++++++++++++++++ data/drules_proto_vehicle_dark.bin | Bin 135776 -> 136965 bytes data/drules_proto_vehicle_dark.txt | 380 ++++++++++++++++++++++++++++ data/types.txt | 4 + data/visibility.txt | 5 + 13 files changed, 1406 insertions(+) diff --git a/data/classificator.txt b/data/classificator.txt index 8f49cf3a6c..044e46550c 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -82,6 +82,11 @@ world + fee - {} {} + parking_space + + permissive - + private - + underground - + {} payment_terminal - pharmacy - place_of_worship + diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 1ce02ff57c57670c307d997095988261a1e7a3dc..81f93421fed06e192150d0221712fa460349cbb9 100644 GIT binary patch delta 584 zcmey;!@GJC?}jWl*~N@pqKUbwd6^}Zx&?_v*_nCi@x=v+$*Dpj9Q>0Hx(YLka0q~C zB_R$$B|a`rs3P55iH2Gs6%HXJvB~S2#rc6^!l+^r_3Ie96tG&NTaa3mn^|0(Sq8RG zNq~#9DzzwIH#0duPhx4Uf+Wxt0$4<$Zb7KUa0}RdS^`|$9NYqvcQtckb=PV}E?FGz zD#|QNETN^Nj&w|%ytkPHtGm`Saw%eWS7}~KYEgPoK9B}Q5SE}JIlzzu5fWgNcQ*3~ c!r~DwJ$Xa3SaX(JdzKp`5Hn5Ba%1KK0DGRQD*ylh delta 25 fcmZ2IiT6tn?}jY5W<}3-MNdW`W}2?($;<@+fG!9a diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 5df5465e2d..e626d3a655 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -5905,6 +5905,238 @@ cont { } } } +cont { + name: "amenity-parking_space" + element { + scale: 15 + symbol { + name: "parking-s" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 16 + symbol { + name: "parking-s" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "parking-m" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-permissive" + element { + scale: 15 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-private" + element { + scale: 15 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-underground" + element { + scale: 15 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "zero-icon" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "zero-icon" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} cont { name: "amenity-payment_terminal" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index d8df82d768ba89c134c8702f0828fbfef7409aff..9942c5399abd1f08e511e694df8c301c57f1f6f7 100644 GIT binary patch delta 485 zcmccE&%0p??*=)ypk78U(Zt-;yv&kH-GaoT?99CM_~L@Z5VRZn4DD zS_MfVAr3($K7?qlL_@8R3WpGq*kplbiRp7w8QIyPT7d%Maa=PPxfHNkq+5_$l$%*x zoLL69vnsVHUpF&3KM%!DgeY-#MsrPN{=AS%iO(Llz;5@FlXCmH-zw2lw;|sf;3=aPi4@&0@`RZtZezj6lq^UCxbpGa~?| C9g+e7 delta 26 gcmdlmh4*4V?*=)y=30;TS`S7bX4+os!MvFf0Fl!P=>Px# diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 6fb8fcf211..390e5b301e 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -5871,6 +5871,206 @@ cont { } } } +cont { + name: "amenity-parking_space" + element { + scale: 16 + symbol { + name: "parking-s" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "parking-m" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-permissive" + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-private" + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-underground" + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "zero-icon" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "zero-icon" + priority: 16000 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} cont { name: "amenity-payment_terminal" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 8e07dd464e8cddb69ac71ad35b9496624f70b3d2..02f6fcb15904fe6f1df2dd67adca6f83a3af47f2 100644 GIT binary patch delta 471 zcmey<#(TS)cf(az*n2gsc;CR3W>*Y&0yqGz-qW|L26NMW^r+58Q2~r0WQv} z)S`Ud%;fw$iKVp)l0r~h5u(J}8qGD8kxLebtwot-i6vCGGLdU0BbOp}D@*fIQj5}y p@_{rcL`m~0-1n2;H;D=YLmeE%$f9D+S6$n$x-xFR>dLhIF97#xl1Tsn delta 22 ecmccJ&HJZ~cf(cJW)qKg6A#AiCLT=7{{jGY;0dV! diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 7aa3c587ef..75b07d54c2 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -5871,6 +5871,206 @@ cont { } } } +cont { + name: "amenity-parking_space" + element { + scale: 16 + symbol { + name: "parking-s" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "parking-m" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-permissive" + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-private" + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "parking-m" + priority: 16000 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} +cont { + name: "amenity-parking_space-underground" + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16037 + min_distance: 25 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "zero-icon" + priority: 16000 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "zero-icon" + priority: 16000 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} cont { name: "amenity-payment_terminal" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 3999a89f17d71d6d5b01724ed81e86d6d10330b9..df09c2a969d06cb6b613651a364b93165ad11675 100644 GIT binary patch delta 188 zcmaE`lw;<4jt#SAC6_R9i6-Wz=4F;t>J}sxWoPE4#}^kQCZ}#z6y{@;T*t(vfL;2W zxCEo(Y9=mOtkSv#MVV!ZC8?7Yg{3C?aF|O9I(^ alb=az18GYz`-+56^K9Aevt=1wzXAY6N<_f` delta 18 acmbQap5wt%jt#SAn?sbghbS?+egyzctp}$7 diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index f616d11737..b706d86141 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -2484,6 +2484,386 @@ cont { } } } +cont { + name: "amenity-parking_space" + element { + scale: 15 + area { + color: 15921870 + priority: -15035 + } + symbol { + name: "parking-m" + priority: 16965 + min_distance: 3 + } + } + element { + scale: 16 + area { + color: 15921870 + priority: -15035 + } + symbol { + name: "parking-m" + priority: 16965 + min_distance: 3 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15965 + } + } + element { + scale: 17 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "parking-m" + priority: 16906 + min_distance: 15 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } + element { + scale: 18 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "parking-m" + priority: 16906 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } + element { + scale: 19 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "parking-m" + priority: 16906 + min_distance: 6 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } +} +cont { + name: "amenity-parking_space-permissive" + element { + scale: 15 + area { + color: 15921870 + priority: -15035 + } + symbol { + name: "zero-icon" + priority: 16965 + min_distance: 3 + } + } + element { + scale: 16 + area { + color: 15921870 + priority: -15035 + } + symbol { + name: "zero-icon" + priority: 16965 + min_distance: 3 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15965 + } + } + element { + scale: 17 + area { + color: 16579778 + priority: -15942 + } + symbol { + name: "zero-icon" + priority: 16058 + min_distance: 7 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15058 + } + } + element { + scale: 18 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "zero-icon" + priority: 16906 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } + element { + scale: 19 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "parking-m" + priority: 16906 + min_distance: 6 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } +} +cont { + name: "amenity-parking_space-private" + element { + scale: 15 + area { + color: 15921870 + priority: -15035 + } + symbol { + name: "zero-icon" + priority: 16965 + min_distance: 3 + } + } + element { + scale: 16 + area { + color: 15921870 + priority: -15035 + } + symbol { + name: "zero-icon" + priority: 16965 + min_distance: 3 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15965 + } + } + element { + scale: 17 + area { + color: 16579778 + priority: -15942 + } + symbol { + name: "zero-icon" + priority: 16058 + min_distance: 7 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15058 + } + } + element { + scale: 18 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "zero-icon" + priority: 16906 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } + element { + scale: 19 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "parking-m" + priority: 16906 + min_distance: 6 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } +} +cont { + name: "amenity-parking_space-underground" + element { + scale: 15 + area { + color: 15921870 + priority: -15035 + } + symbol { + name: "zero-icon" + priority: 16965 + min_distance: 3 + } + } + element { + scale: 16 + area { + color: 15921870 + priority: -15035 + } + symbol { + name: "zero-icon" + priority: 16965 + min_distance: 3 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15965 + } + } + element { + scale: 17 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "zero-icon" + priority: 16906 + min_distance: 15 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } + element { + scale: 18 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "zero-icon" + priority: 16906 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } + element { + scale: 19 + area { + color: 16579778 + priority: -15094 + } + symbol { + name: "zero-icon" + priority: 16906 + min_distance: 6 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15906 + } + } +} cont { name: "amenity-place_of_worship" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 4d5f4254001b618897d3c4c35aa09ba1ddd746b8..7410cc01d6efbad2b90ad319b3c4c2078b62742a 100644 GIT binary patch delta 179 zcmaE`grjvG#|A4|iTO-iqKUbwd6^}Zx&?_v*_nCi@x=v+$(s#ixELi@GI1$jlTF>+ zCN9jVu#AaI7OS*wK~ZK|V#($S;+%|