From 4d1bd01ab8093813d1ee5e27cc6eba4edca547b0 Mon Sep 17 00:00:00 2001 From: vng Date: Mon, 5 Dec 2011 18:09:44 +0300 Subject: [PATCH] New styles. --- data/drules_proto.txt | 276 +++++++++++++++++++++++++++++++++--------- data/visibility.txt | 4 +- 2 files changed, 219 insertions(+), 61 deletions(-) diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 5e0cbb50e7..9ba3cf69d2 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -15954,83 +15954,154 @@ cont { } cont { name: "highway-primary-motorroad" + element { + scale: 9 + lines { + width: 2.5 + color: 0xFFC444 + priority: 540 + } + } element { scale: 10 lines { - width: 4 - color: 0xf088ff - priority: 600 + width: 2 + color: 0xFFC444 + priority: 540 } } element { scale: 11 lines { - width: 6 - color: 0xf088ff - priority: 600 + width: 3 + color: 0xFFC444 + priority: 540 } } element { scale: 12 lines { - width: 8 - color: 0xf088ff - priority: 600 + width: 4 + color: 0xFFC444 + priority: 540 + } + lines { + width: 6 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 12 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 1180 } } element { scale: 13 lines { width: 6 - color: 0xf088ff - priority: 600 + color: 0xFFC444 + priority: 540 + } + lines { + width: 8 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 12 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 1180 } } element { scale: 14 lines { - width: 8 - color: 0xf08800 - priority: 570 + width: 10 + color: 0xFFC444 + priority: 540 + } + lines { + width: 14 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 14 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 11784 } } element { scale: 15 lines { - width: 13 - color: 0x707070 - priority: 270 + width: 12 + color: 0xFFC444 + priority: 540 } lines { - width: 12 - color: 0xf08800 - priority: 271 + width: 16 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 16 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 1180 } } element { scale: 16 lines { - width: 16.8 - color: 0x707070 - priority: 584 + width: 14 + color: 0xFFC444 + priority: 540 } lines { - width: 15.6 - color: 0xf08800 - priority: 585 + width: 18 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 17 + color: 0x404040 + stroke_color: 0xFFC444 + } + priority: 1180 } } element { scale: 17 lines { - width: 18.4 - color: 0x707070 - priority: 575 + width: 16 + color: 0xFFC444 + priority: 540 } lines { - width: 17.2 - color: 0xf08800 - priority: 622 + width: 20 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 17 + color: 0x404040 + stroke_color: 0xFFC444 + } + priority: 1180 } } } @@ -28431,67 +28502,154 @@ cont { } cont { name: "highway-trunk-motorroad" + element { + scale: 9 + lines { + width: 2 + color: 0xFFC444 + priority: 540 + } + } + element { + scale: 10 + lines { + width: 2 + color: 0xFFC444 + priority: 540 + } + } + element { + scale: 11 + lines { + width: 3 + color: 0xFFC444 + priority: 540 + } + } element { scale: 12 lines { - width: 6.25 - color: 0xf08800 - priority: 148 + width: 4 + color: 0xFFC444 + priority: 540 + } + lines { + width: 6 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 12 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 1180 } } element { scale: 13 lines { - width: 9.5 - color: 0xf08800 - priority: 158 + width: 6 + color: 0xFFC444 + priority: 540 + } + lines { + width: 8 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 12 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 1180 } } element { scale: 14 lines { - width: 12 - color: 0xf08800 - priority: 202 + width: 10 + color: 0xFFC444 + priority: 540 + } + lines { + width: 14 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 14 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 11784 } } element { scale: 15 lines { - width: 13 - color: 0x707070 - priority: 294 + width: 12 + color: 0xFFC444 + priority: 540 } lines { - width: 12 - color: 0xf08800 - priority: 295 + width: 16 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 16 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 1180 } } element { scale: 16 lines { - width: 16.8 - color: 0x707070 - priority: 608 + width: 14 + color: 0xFFC444 + priority: 540 } lines { - width: 15.6 - color: 0xf08800 - priority: 609 + width: 18 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 17 + color: 0x404040 + stroke_color: 0xFFC444 + } + priority: 1180 } } element { scale: 17 lines { - width: 18.4 - color: 0x707070 - priority: 586 + width: 16 + color: 0xFFC444 + priority: 540 } lines { - width: 17.2 - color: 0xf08800 - priority: 631 + width: 20 + color: 0xD8A050 + priority: 530 + } + path_text { + primary { + height: 17 + color: 0x404040 + stroke_color: 0xFFC444 + } + priority: 1180 } } } diff --git a/data/visibility.txt b/data/visibility.txt index 2cdc67c20a..f49e7b5399 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -364,7 +364,7 @@ world 000000000000000000 + cycleway-motorroad 000000000000000111 - disused 000000000000000001 - junction 000000000000000011 - - motorroad 000000000011111111 - + motorroad 000000000111111111 - oneway 000000000000000111 - tunnel 000000011111111111 - {} @@ -556,7 +556,7 @@ world 000000000000000000 + embankment 000000000000000011 - junction 000000000000000011 - levee 000000000000000011 - - motorroad 000000000000111111 - + motorroad 000000000111111111 - oneway 000000000000000011 - tunnel 000000011111111111 - {}