From a40a9bec1b823fe2dc209b29c5e5ff00c6b6f8bc Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 9 Jun 2022 16:21:33 +0300 Subject: [PATCH] [styles] Regenerated. Signed-off-by: Viktor Govako --- data/classificator.txt | 14 +- data/colors.txt | 3 - data/drules_proto.bin | Bin 212792 -> 214967 bytes data/drules_proto.txt | 959 ++++++++++++++++++++++++---- data/drules_proto_clear.bin | Bin 213520 -> 215695 bytes data/drules_proto_clear.txt | 959 ++++++++++++++++++++++++---- data/drules_proto_dark.bin | Bin 211974 -> 214077 bytes data/drules_proto_dark.txt | 959 ++++++++++++++++++++++++---- data/drules_proto_vehicle_clear.bin | Bin 140473 -> 142960 bytes data/drules_proto_vehicle_clear.txt | 866 +++++++++++++++++++++---- data/drules_proto_vehicle_dark.bin | Bin 139459 -> 141847 bytes data/drules_proto_vehicle_dark.txt | 866 +++++++++++++++++++++---- data/patterns.txt | 3 +- data/types.txt | 24 +- data/visibility.txt | 20 +- 15 files changed, 3964 insertions(+), 709 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 02ac1e57a7..c941203625 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -199,19 +199,29 @@ world + train_station - {} building:part - + cemetery + + grave - + {} complex_entry - craft + + beekeeper - + blacksmith - brewery - carpenter - + confectionery - electrician - + electronics_repair - gardener - + handicraft - hvac - metal_construction - painter - photographer - plumber - + sawmill - shoemaker - tailor - + winery - {} cuisine + african - @@ -578,6 +588,7 @@ world + cairn - chimney - cutline - + embankment - flagpole - lighthouse - mast - @@ -613,6 +624,7 @@ world + cave_entrance - cliff - coastline - + earth_bank - geyser - glacier - grassland - @@ -631,6 +643,7 @@ world + water + basin - lake - + lock - pond - reservoir - river - @@ -981,7 +994,6 @@ world + drain + tunnel - {} - lock - lock_gate - river + tunnel - diff --git a/data/colors.txt b/data/colors.txt index 4537723866..d13043eedd 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -296,11 +296,9 @@ 67108863 436207616 437326080 -439563059 440681540 442260561 444234362 -448970931 451800027 452984831 609045837 @@ -333,7 +331,6 @@ 1074860288 1090519039 1216522952 -1291845632 1292174597 1292964096 1295201075 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3babf86aee54a566f0a4a36fd5627de05066b230..f54a45fa9c7fe5076faf0a177877b6feba3146e6 100644 GIT binary patch delta 1481 zcmdn-k7s*7?}mT*j0Y$G&zELr0D}*c6$`Z4f7lDm-2Cj#WW!rxp&Ph`G&zKXR5>9E z7#u)SEK)*T0>)s#>;R(`z)FRQQ9AiR!A$wRj9k1)iA6=3sYSYJsd>q%LRuUGLTXTp z=;adeqN$8~C$B9Mr*jBo6(3Z(l7I%OwnvPtMOvOHD4x%+CW_ z1yr(3Dv3)1B9)p0lqky2%SDuto?--9 z!CstLo|~DI1Ge&iJLlvlU90%RxOgDumS;lk^4#3lEq+<$5F?jRMrLtIeo}^Zxp?yuOG=9pb99q) zGSkwiZq3PyjAt1gi@1bf)}$sDm1M+&yhU}pre0<&kz>ipPtM-1_?_`5%k&p-7=_w7 zKQV6S{KOP&#q^44dYle(Il`MS)yKp7!;s7j#8 Y2*YI*kYseWE9o(RWZJ&aka;>U08*HSP5=M^ delta 1025 zcmdnq&%5Iv&xU{bjE5)x&zELT1A}Li6$`XEKG+M)-2Chf%k)NbW>N7C+(KF$LPBbs z5GCI*C55p|PTpTILw-La7jIHxQBh`Uk#1UQUUDkXFafxF>e?q#GzG=JjMS8LTH2Rd ze3Y~x5A%)@{NuylV5knPF~X$wK=K# z6yxO9-p!jQ^od_)JTiSnBBKl~e7Zd|iP0fxyWCMmMS<<>t}>os-2U!5W3gO&!EeUx z1;3est(cB5Pd{qPoGujxOgo~S3}7JQATaG<8>V@IzRj{iE8UwTd ztX^lkzB%(pruuGRCMZuVNi8Z*tkliPPtF#S1$smhYQYbCf&C9}F)B=G`wsz(Kxskz V(n9#9g;AvWP)*-1Z^b-=7XSiqSfu~} diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 12f4efe43d..911cfbc0b3 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -9649,7 +9649,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -9661,11 +9661,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -9673,11 +9673,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9685,11 +9685,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9763,7 +9763,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -9775,11 +9775,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -9787,11 +9787,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9799,11 +9799,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9877,7 +9877,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -9889,11 +9889,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -9901,11 +9901,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9913,11 +9913,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9998,7 +9998,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -10010,11 +10010,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -10022,11 +10022,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -10034,11 +10034,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -10302,7 +10302,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -10314,11 +10314,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -10326,11 +10326,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -10338,11 +10338,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -11646,6 +11646,124 @@ cont { } } } +cont { + name: "cemetery-grave" + element { + scale: 17 + symbol { + name: "cemetery-m" + priority: 16398 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15398 + } + } + element { + scale: 18 + symbol { + name: "cemetery-m" + priority: 16398 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15398 + } + } + element { + scale: 19 + symbol { + name: "cemetery-m" + priority: 16398 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15398 + } + } +} +cont { + name: "craft-beekeeper" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} +cont { + name: "craft-blacksmith" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-brewery" element { @@ -11716,6 +11834,41 @@ cont { } } } +cont { + name: "craft-confectionery" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-electrician" element { @@ -11751,6 +11904,41 @@ cont { } } } +cont { + name: "craft-electronics_repair" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-gardener" element { @@ -11786,6 +11974,41 @@ cont { } } } +cont { + name: "craft-handicraft" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-hvac" element { @@ -11961,6 +12184,41 @@ cont { } } } +cont { + name: "craft-sawmill" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-shoemaker" element { @@ -12031,6 +12289,41 @@ cont { } } } +cont { + name: "craft-winery" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "emergency-defibrillator" element { @@ -29879,7 +30172,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -29891,11 +30184,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -29903,11 +30196,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -29915,11 +30208,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -38218,6 +38511,41 @@ cont { } } } +cont { + name: "man_made-embankment" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "man_made-flagpole" element { @@ -39704,6 +40032,41 @@ cont { } } } +cont { + name: "natural-cliff" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "natural-coastline" element { @@ -39846,6 +40209,41 @@ cont { } } } +cont { + name: "natural-earth_bank" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "natural-geyser" element { @@ -42224,6 +42622,350 @@ cont { apply_if: "bbox_area<4000000" } } +cont { + name: "natural-water-lock" + element { + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 1 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 2 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 3 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 4 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 5 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 6 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 7 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 8 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 9 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 10 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 10 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } +} cont { name: "natural-water-pond" element { @@ -68517,14 +69259,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 10592406 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 3.0 color: 1304608947 @@ -68548,17 +69282,9 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 4.5 - color: 448970931 + color: 1304608947 priority: 1970 } area { @@ -68579,17 +69305,9 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 6.0 - color: 12763315 + color: 1304608947 priority: 1970 } area { @@ -68610,17 +69328,9 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 8.0 - color: 12763315 + color: 1304608947 priority: 1970 } area { @@ -68860,41 +69570,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 98348b8275b97405b88155c43e5e42d750903bd9..dd4547be87e047a9381be732d4172051fc202753 100644 GIT binary patch delta 1461 zcmbQx!rMQUcSC+2sl$chco0OWG zotj!OnX%JbIEqUEDwva)oL!uoS&}jNew*iHn-0#&3T>;!V!4DN^2zymX{pI2nfZA@ ztH4T5x5Y{&aY;a=Q*(flMfrJ|$;I(SsRfCdlN;N-CTp}uA#BJ<%uC4xs|IP`+|+)G z5o8T}abkIHW=;;+%z`$~$)TOA_`|q(Am)~5!tC4pzjO9Q#zWI*M>ERMIoh|!#xOc2 zITdpW=O*UG=O(74>Zax)tT)??2$rH$U$IpWA{6j>3QnRx{UVI6D*iTrsu0O>i|^= Y!^2qtNtMoa4-MvzOxurZGkb~w0IXPt9RL6T delta 1004 zcmeC5$~&QjcSC+2ApI`xv=+V4+r?n3F@JK-;{p%%6XgFye* zcPvnOAt9(XAqRoYjosH6r)wHA>u3vw0#h=~L0e2U>$654Z?5@D%dpu%>i1$ zwjF4LEOUJ~Fv*uEmZTPyCsyj_L2{rtOy}=4000000" + } + element { + scale: 10 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } +} cont { name: "natural-water-pond" element { @@ -67948,14 +68690,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 10592406 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 3.0 color: 1304608947 @@ -67979,17 +68713,9 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 4.5 - color: 448970931 + color: 1304608947 priority: 1970 } area { @@ -68010,17 +68736,9 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 6.0 - color: 12763315 + color: 1304608947 priority: 1970 } area { @@ -68041,17 +68759,9 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 8.0 - color: 12763315 + color: 1304608947 priority: 1970 } area { @@ -68291,41 +69001,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 096e66b4f164d50ce7da21df62f9ab515fa04354..af8cb1c3dbd22d23b7590c738ae0f768acd292e1 100644 GIT binary patch delta 1560 zcmc&!O=uHA6z=SXb~Bo0ch*J`!K94^wK<3uJeeN-0Z~E3K#h~lBw4aQadz9%Q>9>& z9z2Ax1TR9tlO7t#VJ}uts|OWPsAqeSP)|;EnCKmDFrRlpo_`Wyq8{V657Pj}V zRzmf0W8?*ZQU+715}Hs{dp13TH4U8*L^K-g^Wq0vF;5EHNpY=G-3qYSlcDSNedxG= z&@sQFZ=%Iuistc3sQ8_3P&Bdu{sEU=Qq=Z!_RW7pc3#mVi3)sl2UZ2*<#`*GFAl`tXc4rIE z=&Gi9J<(!=>5IYs8MPzRc)b`}kG}*E6;#VMsj7HZYdOu@lV|2E-2$oGa~70!Y@~IZ zB?+Quuu;^BVWWs^e$+9)XZv{}x;fzDQWtMqek;(zhup6~^6Q26SI~y#f51?Ok}vA~ zdJf)&=X4k{usubwmQXY`m)m9iWgbdhJri5b`Umg;%u$FsD8bY&q+8?I<*VG~;Gi$+ zSRX<2NWW$(MI_d)egSfMWfM3no1A%;+u~}`7@y~pf>>LQ@#hXCcWeSph>hm^Z-E*f f<`XW1x;r}b7bAC>=niJg`8v$M;+#{X{O6(HJ{^ri delta 1047 zcmdnn!Q1wOXM<^;@?l0U!KB2ZqRiAH-Q>)Y%J}lcoE#x74gn!G&NMK1Hu+zHHpd5h zfg>FgU$ION&|?-A-@px2A_Q0R4O3DWyX53=c{3RIPwvkbXQzef-UU;Dravg4jp=g= z4>O*aoKU1d3%74pEndtdw~vvF2NoT)jfu@IW&Zq=`P;WlR_chI{J0}(^UTgujFb0t zZ{B>ohxdxg5k@YdjLhPa{G!ZcaLNEVrj;2DTf%Z@^4>piE#DF4z=~7|9)G5lz00trs0vjG2V3cA|*vN0eIDM%Wvz=ZT zhag;D%0b|G-&`iBypRx7n~;OR=4WRvGAeB1pIq1=F@1_Qv!I?(C@@XK3|2tZC-DvRGwI=o0FfMEhGc=4000000" + } + element { + scale: 10 + area { + color: 8738 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } +} cont { name: "natural-water-pond" element { @@ -68033,14 +68775,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 3158064 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 3.0 color: 1295201075 @@ -68064,17 +68798,9 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 4671303 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 4.5 - color: 439563059 + color: 1295201075 priority: 1970 } area { @@ -68095,17 +68821,9 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 4671303 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 6.0 - color: 3355443 + color: 1295201075 priority: 1970 } area { @@ -68126,17 +68844,9 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 4671303 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 8.0 - color: 3355443 + color: 1295201075 priority: 1970 } area { @@ -68376,41 +69086,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 401446 - priority: -15600 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 401446 - priority: -15600 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 401446 - priority: -15600 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 401446 - priority: -15600 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 89064a12d9eed17ff510f303e14cec03e9e10551..196c3461db39e32e40f8fcca1eab06f3bbd8d13b 100644 GIT binary patch delta 1558 zcmdmalHj0YzN7)bLmfWZfQftj11wQx+nXdqQDD5S;-5&i)de#0Uq#3cX` zVQ_%a3J17BsXEtQMlRl@#G<0i)FR!q)V$OAHpYMX4o;nR%Ic>G9=>IXQzij5h}vdoZf* zVdUb0Iec(CH_9|-iuNH!E}@Lf;*$KL%w*l<%#uown~Mi;7;imUV^d$uC7hd>7oVG$ zlB%1Uo0OQBotv6hA|wXPd_vG%4$FKBFW7w*MqEmmu7}{KVqzb9or|FxD4w z3Bg2D6N^eR;z7YdW2YQv=HiE1x;=%DQB0O4CqFrR`$i|m#q879D>DjhuhM3m`b4Oo ziHoN^u_U#qJh4(YB{5gXc=}x_CW+|*0!%W@h8zOZ+XR>l7!9ZMOEZa0p9K*Vnl2>> W7PN;7N^hSm$n=qE`$rL`6Z`jE5%&7)bM`fx$C-fd(L$+-R!G@d3-1W2TLEsDUdpC=j zxHB^Dn;d5q++rRTMo?+Z>F36}TyIs(Xaq1K8CT1?4 z^2CzVqVmK_-IT;!AukSoAyG~SFc5GMIJNvTn-qgW2fqd5^j%U+Mp7QY2!Y9qpvrGh zVG^01Da|CK;=v&ZS0sg^NJt23w$Su=X(lzGaYAsF3MeY4KY$qrR3r>nq=KSodxtcW z0&{&f7cblsIr+)iLZU!d3PNrAVK1=%;VnjmPN2tt?!qc8gk4w|i!fIVmk^3&@#))l J$uVu?2LO5p=zahI diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 8ed81410f0..cd30994ef7 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -4077,8 +4077,8 @@ cont { element { scale: 16 lines { - width: 0.7 - color: 2147483648 + width: 1.0 + color: 2157549977 dashdot { dd: 1.0 dd: 1.0 @@ -4089,11 +4089,11 @@ cont { element { scale: 17 lines { - width: 1.0 - color: 1291845632 + width: 1.5 + color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1505 } @@ -4101,11 +4101,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4113,11 +4113,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4128,8 +4128,8 @@ cont { element { scale: 16 lines { - width: 0.7 - color: 2147483648 + width: 1.0 + color: 2157549977 dashdot { dd: 1.0 dd: 1.0 @@ -4140,11 +4140,11 @@ cont { element { scale: 17 lines { - width: 1.0 - color: 1291845632 + width: 1.5 + color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1505 } @@ -4152,11 +4152,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4164,11 +4164,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4179,8 +4179,8 @@ cont { element { scale: 16 lines { - width: 0.7 - color: 2147483648 + width: 1.0 + color: 2157549977 dashdot { dd: 1.0 dd: 1.0 @@ -4191,11 +4191,11 @@ cont { element { scale: 17 lines { - width: 1.0 - color: 1291845632 + width: 1.5 + color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1505 } @@ -4203,11 +4203,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4215,11 +4215,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4292,6 +4292,57 @@ cont { } } } +cont { + name: "barrier-retaining_wall" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1505 + } + } + element { + scale: 17 + lines { + width: 1.5 + color: 1301911961 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 1505 + } + } + element { + scale: 18 + lines { + width: 2.0 + color: 10066329 + dashdot { + dd: 2.4 + dd: 2.4 + } + priority: 1505 + } + } + element { + scale: 19 + lines { + width: 2.0 + color: 10066329 + dashdot { + dd: 2.4 + dd: 2.4 + } + priority: 1505 + } + } +} cont { name: "barrier-toll_booth" element { @@ -4412,8 +4463,8 @@ cont { element { scale: 16 lines { - width: 0.7 - color: 2147483648 + width: 1.0 + color: 2157549977 dashdot { dd: 1.0 dd: 1.0 @@ -4424,11 +4475,11 @@ cont { element { scale: 17 lines { - width: 1.0 - color: 1291845632 + width: 1.5 + color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1505 } @@ -4436,11 +4487,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4448,11 +4499,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -17493,6 +17544,57 @@ cont { } } } +cont { + name: "historic-citywalls" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1505 + } + } + element { + scale: 17 + lines { + width: 1.5 + color: 1301911961 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 1505 + } + } + element { + scale: 18 + lines { + width: 2.0 + color: 10066329 + dashdot { + dd: 2.4 + dd: 2.4 + } + priority: 1505 + } + } + element { + scale: 19 + lines { + width: 2.0 + color: 10066329 + dashdot { + dd: 2.4 + dd: 2.4 + } + priority: 1505 + } + } +} cont { name: "historic-fort" element { @@ -22320,6 +22422,41 @@ cont { } } } +cont { + name: "man_made-embankment" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "man_made-pier" element { @@ -22907,6 +23044,41 @@ cont { } } } +cont { + name: "natural-cliff" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "natural-coastline" element { @@ -23049,6 +23221,41 @@ cont { } } } +cont { + name: "natural-earth_bank" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "natural-glacier" element { @@ -24957,6 +25164,478 @@ cont { apply_if: "bbox_area>=1000000" } } +cont { + name: "natural-water-lock" + element { + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 1 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 2 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 3 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 4 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 5 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 6 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 7 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 8 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 9 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 10 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 10 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 10 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } +} cont { name: "natural-water-pond" element { @@ -42432,14 +43111,6 @@ cont { name: "waterway-dam" element { scale: 15 - lines { - width: 4.0 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 2.0 color: 2160576191 @@ -42457,14 +43128,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 3.0 color: 2160576191 @@ -42481,14 +43144,6 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 4.5 color: 2160576191 @@ -42505,14 +43160,6 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 6.0 color: 2160576191 @@ -42529,14 +43176,6 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 8.0 color: 2160576191 @@ -42772,41 +43411,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 3584191 - priority: 1929 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 3584191 - priority: 1929 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 3584191 - priority: 1929 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 3584191 - priority: 1929 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index e3cd818115127c97e3cc81e91826dc9952bfdb1a..618d5e691654464fd3a2155a57ee3a0b60118e17 100644 GIT binary patch delta 1515 zcmX?nkYoB4jtwvM84pf=r7z9L00tlI1&(w~Y~q;AXec%Ly#ZJK53s;17AYYv0f-U? z2NhQS~S!0n7&f{*~TG1{nqjFC$W%mX^PD77RpGcPkQJ-$3KCucCa z{Rk765ZJYwzZuyvs_tRr;(ig++92v!@84+ix=$D&8Fv`Th$kH3Fju}#pfobr0S;TCMD)&=ceYB2#Em`xDZ+b zS9rk=6c>bxGdO@U|0@=dxG1nt5QM7d0E;t0goUvPb4>%f0b=WRHBLq!w!B;}-n_(; z(xSv1-Q=9iv^3h6dtz44Dl$1g6XIGU)>u cg40tV458_3APnK{UwD~5GHv%0WGdwc05e2RGXMYp delta 764 zcmbP!h2!u+jtwvM84pi>r7z8w1_saU1sZ^WV|s!VljvmK^ZXniz#=bLz#`%gxrMYi zgoM;MANVwSV$D19AFTlxIkDizaIs?cKb=*qu>zA0rn}Qesh2W@?dc zd16iuFo*=;p+K_`-Mrb;qs3Psu%A}s`$RzQ)ihe!*=1000000" } } +cont { + name: "natural-water-lock" + element { + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 1 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 2 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 3 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 4 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 5 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 6 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 7 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 8 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 9 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 10 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 10 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 10 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } +} cont { name: "natural-water-pond" element { @@ -42756,14 +43435,6 @@ cont { name: "waterway-dam" element { scale: 15 - lines { - width: 4.0 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 2.0 color: 2149128473 @@ -42781,14 +43452,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 3.0 color: 2149128473 @@ -42805,14 +43468,6 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 4.5 color: 2149128473 @@ -42829,14 +43484,6 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 6.0 color: 2149128473 @@ -42853,14 +43500,6 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 8.0 color: 2149128473 @@ -43096,41 +43735,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 401446 - priority: 1929 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 401446 - priority: 1929 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 401446 - priority: 1929 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 401446 - priority: 1929 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/patterns.txt b/data/patterns.txt index db9bb3a875..38129ae965 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -1,5 +1,7 @@ 1.0 18.0 1.0 1.0 +2.0 2.0 +2.4 2.4 1.35 1.0 1.8 1.0 1.44 1.44 @@ -11,7 +13,6 @@ 10.8 4.5 13.5 5.4 18.0 6.2 -2.0 2.0 2.0 1.0 3.6 1.6 5.0 2.2 diff --git a/data/types.txt b/data/types.txt index 2b1170d6f2..31a9c1e73c 100644 --- a/data/types.txt +++ b/data/types.txt @@ -465,7 +465,7 @@ mapswithme mapswithme *piste:type|downhill|expert *landuse|salt_pond -mapswithme +*cemetery|grave *railway|monorail|bridge *area:highway|steps mapswithme @@ -495,8 +495,8 @@ mapswithme *amenity|parking|park_and_ride mapswithme mapswithme -mapswithme -*waterway|lock +*natural|water|lock +waterway|canal mapswithme mapswithme mapswithme @@ -948,14 +948,14 @@ mapswithme *office|estate_agent *office|lawyer *office -mapswithme -mapswithme +*natural|earth_bank +*man_made|embankment *amenity|ferry_terminal *amenity *shop|furniture -mapswithme +*craft|winery *waterway|waterfall -mapswithme +*craft|electronics_repair mapswithme *amenity|casino *amenity|brothel @@ -985,7 +985,7 @@ mapswithme *internet_access|wlan *amenity|waste_disposal *amenity|bbq -mapswithme +*craft|sawmill route|ferry *junction|roundabout *highway|speed_camera @@ -1058,16 +1058,16 @@ route|ferry *shop|travel_agency *highway|elevator *shop|outdoor -mapswithme -mapswithme +*craft|confectionery +*craft|handicraft *shop|dry_cleaning *shop|tyres -mapswithme +*craft|beekeeper *amenity|car_wash *amenity|veterinary *amenity|charging_station *amenity|childcare -mapswithme +*craft|blacksmith *amenity|bicycle_parking *amenity|community_centre *amenity|courthouse diff --git a/data/visibility.txt b/data/visibility.txt index ed0dac1335..42b4f6300d 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -163,7 +163,7 @@ world 00000000000000000000 + gate 00000000000000000000 - hedge 00000000000000001111 - lift_gate 00000000000000001111 - - retaining_wall 00000000000000000000 - + retaining_wall 00000000000000001111 - stile 00000000000000000000 - swing_gate 00000000000000000000 - toll_booth 00000000000011111111 - @@ -199,19 +199,29 @@ world 00000000000000000000 + train_station 00000000000011111111 - {} building:part 00000000000000001111 - + cemetery 00000000000000000000 + + grave 00000000000000000000 - + {} complex_entry 00000000000000000000 - craft 00000000000000000000 + + beekeeper 00000000000000000000 - + blacksmith 00000000000000000000 - brewery 00000000000000000000 - carpenter 00000000000000000000 - + confectionery 00000000000000000000 - electrician 00000000000000000000 - + electronics_repair 00000000000000000000 - gardener 00000000000000000000 - + handicraft 00000000000000000000 - hvac 00000000000000000000 - metal_construction 00000000000000000000 - painter 00000000000000000000 - photographer 00000000000000000000 - plumber 00000000000000000000 - + sawmill 00000000000000000000 - shoemaker 00000000000000000000 - tailor 00000000000000000000 - + winery 00000000000000000000 - {} cuisine 00000000000000000000 + african 00000000000000000000 - @@ -456,7 +466,7 @@ world 00000000000000000000 + defensive 00000000000011111111 - stately 00000000000011111111 - {} - citywalls 00000000000000000000 - + citywalls 00000000000000001111 - fort 00000000000011111111 - memorial 00000000000000011111 + plaque 00000000000000011111 - @@ -578,6 +588,7 @@ world 00000000000000000000 + cairn 00000000000000000000 - chimney 00000000000000000000 - cutline 00000000000000011111 - + embankment 00000000000000001111 - flagpole 00000000000000000000 - lighthouse 00000000000000000000 - mast 00000000000000000000 - @@ -611,8 +622,9 @@ world 00000000000000000000 + {} cape 00000000000000111111 - cave_entrance 00000000000000000000 - - cliff 00000000000000000000 - + cliff 00000000000000001111 - coastline 11111111111111111111 - + earth_bank 00000000000000001111 - geyser 00000000000000000000 - glacier 11111111111111111111 - grassland 00000000000000111111 - @@ -631,6 +643,7 @@ world 00000000000000000000 + water 11111111111111111111 + basin 11111111111111111111 - lake 11111111111111111111 - + lock 11111111111111111111 - pond 11111111111111111111 - reservoir 11111111111111111111 - river 11111111111111111111 - @@ -981,7 +994,6 @@ world 00000000000000000000 + drain 00000000000000000111 + tunnel 00000000000000000000 - {} - lock 00000000000000001111 - lock_gate 00000000000000001111 - river 00000000001111111111 + tunnel 00000000000111111111 -