diff --git a/data/classificator.txt b/data/classificator.txt index a57a29da9d..53b3761cda 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -333,6 +333,8 @@ world + bridge - tunnel - {} + world_level - + world_towns_level - {} historic + archaeological_site - diff --git a/data/colors.txt b/data/colors.txt index f61a254f11..49f5cb2cbb 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -42,6 +42,7 @@ 3355443 3418688 3584191 +3613696 3677969 3677972 3681605 @@ -192,6 +193,7 @@ 15921870 16154634 16178442 +16212780 16238080 16241558 16308697 @@ -209,11 +211,13 @@ 16645629 16711680 16728128 +16735775 16741158 16742144 16742950 16746278 16746413 +16746496 16749632 16752972 16761924 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 08b603feba..28c1ae85b8 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 43ba5962d7..6cdc935ec4 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -33712,6 +33712,372 @@ cont { } } } +cont { + name: "highway-world_level" + element { + scale: 1 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 2 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 3 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 4 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 5 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 6 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 7 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 10 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 11 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 17 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 18 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } +} +cont { + name: "highway-world_towns_level" + element { + scale: 1 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 2 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 3 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 4 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 5 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 6 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 7 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 10 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 11 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 17 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 18 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } +} cont { name: "historic-archaeological_site" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index a4365d7eb8..d59f5a3875 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 8062b2aec0..bb7fef1e70 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -25946,6 +25946,392 @@ cont { } } } +cont { + name: "highway-world_level" + element { + scale: 1 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 2 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 3 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 4 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 5 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 6 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 7 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 10 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 11 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 1.2 + color: 16735775 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} +cont { + name: "highway-world_towns_level" + element { + scale: 1 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 2 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 3 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 4 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 5 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 6 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 7 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 10 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 11 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 0.9 + color: 16746496 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} cont { name: "historic-archaeological_site" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index cc2174d39c..fd5b8f811e 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index aad9a3d50f..b6f7985b15 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -25946,6 +25946,392 @@ cont { } } } +cont { + name: "highway-world_level" + element { + scale: 1 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 2 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 3 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 4 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 5 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 6 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 7 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 10 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 11 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 1.2 + color: 16212780 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} +cont { + name: "highway-world_towns_level" + element { + scale: 1 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 2 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 3 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 4 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 5 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 6 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 7 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 8 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 9 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 10 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 11 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 12 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: BEVELJOIN + cap: BUTTCAP + } + } + element { + scale: 13 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 0.9 + color: 3613696 + priority: 1621 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} cont { name: "historic-archaeological_site" element { diff --git a/data/types.txt b/data/types.txt index fc88161845..de93c877f6 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1049,3 +1049,5 @@ amenity|place_of_worship|shinto amenity|place_of_worship|jewish amenity|place_of_worship|taoist man_made|water_tower +highway|world_level +highway|world_towns_level diff --git a/data/visibility.txt b/data/visibility.txt index db27b08675..a297076478 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -333,6 +333,8 @@ world 00000000000000000000 + bridge 00000000000001111111 - tunnel 00000000000001111111 - {} + world_level 00000000000000000000 - + world_towns_level 00000000000000000000 - {} historic 00000000000000000000 + archaeological_site 00000000000000001111 -