diff options
| author | Darafei Praliaskouski <komzpa@gmail.com> | 2013-03-13 18:25:07 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:51:41 +0300 |
| commit | 31d18d4ac611aa1e0bd917aafa338c1b65fce350 (patch) | |
| tree | 0cd60feb8dd3b709143c081cf1dcb3fcd1fdf2a9 /data | |
| parent | d797609f169ff4ebd1d1e8ce105e2cae130146b6 (diff) | |
[style] dashes, priorities and tunnels
Diffstat (limited to 'data')
| -rw-r--r-- | data/classificator.txt | 32 | ||||
| -rw-r--r-- | data/drules_proto.bin | bin | 125643 -> 105168 bytes | |||
| -rw-r--r-- | data/drules_proto.txt | 15130 | ||||
| -rw-r--r-- | data/mapcss-mapping.csv | 74 | ||||
| -rw-r--r-- | data/normal.mapcss | 6856 | ||||
| -rw-r--r-- | data/types.txt | 74 |
6 files changed, 5395 insertions, 16771 deletions
diff --git a/data/classificator.txt b/data/classificator.txt index 0910efbac5..703eaa8082 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -46,7 +46,6 @@ world + marketplace - nightclub - parking + - destination - fee - multi-storey + fee - @@ -147,7 +146,6 @@ world + {} communication + line + - submarine - underground - {} {} @@ -158,20 +156,11 @@ world + highway + bridleway + bridge - - destination - - no-access - permissive - private - tunnel - {} bus_stop - - byway + - bridge - - destination - - permissive - - private - - tunnel - - {} construction - crossing + island - @@ -180,7 +169,6 @@ world + {} cycleway + bridge - - destination - permissive - private - tunnel - @@ -191,7 +179,6 @@ world + bridge - demanding_alpine_hiking - demanding_mountain_hiking - - destination - difficult_alpine_hiking - hiking - mountain_hiking - @@ -222,7 +209,6 @@ world + bridge - demanding_alpine_hiking - demanding_mountain_hiking - - destination - difficult_alpine_hiking - hiking - horse - @@ -272,10 +258,7 @@ world + bridge - tunnel - {} - parking_aisle + - bridge - - tunnel - - {} + parking_aisle - tunnel - {} steps + @@ -293,23 +276,19 @@ world + track + area - bridge - - destination - grade1 - grade2 - grade3 + - destination - no-access - permissive - private - {} grade4 + - destination - no-access - permissive - private - {} grade5 + - destination - no-access - permissive - private - @@ -317,8 +296,6 @@ world + no-access - permissive - private - - race - - racetrack - tunnel - {} trunk + @@ -353,7 +330,6 @@ world + {} commercial - conservation + - destination - no-access - permissive - private - @@ -412,7 +388,6 @@ world + tennis - {} recreation_ground + - destination - no-access - permissive - private - @@ -526,7 +501,6 @@ world + wind - {} line + - submarine - underground - {} minor_line - @@ -569,10 +543,6 @@ world + bridge - tunnel - {} - proposed + - bridge - - tunnel - - {} rail + bridge - tunnel - diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex 522460a5f0..22e68e0689 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 8a86bb4220..88c5e63b9d 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -5,7 +5,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1491 + priority: 1592 } } element { @@ -13,7 +13,7 @@ cont { lines { width: 1.6 color: 0x202020 - priority: 1724 + priority: 1763 } } element { @@ -21,7 +21,7 @@ cont { lines { width: 3.2 color: 0x202020 - priority: 1779 + priority: 1848 } } } @@ -32,7 +32,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1493 + priority: 1597 } } element { @@ -40,7 +40,7 @@ cont { lines { width: 1.6 color: 0x202020 - priority: 1726 + priority: 1768 } } element { @@ -48,7 +48,7 @@ cont { lines { width: 3.2 color: 0x202020 - priority: 1781 + priority: 1000 } } } @@ -59,7 +59,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1492 + priority: 1595 } } element { @@ -67,7 +67,7 @@ cont { lines { width: 1.6 color: 0x202020 - priority: 1725 + priority: 1765 } } element { @@ -75,7 +75,7 @@ cont { lines { width: 3.2 color: 0x202020 - priority: 1780 + priority: 1851 } } } @@ -86,7 +86,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1494 + priority: 1600 } } element { @@ -94,7 +94,7 @@ cont { lines { width: 1.6 color: 0x202020 - priority: 1727 + priority: 1770 } } element { @@ -102,7 +102,7 @@ cont { lines { width: 3.2 color: 0x202020 - priority: 1782 + priority: 1853 } } } @@ -140,7 +140,7 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } circle { radius: 4 @@ -156,7 +156,7 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } circle { radius: 3.2 @@ -219,7 +219,7 @@ cont { color: 0x808080 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "airport" @@ -238,7 +238,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xD8DCCE @@ -292,7 +292,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "airport" @@ -308,7 +308,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "airport" @@ -324,7 +324,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "airport" @@ -339,7 +339,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } } @@ -411,7 +411,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -446,7 +446,7 @@ cont { lines { width: 3 color: 0x202020 - priority: 140 + priority: 234 cap: BUTTCAP join: BEVELJOIN } @@ -455,7 +455,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1140 + priority: 1234 } } element { @@ -463,7 +463,7 @@ cont { lines { width: 3.5 color: 0x202020 - priority: 150 + priority: 246 cap: BUTTCAP join: BEVELJOIN } @@ -472,7 +472,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1150 + priority: 1246 } } element { @@ -480,7 +480,7 @@ cont { lines { width: 14 color: 0x202020 - priority: 222 + priority: 341 cap: BUTTCAP join: BEVELJOIN } @@ -489,7 +489,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1222 + priority: 1341 } } element { @@ -497,7 +497,7 @@ cont { lines { width: 28 color: 0x202020 - priority: 319 + priority: 0 cap: BUTTCAP join: BEVELJOIN } @@ -506,41 +506,41 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1319 + priority: 1000 } } element { scale: 16 lines { - width: 56 + width: 28 color: 0x202020 - priority: 533 + priority: 0 cap: BUTTCAP join: BEVELJOIN } lines { - width: 40 + width: 20 color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1533 + priority: 1000 } } element { scale: 17 lines { - width: 56 + width: 28 color: 0x202020 - priority: 571 + priority: 0 cap: BUTTCAP join: BEVELJOIN } lines { - width: 40 + width: 20 color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1571 + priority: 1000 } } } @@ -551,7 +551,7 @@ cont { lines { width: 0.74 color: 0x202020 - priority: 141 + priority: 236 cap: BUTTCAP join: BEVELJOIN } @@ -560,7 +560,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1141 + priority: 1236 } } element { @@ -568,7 +568,7 @@ cont { lines { width: 1.5 color: 0x202020 - priority: 151 + priority: 248 cap: BUTTCAP join: BEVELJOIN } @@ -577,7 +577,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1151 + priority: 1248 } } element { @@ -585,7 +585,7 @@ cont { lines { width: 6 color: 0x202020 - priority: 223 + priority: 343 cap: BUTTCAP join: BEVELJOIN } @@ -594,7 +594,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1223 + priority: 1343 } } element { @@ -602,7 +602,7 @@ cont { lines { width: 12 color: 0x202020 - priority: 320 + priority: 419 cap: BUTTCAP join: BEVELJOIN } @@ -611,41 +611,41 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1320 + priority: 1419 } } element { scale: 16 lines { - width: 24 + width: 12 color: 0x202020 - priority: 534 + priority: 419 cap: BUTTCAP join: BEVELJOIN } lines { - width: 16 + width: 8 color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1534 + priority: 1419 } } element { scale: 17 lines { - width: 24 + width: 12 color: 0x202020 - priority: 572 + priority: 419 cap: BUTTCAP join: BEVELJOIN } lines { - width: 16 + width: 8 color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1572 + priority: 1419 } } } @@ -698,6 +698,10 @@ cont { name: "amenity-atm" element { scale: 16 + symbol { + name: "atm" + priority: 16002 + } caption { primary { height: 11 @@ -705,15 +709,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - symbol { - name: "atm" - priority: 16000 + priority: 15002 } } element { scale: 17 + symbol { + name: "atm" + priority: 16002 + } caption { primary { height: 12 @@ -721,11 +725,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - symbol { - name: "atm" - priority: 16000 + priority: 15002 } } } @@ -733,6 +733,10 @@ cont { name: "amenity-bank" element { scale: 16 + symbol { + name: "bank" + priority: 16007 + } caption { primary { height: 11 @@ -740,15 +744,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - symbol { - name: "bank" - priority: 16000 + priority: 15007 } } element { scale: 17 + symbol { + name: "bank" + priority: 16007 + } caption { primary { height: 12 @@ -756,11 +760,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - symbol { - name: "bank" - priority: 16000 + priority: 15007 } } } @@ -775,7 +775,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bar" @@ -791,7 +791,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bar" @@ -827,7 +827,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bicycle_rental" @@ -843,7 +843,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bicycle_rental" @@ -862,7 +862,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bureau_de_change" @@ -878,7 +878,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bureau_de_change" @@ -892,11 +892,15 @@ cont { scale: 16 symbol { name: "bus" - priority: 16000 + priority: 16014 } } element { scale: 17 + symbol { + name: "bus" + priority: 16014 + } caption { primary { height: 12 @@ -904,11 +908,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - symbol { - name: "bus" - priority: 16000 + priority: 15014 } } } @@ -918,7 +918,7 @@ cont { scale: 16 symbol { name: "cafe" - priority: 16000 + priority: 16002 } caption { primary { @@ -927,14 +927,14 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } } element { scale: 17 symbol { name: "cafe" - priority: 16000 + priority: 16002 } caption { primary { @@ -943,7 +943,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } } } @@ -958,7 +958,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "car_rental" @@ -974,7 +974,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "car_rental" @@ -993,7 +993,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "car_sharing" @@ -1009,7 +1009,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "car_sharing" @@ -1028,7 +1028,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "cinema" @@ -1044,7 +1044,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "cinema" @@ -1105,7 +1105,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "pharmacy" @@ -1121,7 +1121,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "pharmacy" @@ -1157,7 +1157,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "embassy" @@ -1173,7 +1173,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "embassy" @@ -1192,7 +1192,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "fastfood" @@ -1208,7 +1208,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "fastfood" @@ -1227,7 +1227,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "firebrigade" @@ -1243,7 +1243,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "firebrigade" @@ -1273,7 +1273,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "fountain" @@ -1303,7 +1303,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "petrolstation" @@ -1319,7 +1319,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "petrolstation" @@ -1428,7 +1428,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hospital" @@ -1447,7 +1447,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hunting_closed_high" @@ -1463,7 +1463,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hunting_closed_high" @@ -1531,7 +1531,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "library" @@ -1550,7 +1550,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "supermarket" @@ -1566,7 +1566,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "supermarket" @@ -1585,7 +1585,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bar" @@ -1601,7 +1601,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bar" @@ -2017,7 +2017,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "pharmacy" @@ -2036,7 +2036,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "religion" @@ -2052,7 +2052,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "religion" @@ -2071,7 +2071,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "police" @@ -2087,7 +2087,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "police" @@ -2106,7 +2106,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "postbox" @@ -2125,7 +2125,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "postoffice" @@ -2141,7 +2141,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "postoffice" @@ -2160,7 +2160,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "pub" @@ -2176,7 +2176,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "pub" @@ -2187,14 +2187,12 @@ cont { cont { name: "amenity-recycling" element { - scale: 16 + scale: 17 symbol { + apply_for_type: 1 name: "recycling" - priority: 16000 + priority: 16002 } - } - element { - scale: 17 caption { primary { height: 12 @@ -2202,11 +2200,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - symbol { - name: "recycling" - priority: 16000 + priority: 15002 } } } @@ -2221,7 +2215,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "restaurant" @@ -2237,7 +2231,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "restaurant" @@ -2256,7 +2250,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "restaurant" @@ -2272,7 +2266,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "restaurant" @@ -2291,7 +2285,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "restaurant" @@ -2303,7 +2297,7 @@ cont { circle { radius: 2.4 color: 0x42FF29 - priority: 16000 + priority: 16002 } caption { primary { @@ -2312,7 +2306,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } } } @@ -2327,7 +2321,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "restaurant" @@ -2339,7 +2333,7 @@ cont { circle { radius: 2.4 color: 0x42FF29 - priority: 16000 + priority: 16002 } caption { primary { @@ -2348,7 +2342,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } } } @@ -2384,14 +2378,14 @@ cont { } element { scale: 17 - area { - color: 0xF0E0DC - priority: -16038 - } symbol { name: "school" priority: 16000 } + area { + color: 0xF0E0DC + priority: -16038 + } } } cont { @@ -2425,7 +2419,7 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } symbol { name: "shelter" @@ -2451,7 +2445,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "speed_trap" @@ -2477,7 +2471,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "taxi" @@ -2490,12 +2484,18 @@ cont { element { scale: 16 symbol { + apply_for_type: 1 name: "telephone" priority: 16000 } } element { scale: 17 + symbol { + apply_for_type: 1 + name: "telephone" + priority: 16002 + } caption { primary { height: 12 @@ -2503,11 +2503,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - symbol { - name: "telephone" - priority: 16000 + priority: 15002 } } } @@ -2522,7 +2518,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "theatre" @@ -2538,7 +2534,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "theatre" @@ -2564,7 +2560,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "toilets" @@ -2582,7 +2578,7 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } element { @@ -2593,7 +2589,7 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } } @@ -2645,21 +2641,21 @@ cont { scale: 15 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } } @@ -2669,21 +2665,21 @@ cont { scale: 15 area { color: 0x707070 - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0x707070 - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0x707070 - priority: 1306 + priority: 1393 } } } @@ -2693,21 +2689,21 @@ cont { scale: 15 area { color: 0xF08800 - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xF08800 - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xF08800 - priority: 1306 + priority: 1393 } } } @@ -2717,21 +2713,21 @@ cont { scale: 15 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } } @@ -2741,21 +2737,21 @@ cont { scale: 15 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } } @@ -2765,21 +2761,21 @@ cont { scale: 15 area { color: 0xFFC444 - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xFFC444 - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xFFC444 - priority: 1306 + priority: 1393 } } } @@ -2789,21 +2785,21 @@ cont { scale: 15 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } } @@ -2813,21 +2809,21 @@ cont { scale: 15 area { color: 0xFFFB80 - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xFFFB80 - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xFFFB80 - priority: 1306 + priority: 1393 } } } @@ -2837,21 +2833,21 @@ cont { scale: 15 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } } @@ -2861,21 +2857,21 @@ cont { scale: 15 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xC0BCAC - priority: 1306 + priority: 1393 } } } @@ -2885,21 +2881,21 @@ cont { scale: 15 area { color: 0xFFFB80 - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xFFFB80 - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xFFFB80 - priority: 1306 + priority: 1393 } } } @@ -2909,21 +2905,21 @@ cont { scale: 15 area { color: 0xFFC444 - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xFFC444 - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xFFC444 - priority: 1306 + priority: 1393 } } } @@ -2933,21 +2929,21 @@ cont { scale: 15 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } element { scale: 16 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } element { scale: 17 area { color: 0xFFFFFF - priority: 1306 + priority: 1393 } } } @@ -2979,16 +2975,6 @@ cont { color: 0x707070 priority: 16000 } - lines { - width: 0.4 - color: 0xFF0000 - dashdot { - dd: 0 - dd: 2 - } - cap: BUTTCAP - priority: 1748 - } } element { scale: 17 @@ -2997,16 +2983,6 @@ cont { color: 0x707070 priority: 16000 } - lines { - width: 0.8 - color: 0xFF0000 - dashdot { - dd: 0 - dd: 4 - } - cap: BUTTCAP - priority: 1819 - } } } cont { @@ -3016,7 +2992,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1767 + priority: 1843 } lines { width: 1 @@ -3026,7 +3002,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1768 + priority: 1846 } } element { @@ -3034,7 +3010,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1827 + priority: 1948 } lines { width: 1 @@ -3044,7 +3020,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1828 + priority: 1951 } } } @@ -3055,7 +3031,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1753 + priority: 1821 } lines { width: 1 @@ -3065,7 +3041,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1755 + priority: 1826 } } element { @@ -3073,7 +3049,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1822 + priority: 1936 } lines { width: 1 @@ -3083,7 +3059,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1823 + priority: 1939 } } } @@ -3104,7 +3080,7 @@ cont { lines { width: 0.4 color: 0xB0B0B0 - priority: 1749 + priority: 1812 } lines { width: 1 @@ -3114,7 +3090,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1751 + priority: 1817 } } element { @@ -3122,7 +3098,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1820 + priority: 1931 } lines { width: 0.8 @@ -3132,7 +3108,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1821 + priority: 1934 } } } @@ -3160,7 +3136,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1759 + priority: 1000 } lines { width: 1 @@ -3170,7 +3146,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1761 + priority: 1841 } } element { @@ -3178,7 +3154,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1825 + priority: 1943 } lines { width: 1 @@ -3188,7 +3164,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1826 + priority: 1946 } } } @@ -3237,7 +3213,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1757 + priority: 1831 } } element { @@ -3245,7 +3221,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1824 + priority: 1941 } } } @@ -3261,7 +3237,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11549 + priority: 11687 } } element { @@ -3274,7 +3250,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11795 + priority: 11873 } } element { @@ -3287,7 +3263,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11830 + priority: 11956 } } } @@ -3303,7 +3279,7 @@ cont { dd: 5.2 } cap: BUTTCAP - priority: 11829 + priority: 11953 } } } @@ -3319,7 +3295,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1057 + priority: 1107 } } element { @@ -3332,7 +3308,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1057 + priority: 1107 } } element { @@ -3345,12 +3321,12 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1062 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1061 + priority: 1117 } } element { @@ -3358,7 +3334,7 @@ cont { lines { width: 2.73 color: 0xFFFF00 - priority: 1062 + priority: 1119 } lines { width: 1.95 @@ -3368,7 +3344,7 @@ cont { dd: 4.69 } cap: BUTTCAP - priority: 1063 + priority: 1121 } } element { @@ -3376,7 +3352,7 @@ cont { lines { width: 3.12 color: 0xFFFF00 - priority: 1062 + priority: 1119 } lines { width: 2.34 @@ -3386,7 +3362,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1063 + priority: 1121 } } element { @@ -3394,7 +3370,7 @@ cont { lines { width: 3.12 color: 0xFFFF00 - priority: 1062 + priority: 1119 } lines { width: 2.34 @@ -3404,7 +3380,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1063 + priority: 1121 } } element { @@ -3412,7 +3388,7 @@ cont { lines { width: 3.12 color: 0xFFFF00 - priority: 1062 + priority: 1119 } lines { width: 2.34 @@ -3422,7 +3398,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1063 + priority: 1121 } } element { @@ -3430,7 +3406,7 @@ cont { lines { width: 3.12 color: 0xFFFF00 - priority: 1062 + priority: 1119 } lines { width: 2.34 @@ -3440,7 +3416,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1063 + priority: 1121 } } element { @@ -3448,7 +3424,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11314 + priority: 11404 } lines { width: 2 @@ -3458,7 +3434,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11315 + priority: 11407 } } element { @@ -3466,7 +3442,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11337 + priority: 11431 } lines { width: 2 @@ -3476,7 +3452,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11338 + priority: 11434 } } element { @@ -3484,7 +3460,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11429 + priority: 11480 } lines { width: 2 @@ -3494,7 +3470,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11430 + priority: 11482 } } element { @@ -3502,7 +3478,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11557 + priority: 11707 } lines { width: 2 @@ -3512,7 +3488,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11558 + priority: 11709 } } element { @@ -3520,7 +3496,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11802 + priority: 11890 } lines { width: 2 @@ -3530,7 +3506,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11803 + priority: 11892 } } element { @@ -3538,7 +3514,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11836 + priority: 11000 } lines { width: 2 @@ -3548,7 +3524,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11837 + priority: 11970 } } } @@ -3564,12 +3540,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3582,12 +3558,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3600,12 +3576,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3618,12 +3594,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3636,12 +3612,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3654,12 +3630,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3672,12 +3648,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3690,12 +3666,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3708,12 +3684,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3726,12 +3702,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3744,12 +3720,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } element { @@ -3762,12 +3738,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1061 + priority: 1117 } lines { width: 1 color: 0xEEEEDD - priority: 1060 + priority: 1114 } } } @@ -3783,12 +3759,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1059 + priority: 1112 } lines { width: 1 color: 0xEEEEDD - priority: 1058 + priority: 1109 } } element { @@ -3801,12 +3777,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1059 + priority: 1112 } lines { width: 1 color: 0xEEEEDD - priority: 1058 + priority: 1109 } } element { @@ -3819,12 +3795,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1059 + priority: 1112 } lines { width: 1 color: 0xEEEEDD - priority: 1058 + priority: 1109 } } element { @@ -3837,12 +3813,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1059 + priority: 1112 } lines { width: 1.2 color: 0xEEEEDD - priority: 1058 + priority: 1109 } } element { @@ -3855,12 +3831,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 11307 + priority: 11397 } lines { width: 2 color: 0xEEEEDD - priority: 11306 + priority: 11395 } } } @@ -3876,12 +3852,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1059 + priority: 1112 } lines { width: 1 color: 0xEEEEDD - priority: 1058 + priority: 1109 } } element { @@ -3894,7 +3870,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1013 + priority: 1039 } lines { width: 0.12 @@ -3906,7 +3882,7 @@ cont { dd: 0.12 } cap: BUTTCAP - priority: 1014 + priority: 1041 } } element { @@ -3919,7 +3895,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1019 + priority: 1048 } lines { width: 0.25 @@ -3931,7 +3907,7 @@ cont { dd: 0.25 } cap: BUTTCAP - priority: 1020 + priority: 1051 } } element { @@ -3944,7 +3920,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1019 + priority: 1048 } lines { width: 0.5 @@ -3956,7 +3932,7 @@ cont { dd: 0.5 } cap: BUTTCAP - priority: 1020 + priority: 1051 } } element { @@ -3969,7 +3945,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 11307 + priority: 11397 } lines { width: 1 @@ -3981,7 +3957,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 11084 + priority: 11151 } } element { @@ -3989,7 +3965,7 @@ cont { lines { width: 10 color: 0xFFFF00 - priority: 1083 + priority: 1148 } lines { width: 2 @@ -4001,7 +3977,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1084 + priority: 1151 } } element { @@ -4016,7 +3992,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11318 + priority: 11414 } } element { @@ -4031,7 +4007,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11342 + priority: 11439 } } element { @@ -4046,7 +4022,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11435 + priority: 11492 } } element { @@ -4061,7 +4037,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11567 + priority: 11731 } } element { @@ -4076,7 +4052,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11809 + priority: 11907 } } element { @@ -4091,7 +4067,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11843 + priority: 11000 } } } @@ -4107,7 +4083,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11426 + priority: 11478 } } element { @@ -4120,7 +4096,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11554 + priority: 11700 } } element { @@ -4133,7 +4109,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11800 + priority: 11885 } } element { @@ -4146,7 +4122,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11835 + priority: 11968 } } } @@ -4162,7 +4138,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11425 + priority: 11475 } } element { @@ -4175,7 +4151,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11553 + priority: 11697 } } element { @@ -4188,7 +4164,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11799 + priority: 11882 } } element { @@ -4201,7 +4177,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11834 + priority: 11965 } } } @@ -4212,7 +4188,7 @@ cont { lines { width: 1 color: 0xF9574B - priority: 11552 + priority: 11695 } } element { @@ -4220,7 +4196,7 @@ cont { lines { width: 1 color: 0xF9574B - priority: 11798 + priority: 11880 } } element { @@ -4228,7 +4204,7 @@ cont { lines { width: 0.8 color: 0xF9574B - priority: 11833 + priority: 11963 } } } @@ -4246,7 +4222,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11551 + priority: 11000 } } element { @@ -4261,7 +4237,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11797 + priority: 11878 } } element { @@ -4276,7 +4252,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11832 + priority: 11960 } } } @@ -4292,7 +4268,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11550 + priority: 11690 } } element { @@ -4305,7 +4281,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11796 + priority: 11875 } } element { @@ -4318,7 +4294,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11831 + priority: 11958 } } } @@ -4336,7 +4312,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11563 + priority: 11721 } } element { @@ -4351,7 +4327,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11806 + priority: 11900 } } element { @@ -4366,7 +4342,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11840 + priority: 11978 } } } @@ -4377,7 +4353,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11320 + priority: 11419 } lines { width: 2 @@ -4387,7 +4363,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11322 + priority: 11424 } } element { @@ -4395,7 +4371,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11344 + priority: 11443 } lines { width: 2 @@ -4405,7 +4381,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11346 + priority: 11448 } } element { @@ -4413,7 +4389,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11437 + priority: 11497 } lines { width: 2 @@ -4423,7 +4399,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11439 + priority: 11502 } } element { @@ -4431,7 +4407,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11569 + priority: 11736 } lines { width: 2 @@ -4441,7 +4417,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11571 + priority: 11741 } } element { @@ -4449,7 +4425,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11811 + priority: 11912 } lines { width: 2 @@ -4459,7 +4435,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11813 + priority: 11917 } } element { @@ -4467,7 +4443,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11845 + priority: 11987 } lines { width: 2 @@ -4477,7 +4453,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11847 + priority: 11992 } } } @@ -4493,7 +4469,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11433 + priority: 11487 } } element { @@ -4506,7 +4482,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11564 + priority: 11724 } } element { @@ -4519,7 +4495,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11807 + priority: 11902 } } element { @@ -4532,7 +4508,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11841 + priority: 11980 } } } @@ -4550,7 +4526,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11562 + priority: 11719 } } element { @@ -4565,7 +4541,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11805 + priority: 11897 } } element { @@ -4580,7 +4556,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11839 + priority: 11975 } } } @@ -4591,7 +4567,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11319 + priority: 11417 } lines { width: 2 @@ -4601,7 +4577,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11321 + priority: 11421 } } element { @@ -4609,7 +4585,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11343 + priority: 11441 } lines { width: 2 @@ -4619,7 +4595,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11345 + priority: 11446 } } element { @@ -4627,7 +4603,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11436 + priority: 11495 } lines { width: 2 @@ -4637,7 +4613,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11438 + priority: 11500 } } element { @@ -4645,7 +4621,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11568 + priority: 11734 } lines { width: 2 @@ -4655,7 +4631,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11570 + priority: 11739 } } element { @@ -4663,7 +4639,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11810 + priority: 11909 } lines { width: 2 @@ -4673,7 +4649,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11812 + priority: 11914 } } element { @@ -4681,7 +4657,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11844 + priority: 11985 } lines { width: 2 @@ -4691,7 +4667,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11846 + priority: 11990 } } } @@ -4709,7 +4685,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11317 + priority: 11412 } } element { @@ -4724,7 +4700,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11341 + priority: 11436 } } element { @@ -4739,7 +4715,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11434 + priority: 11490 } } element { @@ -4754,7 +4730,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11566 + priority: 11729 } } element { @@ -4769,7 +4745,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11808 + priority: 11904 } } element { @@ -4784,7 +4760,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11842 + priority: 11982 } } } @@ -4795,7 +4771,7 @@ cont { lines { width: 0.31 color: 0xFFFF00 - priority: 1012 + priority: 1036 } } element { @@ -4803,7 +4779,7 @@ cont { lines { width: 0.62 color: 0xFFFF00 - priority: 1013 + priority: 1039 } lines { width: 0.12 @@ -4815,7 +4791,7 @@ cont { dd: 0.12 } cap: BUTTCAP - priority: 1014 + priority: 1041 } } element { @@ -4823,7 +4799,7 @@ cont { lines { width: 1.25 color: 0xFFFF00 - priority: 1019 + priority: 1048 } lines { width: 0.25 @@ -4835,7 +4811,7 @@ cont { dd: 0.25 } cap: BUTTCAP - priority: 1020 + priority: 1051 } } element { @@ -4843,7 +4819,7 @@ cont { lines { width: 1 color: 0xFFFF00 - priority: 1019 + priority: 1048 } lines { width: 0.5 @@ -4855,7 +4831,7 @@ cont { dd: 0.5 } cap: BUTTCAP - priority: 1020 + priority: 1051 } } element { @@ -4863,7 +4839,7 @@ cont { lines { width: 5 color: 0xFFFF00 - priority: 1083 + priority: 1148 } lines { width: 1 @@ -4875,7 +4851,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 1084 + priority: 1151 } } element { @@ -4883,7 +4859,7 @@ cont { lines { width: 10 color: 0xFFFF00 - priority: 1083 + priority: 1148 } lines { width: 2 @@ -4895,7 +4871,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1084 + priority: 1151 } } element { @@ -4910,7 +4886,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11318 + priority: 11414 } } element { @@ -4925,7 +4901,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11342 + priority: 11439 } } element { @@ -4940,7 +4916,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11435 + priority: 11492 } } element { @@ -4955,7 +4931,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11567 + priority: 11731 } } element { @@ -4970,7 +4946,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11809 + priority: 11907 } } element { @@ -4985,7 +4961,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11843 + priority: 11000 } } } @@ -5001,7 +4977,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11561 + priority: 11717 } } element { @@ -5014,7 +4990,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11804 + priority: 11895 } } element { @@ -5027,7 +5003,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11838 + priority: 11973 } } } @@ -5045,7 +5021,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 11085 + priority: 11153 } } element { @@ -5060,7 +5036,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 11085 + priority: 11153 } } element { @@ -5075,7 +5051,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11323 + priority: 11426 } } element { @@ -5090,7 +5066,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11347 + priority: 11451 } } element { @@ -5105,7 +5081,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11440 + priority: 11504 } } element { @@ -5120,7 +5096,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11572 + priority: 11743 } } element { @@ -5135,7 +5111,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11814 + priority: 11919 } } element { @@ -5150,7 +5126,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11848 + priority: 11995 } } } @@ -5163,7 +5139,7 @@ cont { height: 8 color: 0x808070 } - priority: 16000 + priority: 15000 } area { color: 0xCDCDB4 @@ -5175,7 +5151,7 @@ cont { symbol { apply_for_type: 1 name: "building" - priority: 16472 + priority: 16000 } caption { secondary { @@ -5186,11 +5162,11 @@ cont { height: 10 color: 0x808070 } - priority: 16472 + priority: 15000 } area { color: 0xCDCDB4 - priority: 1473 + priority: 1001 } } element { @@ -5205,7 +5181,7 @@ cont { height: 11 color: 0x404040 } - priority: 16000 + priority: 15000 } area { color: 0xCDCDB4 @@ -5222,7 +5198,7 @@ cont { height: 8 color: 0x808070 } - priority: 16000 + priority: 15000 } area { color: 0xCDCDB4 @@ -5234,7 +5210,7 @@ cont { symbol { apply_for_type: 1 name: "building" - priority: 16472 + priority: 16000 } caption { secondary { @@ -5245,11 +5221,11 @@ cont { height: 11 color: 0x808070 } - priority: 16472 + priority: 15000 } area { color: 0xCDCDB4 - priority: 1473 + priority: 1001 } } element { @@ -5264,7 +5240,7 @@ cont { height: 11 color: 0x404040 } - priority: 16000 + priority: 15000 } area { color: 0xCDCDB4 @@ -5279,7 +5255,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1740 + priority: 1795 } lines { width: 0.4 @@ -5289,7 +5265,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1743 + priority: 1800 } } element { @@ -5297,64 +5273,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1798 - } - lines { - width: 0.8 - color: 0xF080F0 - dashdot { - dd: 8 - dd: 4 - } - cap: BUTTCAP - priority: 1801 - } - } -} -cont { - name: "communication-line-submarine" - element { - scale: 16 - lines { - width: 0.4 - color: 0x80F080F0 - dashdot { - dd: 1.2 - dd: 2 - dd: 1.2 - dd: 2 - dd: 1.2 - dd: 4.4 - } - cap: BUTTCAP - priority: 1742 - } - lines { - width: 0.4 - color: 0xF080F0 - dashdot { - dd: 8 - dd: 4 - } - cap: BUTTCAP - priority: 1743 - } - } - element { - scale: 17 - lines { - width: 0.8 - color: 0x80F080F0 - dashdot { - dd: 1.2 - dd: 2 - dd: 1.2 - dd: 2 - dd: 1.2 - dd: 4.4 - } - cap: BUTTCAP - priority: 1800 + priority: 1880 } lines { width: 0.8 @@ -5364,7 +5283,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1801 + priority: 1887 } } } @@ -5384,7 +5303,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1740 + priority: 1795 } lines { width: 0.4 @@ -5394,7 +5313,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1743 + priority: 1800 } } element { @@ -5411,7 +5330,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1799 + priority: 1882 } lines { width: 0.8 @@ -5421,7 +5340,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1801 + priority: 1887 } } } @@ -5470,45 +5389,6 @@ cont { cont { name: "highway-bridleway" element { - scale: 10 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 11 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 12 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { scale: 13 lines { width: 0.9 @@ -5518,7 +5398,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1107 + priority: 1173 } } element { @@ -5531,7 +5411,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1159 + priority: 1260 } } element { @@ -5539,7 +5419,7 @@ cont { lines { width: 3.2 color: 0xD3CB98 - priority: 1262 + priority: 1351 } } element { @@ -5555,7 +5435,7 @@ cont { lines { width: 6.4 color: 0xD3CB98 - priority: 1482 + priority: 1578 } } element { @@ -5571,52 +5451,13 @@ cont { lines { width: 6.8 color: 0xD3CB98 - priority: 1512 + priority: 1000 } } } cont { name: "highway-bridleway-bridge" element { - scale: 10 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 11 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 12 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { scale: 13 lines { width: 0.9 @@ -5626,7 +5467,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1107 + priority: 1173 } } element { @@ -5639,7 +5480,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1159 + priority: 1260 } } element { @@ -5647,7 +5488,7 @@ cont { lines { width: 3.2 color: 0xD3CB98 - priority: 1262 + priority: 1351 } } element { @@ -5663,13 +5504,13 @@ cont { lines { width: 14.4 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 6.4 color: 0xD3CB98 - priority: 1482 + priority: 1578 } lines { width: 16.4 @@ -5691,13 +5532,13 @@ cont { lines { width: 14.8 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 6.8 color: 0xD3CB98 - priority: 1512 + priority: 1000 } lines { width: 16.8 @@ -5708,294 +5549,39 @@ cont { } } cont { - name: "highway-bridleway-destination" - element { - scale: 10 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 11 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 12 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 13 - lines { - width: 0.9 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1107 - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 0xcc8FBF4D - dashdot { - dd: 3 - dd: 4 - } - cap: BUTTCAP - priority: 1159 - } - } - element { - scale: 15 - lines { - width: 3.2 - color: 0xccD3CB98 - priority: 1262 - } - } - element { - scale: 16 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 6.4 - color: 0xD3CB98 - priority: 1482 - } - } - element { - scale: 17 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 6.8 - color: 0xD3CB98 - priority: 1512 - } - } -} -cont { - name: "highway-bridleway-no-access" - element { - scale: 10 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 11 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 12 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 13 - lines { - width: 0.9 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1107 - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 0xcc8FBF4D - dashdot { - dd: 3 - dd: 4 - } - cap: BUTTCAP - priority: 1159 - } - } - element { - scale: 15 - lines { - width: 3.2 - color: 0xccD3CB98 - priority: 1262 - } - } - element { - scale: 16 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 6.4 - color: 0xD3CB98 - priority: 1482 - } - } - element { - scale: 17 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 6.8 - color: 0xD3CB98 - priority: 1512 - } - } -} -cont { name: "highway-bridleway-permissive" element { - scale: 10 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 11 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 12 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { scale: 13 lines { width: 0.9 - color: 0xccA9D355 + color: 0xA9D355 dashdot { dd: 2.25 dd: 3 } cap: BUTTCAP - priority: 1107 + priority: 1173 } } element { scale: 14 lines { width: 1.6 - color: 0xcc8FBF4D + color: 0x8FBF4D dashdot { dd: 3 dd: 4 } cap: BUTTCAP - priority: 1159 + priority: 1260 } } element { scale: 15 lines { width: 3.2 - color: 0xccD3CB98 - priority: 1262 + color: 0xD3CB98 + priority: 1351 } } element { @@ -6011,7 +5597,7 @@ cont { lines { width: 6.4 color: 0xD3CB98 - priority: 1482 + priority: 1578 } } element { @@ -6027,83 +5613,44 @@ cont { lines { width: 6.8 color: 0xD3CB98 - priority: 1512 + priority: 1000 } } } cont { name: "highway-bridleway-private" element { - scale: 10 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 11 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 12 - lines { - width: 0.7 - color: 0xccA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { scale: 13 lines { width: 0.9 - color: 0xccA9D355 + color: 0xA9D355 dashdot { dd: 2.25 dd: 3 } cap: BUTTCAP - priority: 1107 + priority: 1173 } } element { scale: 14 lines { width: 1.6 - color: 0xcc8FBF4D + color: 0x8FBF4D dashdot { dd: 3 dd: 4 } cap: BUTTCAP - priority: 1159 + priority: 1260 } } element { scale: 15 lines { width: 3.2 - color: 0xccD3CB98 - priority: 1262 + color: 0xD3CB98 + priority: 1351 } } element { @@ -6119,7 +5666,7 @@ cont { lines { width: 6.4 color: 0xD3CB98 - priority: 1482 + priority: 1578 } } element { @@ -6135,62 +5682,13 @@ cont { lines { width: 6.8 color: 0xD3CB98 - priority: 1512 + priority: 1000 } } } cont { name: "highway-bridleway-tunnel" element { - scale: 10 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 11 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1099 - } - } - element { - scale: 12 - lines { - width: 1 - color: 0xE6DDA5 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1099 - } - lines { - width: 0.7 - color: 0xFFFFFF - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1161 - } - } - element { scale: 13 lines { width: 0.9 @@ -6200,17 +5698,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1107 - } - lines { - width: 0.9 - color: 0xFFFFFF - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1171 + priority: 1173 } } element { @@ -6223,17 +5711,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1159 - } - lines { - width: 1.6 - color: 0xFFFFFF - dashdot { - dd: 3 - dd: 4 - } - cap: BUTTCAP - priority: 1249 + priority: 1260 } } element { @@ -6241,278 +5719,7 @@ cont { lines { width: 3.2 color: 0xD3CB98 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1262 - } - lines { - width: 3.2 - color: 0xFFFFFF - priority: 1343 - } - } - element { - scale: 16 - lines { - width: 7.2 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1555 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16555 - } - lines { - width: 6.4 - color: 0xD3CB98 - priority: 1482 - } - lines { - width: 6.4 - color: 0xFFFFFF - priority: 1556 - } - } - element { - scale: 17 - lines { - width: 8 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1585 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16585 - } - lines { - width: 6.8 - color: 0xD3CB98 - priority: 1512 - } - lines { - width: 6.8 - color: 0xFFFFFF - priority: 1586 - } - } -} -cont { - name: "highway-bus_stop" - element { - scale: 16 - caption { - primary { - height: 10 - color: 0x3050D8 - stroke_color: 0xFFFFFF - offset_y: 10 - } - priority: 16000 - } - symbol { - name: "bus-mini" - priority: 16000 - } - } - element { - scale: 17 - caption { - primary { - height: 11 - color: 0x3050D8 - stroke_color: 0xFFFFFF - offset_y: 10 - } - priority: 16000 - } - symbol { - name: "bus" - priority: 16000 - } - } -} -cont { - name: "highway-byway" - element { - scale: 10 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 12 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 14 - lines { - width: 1 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 15 - lines { - width: 2 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 16 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 4 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 17 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 6 - color: 0xC0A87C - priority: 1033 - } - } -} -cont { - name: "highway-byway-bridge" - element { - scale: 10 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 12 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 14 - lines { - width: 1 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 15 - lines { - width: 2 - color: 0xC0A87C - priority: 1033 + priority: 1351 } } element { @@ -6526,20 +5733,24 @@ cont { priority: 16000 } lines { - width: 12 + width: 14.4 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 4 - color: 0xC0A87C - priority: 1033 + width: 6.4 + color: 0xD3CB98 + priority: 1578 } lines { - width: 14 + width: 16.4 color: 0x707070 priority: 0 + dashdot { + dd: 5 + dd: 5 + } cap: BUTTCAP } } @@ -6554,453 +5765,60 @@ cont { priority: 16000 } lines { - width: 14 + width: 14.8 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 6 - color: 0xC0A87C - priority: 1033 + width: 6.8 + color: 0xD3CB98 + priority: 1000 } lines { - width: 16 + width: 16.8 color: 0x707070 priority: 0 - cap: BUTTCAP - } - } -} -cont { - name: "highway-byway-destination" - element { - scale: 10 - lines { - width: 1 - color: 0xccC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xccC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 12 - lines { - width: 1 - color: 0xccC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 14 - lines { - width: 1 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 15 - lines { - width: 2 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 16 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 4 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 17 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 6 - color: 0xC0A87C - priority: 1033 - } - } -} -cont { - name: "highway-byway-permissive" - element { - scale: 10 - lines { - width: 1 - color: 0xccC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xccC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 12 - lines { - width: 1 - color: 0xccC0A87C dashdot { - dd: 4.5 - dd: 3 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 14 - lines { - width: 1 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 15 - lines { - width: 2 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 16 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 4 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 17 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 6 - color: 0xC0A87C - priority: 1033 } } } cont { - name: "highway-byway-private" - element { - scale: 10 - lines { - width: 1 - color: 0xccC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xccC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 12 - lines { - width: 1 - color: 0xccC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 14 - lines { - width: 1 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 15 - lines { - width: 2 - color: 0xccC0A87C - priority: 1033 - } - } - element { - scale: 16 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 4 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 17 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - lines { - width: 6 - color: 0xC0A87C - priority: 1033 - } - } -} -cont { - name: "highway-byway-tunnel" - element { - scale: 10 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 12 - lines { - width: 1 - color: 0xC0A87C - dashdot { - dd: 4.5 - dd: 3 - } - cap: BUTTCAP - priority: 1033 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 14 - lines { - width: 1 - color: 0xC0A87C - priority: 1033 - } - } - element { - scale: 15 - lines { - width: 4 - color: 0x505050 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1345 - } - lines { - width: 1.6 - color: 0xFFFFFF - priority: 1346 - } - } + name: "highway-bus_stop" element { scale: 16 - lines { - width: 8 - color: 0x505050 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1558 + symbol { + name: "bus-mini" + priority: 16014 } - path_text { + caption { primary { - height: 12 - color: 0x606060 + height: 10 + color: 0x3050D8 stroke_color: 0xFFFFFF + offset_y: 10 } - priority: 16558 - } - lines { - width: 4 - color: 0xC0A87C - priority: 1033 - } - lines { - width: 3.2 - color: 0xFFFFFF - priority: 1559 + priority: 15014 } } element { scale: 17 - lines { - width: 8 - color: 0x505050 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1587 + symbol { + name: "bus" + priority: 16014 } - path_text { + caption { primary { - height: 12 - color: 0x606060 + height: 11 + color: 0x3050D8 stroke_color: 0xFFFFFF + offset_y: 10 } - priority: 16587 - } - lines { - width: 6 - color: 0xC0A87C - priority: 1033 - } - lines { - width: 3.2 - color: 0xFFFFFF - priority: 1588 + priority: 15014 } } } @@ -7016,7 +5834,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1288 + priority: 1000 } } element { @@ -7029,7 +5847,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1359 + priority: 1000 } } element { @@ -7042,7 +5860,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1441 + priority: 1000 } } element { @@ -7055,7 +5873,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1670 + priority: 1000 } } element { @@ -7068,7 +5886,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1694 + priority: 1000 } } } @@ -7084,7 +5902,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { @@ -7097,7 +5915,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1158 + priority: 1021 } } element { @@ -7105,39 +5923,39 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1257 + priority: 1021 } } element { scale: 16 + lines { + width: 2 + color: 0x90BC90 + priority: 1021 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 2 - color: 0x90BC90 - priority: 1478 + priority: 16021 } } element { scale: 17 + lines { + width: 3 + color: 0x90BC90 + priority: 1021 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 3 - color: 0x90BC90 - priority: 1507 + priority: 16021 } } } @@ -7153,7 +5971,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { @@ -7166,7 +5984,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1158 + priority: 1021 } } element { @@ -7174,31 +5992,31 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1257 + priority: 1021 } } element { scale: 16 + lines { + width: 2 + color: 0x90BC90 + priority: 1021 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 2 - color: 0x90BC90 - priority: 1478 - } - lines { width: 12 color: 0x707070 priority: 0 @@ -7207,26 +6025,26 @@ cont { } element { scale: 17 + lines { + width: 3 + color: 0x90BC90 + priority: 1021 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } lines { width: 11 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 3 - color: 0x90BC90 - priority: 1507 - } - lines { width: 13 color: 0x707070 priority: 0 @@ -7235,312 +6053,217 @@ cont { } } cont { - name: "highway-cycleway-destination" + name: "highway-cycleway-permissive" element { scale: 13 lines { width: 1 - color: 0xcc4DBF4D + color: 0x4DBF4D dashdot { dd: 2.25 dd: 3 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xcc4DBF4D + color: 0x4DBF4D dashdot { dd: 3 dd: 4 } cap: BUTTCAP - priority: 1158 + priority: 1021 } } element { scale: 15 lines { width: 1 - color: 0xcc90BC90 - priority: 1257 + color: 0x90BC90 + priority: 1021 } } element { scale: 16 + lines { + width: 2 + color: 0x90BC90 + priority: 1021 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 2 - color: 0x90BC90 - priority: 1478 + priority: 16021 } } element { scale: 17 + lines { + width: 3 + color: 0x90BC90 + priority: 1021 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 3 - color: 0x90BC90 - priority: 1507 + priority: 16021 } } } cont { - name: "highway-cycleway-permissive" + name: "highway-cycleway-private" element { scale: 13 lines { width: 1 - color: 0xcc4DBF4D + color: 0x4DBF4D dashdot { dd: 2.25 dd: 3 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xcc4DBF4D + color: 0x4DBF4D dashdot { dd: 3 dd: 4 } cap: BUTTCAP - priority: 1158 + priority: 1021 } } element { scale: 15 lines { width: 1 - color: 0xcc90BC90 - priority: 1257 + color: 0x90BC90 + priority: 1021 } } element { scale: 16 + lines { + width: 2 + color: 0x90BC90 + priority: 1021 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 2 - color: 0x90BC90 - priority: 1478 + priority: 16021 } } element { scale: 17 + lines { + width: 3 + color: 0x90BC90 + priority: 1021 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 3 - color: 0x90BC90 - priority: 1507 + priority: 16021 } } } cont { - name: "highway-cycleway-private" + name: "highway-cycleway-tunnel" element { scale: 13 lines { width: 1 - color: 0xcc4DBF4D + color: 0x4DBF4D dashdot { dd: 2.25 dd: 3 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xcc4DBF4D + color: 0x4DBF4D dashdot { dd: 3 dd: 4 } cap: BUTTCAP - priority: 1158 + priority: 1021 } } element { scale: 15 lines { width: 1 - color: 0xcc90BC90 - priority: 1257 + color: 0x90BC90 + priority: 1021 } } element { scale: 16 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } lines { width: 2 color: 0x90BC90 - priority: 1478 + priority: 1021 } - } - element { - scale: 17 path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 3 - color: 0x90BC90 - priority: 1507 - } - } -} -cont { - name: "highway-cycleway-tunnel" - element { - scale: 12 - lines { - width: 1 - color: 0x90BC90 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1041 + priority: 16021 } lines { - width: 0.7 - color: 0xFFFFFF - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1042 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0x4DBF4D - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1106 - } - lines { - width: 0.9 + width: 10 color: 0xFFFFFF - dashdot { - dd: 2.25 - dd: 3 - } + priority: 4 cap: BUTTCAP - priority: 1042 - } - } - element { - scale: 14 - lines { - width: 2 - color: 0x90BC90 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1041 } lines { - width: 1.6 - color: 0xFFFFFF + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3 - dd: 4 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1042 } } element { - scale: 15 + scale: 17 lines { - width: 1 + width: 3 color: 0x90BC90 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1257 - } - lines { - width: 3.2 - color: 0xFFFFFF - priority: 1042 - } - } - element { - scale: 16 - lines { - width: 7.2 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1041 + priority: 1021 } path_text { primary { @@ -7548,48 +6271,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16041 + priority: 16021 } lines { - width: 2 - color: 0x90BC90 - priority: 1478 - } - lines { - width: 6.4 + width: 11 color: 0xFFFFFF - priority: 1042 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 8 + width: 13 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1041 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16041 - } - lines { - width: 3 - color: 0x90BC90 - priority: 1507 - } - lines { - width: 6.8 - color: 0xFFFFFF - priority: 1042 } } } @@ -7600,7 +6298,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1007 + priority: 1019 } } element { @@ -7608,7 +6306,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1007 + priority: 1019 } path_text { primary { @@ -7616,7 +6314,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { @@ -7624,7 +6322,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1007 + priority: 1019 } path_text { primary { @@ -7632,7 +6330,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -7643,7 +6341,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1007 + priority: 1019 } } element { @@ -7651,7 +6349,7 @@ cont { lines { width: 1.2 color: 0x0000FF - priority: 1007 + priority: 1019 } path_text { primary { @@ -7659,7 +6357,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { @@ -7667,7 +6365,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1007 + priority: 1019 } path_text { primary { @@ -7675,7 +6373,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -7685,7 +6383,7 @@ cont { scale: 15 area { color: 0xD0CCBC - priority: 1008 + priority: 1020 } } element { @@ -7696,11 +6394,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } area { color: 0xD0CCBC - priority: 1008 + priority: 1020 } } element { @@ -7711,11 +6409,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } area { color: 0xC0BCAC - priority: 1008 + priority: 1020 } } } @@ -7726,7 +6424,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1007 + priority: 1019 } } element { @@ -7734,7 +6432,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1007 + priority: 1019 } path_text { primary { @@ -7742,12 +6440,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -7762,7 +6460,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1007 + priority: 1019 } path_text { primary { @@ -7770,12 +6468,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { width: 11 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -7793,7 +6491,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1007 + priority: 1019 } } element { @@ -7806,7 +6504,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -7814,7 +6512,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { @@ -7827,7 +6525,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -7835,7 +6533,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -7846,7 +6544,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1007 + priority: 1019 } } element { @@ -7859,7 +6557,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -7867,7 +6565,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { @@ -7880,50 +6578,7 @@ cont { dd: 1.2 } cap: BUTTCAP - priority: 1007 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16007 - } - } -} -cont { - name: "highway-footway-destination" - element { - scale: 15 - lines { - width: 1 - color: 0xccD0CCBC - priority: 1007 - } - } - element { - scale: 16 - lines { - width: 2 - color: 0xccD0CCBC - priority: 1007 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16007 - } - } - element { - scale: 17 - lines { - width: 3 - color: 0xccC0BCAC - priority: 1007 + priority: 1019 } path_text { primary { @@ -7931,7 +6586,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -7942,7 +6597,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1007 + priority: 1019 } } element { @@ -7955,7 +6610,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -7963,7 +6618,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { @@ -7976,7 +6631,7 @@ cont { dd: 1.2 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -7984,7 +6639,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -7995,7 +6650,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1007 + priority: 1019 } } element { @@ -8003,7 +6658,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1007 + priority: 1019 } path_text { primary { @@ -8011,7 +6666,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { @@ -8019,7 +6674,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1007 + priority: 1019 } path_text { primary { @@ -8027,7 +6682,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -8038,7 +6693,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1007 + priority: 1019 } } element { @@ -8051,7 +6706,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -8059,7 +6714,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { @@ -8072,7 +6727,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -8080,7 +6735,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -8090,16 +6745,16 @@ cont { scale: 15 lines { width: 1 - color: 0xccD0CCBC - priority: 1007 + color: 0xD0CCBC + priority: 1019 } } element { scale: 16 lines { width: 2 - color: 0xccD0CCBC - priority: 1007 + color: 0xD0CCBC + priority: 1019 } path_text { primary { @@ -8107,15 +6762,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { scale: 17 lines { width: 3 - color: 0xccC0BCAC - priority: 1007 + color: 0xC0BCAC + priority: 1019 } path_text { primary { @@ -8123,7 +6778,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -8133,16 +6788,16 @@ cont { scale: 15 lines { width: 1 - color: 0xccD0CCBC - priority: 1007 + color: 0xD0CCBC + priority: 1019 } } element { scale: 16 lines { width: 2 - color: 0xccD0CCBC - priority: 1007 + color: 0xD0CCBC + priority: 1019 } path_text { primary { @@ -8150,15 +6805,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { scale: 17 lines { width: 3 - color: 0xccC0BCAC - priority: 1007 + color: 0xC0BCAC + priority: 1019 } path_text { primary { @@ -8166,7 +6821,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -8176,16 +6831,16 @@ cont { scale: 15 lines { width: 1 - color: 0xccD0CCBC - priority: 1007 + color: 0xD0CCBC + priority: 1019 } } element { scale: 16 lines { width: 2 - color: 0xccD0CCBC - priority: 1007 + color: 0xD0CCBC + priority: 1019 } path_text { primary { @@ -8193,15 +6848,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { scale: 17 lines { width: 3 - color: 0xccC0BCAC - priority: 1007 + color: 0xC0BCAC + priority: 1019 } path_text { primary { @@ -8209,87 +6864,58 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } cont { name: "highway-footway-tunnel" element { - scale: 13 - lines { - width: 1.2 - color: 0xD0CCAC - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1007 - } + scale: 15 lines { - width: 0.9 - color: 0xFFFFFF - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1155 + width: 1 + color: 0xD0CCBC + priority: 1019 } } element { - scale: 14 + scale: 16 lines { width: 2 - color: 0xD0CCAC - dashdot { - dd: 2.2 - dd: 2.2 + color: 0xD0CCBC + priority: 1019 + } + path_text { + primary { + height: 12 + color: 0x606060 + stroke_color: 0xFFFFFF } - cap: BUTTCAP - priority: 1007 + priority: 16019 } lines { - width: 1.6 + width: 10 color: 0xFFFFFF - dashdot { - dd: 3 - dd: 4 - } + priority: 4 cap: BUTTCAP - priority: 1228 } - } - element { - scale: 15 lines { - width: 2.8 + width: 12 color: 0x707070 + priority: 0 dashdot { - dd: 2.8 - dd: 2.8 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1007 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1325 } } element { - scale: 16 + scale: 17 lines { - width: 4.8 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1007 + width: 3 + color: 0xC0BCAC + priority: 1019 } path_text { primary { @@ -8297,38 +6923,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { - width: 4 + width: 11 color: 0xFFFFFF - priority: 1180 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 3 - color: 0xC0BCAC + width: 13 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1007 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16007 - } - lines { - width: 3.6 - color: 0xFFFFFF - priority: 1180 } } } @@ -8339,13 +6950,13 @@ cont { lines { width: 2.99 color: 0x202020 - priority: 102 + priority: 165 cap: BUTTCAP } lines { width: 2.75 color: 0xCDE5EA - priority: 1102 + priority: 1165 } } element { @@ -8353,13 +6964,13 @@ cont { lines { width: 4.5 color: 0x101010 - priority: 152 + priority: 251 cap: BUTTCAP } lines { width: 3.5 color: 0xCDE5EA - priority: 1152 + priority: 1251 } } element { @@ -8367,13 +6978,13 @@ cont { lines { width: 8.4 color: 0x707070 - priority: 249 + priority: 346 cap: BUTTCAP } lines { width: 7 color: 0xCDE5EA - priority: 1249 + priority: 1346 } } element { @@ -8381,13 +6992,13 @@ cont { lines { width: 10.4 color: 0x707070 - priority: 474 + priority: 573 cap: BUTTCAP } lines { width: 9 color: 0xCDE5EA - priority: 1474 + priority: 1573 } } element { @@ -8395,211 +7006,182 @@ cont { lines { width: 13.2 color: 0x707070 - priority: 502 + priority: 602 cap: BUTTCAP } lines { width: 10 color: 0xCDE5EA - priority: 1502 + priority: 1602 } } } cont { name: "highway-living_street" element { + scale: 13 + lines { + width: 1 + color: 0xFFFFFF + priority: 1019 + } + } + element { scale: 14 lines { - width: 4.2 - color: 0x101010 - priority: 8 + width: 5 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP } lines { - width: 3.5 + width: 3 color: 0xFFFFFF - priority: 1008 + priority: 1019 } } element { scale: 15 + lines { + width: 6 + color: 0xC8C8AF + priority: 19 + cap: BUTTCAP + } + lines { + width: 4 + color: 0xFFFFFF + priority: 1019 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16019 } + } + element { + scale: 16 lines { - width: 7 - color: 0xD0CCAC - dashdot { - dd: 1.7 - dd: 2.4 - } + width: 10 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP - priority: 1278 } lines { - width: 7 + width: 6 color: 0xFFFFFF - priority: 1277 - } - lines { - width: 7.8 - color: 0x707070 - priority: 1119 + priority: 1019 } - } - element { - scale: 16 path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16019 } + } + element { + scale: 17 lines { - width: 9 - color: 0xD0CCAC - dashdot { - dd: 2.2 - dd: 3.2 - } + width: 12 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP - priority: 1497 } lines { - width: 9 + width: 8 color: 0xFFFFFF - priority: 1496 - } - lines { - width: 10 - color: 0x707070 - priority: 1383 + priority: 1019 } - } - element { - scale: 17 path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 10.8 - color: 0xD0CCAC - dashdot { - dd: 2.8 - dd: 4 - } - cap: BUTTCAP - priority: 1527 - } - lines { - width: 10.8 - color: 0xFFFFFF - priority: 1526 - } - lines { - width: 12 - color: 0x707070 - priority: 1412 + priority: 16019 } } } cont { name: "highway-living_street-bridge" element { + scale: 13 + lines { + width: 1 + color: 0xFFFFFF + priority: 1019 + } + } + element { scale: 14 lines { - width: 4.2 - color: 0x101010 - priority: 8 + width: 5 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP } lines { - width: 3.5 + width: 3 color: 0xFFFFFF - priority: 1008 + priority: 1019 } } element { scale: 15 + lines { + width: 6 + color: 0xC8C8AF + priority: 19 + cap: BUTTCAP + } + lines { + width: 4 + color: 0xFFFFFF + priority: 1019 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16019 } + } + element { + scale: 16 lines { - width: 7 - color: 0xD0CCAC - dashdot { - dd: 1.7 - dd: 2.4 - } + width: 10 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP - priority: 1278 } lines { - width: 7 + width: 6 color: 0xFFFFFF - priority: 1277 - } - lines { - width: 7.8 - color: 0x707070 - priority: 1119 + priority: 1019 } - } - element { - scale: 16 path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 9 - color: 0xD0CCAC - dashdot { - dd: 2.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1497 - } - lines { - width: 9 - color: 0xFFFFFF - priority: 1496 - } - lines { - width: 10 - color: 0x707070 - priority: 1383 + priority: 16019 } lines { - width: 17 + width: 14 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 19 + width: 16 color: 0x707070 priority: 0 cap: BUTTCAP @@ -8607,42 +7189,33 @@ cont { } element { scale: 17 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16008 - } lines { - width: 10.8 - color: 0xD0CCAC - dashdot { - dd: 2.8 - dd: 4 - } + width: 12 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP - priority: 1527 } lines { - width: 10.8 + width: 8 color: 0xFFFFFF - priority: 1526 + priority: 1019 } - lines { - width: 12 - color: 0x707070 - priority: 1412 + path_text { + primary { + height: 12 + color: 0x606060 + stroke_color: 0xFFFFFF + } + priority: 16019 } lines { - width: 20 + width: 16 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 22 + width: 18 color: 0x707070 priority: 0 cap: BUTTCAP @@ -8652,44 +7225,39 @@ cont { cont { name: "highway-living_street-tunnel" element { - scale: 14 + scale: 13 lines { - width: 4.2 - color: 0x101010 - priority: 8 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP + width: 1 + color: 0xFFFFFF + priority: 1019 } + } + element { + scale: 14 lines { - width: 3.5 - color: 0xFFFFFF - dashdot { - dd: 2.2 - dd: 2.2 - } + width: 5 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP - priority: 1008 } lines { - width: 3.5 + width: 3 color: 0xFFFFFF - priority: 1272 + priority: 1019 } } element { scale: 15 lines { - width: 8.4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } + width: 6 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP - priority: 1008 + } + lines { + width: 4 + color: 0xFFFFFF + priority: 1019 } path_text { primary { @@ -8697,45 +7265,21 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 7 - color: 0xD0CCAC - dashdot { - dd: 1.7 - dd: 2.4 - } - cap: BUTTCAP - priority: 1278 - } - lines { - width: 7 - color: 0xFFFFFF - priority: 1277 - } - lines { - width: 7.8 - color: 0x707070 - priority: 1119 - } - lines { - width: 7 - color: 0xFFFFFF - priority: 1358 + priority: 16019 } } element { scale: 16 lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 10 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP - priority: 1008 + } + lines { + width: 6 + color: 0xFFFFFF + priority: 1019 } path_text { primary { @@ -8743,45 +7287,37 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 9 - color: 0xD0CCAC - dashdot { - dd: 2.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1497 + priority: 16019 } lines { - width: 9 + width: 14 color: 0xFFFFFF - priority: 1496 + priority: 4 + cap: BUTTCAP } lines { - width: 10 + width: 16 color: 0x707070 - priority: 1383 - } - lines { - width: 8.8 - color: 0xFFFFFF - priority: 1576 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { scale: 17 lines { - width: 13.2 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 12 + color: 0xC8C8AF + priority: 19 cap: BUTTCAP - priority: 1008 + } + lines { + width: 8 + color: 0xFFFFFF + priority: 1019 } path_text { primary { @@ -8789,32 +7325,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 10.8 - color: 0xD0CCAC - dashdot { - dd: 2.8 - dd: 4 - } - cap: BUTTCAP - priority: 1527 + priority: 16019 } lines { - width: 10.8 + width: 16 color: 0xFFFFFF - priority: 1526 + priority: 4 + cap: BUTTCAP } lines { - width: 12 + width: 18 color: 0x707070 - priority: 1412 - } - lines { - width: 10.8 - color: 0xFFFFFF - priority: 1604 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -8826,7 +7353,7 @@ cont { width: 1 color: 0xEFBB6E cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -8835,7 +7362,7 @@ cont { width: 2 color: 0xEF9721 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -8844,7 +7371,7 @@ cont { width: 3 color: 0xF08800 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -8853,7 +7380,7 @@ cont { width: 4 color: 0xF08800 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -8861,13 +7388,13 @@ cont { lines { width: 6 color: 0xB87C04 - priority: 12 + priority: 36 cap: BUTTCAP } lines { width: 4 color: 0xF08800 - priority: 1012 + priority: 1036 } } element { @@ -8875,35 +7402,35 @@ cont { lines { width: 8 color: 0xB87C04 - priority: 12 + priority: 36 cap: BUTTCAP } lines { width: 6 color: 0xF08800 - priority: 1012 + priority: 1036 } } element { scale: 13 - path_text { - primary { - height: 16 - color: 0x202020 - stroke_color: 0xF08800 - } - priority: 16012 - } lines { width: 10 color: 0xB87C04 - priority: 440 + priority: 36 cap: BUTTCAP } lines { width: 8 color: 0xF08800 - priority: 1440 + priority: 1036 + } + path_text { + primary { + height: 16 + color: 0x202020 + stroke_color: 0xF08800 + } + priority: 16036 } } element { @@ -8914,18 +7441,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 16 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1440 + priority: 1504 } } element { @@ -8936,18 +7463,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 20 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1440 + priority: 1504 } } element { @@ -8958,18 +7485,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 20 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1440 + priority: 1504 } } element { @@ -8980,18 +7507,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 21 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 17 color: 0xF08800 - priority: 1440 + priority: 1504 } } } @@ -9003,7 +7530,7 @@ cont { width: 1 color: 0xEFBB6E cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -9012,7 +7539,7 @@ cont { width: 2 color: 0xEF9721 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -9021,7 +7548,7 @@ cont { width: 3 color: 0xF08800 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -9030,7 +7557,7 @@ cont { width: 4 color: 0xF08800 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -9038,13 +7565,13 @@ cont { lines { width: 6 color: 0xB87C04 - priority: 12 + priority: 36 cap: BUTTCAP } lines { width: 4 color: 0xF08800 - priority: 1012 + priority: 1036 } } element { @@ -9052,35 +7579,35 @@ cont { lines { width: 8 color: 0xB87C04 - priority: 12 + priority: 36 cap: BUTTCAP } lines { width: 6 color: 0xF08800 - priority: 1012 + priority: 1036 } } element { scale: 13 - path_text { - primary { - height: 16 - color: 0x202020 - stroke_color: 0xF08800 - } - priority: 16012 - } lines { width: 10 color: 0xB87C04 - priority: 440 + priority: 36 cap: BUTTCAP } lines { width: 8 color: 0xF08800 - priority: 1440 + priority: 1036 + } + path_text { + primary { + height: 16 + color: 0x202020 + stroke_color: 0xF08800 + } + priority: 16036 } } element { @@ -9091,18 +7618,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 16 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1440 + priority: 1504 } } element { @@ -9113,18 +7640,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 20 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1440 + priority: 1504 } } element { @@ -9135,24 +7662,24 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 24 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 20 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1440 + priority: 1504 } lines { width: 26 @@ -9169,24 +7696,24 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 25 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 21 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 17 color: 0xF08800 - priority: 1440 + priority: 1504 } lines { width: 27 @@ -9204,7 +7731,7 @@ cont { width: 1 color: 0xEFBB6E cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -9213,7 +7740,7 @@ cont { width: 2 color: 0xEF9721 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -9222,7 +7749,7 @@ cont { width: 3 color: 0xF08800 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -9231,7 +7758,7 @@ cont { width: 4 color: 0xF08800 cap: BUTTCAP - priority: 1012 + priority: 1036 } } element { @@ -9239,13 +7766,13 @@ cont { lines { width: 6 color: 0xB87C04 - priority: 12 + priority: 36 cap: BUTTCAP } lines { width: 4 color: 0xF08800 - priority: 1012 + priority: 1036 } } element { @@ -9253,212 +7780,155 @@ cont { lines { width: 8 color: 0xB87C04 - priority: 12 - dashdot { - dd: 1.5 - dd: 1.5 - } + priority: 36 cap: BUTTCAP } lines { width: 6 color: 0xF08800 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1012 - } - lines { - width: 5.25 - color: 0xFFFFFF - priority: 1221 + priority: 1036 } } element { scale: 13 lines { - width: 8 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1012 - } - path_text { - primary { - height: 16 - color: 0x202020 - stroke_color: 0xF08800 - } - priority: 16012 - } - lines { width: 10 color: 0xB87C04 - priority: 440 + priority: 36 cap: BUTTCAP } lines { width: 8 color: 0xF08800 - priority: 1440 + priority: 1036 } - lines { - width: 7.5 - color: 0xFFFFFF - priority: 1232 + path_text { + primary { + height: 16 + color: 0x202020 + stroke_color: 0xF08800 + } + priority: 16036 } } element { scale: 14 - lines { - width: 9 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1012 - } path_text { primary { height: 16 color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 16 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1440 - } - lines { - width: 8 - color: 0xFFFFFF - priority: 1299 + priority: 1504 } } element { scale: 15 - lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1012 - } path_text { primary { height: 17 color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 } lines { width: 20 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1440 - } - lines { - width: 9 - color: 0xFFFFFF - priority: 1381 + priority: 1504 } } element { scale: 16 - lines { - width: 15.2 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1012 - } path_text { primary { height: 18 color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 + } + lines { + width: 24 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 20 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1440 - } - lines { - width: 13.6 - color: 0xFFFFFF - priority: 1599 + priority: 1504 } - } - element { - scale: 17 lines { - width: 16 + width: 26 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1012 } + } + element { + scale: 17 path_text { primary { height: 18 color: 0x202020 stroke_color: 0xF08800 } - priority: 16012 + priority: 16036 + } + lines { + width: 25 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 21 color: 0xB87C04 - priority: 440 + priority: 504 cap: BUTTCAP } lines { width: 17 color: 0xF08800 - priority: 1440 + priority: 1504 } lines { - width: 13.6 - color: 0xFFFFFF - priority: 1639 + width: 27 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -9472,7 +7942,7 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } element { @@ -9483,7 +7953,7 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } element { @@ -9494,7 +7964,7 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } element { @@ -9505,7 +7975,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } element { @@ -9516,7 +7986,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } } @@ -9524,18 +7994,18 @@ cont { name: "highway-motorway_link" element { scale: 14 + lines { + width: 5.5 + color: 0xF08800 + priority: 1036 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 5.5 - color: 0xF08800 - priority: 1184 + priority: 16036 } } element { @@ -9546,12 +8016,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16036 } lines { width: 9 color: 0xF08800 - priority: 1431 + priority: 1485 } } element { @@ -9562,12 +8032,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16036 } lines { width: 12 color: 0xF08800 - priority: 1431 + priority: 1485 } } element { @@ -9578,12 +8048,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16036 } lines { width: 12 color: 0xF08800 - priority: 1431 + priority: 1485 } } } @@ -9591,18 +8061,18 @@ cont { name: "highway-motorway_link-bridge" element { scale: 14 + lines { + width: 5.5 + color: 0xF08800 + priority: 1036 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 5.5 - color: 0xF08800 - priority: 1184 + priority: 16036 } } element { @@ -9613,12 +8083,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16036 } lines { width: 9 color: 0xF08800 - priority: 1431 + priority: 1485 } } element { @@ -9629,18 +8099,18 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16036 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1431 + priority: 1485 } lines { width: 22 @@ -9657,18 +8127,18 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16036 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1431 + priority: 1485 } lines { width: 22 @@ -9683,14 +8153,9 @@ cont { element { scale: 14 lines { - width: 6.5 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1290 + width: 5.5 + color: 0xF08800 + priority: 1036 } path_text { primary { @@ -9698,110 +8163,87 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16290 - } - lines { - width: 5.5 - color: 0xF08800 - priority: 1184 - } - lines { - width: 5.5 - color: 0xFFFFFF - priority: 1291 + priority: 16036 } } element { scale: 15 - lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1373 - } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16373 + priority: 16036 } lines { width: 9 color: 0xF08800 - priority: 1431 - } - lines { - width: 9 - color: 0xFFFFFF - priority: 1374 + priority: 1485 } } element { scale: 16 - lines { - width: 13.6 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1591 - } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16591 + priority: 16036 } lines { - width: 12 - color: 0xF08800 - priority: 1431 + width: 20 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 12 - color: 0xFFFFFF - priority: 1592 + color: 0xF08800 + priority: 1485 } - } - element { - scale: 17 lines { - width: 14.4 + width: 22 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1629 } + } + element { + scale: 17 path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16629 + priority: 16036 + } + lines { + width: 20 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1431 + priority: 1485 } lines { - width: 12 - color: 0xFFFFFF - priority: 1630 + width: 22 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -9812,39 +8254,39 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1007 + priority: 1019 } } element { scale: 16 + lines { + width: 2 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } @@ -9855,7 +8297,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1007 + priority: 1019 } } element { @@ -9863,7 +8305,7 @@ cont { lines { width: 1.2 color: 0x0000FF - priority: 1007 + priority: 1019 } path_text { primary { @@ -9871,12 +8313,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { @@ -9884,7 +8321,7 @@ cont { lines { width: 0.8 color: 0x0000FF - priority: 1007 + priority: 1019 } path_text { primary { @@ -9892,12 +8329,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } @@ -9908,49 +8340,39 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1007 + priority: 1019 } } element { scale: 16 + lines { + width: 2 + color: 0x90BC90 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 - } - lines { - width: 2 - color: 0x90BC90 - priority: 1538 + priority: 16019 } } element { scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 - } - lines { - width: 3 - color: 0x90BC90 - priority: 1538 + priority: 16019 } } } @@ -9961,36 +8383,31 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1007 + priority: 1019 } } element { scale: 16 + lines { + width: 2 + color: 0x90BC90 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 - } - lines { - width: 2 - color: 0x90BC90 - priority: 1538 - } - lines { width: 12 color: 0x707070 priority: 0 @@ -9999,31 +8416,26 @@ cont { } element { scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { width: 11 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 - } - lines { - width: 3 - color: 0x90BC90 - priority: 1538 - } - lines { width: 13 color: 0x707070 priority: 0 @@ -10034,72 +8446,19 @@ cont { cont { name: "highway-path-bicycle-tunnel" element { - scale: 14 - lines { - width: 2 - color: 0xD0CCAC - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1007 - } - lines { - width: 1.6 - color: 0xFFFFFF - dashdot { - dd: 3 - dd: 4 - } - cap: BUTTCAP - priority: 1246 - } - lines { - width: 1.6 - color: 0xFFFFFF - dashdot { - dd: 3 - dd: 4 - } - cap: BUTTCAP - priority: 1240 - } - } - element { scale: 15 lines { - width: 2.8 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1007 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1340 - } - lines { - width: 3.2 - color: 0xFFFFFF - priority: 1334 + width: 1 + color: 0x90BC90 + priority: 1019 } } element { scale: 16 lines { - width: 7.2 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1007 + width: 2 + color: 0x90BC90 + priority: 1019 } path_text { primary { @@ -10107,35 +8466,31 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } lines { - width: 2 - color: 0x90BC90 - priority: 1538 - } - lines { - width: 6.4 + width: 10 color: 0xFFFFFF - priority: 1548 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 4.8 + width: 12 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1007 + } + } + element { + scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 } path_text { primary { @@ -10143,22 +8498,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 - } - lines { - width: 3.6 + width: 11 color: 0xFFFFFF - priority: 1584 + priority: 4 + cap: BUTTCAP } lines { - width: 6.8 - color: 0xFFFFFF - priority: 1580 + width: 13 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -10169,31 +8525,31 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1007 + priority: 1019 } } element { scale: 16 + lines { + width: 2 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 - } - lines { width: 12 color: 0x707070 priority: 0 @@ -10202,26 +8558,26 @@ cont { } element { scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { width: 11 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 - } - lines { width: 13 color: 0x707070 priority: 0 @@ -10236,7 +8592,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1007 + priority: 1019 } } element { @@ -10249,7 +8605,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -10257,25 +8613,20 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { scale: 17 lines { - width: 0.8 - color: 0x0000FF + width: 3 + color: 0xC0C0C0 dashdot { dd: 4 dd: 4 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -10283,12 +8634,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } @@ -10299,20 +8645,20 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1007 + priority: 1019 } } element { scale: 16 lines { - width: 1.2 - color: 0xFF0000 + width: 2 + color: 0xC0C0C0 dashdot { dd: 0.16 dd: 2.4 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -10320,81 +8666,28 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { scale: 17 lines { - width: 0.8 - color: 0xFF0000 + width: 3 + color: 0xC0C0C0 dashdot { dd: 0.08 dd: 1.2 } cap: BUTTCAP - priority: 1007 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 - } - } -} -cont { - name: "highway-path-destination" - element { - scale: 15 - lines { - width: 2 - color: 0xccC0C0C0 - priority: 1007 - } - } - element { - scale: 16 - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 1019 } - } - element { - scale: 17 path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } @@ -10405,7 +8698,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1007 + priority: 1019 } } element { @@ -10418,7 +8711,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -10426,12 +8719,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { @@ -10444,7 +8732,7 @@ cont { dd: 1.2 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -10452,12 +8740,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } @@ -10468,15 +8751,15 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1007 + priority: 1019 } } element { scale: 16 lines { - width: 1.2 - color: 0xFF0000 - priority: 1007 + width: 2 + color: 0xC0C0C0 + priority: 1019 } path_text { primary { @@ -10484,12 +8767,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { @@ -10497,7 +8775,7 @@ cont { lines { width: 0.8 color: 0xFF0000 - priority: 1007 + priority: 1019 } path_text { primary { @@ -10505,104 +8783,50 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } cont { name: "highway-path-horse" element { - scale: 12 - lines { - width: 0.7 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1007 - } - } - element { - scale: 13 - lines { - width: 0.9 - color: 0xA9D355 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1007 - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 0x8FBF4D - dashdot { - dd: 3 - dd: 4 - } - cap: BUTTCAP - priority: 1007 - } - } - element { scale: 15 lines { - width: 3.2 - color: 0xD3CB98 - priority: 1007 + width: 2 + color: 0xC0C0C0 + priority: 1019 } } element { scale: 16 + lines { + width: 2 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 - } - lines { - width: 6.4 - color: 0xD3CB98 - priority: 1479 + priority: 16019 } } element { scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 - } - lines { - width: 6.8 - color: 0xD3CB98 - priority: 1509 + priority: 16019 } } } @@ -10613,20 +8837,20 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1007 + priority: 1019 } } element { scale: 16 lines { - width: 1.2 - color: 0xFF0000 + width: 2 + color: 0xC0C0C0 dashdot { dd: 2 dd: 2 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -10634,25 +8858,20 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { scale: 17 lines { - width: 0.8 - color: 0xFF0000 + width: 3 + color: 0xC0C0C0 dashdot { dd: 4 dd: 4 } cap: BUTTCAP - priority: 1007 + priority: 1019 } path_text { primary { @@ -10660,12 +8879,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } @@ -10675,40 +8889,40 @@ cont { scale: 15 lines { width: 2 - color: 0xccC0C0C0 - priority: 1007 + color: 0xC0C0C0 + priority: 1019 } } element { scale: 16 + lines { + width: 2 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } @@ -10718,40 +8932,40 @@ cont { scale: 15 lines { width: 2 - color: 0xccC0C0C0 - priority: 1007 + color: 0xC0C0C0 + priority: 1019 } } element { scale: 16 + lines { + width: 2 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } @@ -10761,97 +8975,59 @@ cont { scale: 15 lines { width: 2 - color: 0xccC0C0C0 - priority: 1007 + color: 0xC0C0C0 + priority: 1019 } } element { scale: 16 + lines { + width: 2 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 + priority: 16019 } } element { scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 + } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 - } - lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + priority: 16019 } } } cont { name: "highway-path-tunnel" element { - scale: 14 - lines { - width: 2 - color: 0xD0CCAC - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1007 - } - lines { - width: 1.6 - color: 0xFFFFFF - dashdot { - dd: 3 - dd: 4 - } - cap: BUTTCAP - priority: 1246 - } - } - element { scale: 15 lines { - width: 2.8 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1007 - } - lines { width: 2 - color: 0xFFFFFF - priority: 1340 + color: 0xC0C0C0 + priority: 1019 } } element { scale: 16 lines { - width: 4.8 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1007 + width: 2 + color: 0xC0C0C0 + priority: 1019 } path_text { primary { @@ -10859,30 +9035,31 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { - width: 2 - color: 0xC0C0C0 - priority: 1481 - } - lines { - width: 4 + width: 10 color: 0xFFFFFF - priority: 1553 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 4.8 + width: 12 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1007 + } + } + element { + scale: 17 + lines { + width: 3 + color: 0xC0C0C0 + priority: 1019 } path_text { primary { @@ -10890,17 +9067,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { - width: 3 - color: 0xC0C0C0 - priority: 1511 + width: 11 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { - width: 3.6 - color: 0xFFFFFF - priority: 1584 + width: 13 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -10911,7 +9094,7 @@ cont { lines { width: 1 color: 0xD0CCAC - priority: 1007 + priority: 1019 } } element { @@ -10919,13 +9102,13 @@ cont { lines { width: 5 color: 0xC0BC9C - priority: 7 + priority: 19 cap: BUTTCAP } lines { width: 3 color: 0xE8E8E8 - priority: 1007 + priority: 1019 } } element { @@ -10933,13 +9116,13 @@ cont { lines { width: 6 color: 0xC0BC9C - priority: 7 + priority: 19 cap: BUTTCAP } lines { width: 4 color: 0xE8E8E8 - priority: 1007 + priority: 1019 } path_text { primary { @@ -10947,7 +9130,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } element { @@ -10955,13 +9138,13 @@ cont { lines { width: 9 color: 0xC0BC9C - priority: 7 + priority: 19 cap: BUTTCAP } lines { width: 7 color: 0xE8E8E8 - priority: 1007 + priority: 1019 } path_text { primary { @@ -10969,7 +9152,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } } } @@ -10979,14 +9162,14 @@ cont { scale: 14 area { color: 0xD0CCAC - priority: 1008 + priority: 1020 } } element { scale: 15 area { color: 0xE8E8E8 - priority: 1008 + priority: 1020 } } element { @@ -10997,11 +9180,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } area { color: 0xE8E8E8 - priority: 1008 + priority: 1020 } } element { @@ -11012,11 +9195,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } area { color: 0xE8E8E8 - priority: 1008 + priority: 1020 } } } @@ -11027,7 +9210,7 @@ cont { lines { width: 1 color: 0xD0CCAC - priority: 1007 + priority: 1019 } } element { @@ -11035,13 +9218,13 @@ cont { lines { width: 5 color: 0xC0BC9C - priority: 7 + priority: 19 cap: BUTTCAP } lines { width: 3 color: 0xE8E8E8 - priority: 1007 + priority: 1019 } } element { @@ -11049,13 +9232,13 @@ cont { lines { width: 6 color: 0xC0BC9C - priority: 7 + priority: 19 cap: BUTTCAP } lines { width: 4 color: 0xE8E8E8 - priority: 1007 + priority: 1019 } path_text { primary { @@ -11063,12 +9246,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { width: 12 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -11083,13 +9266,13 @@ cont { lines { width: 9 color: 0xC0BC9C - priority: 7 + priority: 19 cap: BUTTCAP } lines { width: 7 color: 0xE8E8E8 - priority: 1007 + priority: 1019 } path_text { primary { @@ -11097,12 +9280,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { width: 15 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -11120,17 +9303,7 @@ cont { lines { width: 1 color: 0xD0CCAC - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1007 - } - lines { - width: 3.5 - color: 0xFFFFFF - priority: 1234 + priority: 1019 } } element { @@ -11138,50 +9311,27 @@ cont { lines { width: 5 color: 0xC0BC9C - priority: 7 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 19 cap: BUTTCAP } lines { width: 3 color: 0xE8E8E8 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1007 - } - lines { - width: 7 - color: 0xFFFFFF - priority: 1331 + priority: 1019 } } element { scale: 16 lines { - width: 12 + width: 6 color: 0xC0BC9C - priority: 7 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 19 cap: BUTTCAP } lines { - width: 10 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1007 + width: 4 + color: 0xE8E8E8 + priority: 1019 } path_text { primary { @@ -11189,35 +9339,37 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { - width: 9 + width: 12 color: 0xFFFFFF - priority: 1543 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { width: 14 - color: 0xC0BC9C - priority: 7 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP } + } + element { + scale: 17 lines { - width: 12 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 9 + color: 0xC0BC9C + priority: 19 cap: BUTTCAP - priority: 1007 + } + lines { + width: 7 + color: 0xE8E8E8 + priority: 1019 } path_text { primary { @@ -11225,12 +9377,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16019 } lines { - width: 10.8 + width: 15 color: 0xFFFFFF - priority: 1578 + priority: 4 + cap: BUTTCAP + } + lines { + width: 17 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -11242,7 +9405,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11251,7 +9414,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11260,7 +9423,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11269,7 +9432,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11278,7 +9441,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11286,13 +9449,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 9 + priority: 34 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1009 + priority: 1034 } path_text { primary { @@ -11300,117 +9463,117 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } } element { scale: 13 - path_text { - primary { - height: 12 - color: 0x303030 - stroke_color: 0xFFC444 - } - priority: 16009 - } lines { width: 7 color: 0xD8A050 - priority: 0 + priority: 34 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1000 + priority: 1034 } - } - element { - scale: 14 path_text { primary { - height: 14 + height: 12 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } + } + element { + scale: 14 lines { width: 9 color: 0xD8A050 - priority: 386 + priority: 34 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1386 + priority: 1034 } - } - element { - scale: 15 path_text { primary { - height: 16 + height: 14 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } + } + element { + scale: 15 lines { width: 12 color: 0xD8A050 - priority: 386 + priority: 34 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1386 + priority: 1034 } - } - element { - scale: 16 path_text { primary { - height: 17 - color: 0x404040 + height: 16 + color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } + } + element { + scale: 16 lines { width: 18 color: 0xD8A050 - priority: 386 + priority: 34 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1386 + priority: 1034 } - } - element { - scale: 17 path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } + } + element { + scale: 17 lines { width: 20 color: 0xD8A050 - priority: 0 + priority: 34 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1000 + priority: 1034 + } + path_text { + primary { + height: 17 + color: 0x404040 + stroke_color: 0xFFC444 + } + priority: 16034 } } } @@ -11422,7 +9585,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11431,7 +9594,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11440,7 +9603,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11449,7 +9612,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11458,7 +9621,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11466,13 +9629,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 9 + priority: 34 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1009 + priority: 1034 } path_text { primary { @@ -11480,103 +9643,103 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } } element { scale: 13 - path_text { - primary { - height: 12 - color: 0x303030 - stroke_color: 0xFFC444 - } - priority: 16009 - } lines { width: 7 color: 0xD8A050 - priority: 0 + priority: 34 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1000 + priority: 1034 } - } - element { - scale: 14 path_text { primary { - height: 14 + height: 12 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } + } + element { + scale: 14 lines { width: 9 color: 0xD8A050 - priority: 386 + priority: 34 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1386 + priority: 1034 } - } - element { - scale: 15 path_text { primary { - height: 16 + height: 14 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } + } + element { + scale: 15 lines { width: 12 color: 0xD8A050 - priority: 386 + priority: 34 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1386 + priority: 1034 + } + path_text { + primary { + height: 16 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 16034 } } element { scale: 16 + lines { + width: 18 + color: 0xD8A050 + priority: 34 + cap: BUTTCAP + } + lines { + width: 14 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } lines { width: 22 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 18 - color: 0xD8A050 - priority: 386 - cap: BUTTCAP - } - lines { - width: 14 - color: 0xFFC444 - priority: 1386 - } - lines { width: 24 color: 0x707070 priority: 0 @@ -11585,32 +9748,32 @@ cont { } element { scale: 17 + lines { + width: 20 + color: 0xD8A050 + priority: 34 + cap: BUTTCAP + } + lines { + width: 16 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } lines { width: 24 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 20 - color: 0xD8A050 - priority: 0 - cap: BUTTCAP - } - lines { - width: 16 - color: 0xFFC444 - priority: 1000 - } - lines { width: 26 color: 0x707070 priority: 0 @@ -11626,7 +9789,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11635,7 +9798,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11644,7 +9807,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11653,7 +9816,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { @@ -11662,30 +9825,21 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1009 + priority: 1034 } } element { scale: 12 lines { - width: 5.5 + width: 5 color: 0xD8A050 - priority: 9 - dashdot { - dd: 1.5 - dd: 1.5 - } + priority: 34 cap: BUTTCAP } lines { - width: 3.5 - color: 0x202020 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1009 + width: 3 + color: 0xFFC444 + priority: 1034 } path_text { primary { @@ -11693,136 +9847,87 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 - } - lines { - width: 3.25 - color: 0xFFFFFF - priority: 1000 + priority: 16034 } } element { scale: 13 lines { - width: 5.5 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1009 - } - path_text { - primary { - height: 12 - color: 0x303030 - stroke_color: 0xFFC444 - } - priority: 16009 - } - lines { width: 7 color: 0xD8A050 - priority: 0 + priority: 34 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1000 - } - lines { - width: 5 - color: 0xFFFFFF - priority: 1000 - } - } - element { - scale: 14 - lines { - width: 7 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1009 + priority: 1034 } path_text { primary { - height: 14 + height: 12 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } + } + element { + scale: 14 lines { width: 9 color: 0xD8A050 - priority: 386 + priority: 34 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1386 - } - lines { - width: 6 - color: 0xFFFFFF - priority: 1294 - } - } - element { - scale: 15 - lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1009 + priority: 1034 } path_text { primary { - height: 16 + height: 14 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } + } + element { + scale: 15 lines { width: 12 color: 0xD8A050 - priority: 386 + priority: 34 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1386 + priority: 1034 } - lines { - width: 9 - color: 0xFFFFFF - priority: 1376 + path_text { + primary { + height: 16 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 16034 } } element { scale: 16 lines { - width: 13.6 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 18 + color: 0xD8A050 + priority: 34 cap: BUTTCAP - priority: 1009 + } + lines { + width: 14 + color: 0xFFC444 + priority: 1034 } path_text { primary { @@ -11830,36 +9935,37 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } lines { - width: 18 - color: 0xD8A050 - priority: 386 + width: 22 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP } lines { - width: 14 - color: 0xFFC444 - priority: 1386 - } - lines { - width: 12 - color: 0xFFFFFF - priority: 1595 + width: 24 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { scale: 17 lines { - width: 14.4 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 20 + color: 0xD8A050 + priority: 34 cap: BUTTCAP - priority: 1009 + } + lines { + width: 16 + color: 0xFFC444 + priority: 1034 } path_text { primary { @@ -11867,23 +9973,23 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16009 + priority: 16034 } lines { - width: 20 - color: 0xD8A050 - priority: 0 + width: 24 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP } lines { - width: 16 - color: 0xFFC444 - priority: 1000 - } - lines { - width: 12 - color: 0xFFFFFF - priority: 1633 + width: 26 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -11894,7 +10000,7 @@ cont { lines { width: 1.62 color: 0xFFC444 - priority: 1000 + priority: 1034 } } element { @@ -11902,7 +10008,7 @@ cont { lines { width: 1.69 color: 0xFFC444 - priority: 1000 + priority: 1034 } } element { @@ -11910,71 +10016,71 @@ cont { lines { width: 2.75 color: 0xFFC444 - priority: 1000 + priority: 1034 } } element { scale: 14 + lines { + width: 4.5 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 4.5 - color: 0xFFC444 - priority: 1182 + priority: 16034 } } element { scale: 15 + lines { + width: 9 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 9 - color: 0xFFC444 - priority: 1000 + priority: 16034 } } element { scale: 16 + lines { + width: 12 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16034 } + } + element { + scale: 17 lines { width: 12 color: 0xFFC444 - priority: 1501 + priority: 1034 } - } - element { - scale: 17 path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 12 - color: 0xFFC444 - priority: 1531 + priority: 16034 } } } @@ -11985,7 +10091,7 @@ cont { lines { width: 1.62 color: 0xFFC444 - priority: 1000 + priority: 1034 } } element { @@ -11993,7 +10099,7 @@ cont { lines { width: 1.69 color: 0xFFC444 - priority: 1000 + priority: 1034 } } element { @@ -12001,63 +10107,63 @@ cont { lines { width: 2.75 color: 0xFFC444 - priority: 1000 + priority: 1034 } } element { scale: 14 + lines { + width: 4.5 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 4.5 - color: 0xFFC444 - priority: 1182 + priority: 16034 } } element { scale: 15 + lines { + width: 9 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 9 - color: 0xFFC444 - priority: 1000 + priority: 16034 } } element { scale: 16 + lines { + width: 12 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16034 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 12 - color: 0xFFC444 - priority: 1501 - } - lines { width: 22 color: 0x707070 priority: 0 @@ -12066,26 +10172,26 @@ cont { } element { scale: 17 + lines { + width: 12 + color: 0xFFC444 + priority: 1034 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16034 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 12 - color: 0xFFC444 - priority: 1531 - } - lines { width: 22 color: 0x707070 priority: 0 @@ -12100,7 +10206,7 @@ cont { lines { width: 1.62 color: 0xFFC444 - priority: 1000 + priority: 1034 } } element { @@ -12108,48 +10214,23 @@ cont { lines { width: 1.69 color: 0xFFC444 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1205 - } - lines { - width: 1.69 - color: 0xFFFFFF - priority: 1206 + priority: 1034 } } element { scale: 13 lines { - width: 3 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1000 - } - lines { width: 2.75 - color: 0xFFFFFF - priority: 1000 + color: 0xFFC444 + priority: 1034 } } element { scale: 14 lines { - width: 5.5 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1285 + width: 4.5 + color: 0xFFC444 + priority: 1034 } path_text { primary { @@ -12157,30 +10238,15 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16285 - } - lines { - width: 4.5 - color: 0xFFC444 - priority: 1182 - } - lines { - width: 4.5 - color: 0xFFFFFF - priority: 1286 + priority: 16034 } } element { scale: 15 lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1371 + width: 9 + color: 0xFFC444 + priority: 1034 } path_text { primary { @@ -12188,30 +10254,15 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16371 - } - lines { - width: 9 - color: 0xFFC444 - priority: 1000 - } - lines { - width: 9 - color: 0xFFFFFF - priority: 1372 + priority: 16034 } } element { scale: 16 lines { - width: 13.6 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1589 + width: 12 + color: 0xFFC444 + priority: 1034 } path_text { primary { @@ -12219,30 +10270,31 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16589 - } - lines { - width: 12 - color: 0xFFC444 - priority: 1501 + priority: 16034 } lines { - width: 12 + width: 20 color: 0xFFFFFF - priority: 1590 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 14.4 + width: 22 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1000 + } + } + element { + scale: 17 + lines { + width: 12 + color: 0xFFC444 + priority: 1034 } path_text { primary { @@ -12250,17 +10302,23 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16034 } lines { - width: 12 - color: 0xFFC444 - priority: 1531 + width: 20 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { - width: 12 - color: 0xFFFFFF - priority: 1000 + width: 22 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -12271,7 +10329,7 @@ cont { lines { width: 0.38 color: 0xE8E4D4 - priority: 1094 + priority: 1156 } } element { @@ -12279,7 +10337,7 @@ cont { lines { width: 0.75 color: 0xE8E4D4 - priority: 1103 + priority: 1168 } } element { @@ -12287,7 +10345,7 @@ cont { lines { width: 3 color: 0xE8E4D4 - priority: 1153 + priority: 1253 } } element { @@ -12295,7 +10353,7 @@ cont { lines { width: 3.4 color: 0xFFFFFF - priority: 1099 + priority: 1160 } lines { width: 3.4 @@ -12305,7 +10363,7 @@ cont { dd: 0.4 } cap: BUTTCAP - priority: 1100 + priority: 1163 } } element { @@ -12313,7 +10371,7 @@ cont { lines { width: 12 color: 0xE8E4D4 - priority: 1475 + priority: 1575 } lines { width: 6.8 @@ -12323,12 +10381,12 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1365 + priority: 1456 } lines { width: 6 color: 0xE8E4D4 - priority: 1485 + priority: 1580 } } element { @@ -12336,7 +10394,7 @@ cont { lines { width: 12 color: 0xE8E4D4 - priority: 1503 + priority: 1460 } lines { width: 13.6 @@ -12346,12 +10404,12 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1379 + priority: 1463 } lines { width: 12 color: 0xE8E4D4 - priority: 1513 + priority: 1624 } } } @@ -12362,7 +10420,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1008 + priority: 1026 } } element { @@ -12370,13 +10428,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1008 + priority: 1026 } } element { @@ -12384,13 +10442,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -12398,7 +10456,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { @@ -12406,13 +10464,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -12420,7 +10478,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { @@ -12428,13 +10486,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -12442,7 +10500,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } } @@ -12452,14 +10510,14 @@ cont { scale: 13 area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { scale: 14 area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { @@ -12470,11 +10528,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { @@ -12485,11 +10543,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { @@ -12500,11 +10558,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } } @@ -12515,7 +10573,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1008 + priority: 1026 } } element { @@ -12523,13 +10581,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1008 + priority: 1026 } } element { @@ -12537,13 +10595,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -12551,7 +10609,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { @@ -12559,13 +10617,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -12573,12 +10631,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 14 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -12593,13 +10651,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -12607,12 +10665,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 16 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -12629,8 +10687,8 @@ cont { scale: 13 lines { width: 1 - color: 0xccFFFFFF - priority: 1008 + color: 0xFFFFFF + priority: 1026 } } element { @@ -12638,13 +10696,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 3 - color: 0xccFFFFFF - priority: 1008 + color: 0xFFFFFF + priority: 1026 } } element { @@ -12652,13 +10710,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 4 - color: 0xccFFFFFF - priority: 1008 + color: 0xFFFFFF + priority: 1026 } path_text { primary { @@ -12666,18 +10724,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 6 - color: 0xC8C8AF - priority: 332 - cap: BUTTCAP - } - lines { - width: 4 - color: 0xFFFFFF - priority: 1332 + priority: 16026 } } element { @@ -12685,13 +10732,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 6 - color: 0xccFFFFFF - priority: 1008 + color: 0xFFFFFF + priority: 1026 } path_text { primary { @@ -12699,18 +10746,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 10 - color: 0xC8C8AF - priority: 332 - cap: BUTTCAP - } - lines { - width: 6 - color: 0xFFFFFF - priority: 1332 + priority: 16026 } } element { @@ -12718,13 +10754,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 8 - color: 0xccFFFFFF - priority: 1008 + color: 0xFFFFFF + priority: 1026 } path_text { primary { @@ -12732,74 +10768,32 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } } cont { name: "highway-residential-tunnel" element { - scale: 12 - lines { - width: 1 - color: 0xE6E6E6 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 0.7 - color: 0xFFFFFF - priority: 1177 - } - } - element { scale: 13 lines { - width: 3 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 2.75 + width: 1 color: 0xFFFFFF - priority: 1000 + priority: 1026 } } element { scale: 14 lines { - width: 6.5 + width: 5 color: 0xC8C8AF - priority: 8 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - } - lines { - width: 4.5 - color: 0x101010 - dashdot { - dd: 2.2 - dd: 2.2 - } + priority: 26 cap: BUTTCAP - priority: 1008 } lines { - width: 3.5 + width: 3 color: 0xFFFFFF - priority: 1266 + priority: 1026 } } element { @@ -12807,22 +10801,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 8 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 26 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1008 + priority: 1026 } path_text { primary { @@ -12830,12 +10815,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 7 - color: 0xFFFFFF - priority: 1356 + priority: 16026 } } element { @@ -12843,22 +10823,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 8 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 26 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1008 + priority: 1026 } path_text { primary { @@ -12866,35 +10837,37 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { - width: 8.8 + width: 14 color: 0xFFFFFF - priority: 1000 + priority: 4 + cap: BUTTCAP + } + lines { + width: 16 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { scale: 17 lines { - width: 17.2 + width: 12 color: 0xC8C8AF - priority: 8 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 26 cap: BUTTCAP } lines { - width: 13.2 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1008 + width: 8 + color: 0xFFFFFF + priority: 1026 } path_text { primary { @@ -12902,12 +10875,23 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { - width: 10.8 + width: 16 color: 0xFFFFFF - priority: 1000 + priority: 4 + cap: BUTTCAP + } + lines { + width: 18 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -12915,6 +10899,11 @@ cont { name: "highway-road" element { scale: 14 + lines { + width: 3.5 + color: 0xD0D0D0 + priority: 1000 + } path_text { primary { height: 12 @@ -12923,14 +10912,14 @@ cont { } priority: 16000 } - lines { - width: 3.5 - color: 0xD0D0D0 - priority: 1173 - } } element { scale: 15 + lines { + width: 7 + color: 0xD0D0D0 + priority: 1000 + } path_text { primary { height: 12 @@ -12939,14 +10928,14 @@ cont { } priority: 16000 } - lines { - width: 7 - color: 0xD0D0D0 - priority: 1279 - } } element { scale: 16 + lines { + width: 9 + color: 0xD0D0D0 + priority: 1000 + } path_text { primary { height: 12 @@ -12955,14 +10944,14 @@ cont { } priority: 16000 } - lines { - width: 9 - color: 0xD0D0D0 - priority: 1495 - } } element { scale: 17 + lines { + width: 10 + color: 0xD0D0D0 + priority: 1000 + } path_text { primary { height: 12 @@ -12971,17 +10960,17 @@ cont { } priority: 16000 } - lines { - width: 10 - color: 0xD0D0D0 - priority: 1525 - } } } cont { name: "highway-road-bridge" element { scale: 14 + lines { + width: 3.5 + color: 0xD0D0D0 + priority: 1000 + } path_text { primary { height: 12 @@ -12990,14 +10979,14 @@ cont { } priority: 16000 } - lines { - width: 3.5 - color: 0xD0D0D0 - priority: 1173 - } } element { scale: 15 + lines { + width: 7 + color: 0xD0D0D0 + priority: 1000 + } path_text { primary { height: 12 @@ -13006,14 +10995,14 @@ cont { } priority: 16000 } - lines { - width: 7 - color: 0xD0D0D0 - priority: 1279 - } } element { scale: 16 + lines { + width: 9 + color: 0xD0D0D0 + priority: 1000 + } path_text { primary { height: 12 @@ -13025,15 +11014,10 @@ cont { lines { width: 17 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 9 - color: 0xD0D0D0 - priority: 1495 - } - lines { width: 19 color: 0x707070 priority: 0 @@ -13042,6 +11026,11 @@ cont { } element { scale: 17 + lines { + width: 10 + color: 0xD0D0D0 + priority: 1000 + } path_text { primary { height: 12 @@ -13053,15 +11042,10 @@ cont { lines { width: 18 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 10 - color: 0xD0D0D0 - priority: 1525 - } - lines { width: 20 color: 0x707070 priority: 0 @@ -13072,34 +11056,11 @@ cont { cont { name: "highway-road-tunnel" element { - scale: 13 - lines { - width: 3 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1201 - } - lines { - width: 2.75 - color: 0xFFFFFF - priority: 1202 - } - } - element { scale: 14 lines { - width: 4.5 - color: 0x101010 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1276 + width: 3.5 + color: 0xD0D0D0 + priority: 1000 } path_text { primary { @@ -13107,30 +11068,15 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16276 - } - lines { - width: 3.5 - color: 0xD0D0D0 - priority: 1173 - } - lines { - width: 3.5 - color: 0xFFFFFF - priority: 1277 + priority: 16000 } } element { scale: 15 lines { - width: 8.4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1360 + width: 7 + color: 0xD0D0D0 + priority: 1000 } path_text { primary { @@ -13138,30 +11084,15 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16360 - } - lines { - width: 7 - color: 0xD0D0D0 - priority: 1279 - } - lines { - width: 7 - color: 0xFFFFFF - priority: 1361 + priority: 16000 } } element { scale: 16 lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1579 + width: 9 + color: 0xD0D0D0 + priority: 1000 } path_text { primary { @@ -13169,30 +11100,31 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16579 - } - lines { - width: 9 - color: 0xD0D0D0 - priority: 1495 + priority: 16000 } lines { - width: 9 + width: 17 color: 0xFFFFFF - priority: 1580 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 13.2 + width: 19 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1611 + } + } + element { + scale: 17 + lines { + width: 10 + color: 0xD0D0D0 + priority: 1000 } path_text { primary { @@ -13200,17 +11132,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16611 + priority: 16000 } lines { - width: 10 - color: 0xD0D0D0 - priority: 1525 + width: 18 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { - width: 10 - color: 0xFFFFFF - priority: 1612 + width: 20 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -13221,7 +11159,7 @@ cont { lines { width: 0.5 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13229,7 +11167,7 @@ cont { lines { width: 1 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13237,7 +11175,7 @@ cont { lines { width: 2 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13245,13 +11183,13 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 3 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13259,13 +11197,13 @@ cont { lines { width: 6 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 4 color: 0xFFFB80 - priority: 1010 + priority: 1031 } path_text { primary { @@ -13273,29 +11211,29 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } } element { scale: 14 - path_text { - primary { - height: 12 - color: 0x404040 - stroke_color: 0xFFFB80 - } - priority: 16010 - } lines { width: 7 color: 0xC8C860 - priority: 0 + priority: 31 cap: BUTTCAP } lines { width: 5 color: 0xFFFB80 - priority: 1000 + priority: 1031 + } + path_text { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFB80 + } + priority: 16031 } } element { @@ -13303,13 +11241,13 @@ cont { lines { width: 9 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 7 color: 0xFFFB80 - priority: 1010 + priority: 1031 } path_text { primary { @@ -13317,7 +11255,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } } element { @@ -13325,13 +11263,13 @@ cont { lines { width: 15 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 11 color: 0xFFFB80 - priority: 1010 + priority: 1031 } path_text { primary { @@ -13339,7 +11277,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } } element { @@ -13347,13 +11285,13 @@ cont { lines { width: 18 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 14 color: 0xFFFB80 - priority: 1010 + priority: 1031 } path_text { primary { @@ -13361,7 +11299,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } } } @@ -13372,7 +11310,7 @@ cont { lines { width: 0.5 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13380,7 +11318,7 @@ cont { lines { width: 1 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13388,7 +11326,7 @@ cont { lines { width: 2 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13396,13 +11334,13 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 3 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13410,13 +11348,13 @@ cont { lines { width: 6 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 4 color: 0xFFFB80 - priority: 1010 + priority: 1031 } path_text { primary { @@ -13424,29 +11362,29 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } } element { scale: 14 - path_text { - primary { - height: 12 - color: 0x404040 - stroke_color: 0xFFFB80 - } - priority: 16010 - } lines { width: 7 color: 0xC8C860 - priority: 0 + priority: 31 cap: BUTTCAP } lines { width: 5 color: 0xFFFB80 - priority: 1000 + priority: 1031 + } + path_text { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFB80 + } + priority: 16031 } } element { @@ -13454,13 +11392,13 @@ cont { lines { width: 9 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 7 color: 0xFFFB80 - priority: 1010 + priority: 1031 } path_text { primary { @@ -13468,7 +11406,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } } element { @@ -13476,13 +11414,13 @@ cont { lines { width: 15 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 11 color: 0xFFFB80 - priority: 1010 + priority: 1031 } path_text { primary { @@ -13490,12 +11428,12 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } lines { width: 19 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -13510,13 +11448,13 @@ cont { lines { width: 18 color: 0xC8C860 - priority: 10 + priority: 31 cap: BUTTCAP } lines { width: 14 color: 0xFFFB80 - priority: 1010 + priority: 1031 } path_text { primary { @@ -13524,12 +11462,12 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } lines { width: 22 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -13547,7 +11485,7 @@ cont { lines { width: 0.5 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13555,7 +11493,7 @@ cont { lines { width: 1 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13563,7 +11501,7 @@ cont { lines { width: 2 color: 0xFFFB80 - priority: 1010 + priority: 1031 } } element { @@ -13571,50 +11509,27 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 10 - dashdot { - dd: 1.5 - dd: 1.5 - } + priority: 31 cap: BUTTCAP } lines { width: 3 - color: 0x202020 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1010 - } - lines { - width: 2.75 - color: 0xFFFFFF - priority: 1000 + color: 0xFFFB80 + priority: 1031 } } element { scale: 13 lines { - width: 7 + width: 6 color: 0xC8C860 - priority: 10 - dashdot { - dd: 1.85 - dd: 1.85 - } + priority: 31 cap: BUTTCAP } lines { - width: 5 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1010 + width: 4 + color: 0xFFFB80 + priority: 1031 } path_text { primary { @@ -13622,25 +11537,21 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 - } - lines { - width: 4.5 - color: 0xFFFFFF - priority: 1000 + priority: 16031 } } element { scale: 14 lines { width: 7 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } + color: 0xC8C860 + priority: 31 cap: BUTTCAP - priority: 1010 + } + lines { + width: 5 + color: 0xFFFB80 + priority: 1031 } path_text { primary { @@ -13648,23 +11559,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 - } - lines { - width: 7 - color: 0xC8C860 - priority: 0 - cap: BUTTCAP - } - lines { - width: 5 - color: 0xFFFB80 - priority: 1000 - } - lines { - width: 6 - color: 0xFFFFFF - priority: 1000 + priority: 16031 } } element { @@ -13672,22 +11567,13 @@ cont { lines { width: 9 color: 0xC8C860 - priority: 10 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 31 cap: BUTTCAP } lines { width: 7 color: 0xFFFB80 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1010 + priority: 1031 } path_text { primary { @@ -13695,35 +11581,21 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 - } - lines { - width: 9 - color: 0xFFFFFF - priority: 1369 + priority: 16031 } } element { scale: 16 lines { - width: 17.6 + width: 15 color: 0xC8C860 - priority: 10 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 31 cap: BUTTCAP } lines { - width: 13.6 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1010 + width: 11 + color: 0xFFFB80 + priority: 1031 } path_text { primary { @@ -13731,12 +11603,23 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } lines { - width: 12 + width: 19 color: 0xFFFFFF - priority: 1588 + priority: 4 + cap: BUTTCAP + } + lines { + width: 21 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { @@ -13744,22 +11627,13 @@ cont { lines { width: 18 color: 0xC8C860 - priority: 10 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 31 cap: BUTTCAP } lines { width: 14 color: 0xFFFB80 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1010 + priority: 1031 } path_text { primary { @@ -13767,12 +11641,23 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16010 + priority: 16031 } lines { - width: 12 + width: 22 color: 0xFFFFFF - priority: 1000 + priority: 4 + cap: BUTTCAP + } + lines { + width: 24 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -13780,18 +11665,18 @@ cont { name: "highway-secondary_link" element { scale: 14 + lines { + width: 4.5 + color: 0xFFFB80 + priority: 1031 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 4.5 - color: 0xFFFB80 - priority: 1000 + priority: 16031 } } element { @@ -13799,7 +11684,7 @@ cont { lines { width: 9 color: 0xFFFB80 - priority: 1000 + priority: 1031 } path_text { primary { @@ -13807,7 +11692,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16031 } } element { @@ -13815,7 +11700,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1000 + priority: 1031 } path_text { primary { @@ -13823,7 +11708,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16031 } } element { @@ -13831,7 +11716,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1000 + priority: 1031 } path_text { primary { @@ -13839,7 +11724,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16031 } } } @@ -13847,18 +11732,18 @@ cont { name: "highway-secondary_link-bridge" element { scale: 14 + lines { + width: 4.5 + color: 0xFFFB80 + priority: 1031 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 4.5 - color: 0xFFFB80 - priority: 1000 + priority: 16031 } } element { @@ -13866,7 +11751,7 @@ cont { lines { width: 9 color: 0xFFFB80 - priority: 1000 + priority: 1031 } path_text { primary { @@ -13874,7 +11759,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16031 } } element { @@ -13882,7 +11767,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1000 + priority: 1031 } path_text { primary { @@ -13890,12 +11775,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16031 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -13910,7 +11795,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1000 + priority: 1031 } path_text { primary { @@ -13918,12 +11803,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16031 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -13937,52 +11822,11 @@ cont { cont { name: "highway-secondary_link-tunnel" element { - scale: 12 - lines { - width: 1.75 - color: 0x202020 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1000 - } - lines { - width: 1.69 - color: 0xFFFFFF - priority: 1000 - } - } - element { - scale: 13 - lines { - width: 3 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1000 - } - lines { - width: 2.75 - color: 0xFFFFFF - priority: 1000 - } - } - element { scale: 14 lines { - width: 5.5 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1000 + width: 4.5 + color: 0xFFFB80 + priority: 1031 } path_text { primary { @@ -13990,17 +11834,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 4.5 - color: 0xFFFB80 - priority: 1000 - } - lines { - width: 4.5 - color: 0xFFFFFF - priority: 1000 + priority: 16031 } } element { @@ -14008,12 +11842,7 @@ cont { lines { width: 9 color: 0xFFFB80 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1365 + priority: 1031 } path_text { primary { @@ -14021,12 +11850,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16365 - } - lines { - width: 9 - color: 0xFFFFFF - priority: 1000 + priority: 16031 } } element { @@ -14034,12 +11858,7 @@ cont { lines { width: 12 color: 0xFFFB80 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1000 + priority: 1031 } path_text { primary { @@ -14047,25 +11866,31 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16031 } lines { - width: 12 + width: 20 color: 0xFFFFFF - priority: 1586 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 14.4 + width: 22 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1617 + } + } + element { + scale: 17 + lines { + width: 12 + color: 0xFFFB80 + priority: 1031 } path_text { primary { @@ -14073,12 +11898,23 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16617 + priority: 16031 } lines { - width: 12 + width: 20 color: 0xFFFFFF - priority: 1000 + priority: 4 + cap: BUTTCAP + } + lines { + width: 22 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -14089,7 +11925,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1008 + priority: 1026 } } element { @@ -14097,7 +11933,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14105,7 +11941,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { @@ -14113,7 +11949,7 @@ cont { lines { width: 7 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14121,7 +11957,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } } @@ -14131,7 +11967,7 @@ cont { scale: 15 area { color: 0xFDFDFD - priority: 1009 + priority: 1027 } } element { @@ -14142,11 +11978,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { @@ -14157,11 +11993,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } } @@ -14172,7 +12008,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1008 + priority: 1026 } } element { @@ -14180,7 +12016,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14188,12 +12024,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 13 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -14208,7 +12044,7 @@ cont { lines { width: 7 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14216,12 +12052,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 15 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -14239,7 +12075,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1008 + priority: 1026 } } element { @@ -14247,7 +12083,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14255,21 +12091,21 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { scale: 17 lines { - width: 7.8 + width: 8 color: 0x707070 - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 7 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14277,7 +12113,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } } @@ -14287,7 +12123,7 @@ cont { scale: 15 area { color: 0xFDFDFD - priority: 1009 + priority: 1027 } } element { @@ -14298,11 +12134,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { @@ -14313,11 +12149,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } } @@ -14328,7 +12164,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1008 + priority: 1026 } } element { @@ -14336,7 +12172,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14344,12 +12180,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 13 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -14362,15 +12198,15 @@ cont { element { scale: 17 lines { - width: 7.8 + width: 8 color: 0x707070 - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 7 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14378,12 +12214,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 15 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -14397,85 +12233,11 @@ cont { cont { name: "highway-service-driveway-tunnel" element { - scale: 12 - lines { - width: 1 - color: 0xE6E6E6 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 0.7 - color: 0xFFFFFF - dashdot { - dd: 4.5 - dd: 2.25 - } - cap: BUTTCAP - priority: 1172 - } - } - element { - scale: 13 - lines { - width: 1.2 - color: 0xE6E6E6 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 0.9 - color: 0xFFFFFF - dashdot { - dd: 4.5 - dd: 2.25 - } - cap: BUTTCAP - priority: 1183 - } - } - element { - scale: 14 - lines { - width: 2 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 1.8 - color: 0xFFFFFF - priority: 1261 - } - } - element { scale: 15 lines { - width: 4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 3.2 - color: 0xFFFFFF - priority: 1354 + width: 3 + color: 0xFDFDFD + priority: 1026 } } element { @@ -14483,12 +12245,7 @@ cont { lines { width: 5 color: 0xFFFFFF - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1008 + priority: 1026 } path_text { primary { @@ -14496,35 +12253,37 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { - width: 6.4 + width: 13 color: 0xFFFFFF - priority: 1571 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 5.6 + width: 15 color: 0x707070 - priority: 8 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP } + } + element { + scale: 17 lines { - width: 4.8 + width: 8 color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 26 cap: BUTTCAP - priority: 1008 + } + lines { + width: 7 + color: 0xFFFFFF + priority: 1026 } path_text { primary { @@ -14532,17 +12291,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { - width: 6.8 + width: 15 color: 0xFFFFFF - priority: 1597 + priority: 4 + cap: BUTTCAP } lines { - width: 4 - color: 0xFFFFFF - priority: 1594 + width: 17 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -14553,7 +12318,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1008 + priority: 1026 } } element { @@ -14561,7 +12326,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14569,7 +12334,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { @@ -14577,7 +12342,7 @@ cont { lines { width: 7 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14585,18 +12350,18 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } } cont { - name: "highway-service-parking_aisle-bridge" + name: "highway-service-tunnel" element { scale: 15 lines { width: 3 color: 0xFDFDFD - priority: 1008 + priority: 1026 } } element { @@ -14604,7 +12369,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14612,18 +12377,22 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 13 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 15 color: 0x707070 priority: 0 + dashdot { + dd: 5 + dd: 5 + } cap: BUTTCAP } } @@ -14632,7 +12401,7 @@ cont { lines { width: 7 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -14640,303 +12409,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 15 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 17 color: 0x707070 priority: 0 - cap: BUTTCAP - } - } -} -cont { - name: "highway-service-parking_aisle-tunnel" - element { - scale: 12 - lines { - width: 1 - color: 0xE6E6E6 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 0.7 - color: 0xFFFFFF - dashdot { - dd: 4.5 - dd: 2.25 - } - cap: BUTTCAP - priority: 1172 - } - } - element { - scale: 13 - lines { - width: 1.2 - color: 0xE6E6E6 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 0.9 - color: 0xFFFFFF - dashdot { - dd: 4.5 - dd: 2.25 - } - cap: BUTTCAP - priority: 1183 - } - } - element { - scale: 14 - lines { - width: 2 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 1.8 - color: 0xFFFFFF - priority: 1261 - } - } - element { - scale: 15 - lines { - width: 4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 3.2 - color: 0xFFFFFF - priority: 1354 - } - } - element { - scale: 16 - lines { - width: 2.4 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1008 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16008 - } - lines { - width: 6.4 - color: 0xFFFFFF - priority: 1571 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1568 - } - } - element { - scale: 17 - lines { - width: 7 - color: 0xFFFFFF - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1008 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16008 - } - lines { - width: 6.8 - color: 0xFFFFFF - priority: 1597 - } - lines { - width: 4 - color: 0xFFFFFF - priority: 1592 - } - } -} -cont { - name: "highway-service-tunnel" - element { - scale: 12 - lines { - width: 1 - color: 0xE6E6E6 dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 0.7 - color: 0xFFFFFF - dashdot { - dd: 4.5 - dd: 2.25 - } - cap: BUTTCAP - priority: 1172 - } - } - element { - scale: 13 - lines { - width: 1.2 - color: 0xE6E6E6 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 0.9 - color: 0xFFFFFF - dashdot { - dd: 4.5 - dd: 2.25 - } - cap: BUTTCAP - priority: 1183 - } - } - element { - scale: 14 - lines { - width: 2 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 1.8 - color: 0xFFFFFF - priority: 1261 - } - } - element { - scale: 15 - lines { - width: 4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 3.2 - color: 0xFFFFFF - priority: 1354 - } - } - element { - scale: 16 - lines { - width: 5 - color: 0xFFFFFF - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1008 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16008 - } - lines { - width: 6.4 - color: 0xFFFFFF - priority: 1571 - } - } - element { - scale: 17 - lines { - width: 7 - color: 0xFFFFFF - dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1008 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16008 - } - lines { - width: 6.8 - color: 0xFFFFFF - priority: 1597 } } } @@ -14952,7 +12441,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1007 + priority: 1024 } } element { @@ -14965,7 +12454,7 @@ cont { dd: 0.4 } cap: BUTTCAP - priority: 1007 + priority: 1024 } } element { @@ -14976,7 +12465,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16024 } lines { width: 4 @@ -14986,7 +12475,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1565 + priority: 1726 } } element { @@ -14994,7 +12483,7 @@ cont { lines { width: 6 color: 0xA0A090 - priority: 1007 + priority: 1024 } path_text { primary { @@ -15002,7 +12491,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16024 } lines { width: 4 @@ -15012,7 +12501,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1570 + priority: 1739 } } } @@ -15028,7 +12517,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1007 + priority: 1024 } } element { @@ -15041,7 +12530,7 @@ cont { dd: 0.4 } cap: BUTTCAP - priority: 1007 + priority: 1024 } } element { @@ -15052,12 +12541,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16024 } lines { width: 12 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -15068,7 +12557,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 14 @@ -15082,7 +12571,7 @@ cont { lines { width: 6 color: 0xA0A090 - priority: 1007 + priority: 1024 } path_text { primary { @@ -15090,12 +12579,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16024 } lines { width: 12 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -15106,7 +12595,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1570 + priority: 1739 } lines { width: 14 @@ -15121,68 +12610,44 @@ cont { element { scale: 14 lines { - width: 2 - color: 0xD0CCAC - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1007 - } - lines { width: 1.6 - color: 0xFFFFFF + color: 0xD0CCAC dashdot { dd: 1 dd: 3 } cap: BUTTCAP - priority: 1225 + priority: 1024 } } element { scale: 15 lines { - width: 2.8 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1007 - } - lines { width: 2 - color: 0xFFFFFF + color: 0xD0CCAC dashdot { dd: 1.2 dd: 0.4 } cap: BUTTCAP - priority: 1322 + priority: 1024 } } element { scale: 16 - lines { - width: 4.8 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1007 - } path_text { primary { height: 12 color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16024 + } + lines { + width: 12 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 4 @@ -15192,17 +12657,17 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { - width: 4 - color: 0xFFFFFF + width: 14 + color: 0x707070 + priority: 0 dashdot { - dd: 2.4 - dd: 0.8 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1536 } } element { @@ -15210,12 +12675,7 @@ cont { lines { width: 6 color: 0xA0A090 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1007 + priority: 1024 } path_text { primary { @@ -15223,7 +12683,13 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16007 + priority: 16024 + } + lines { + width: 12 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 4 @@ -15233,17 +12699,17 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1570 + priority: 1739 } lines { - width: 3.6 - color: 0xFFFFFF + width: 14 + color: 0x707070 + priority: 0 dashdot { - dd: 2.4 - dd: 0.8 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1574 } } } @@ -15254,13 +12720,13 @@ cont { lines { width: 2 color: 0xC8C860 - priority: 11 + priority: 29 cap: BUTTCAP } lines { width: 1 color: 0xFFFF90 - priority: 1011 + priority: 1029 } } element { @@ -15268,101 +12734,101 @@ cont { lines { width: 4 color: 0xC8C860 - priority: 11 + priority: 29 cap: BUTTCAP } lines { width: 2 color: 0xFFFF90 - priority: 1011 + priority: 1029 } } element { scale: 14 - path_text { - primary { - height: 12 - color: 0x404040 - stroke_color: 0xFFFF90 - } - priority: 16011 - } lines { width: 5 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFF90 - priority: 1363 + priority: 1029 } - } - element { - scale: 15 path_text { primary { height: 12 color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16011 + priority: 16029 } + } + element { + scale: 15 lines { width: 6 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFF90 - priority: 1363 + priority: 1029 } - } - element { - scale: 16 path_text { primary { height: 12 color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16011 + priority: 16029 } + } + element { + scale: 16 lines { width: 10 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFF90 - priority: 1363 + priority: 1029 } - } - element { - scale: 17 path_text { primary { height: 12 color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16011 + priority: 16029 } + } + element { + scale: 17 lines { width: 16 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 12 color: 0xFFFF90 - priority: 1363 + priority: 1029 + } + path_text { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFF90 + } + priority: 16029 } } } @@ -15373,13 +12839,13 @@ cont { lines { width: 2 color: 0xC8C860 - priority: 11 + priority: 29 cap: BUTTCAP } lines { width: 1 color: 0xFFFF90 - priority: 1011 + priority: 1029 } } element { @@ -15387,85 +12853,85 @@ cont { lines { width: 4 color: 0xC8C860 - priority: 11 + priority: 29 cap: BUTTCAP } lines { width: 2 color: 0xFFFF90 - priority: 1011 + priority: 1029 } } element { scale: 14 - path_text { - primary { - height: 12 - color: 0x404040 - stroke_color: 0xFFFF90 - } - priority: 16011 - } lines { width: 5 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFF90 - priority: 1363 + priority: 1029 } - } - element { - scale: 15 path_text { primary { height: 12 color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16011 + priority: 16029 } + } + element { + scale: 15 lines { width: 6 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFF90 - priority: 1363 + priority: 1029 } - } - element { - scale: 16 path_text { primary { height: 12 color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16011 - } - lines { - width: 14 - color: 0xFFFFFF - priority: 1 - cap: BUTTCAP + priority: 16029 } + } + element { + scale: 16 lines { width: 10 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFF90 - priority: 1363 + priority: 1029 + } + path_text { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFF90 + } + priority: 16029 + } + lines { + width: 14 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 16 @@ -15476,32 +12942,32 @@ cont { } element { scale: 17 + lines { + width: 16 + color: 0xC8C860 + priority: 29 + cap: BUTTCAP + } + lines { + width: 12 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16011 + priority: 16029 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 16 - color: 0xC8C860 - priority: 363 - cap: BUTTCAP - } - lines { - width: 12 - color: 0xFFFF90 - priority: 1363 - } - lines { width: 22 color: 0x707070 priority: 0 @@ -15514,44 +12980,15 @@ cont { element { scale: 12 lines { - width: 1.44 - color: 0xFFFFFF - priority: 1199 - } - lines { width: 2 color: 0xC8C860 - priority: 11 - dashdot { - dd: 1.5 - dd: 1.5 - } + priority: 29 cap: BUTTCAP } lines { width: 1 color: 0xFFFF90 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1011 - } - lines { - width: 0.7 - color: 0xFFFFFF - priority: 1181 - } - lines { - width: 1.62 - color: 0x202020 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1198 + priority: 1029 } } element { @@ -15559,87 +12996,27 @@ cont { lines { width: 4 color: 0xC8C860 - priority: 11 - dashdot { - dd: 1.85 - dd: 1.85 - } + priority: 29 cap: BUTTCAP } lines { width: 2 color: 0xFFFF90 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1011 - } - lines { - width: 2.75 - color: 0xFFFFFF - priority: 1192 - } - lines { - width: 3.12 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1207 + priority: 1029 } } element { scale: 14 lines { - width: 5.5 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1011 - } - path_text { - primary { - height: 12 - color: 0x404040 - stroke_color: 0xFFFF90 - } - priority: 16011 - } - lines { width: 5 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFF90 - priority: 1363 - } - lines { - width: 4.5 - color: 0xFFFFFF - priority: 1281 - } - } - element { - scale: 15 - lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1011 + priority: 1029 } path_text { primary { @@ -15647,36 +13024,21 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16011 + priority: 16029 } + } + element { + scale: 15 lines { width: 6 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFF90 - priority: 1363 - } - lines { - width: 9 - color: 0xFFFFFF - priority: 1363 - } - } - element { - scale: 16 - lines { - width: 13.6 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1011 + priority: 1029 } path_text { primary { @@ -15684,60 +13046,83 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16011 + priority: 16029 } + } + element { + scale: 16 lines { width: 10 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFF90 - priority: 1363 + priority: 1029 + } + path_text { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFF90 + } + priority: 16029 } lines { - width: 12 + width: 14 color: 0xFFFFFF - priority: 1584 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 14.4 + width: 16 color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1011 - } - path_text { - primary { - height: 12 - color: 0x404040 - stroke_color: 0xFFFF90 - } - priority: 16011 } + } + element { + scale: 17 lines { width: 16 color: 0xC8C860 - priority: 363 + priority: 29 cap: BUTTCAP } lines { width: 12 color: 0xFFFF90 - priority: 1363 + priority: 1029 + } + path_text { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFF90 + } + priority: 16029 } lines { - width: 12 + width: 20 color: 0xFFFFFF - priority: 1615 + priority: 4 + cap: BUTTCAP + } + lines { + width: 22 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -15748,7 +13133,7 @@ cont { lines { width: 1.44 color: 0xFFFF90 - priority: 1000 + priority: 1029 } } element { @@ -15756,7 +13141,7 @@ cont { lines { width: 2.75 color: 0xFFFF90 - priority: 1127 + priority: 1029 } } element { @@ -15764,55 +13149,55 @@ cont { lines { width: 4.5 color: 0xFFFF90 - priority: 1178 + priority: 1029 } } element { scale: 15 + lines { + width: 9 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 9 - color: 0xFFFF90 - priority: 1280 + priority: 16029 } } element { scale: 16 + lines { + width: 12 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16029 } + } + element { + scale: 17 lines { width: 12 color: 0xFFFF90 - priority: 1499 + priority: 1029 } - } - element { - scale: 17 path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 12 - color: 0xFFFF90 - priority: 1528 + priority: 16029 } } } @@ -15823,7 +13208,7 @@ cont { lines { width: 1.44 color: 0xFFFF90 - priority: 1000 + priority: 1029 } } element { @@ -15831,7 +13216,7 @@ cont { lines { width: 2.75 color: 0xFFFF90 - priority: 1127 + priority: 1029 } } element { @@ -15839,47 +13224,47 @@ cont { lines { width: 4.5 color: 0xFFFF90 - priority: 1178 + priority: 1029 } } element { scale: 15 + lines { + width: 9 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 9 - color: 0xFFFF90 - priority: 1280 + priority: 16029 } } element { scale: 16 + lines { + width: 12 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16029 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 12 - color: 0xFFFF90 - priority: 1499 - } - lines { width: 22 color: 0x707070 priority: 0 @@ -15888,26 +13273,26 @@ cont { } element { scale: 17 + lines { + width: 12 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16029 } lines { width: 20 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 12 - color: 0xFFFF90 - priority: 1528 - } - lines { width: 22 color: 0x707070 priority: 0 @@ -15922,7 +13307,7 @@ cont { lines { width: 1.44 color: 0xFFFF90 - priority: 1000 + priority: 1029 } } element { @@ -15930,7 +13315,7 @@ cont { lines { width: 2.75 color: 0xFFFF90 - priority: 1127 + priority: 1029 } } element { @@ -15938,55 +13323,87 @@ cont { lines { width: 4.5 color: 0xFFFF90 - priority: 1178 + priority: 1029 } } element { scale: 15 + lines { + width: 9 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 - } - lines { - width: 9 - color: 0xFFFF90 - priority: 1280 + priority: 16029 } } element { scale: 16 + lines { + width: 12 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16029 } lines { - width: 12 - color: 0xFFFF90 - priority: 1499 + width: 20 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { + width: 22 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { scale: 17 + lines { + width: 12 + color: 0xFFFF90 + priority: 1029 + } path_text { primary { height: 12 color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16029 } lines { - width: 12 - color: 0xFFFF90 - priority: 1528 + width: 20 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { + width: 22 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -16002,7 +13419,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { @@ -16015,7 +13432,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1162 + priority: 1021 } } element { @@ -16023,7 +13440,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1272 + priority: 1021 } } element { @@ -16031,7 +13448,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1000 + priority: 1021 } path_text { primary { @@ -16039,7 +13456,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } } element { @@ -16047,7 +13464,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1000 + priority: 1021 } path_text { primary { @@ -16055,7 +13472,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } } } @@ -16065,21 +13482,21 @@ cont { scale: 13 area { color: 0xD79331 - priority: 1113 + priority: 1022 } } element { scale: 14 area { color: 0xD79331 - priority: 1163 + priority: 1022 } } element { scale: 15 area { color: 0xC0A87C - priority: 1273 + priority: 1022 } } element { @@ -16090,11 +13507,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } area { color: 0xC0A87C - priority: 1001 + priority: 1022 } } element { @@ -16105,11 +13522,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } area { color: 0xC0A87C - priority: 1001 + priority: 1022 } } } @@ -16125,7 +13542,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { @@ -16138,7 +13555,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1162 + priority: 1021 } } element { @@ -16146,7 +13563,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1272 + priority: 1021 } } element { @@ -16154,7 +13571,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1000 + priority: 1021 } path_text { primary { @@ -16162,12 +13579,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } lines { width: 12 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -16182,7 +13599,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1000 + priority: 1021 } path_text { primary { @@ -16190,12 +13607,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } lines { width: 14 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -16207,82 +13624,13 @@ cont { } } cont { - name: "highway-track-destination" - element { - scale: 13 - lines { - width: 1 - color: 0xccD79331 - dashdot { - dd: 6 - dd: 2.25 - } - cap: BUTTCAP - priority: 1112 - } - } - element { - scale: 14 - lines { - width: 1 - color: 0xccD79331 - dashdot { - dd: 8 - dd: 3 - } - cap: BUTTCAP - priority: 1162 - } - } - element { - scale: 15 - lines { - width: 2 - color: 0xccC0A87C - priority: 1272 - } - } - element { - scale: 16 - lines { - width: 4 - color: 0xccC0A87C - priority: 1000 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - } - element { - scale: 17 - lines { - width: 6 - color: 0xccC0A87C - priority: 1000 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - } -} -cont { name: "highway-track-grade1" element { scale: 12 lines { width: 1 color: 0xD79331 - priority: 1000 + priority: 1021 } } element { @@ -16295,7 +13643,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { @@ -16308,7 +13656,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1163 + priority: 1021 } } element { @@ -16316,7 +13664,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1272 + priority: 1021 } } element { @@ -16324,7 +13672,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1486 + priority: 1021 } path_text { primary { @@ -16332,7 +13680,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16486 + priority: 16021 } } element { @@ -16340,7 +13688,7 @@ cont { lines { width: 4 color: 0xD79331 - priority: 1514 + priority: 1021 } path_text { primary { @@ -16348,7 +13696,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16514 + priority: 16021 } } } @@ -16364,7 +13712,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1104 + priority: 1021 } } element { @@ -16377,7 +13725,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { @@ -16390,7 +13738,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1162 + priority: 1021 } } element { @@ -16398,7 +13746,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1268 + priority: 1021 } } element { @@ -16406,7 +13754,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1487 + priority: 1021 } path_text { primary { @@ -16414,7 +13762,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16487 + priority: 16021 } } element { @@ -16422,7 +13770,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1515 + priority: 1021 } path_text { primary { @@ -16430,7 +13778,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16515 + priority: 16021 } } } @@ -16446,7 +13794,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1000 + priority: 1021 } } element { @@ -16459,7 +13807,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { @@ -16472,7 +13820,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1165 + priority: 1021 } } element { @@ -16480,7 +13828,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1272 + priority: 1021 } } element { @@ -16488,7 +13836,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1488 + priority: 1021 } path_text { primary { @@ -16496,7 +13844,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16488 + priority: 16021 } } element { @@ -16504,89 +13852,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1516 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16516 - } - } -} -cont { - name: "highway-track-grade3-destination" - element { - scale: 12 - lines { - width: 0.7 - color: 0xccD79331 - dashdot { - dd: 2.25 - dd: 3 - } - cap: BUTTCAP - priority: 1000 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0xccD79331 - dashdot { - dd: 6 - dd: 2.25 - } - cap: BUTTCAP - priority: 1112 - } - } - element { - scale: 14 - lines { - width: 1 - color: 0xccD79331 - dashdot { - dd: 3 - dd: 4 - } - cap: BUTTCAP - priority: 1165 - } - } - element { - scale: 15 - lines { - width: 2 - color: 0xccC0A87C - priority: 1272 - } - } - element { - scale: 16 - lines { - width: 4 - color: 0xccC0A87C - priority: 1488 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16488 - } - } - element { - scale: 17 - lines { - width: 6 - color: 0xccC0A87C - priority: 1516 + priority: 1021 } path_text { primary { @@ -16594,7 +13860,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16516 + priority: 16021 } } } @@ -16604,55 +13870,55 @@ cont { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 2.25 dd: 3 } cap: BUTTCAP - priority: 1000 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 3 dd: 4 } cap: BUTTCAP - priority: 1165 + priority: 1021 } } element { scale: 15 lines { width: 2 - color: 0xccC0A87C - priority: 1272 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1488 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -16660,15 +13926,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16488 + priority: 16021 } } element { scale: 17 lines { width: 6 - color: 0xccC0A87C - priority: 1516 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -16676,7 +13942,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16516 + priority: 16021 } } } @@ -16686,55 +13952,55 @@ cont { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 2.25 dd: 3 } cap: BUTTCAP - priority: 1000 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 3 dd: 4 } cap: BUTTCAP - priority: 1165 + priority: 1021 } } element { scale: 15 lines { width: 2 - color: 0xccC0A87C - priority: 1272 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1488 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -16742,15 +14008,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16488 + priority: 16021 } } element { scale: 17 lines { width: 6 - color: 0xccC0A87C - priority: 1516 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -16758,7 +14024,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16516 + priority: 16021 } } } @@ -16768,55 +14034,55 @@ cont { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 2.25 dd: 3 } cap: BUTTCAP - priority: 1000 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 3 dd: 4 } cap: BUTTCAP - priority: 1165 + priority: 1021 } } element { scale: 15 lines { width: 2 - color: 0xccC0A87C - priority: 1272 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1488 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -16824,15 +14090,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16488 + priority: 16021 } } element { scale: 17 lines { width: 6 - color: 0xccC0A87C - priority: 1516 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -16840,7 +14106,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16516 + priority: 16021 } } } @@ -16858,7 +14124,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { @@ -16871,7 +14137,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { @@ -16886,7 +14152,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1377 + priority: 1021 } } element { @@ -16894,7 +14160,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1270 + priority: 1021 } } element { @@ -16902,7 +14168,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1489 + priority: 1021 } path_text { primary { @@ -16910,7 +14176,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16489 + priority: 16021 } } element { @@ -16918,93 +14184,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1517 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16517 - } - } -} -cont { - name: "highway-track-grade4-destination" - element { - scale: 12 - lines { - width: 0.7 - color: 0xccD79331 - dashdot { - dd: 2.25 - dd: 2.25 - dd: 0.75 - dd: 2.25 - } - cap: BUTTCAP - priority: 1106 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0xccD79331 - dashdot { - dd: 6 - dd: 2.25 - } - cap: BUTTCAP - priority: 1112 - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 0xccD79331 - dashdot { - dd: 3 - dd: 3 - dd: 1 - dd: 3 - } - cap: BUTTCAP - priority: 1377 - } - } - element { - scale: 15 - lines { - width: 2.8 - color: 0xccC0A87C - priority: 1270 - } - } - element { - scale: 16 - lines { - width: 4 - color: 0xccC0A87C - priority: 1489 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16489 - } - } - element { - scale: 17 - lines { - width: 6 - color: 0xccC0A87C - priority: 1517 + priority: 1021 } path_text { primary { @@ -17012,7 +14192,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16517 + priority: 16021 } } } @@ -17022,7 +14202,7 @@ cont { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 2.25 dd: 2.25 @@ -17030,27 +14210,27 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1.6 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 3 dd: 3 @@ -17058,23 +14238,23 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1377 + priority: 1021 } } element { scale: 15 lines { width: 2.8 - color: 0xccC0A87C - priority: 1270 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1489 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17082,15 +14262,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16489 + priority: 16021 } } element { scale: 17 lines { width: 6 - color: 0xccC0A87C - priority: 1517 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17098,7 +14278,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16517 + priority: 16021 } } } @@ -17108,7 +14288,7 @@ cont { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 2.25 dd: 2.25 @@ -17116,27 +14296,27 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1.6 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 3 dd: 3 @@ -17144,23 +14324,23 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1377 + priority: 1021 } } element { scale: 15 lines { width: 2.8 - color: 0xccC0A87C - priority: 1270 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1489 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17168,15 +14348,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16489 + priority: 16021 } } element { scale: 17 lines { width: 6 - color: 0xccC0A87C - priority: 1517 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17184,7 +14364,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16517 + priority: 16021 } } } @@ -17194,7 +14374,7 @@ cont { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 2.25 dd: 2.25 @@ -17202,27 +14382,27 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1106 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1.6 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 3 dd: 3 @@ -17230,23 +14410,23 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1377 + priority: 1021 } } element { scale: 15 lines { width: 2.8 - color: 0xccC0A87C - priority: 1270 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1489 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17254,15 +14434,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16489 + priority: 16021 } } element { scale: 17 lines { width: 6 - color: 0xccC0A87C - priority: 1517 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17270,7 +14450,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16517 + priority: 16021 } } } @@ -17286,7 +14466,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1000 + priority: 1021 } } element { @@ -17299,7 +14479,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { @@ -17312,7 +14492,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1166 + priority: 1021 } } element { @@ -17320,7 +14500,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1271 + priority: 1021 } } element { @@ -17328,7 +14508,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1490 + priority: 1021 } path_text { primary { @@ -17336,7 +14516,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16490 + priority: 16021 } } element { @@ -17344,7 +14524,7 @@ cont { lines { width: 5.6 color: 0xC0A87C - priority: 1518 + priority: 1021 } path_text { primary { @@ -17352,65 +14532,65 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16518 + priority: 16021 } } } cont { - name: "highway-track-grade5-destination" + name: "highway-track-grade5-no-access" element { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 0.75 dd: 2.25 } cap: BUTTCAP - priority: 1000 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1.6 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 1 dd: 3 } cap: BUTTCAP - priority: 1166 + priority: 1021 } } element { scale: 15 lines { width: 2.8 - color: 0xccC0A87C - priority: 1271 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1490 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17418,15 +14598,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16490 + priority: 16021 } } element { scale: 17 lines { width: 5.6 - color: 0xccC0A87C - priority: 1518 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17434,65 +14614,65 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16518 + priority: 16021 } } } cont { - name: "highway-track-grade5-no-access" + name: "highway-track-grade5-permissive" element { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 0.75 dd: 2.25 } cap: BUTTCAP - priority: 1000 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1.6 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 1 dd: 3 } cap: BUTTCAP - priority: 1166 + priority: 1021 } } element { scale: 15 lines { width: 2.8 - color: 0xccC0A87C - priority: 1271 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1490 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17500,15 +14680,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16490 + priority: 16021 } } element { scale: 17 lines { width: 5.6 - color: 0xccC0A87C - priority: 1518 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17516,65 +14696,65 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16518 + priority: 16021 } } } cont { - name: "highway-track-grade5-permissive" + name: "highway-track-grade5-private" element { scale: 12 lines { width: 0.7 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 0.75 dd: 2.25 } cap: BUTTCAP - priority: 1000 + priority: 1021 } } element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1.6 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 1 dd: 3 } cap: BUTTCAP - priority: 1166 + priority: 1021 } } element { scale: 15 lines { width: 2.8 - color: 0xccC0A87C - priority: 1271 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1490 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17582,15 +14762,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16490 + priority: 16021 } } element { scale: 17 lines { width: 5.6 - color: 0xccC0A87C - priority: 1518 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17598,65 +14778,52 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16518 + priority: 16021 } } } cont { - name: "highway-track-grade5-private" - element { - scale: 12 - lines { - width: 0.7 - color: 0xccD79331 - dashdot { - dd: 0.75 - dd: 2.25 - } - cap: BUTTCAP - priority: 1000 - } - } + name: "highway-track-no-access" element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { - width: 1.6 - color: 0xccD79331 + width: 1 + color: 0xD79331 dashdot { - dd: 1 + dd: 8 dd: 3 } cap: BUTTCAP - priority: 1166 + priority: 1021 } } element { scale: 15 lines { - width: 2.8 - color: 0xccC0A87C - priority: 1271 + width: 2 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1490 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17664,15 +14831,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16490 + priority: 16021 } } element { scale: 17 lines { - width: 5.6 - color: 0xccC0A87C - priority: 1518 + width: 6 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17680,52 +14847,52 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16518 + priority: 16021 } } } cont { - name: "highway-track-no-access" + name: "highway-track-permissive" element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 8 dd: 3 } cap: BUTTCAP - priority: 1162 + priority: 1021 } } element { scale: 15 lines { width: 2 - color: 0xccC0A87C - priority: 1272 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1000 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17733,15 +14900,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } } element { scale: 17 lines { width: 6 - color: 0xccC0A87C - priority: 1000 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17749,52 +14916,52 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } } } cont { - name: "highway-track-permissive" + name: "highway-track-private" element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 8 dd: 3 } cap: BUTTCAP - priority: 1162 + priority: 1021 } } element { scale: 15 lines { width: 2 - color: 0xccC0A87C - priority: 1272 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1000 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17802,15 +14969,15 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } } element { scale: 17 lines { width: 6 - color: 0xccC0A87C - priority: 1000 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17818,68 +14985,52 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 16021 } } } cont { - name: "highway-track-private" + name: "highway-track-tunnel" element { scale: 13 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 6 dd: 2.25 } cap: BUTTCAP - priority: 1112 + priority: 1021 } } element { scale: 14 lines { width: 1 - color: 0xccD79331 + color: 0xD79331 dashdot { dd: 8 dd: 3 } cap: BUTTCAP - priority: 1162 + priority: 1021 } } element { scale: 15 lines { width: 2 - color: 0xccC0A87C - priority: 1272 + color: 0xC0A87C + priority: 1021 } } element { scale: 16 lines { width: 4 - color: 0xccC0A87C - priority: 1000 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16000 - } - } - element { - scale: 17 - lines { - width: 6 - color: 0xccC0A87C - priority: 1000 + color: 0xC0A87C + priority: 1021 } path_text { primary { @@ -17887,277 +15038,31 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16000 - } - } -} -cont { - name: "highway-track-race" - element { - scale: 12 - lines { - width: 0.38 - color: 0xE8E4D4 - priority: 1094 + priority: 16021 } - } - element { - scale: 13 - lines { - width: 0.75 - color: 0xE8E4D4 - priority: 1103 - } - } - element { - scale: 14 - lines { - width: 3 - color: 0xE8E4D4 - priority: 1153 - } - } - element { - scale: 15 - lines { - width: 3.4 - color: 0xFFFFFF - priority: 1099 - } - lines { - width: 3.4 - color: 0xFF0000 - dashdot { - dd: 0.4 - dd: 0.4 - } - cap: BUTTCAP - priority: 1100 - } - } - element { - scale: 16 lines { width: 12 - color: 0xE8E4D4 - priority: 1475 - } - lines { - width: 6.8 - color: 0xFF0000 - dashdot { - dd: 0.8 - dd: 0.8 - } - cap: BUTTCAP - priority: 1365 - } - lines { - width: 6 - color: 0xE8E4D4 - priority: 1485 - } - } - element { - scale: 17 - lines { - width: 12 - color: 0xE8E4D4 - priority: 1503 - } - lines { - width: 13.6 - color: 0xFF0000 - dashdot { - dd: 1.6 - dd: 1.6 - } - cap: BUTTCAP - priority: 1379 - } - lines { - width: 12 - color: 0xE8E4D4 - priority: 1513 - } - } -} -cont { - name: "highway-track-racetrack" - element { - scale: 12 - lines { - width: 0.38 - color: 0xE8E4D4 - priority: 1094 - } - } - element { - scale: 13 - lines { - width: 0.75 - color: 0xE8E4D4 - priority: 1103 - } - } - element { - scale: 14 - lines { - width: 3 - color: 0xE8E4D4 - priority: 1153 - } - } - element { - scale: 15 - lines { - width: 3.4 color: 0xFFFFFF - priority: 1099 - } - lines { - width: 3.4 - color: 0xFF0000 - dashdot { - dd: 0.4 - dd: 0.4 - } + priority: 4 cap: BUTTCAP - priority: 1100 - } - } - element { - scale: 16 - lines { - width: 12 - color: 0xE8E4D4 - priority: 1475 } lines { - width: 6.8 - color: 0xFF0000 + width: 14 + color: 0x707070 + priority: 0 dashdot { - dd: 0.8 - dd: 0.8 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1365 - } - lines { - width: 6 - color: 0xE8E4D4 - priority: 1485 } } element { scale: 17 lines { - width: 12 - color: 0xE8E4D4 - priority: 1503 - } - lines { - width: 13.6 - color: 0xFF0000 - dashdot { - dd: 1.6 - dd: 1.6 - } - cap: BUTTCAP - priority: 1379 - } - lines { - width: 12 - color: 0xE8E4D4 - priority: 1513 - } - } -} -cont { - name: "highway-track-tunnel" - element { - scale: 12 - lines { - width: 1 - color: 0x40FFF2DE - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1377 - } - lines { - width: 0.7 - color: 0xFFFFFF - priority: 1166 - } - } - element { - scale: 13 - lines { - width: 1 - color: 0x40D79331 - dashdot { - dd: 6 - dd: 2.25 - } - cap: BUTTCAP - priority: 1112 - } - lines { - width: 0.9 - color: 0xFFFFFF - priority: 1177 - } - } - element { - scale: 14 - lines { - width: 2 - color: 0x40FFF2DE - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1254 - } - lines { - width: 1.6 - color: 0xFFFFFF - priority: 1255 - } - } - element { - scale: 15 - lines { - width: 4 - color: 0xD79331 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1348 - } - lines { - width: 2.8 - color: 0xFFFFFF - priority: 1349 - } - } - element { - scale: 16 - lines { - width: 4 + width: 6 color: 0xC0A87C - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1561 + priority: 1021 } path_text { primary { @@ -18165,38 +15070,23 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16561 + priority: 16021 } lines { - width: 5.6 + width: 14 color: 0xFFFFFF - priority: 1562 + priority: 4 + cap: BUTTCAP } - } - element { - scale: 17 lines { - width: 8 - color: 0xD79331 + width: 16 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1589 - } - path_text { - primary { - height: 12 - color: 0x606060 - stroke_color: 0xFFFFFF - } - priority: 16589 - } - lines { - width: 5.6 - color: 0xFFFFFF - priority: 1590 } } } @@ -18208,7 +15098,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18217,7 +15107,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18226,7 +15116,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18235,7 +15125,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18244,7 +15134,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18252,13 +15142,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 13 + priority: 39 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1013 + priority: 1039 } path_text { primary { @@ -18266,117 +15156,117 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } } element { scale: 13 - path_text { - primary { - height: 12 - color: 0x303030 - stroke_color: 0xFFC444 - } - priority: 16013 - } lines { width: 7 color: 0xD8A050 - priority: 0 + priority: 39 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1000 + priority: 1039 } - } - element { - scale: 14 path_text { primary { - height: 14 + height: 12 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } + } + element { + scale: 14 lines { width: 9 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1386 + priority: 1039 } - } - element { - scale: 15 path_text { primary { - height: 16 + height: 14 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } + } + element { + scale: 15 lines { width: 12 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1386 + priority: 1039 } - } - element { - scale: 16 path_text { primary { - height: 17 - color: 0x404040 + height: 16 + color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } + } + element { + scale: 16 lines { width: 18 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1386 + priority: 1039 } - } - element { - scale: 17 path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } + } + element { + scale: 17 lines { width: 20 color: 0xD8A050 - priority: 0 + priority: 39 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1000 + priority: 1039 + } + path_text { + primary { + height: 17 + color: 0x404040 + stroke_color: 0xFFC444 + } + priority: 16039 } } } @@ -18388,7 +15278,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18397,7 +15287,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18406,7 +15296,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18415,7 +15305,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18424,7 +15314,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18432,13 +15322,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 13 + priority: 39 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1013 + priority: 1039 } path_text { primary { @@ -18446,103 +15336,103 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } } element { scale: 13 - path_text { - primary { - height: 12 - color: 0x303030 - stroke_color: 0xFFC444 - } - priority: 16013 - } lines { width: 7 color: 0xD8A050 - priority: 0 + priority: 39 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1000 + priority: 1039 } - } - element { - scale: 14 path_text { primary { - height: 14 + height: 12 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } + } + element { + scale: 14 lines { width: 9 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1386 + priority: 1039 } - } - element { - scale: 15 path_text { primary { - height: 16 + height: 14 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } + } + element { + scale: 15 lines { width: 12 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1386 + priority: 1039 + } + path_text { + primary { + height: 16 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 16039 } } element { scale: 16 + lines { + width: 18 + color: 0xD8A050 + priority: 39 + cap: BUTTCAP + } + lines { + width: 14 + color: 0xFFC444 + priority: 1039 + } path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } lines { width: 22 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 18 - color: 0xD8A050 - priority: 386 - cap: BUTTCAP - } - lines { - width: 14 - color: 0xFFC444 - priority: 1386 - } - lines { width: 24 color: 0x707070 priority: 0 @@ -18551,32 +15441,32 @@ cont { } element { scale: 17 + lines { + width: 20 + color: 0xD8A050 + priority: 39 + cap: BUTTCAP + } + lines { + width: 16 + color: 0xFFC444 + priority: 1039 + } path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } lines { width: 24 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 20 - color: 0xD8A050 - priority: 0 - cap: BUTTCAP - } - lines { - width: 16 - color: 0xFFC444 - priority: 1000 - } - lines { width: 26 color: 0x707070 priority: 0 @@ -18592,7 +15482,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18601,7 +15491,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18610,7 +15500,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18619,7 +15509,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { @@ -18628,30 +15518,21 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1013 + priority: 1039 } } element { scale: 12 lines { - width: 6.5 + width: 5 color: 0xD8A050 - priority: 13 - dashdot { - dd: 1.5 - dd: 1.5 - } + priority: 39 cap: BUTTCAP } lines { - width: 4.5 - color: 0x202020 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1013 + width: 3 + color: 0xFFC444 + priority: 1039 } path_text { primary { @@ -18659,136 +15540,87 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 - } - lines { - width: 4.25 - color: 0xFFFFFF - priority: 1218 + priority: 16039 } } element { scale: 13 lines { width: 7 - color: 0x202020 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1013 - } - path_text { - primary { - height: 12 - color: 0x303030 - stroke_color: 0xFFC444 - } - priority: 16013 - } - lines { - width: 7 color: 0xD8A050 - priority: 0 + priority: 39 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1000 - } - lines { - width: 6.5 - color: 0xFFFFFF - priority: 1229 - } - } - element { - scale: 14 - lines { - width: 9 - color: 0x202020 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1013 + priority: 1039 } path_text { primary { - height: 14 + height: 12 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } + } + element { + scale: 14 lines { width: 9 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1386 - } - lines { - width: 8 - color: 0xFFFFFF - priority: 1296 - } - } - element { - scale: 15 - lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1013 + priority: 1039 } path_text { primary { - height: 16 + height: 14 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } + } + element { + scale: 15 lines { width: 12 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1386 + priority: 1039 } - lines { - width: 9 - color: 0xFFFFFF - priority: 1378 + path_text { + primary { + height: 16 + color: 0x303030 + stroke_color: 0xFFC444 + } + priority: 16039 } } element { scale: 16 lines { - width: 13.6 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 18 + color: 0xD8A050 + priority: 39 cap: BUTTCAP - priority: 1013 + } + lines { + width: 14 + color: 0xFFC444 + priority: 1039 } path_text { primary { @@ -18796,36 +15628,37 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } lines { - width: 18 - color: 0xD8A050 - priority: 386 + width: 22 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP } lines { - width: 14 - color: 0xFFC444 - priority: 1386 - } - lines { - width: 12 - color: 0xFFFFFF - priority: 1597 + width: 24 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { scale: 17 lines { - width: 14.4 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 20 + color: 0xD8A050 + priority: 39 cap: BUTTCAP - priority: 1013 + } + lines { + width: 16 + color: 0xFFC444 + priority: 1039 } path_text { primary { @@ -18833,23 +15666,23 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16013 + priority: 16039 } lines { - width: 20 - color: 0xD8A050 - priority: 0 + width: 24 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP } lines { - width: 16 - color: 0xFFC444 - priority: 1000 - } - lines { - width: 12 - color: 0xFFFFFF - priority: 1636 + width: 26 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -18857,68 +15690,68 @@ cont { name: "highway-trunk_link" element { scale: 15 - path_text { - primary { - height: 16 - color: 0x303030 - stroke_color: 0xFFC444 - } - priority: 16000 - } lines { width: 12 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1386 + priority: 1039 } - } - element { - scale: 16 path_text { primary { - height: 17 - color: 0x404040 + height: 16 + color: 0x303030 stroke_color: 0xFFC444 } - priority: 16000 + priority: 16039 } + } + element { + scale: 16 lines { width: 18 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1386 + priority: 1039 } - } - element { - scale: 17 path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16000 + priority: 16039 } + } + element { + scale: 17 lines { width: 20 color: 0xD8A050 - priority: 0 + priority: 39 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1000 + priority: 1039 + } + path_text { + primary { + height: 17 + color: 0x404040 + stroke_color: 0xFFC444 + } + priority: 16039 } } } @@ -18926,54 +15759,54 @@ cont { name: "highway-trunk_link-bridge" element { scale: 15 + lines { + width: 12 + color: 0xD8A050 + priority: 39 + cap: BUTTCAP + } + lines { + width: 8 + color: 0xFFC444 + priority: 1039 + } path_text { primary { height: 16 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16000 + priority: 16039 } + } + element { + scale: 16 lines { - width: 12 + width: 18 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { - width: 8 + width: 14 color: 0xFFC444 - priority: 1386 + priority: 1039 } - } - element { - scale: 16 path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16000 + priority: 16039 } lines { width: 22 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { - width: 18 - color: 0xD8A050 - priority: 386 - cap: BUTTCAP - } - lines { - width: 14 - color: 0xFFC444 - priority: 1386 - } - lines { width: 24 color: 0x707070 priority: 0 @@ -18982,32 +15815,32 @@ cont { } element { scale: 17 + lines { + width: 20 + color: 0xD8A050 + priority: 39 + cap: BUTTCAP + } + lines { + width: 16 + color: 0xFFC444 + priority: 1039 + } path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16000 + priority: 16039 } lines { width: 24 color: 0xFFFFFF - priority: 1 - cap: BUTTCAP - } - lines { - width: 20 - color: 0xD8A050 - priority: 0 + priority: 4 cap: BUTTCAP } lines { - width: 16 - color: 0xFFC444 - priority: 1000 - } - lines { width: 26 color: 0x707070 priority: 0 @@ -19019,68 +15852,100 @@ cont { name: "highway-trunk_link-tunnel" element { scale: 15 + lines { + width: 12 + color: 0xD8A050 + priority: 39 + cap: BUTTCAP + } + lines { + width: 8 + color: 0xFFC444 + priority: 1039 + } path_text { primary { height: 16 color: 0x303030 stroke_color: 0xFFC444 } - priority: 16000 + priority: 16039 } + } + element { + scale: 16 lines { - width: 12 + width: 18 color: 0xD8A050 - priority: 386 + priority: 39 cap: BUTTCAP } lines { - width: 8 + width: 14 color: 0xFFC444 - priority: 1386 + priority: 1039 } - } - element { - scale: 16 path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16000 + priority: 16039 } lines { - width: 18 - color: 0xD8A050 - priority: 386 + width: 22 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP } lines { - width: 14 - color: 0xFFC444 - priority: 1386 + width: 24 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { scale: 17 + lines { + width: 20 + color: 0xD8A050 + priority: 39 + cap: BUTTCAP + } + lines { + width: 16 + color: 0xFFC444 + priority: 1039 + } path_text { primary { height: 17 color: 0x404040 stroke_color: 0xFFC444 } - priority: 16000 + priority: 16039 } lines { - width: 20 - color: 0xD8A050 - priority: 0 + width: 24 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP } lines { - width: 16 - color: 0xFFC444 - priority: 1000 + width: 26 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -19092,7 +15957,7 @@ cont { width: 1 color: 0xFFFFFF cap: BUTTCAP - priority: 1008 + priority: 1026 } } element { @@ -19100,13 +15965,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1008 + priority: 1026 } } element { @@ -19114,13 +15979,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -19128,7 +15993,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { @@ -19136,13 +16001,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -19150,7 +16015,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { @@ -19158,13 +16023,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -19172,7 +16037,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } } @@ -19182,14 +16047,14 @@ cont { scale: 13 area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { scale: 14 area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { @@ -19200,11 +16065,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { @@ -19215,11 +16080,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } element { @@ -19230,11 +16095,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } area { color: 0xFFFFFF - priority: 1009 + priority: 1027 } } } @@ -19246,7 +16111,7 @@ cont { width: 1 color: 0xFFFFFF cap: BUTTCAP - priority: 1008 + priority: 1026 } } element { @@ -19254,13 +16119,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1008 + priority: 1026 } } element { @@ -19268,13 +16133,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -19282,7 +16147,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } } element { @@ -19290,13 +16155,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -19304,12 +16169,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 14 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -19324,13 +16189,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 8 + priority: 26 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1008 + priority: 1026 } path_text { primary { @@ -19338,12 +16203,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { width: 16 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -19361,17 +16226,8 @@ cont { lines { width: 1 color: 0xFFFFFF - dashdot { - dd: 1.85 - dd: 1.85 - } cap: BUTTCAP - priority: 1008 - } - lines { - width: 2.75 - color: 0xFFFFFF - priority: 1000 + priority: 1026 } } element { @@ -19379,27 +16235,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 8 - dashdot { - dd: 2.2 - dd: 2.2 - } + priority: 26 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1008 - } - lines { - width: 3.5 - color: 0xFFFFFF - priority: 1042 + priority: 1026 } } element { @@ -19407,22 +16249,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 8 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 26 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1008 + priority: 1026 } path_text { primary { @@ -19430,35 +16263,21 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 - } - lines { - width: 7 - color: 0xFFFFFF - priority: 1042 + priority: 16026 } } element { scale: 16 lines { - width: 14.4 + width: 10 color: 0xC8C8AF - priority: 8 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 26 cap: BUTTCAP } lines { - width: 10.4 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1008 + width: 6 + color: 0xFFFFFF + priority: 1026 } path_text { primary { @@ -19466,35 +16285,37 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { - width: 8.8 + width: 14 color: 0xFFFFFF - priority: 1042 + priority: 4 + cap: BUTTCAP + } + lines { + width: 16 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { scale: 17 lines { - width: 17.2 + width: 12 color: 0xC8C8AF - priority: 8 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 26 cap: BUTTCAP } lines { - width: 13.2 - color: 0x707070 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1008 + width: 8 + color: 0xFFFFFF + priority: 1026 } path_text { primary { @@ -19502,12 +16323,23 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16008 + priority: 16026 } lines { - width: 10.8 + width: 16 color: 0xFFFFFF - priority: 1042 + priority: 4 + cap: BUTTCAP + } + lines { + width: 18 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -19522,7 +16354,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "museum" @@ -19538,7 +16370,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "museum" @@ -19557,7 +16389,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "cannon" @@ -19573,7 +16405,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "cannon" @@ -19592,7 +16424,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "castle" @@ -19608,7 +16440,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "castle" @@ -19627,7 +16459,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "memorial" @@ -19643,7 +16475,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "memorial" @@ -19662,7 +16494,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "memorial" @@ -19678,7 +16510,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "memorial" @@ -19697,7 +16529,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "museum" @@ -19713,7 +16545,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "museum" @@ -19732,7 +16564,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "ruins" @@ -19748,7 +16580,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "ruins" @@ -19786,7 +16618,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -19800,7 +16632,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -19814,7 +16646,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -19852,7 +16684,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -19866,7 +16698,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -19880,7 +16712,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -19918,7 +16750,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 @@ -19932,7 +16764,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 @@ -19946,7 +16778,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 @@ -19984,7 +16816,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -19998,7 +16830,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -20012,7 +16844,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -20050,7 +16882,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -20064,7 +16896,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -20078,7 +16910,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 @@ -20116,7 +16948,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xF8F8D8 @@ -20130,7 +16962,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xF8F8D8 @@ -20144,7 +16976,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xF8F8D8 @@ -20198,7 +17030,7 @@ cont { } } cont { - name: "landuse-conservation-destination" + name: "landuse-conservation-no-access" element { scale: 12 area { @@ -20243,7 +17075,7 @@ cont { } } cont { - name: "landuse-conservation-no-access" + name: "landuse-conservation-permissive" element { scale: 12 area { @@ -20288,7 +17120,7 @@ cont { } } cont { - name: "landuse-conservation-permissive" + name: "landuse-conservation-private" element { scale: 12 area { @@ -20333,71 +17165,26 @@ cont { } } cont { - name: "landuse-conservation-private" - element { - scale: 12 - area { - color: 0xCFECA8 - priority: -16104 - } - } - element { - scale: 13 - area { - color: 0xCFECA8 - priority: -16105 - } - } - element { - scale: 14 - area { - color: 0xCFECA8 - priority: -16106 - } - } - element { - scale: 15 - area { - color: 0xCFECA8 - priority: -16107 - } - } - element { - scale: 16 - area { - color: 0xCFECA8 - priority: -16108 - } - } - element { - scale: 17 - area { - color: 0xCFECA8 - priority: -16109 - } - } -} -cont { name: "landuse-construction" element { scale: 12 area { color: 0xE8E4D4 - priority: -16110 + priority: -16104 } } element { scale: 13 area { color: 0xD8D8C4 - priority: -16111 + priority: -16105 } } element { scale: 14 area { color: 0xE0E0D0 - priority: -16112 + priority: -16106 } } element { @@ -20407,11 +17194,11 @@ cont { height: 12 color: 0x808070 } - priority: 16000 + priority: 15000 } area { color: 0xE0E0D0 - priority: -16113 + priority: -16107 } } element { @@ -20421,11 +17208,11 @@ cont { height: 12 color: 0x808070 } - priority: 16000 + priority: 15000 } area { color: 0xE0E0D0 - priority: -16114 + priority: -16108 } } element { @@ -20435,11 +17222,11 @@ cont { height: 14 color: 0x404040 } - priority: 16000 + priority: 15000 } area { color: 0xE0E0D0 - priority: -16115 + priority: -16109 } } } @@ -20449,21 +17236,21 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16116 + priority: -16110 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16117 + priority: -16111 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16118 + priority: -16112 } } element { @@ -20473,11 +17260,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16119 + priority: -16113 } } element { @@ -20487,11 +17274,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16120 + priority: -16114 } } element { @@ -20501,11 +17288,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16121 + priority: -16115 } } } @@ -20515,21 +17302,21 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16122 + priority: -16116 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16123 + priority: -16117 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16124 + priority: -16118 } } element { @@ -20539,11 +17326,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16125 + priority: -16119 } } element { @@ -20553,11 +17340,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16126 + priority: -16120 } } element { @@ -20567,11 +17354,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16127 + priority: -16121 } } } @@ -20581,21 +17368,21 @@ cont { scale: 12 area { color: 0xE8E4D4 - priority: -16128 + priority: -16122 } } element { scale: 13 area { color: 0xE4E4E4 - priority: -16129 + priority: -16123 } } element { scale: 14 area { color: 0xE4E4E4 - priority: -16130 + priority: -16124 } } element { @@ -20605,11 +17392,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE4E4E4 - priority: -16131 + priority: -16125 } } element { @@ -20619,11 +17406,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE4E4E4 - priority: -16132 + priority: -16126 } } element { @@ -20633,11 +17420,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE4E4E4 - priority: -16133 + priority: -16127 } } } @@ -20647,42 +17434,42 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16134 + priority: -16128 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16135 + priority: -16129 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16136 + priority: -16130 } } element { scale: 15 area { color: 0xD0E8C4 - priority: -16137 + priority: -16131 } } element { scale: 16 area { color: 0xD0E8C4 - priority: -16138 + priority: -16132 } } element { scale: 17 area { color: 0xD0E8C4 - priority: -16139 + priority: -16133 } } } @@ -20692,35 +17479,35 @@ cont { scale: 10 area { color: 0xD0E8C4 - priority: -16140 + priority: -16134 } } element { scale: 11 area { color: 0xD0E8C4 - priority: -16141 + priority: -16135 } } element { scale: 12 area { color: 0xD0E8C4 - priority: -16142 + priority: -16136 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16143 + priority: -16137 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16144 + priority: -16138 } } element { @@ -20730,11 +17517,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16145 + priority: -16139 } } element { @@ -20744,11 +17531,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16146 + priority: -16140 } } element { @@ -20758,11 +17545,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16147 + priority: -16141 } } } @@ -20772,35 +17559,35 @@ cont { scale: 10 area { color: 0xD0E8C4 - priority: -16148 + priority: -16142 } } element { scale: 11 area { color: 0xD0E8C4 - priority: -16149 + priority: -16143 } } element { scale: 12 area { color: 0xD0E8C4 - priority: -16150 + priority: -16144 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16151 + priority: -16145 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16152 + priority: -16146 } } element { @@ -20810,11 +17597,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16153 + priority: -16147 } } element { @@ -20824,11 +17611,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16154 + priority: -16148 } } element { @@ -20838,11 +17625,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16155 + priority: -16149 } } } @@ -20852,35 +17639,35 @@ cont { scale: 10 area { color: 0xD0E8C4 - priority: -16156 + priority: -16150 } } element { scale: 11 area { color: 0xD0E8C4 - priority: -16157 + priority: -16151 } } element { scale: 12 area { color: 0xD0E8C4 - priority: -16158 + priority: -16152 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16159 + priority: -16153 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16160 + priority: -16154 } } element { @@ -20890,11 +17677,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16161 + priority: -16155 } } element { @@ -20905,11 +17692,11 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16162 + priority: -16156 } } element { @@ -20919,11 +17706,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16163 + priority: -16157 } } } @@ -20933,35 +17720,35 @@ cont { scale: 10 area { color: 0xD0E8C4 - priority: -16164 + priority: -16158 } } element { scale: 11 area { color: 0xD0E8C4 - priority: -16165 + priority: -16159 } } element { scale: 12 area { color: 0xD0E8C4 - priority: -16166 + priority: -16160 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16167 + priority: -16161 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16168 + priority: -16162 } } element { @@ -20971,11 +17758,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16169 + priority: -16163 } } element { @@ -20985,11 +17772,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16170 + priority: -16164 } } element { @@ -20999,11 +17786,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16171 + priority: -16165 } } } @@ -21016,11 +17803,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE1E1E5 - priority: -16172 + priority: -16166 } } element { @@ -21030,11 +17817,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE1E1E5 - priority: -16173 + priority: -16167 } } element { @@ -21044,11 +17831,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE1E1E5 - priority: -16174 + priority: -16168 } } } @@ -21058,21 +17845,21 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16175 + priority: -16169 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16176 + priority: -16170 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16177 + priority: -16171 } } element { @@ -21082,11 +17869,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16178 + priority: -16172 } } element { @@ -21096,11 +17883,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16179 + priority: -16173 } } element { @@ -21110,11 +17897,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16180 + priority: -16174 } } } @@ -21124,21 +17911,21 @@ cont { scale: 12 area { color: 0xE8E4D4 - priority: -16181 + priority: -16175 } } element { scale: 13 area { color: 0xD8D8C4 - priority: -16182 + priority: -16176 } } element { scale: 14 area { color: 0xD8D8C4 - priority: -16183 + priority: -16177 } } element { @@ -21148,11 +17935,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD8D8C4 - priority: -16184 + priority: -16178 } } element { @@ -21162,11 +17949,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD8D8C4 - priority: -16185 + priority: -16179 } } element { @@ -21176,11 +17963,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD8D8C4 - priority: -16186 + priority: -16180 } } } @@ -21193,7 +17980,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -21203,7 +17990,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -21213,7 +18000,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -21223,21 +18010,21 @@ cont { scale: 12 area { color: 0xE8E4D4 - priority: -16187 + priority: -16181 } } element { scale: 13 area { color: 0xE8E4D4 - priority: -16188 + priority: -16182 } } element { scale: 14 area { color: 0xE8E4D4 - priority: -16189 + priority: -16183 } } element { @@ -21247,11 +18034,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 - priority: -16190 + priority: -16184 } } element { @@ -21261,11 +18048,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 - priority: -16191 + priority: -16185 } } element { @@ -21275,11 +18062,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 - priority: -16192 + priority: -16186 } } } @@ -21289,14 +18076,14 @@ cont { scale: 13 area { color: 0xE9DD72 - priority: -16193 + priority: -16187 } } element { scale: 14 area { color: 0xE9DD72 - priority: -16194 + priority: -16188 } } element { @@ -21306,11 +18093,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE9DD72 - priority: -16195 + priority: -16189 } } element { @@ -21320,11 +18107,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE9DD72 - priority: -16196 + priority: -16190 } } element { @@ -21334,11 +18121,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE9DD72 - priority: -16197 + priority: -16191 } } } @@ -21348,21 +18135,21 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16198 + priority: -16192 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16199 + priority: -16193 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16200 + priority: -16194 } } element { @@ -21372,11 +18159,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16201 + priority: -16195 } } element { @@ -21386,11 +18173,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16202 + priority: -16196 } } element { @@ -21400,11 +18187,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16203 + priority: -16197 } } } @@ -21414,21 +18201,21 @@ cont { scale: 12 area { color: 0x80D0D050 - priority: -16204 + priority: -16198 } } element { scale: 13 area { color: 0x80D0D050 - priority: -16205 + priority: -16199 } } element { scale: 14 area { color: 0x80D0D050 - priority: -16206 + priority: -16200 } } element { @@ -21438,11 +18225,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0x80D0D050 - priority: -16207 + priority: -16201 } } element { @@ -21452,11 +18239,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0x80D0D050 - priority: -16208 + priority: -16202 } } element { @@ -21466,11 +18253,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0x80D0D050 - priority: -16209 + priority: -16203 } } } @@ -21483,7 +18270,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -21493,7 +18280,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -21503,7 +18290,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -21513,21 +18300,21 @@ cont { scale: 12 area { color: 0xE8E4D4 - priority: -16210 + priority: -16204 } } element { scale: 13 area { color: 0xE9DD72 - priority: -16211 + priority: -16205 } } element { scale: 14 area { color: 0xE9DD72 - priority: -16212 + priority: -16206 } } element { @@ -21537,11 +18324,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE9DD72 - priority: -16213 + priority: -16207 } } element { @@ -21551,11 +18338,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE9DD72 - priority: -16214 + priority: -16208 } } element { @@ -21565,11 +18352,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE9DD72 - priority: -16215 + priority: -16209 } } } @@ -21579,21 +18366,21 @@ cont { scale: 12 area { color: 0xE8E4D4 - priority: -16216 + priority: -16210 } } element { scale: 13 area { color: 0xE8E4D4 - priority: -16217 + priority: -16211 } } element { scale: 14 area { color: 0xE8E4D4 - priority: -16218 + priority: -16212 } } element { @@ -21603,11 +18390,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 - priority: -16219 + priority: -16213 } } element { @@ -21617,11 +18404,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 - priority: -16220 + priority: -16214 } } element { @@ -21631,11 +18418,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xE8E4D4 - priority: -16221 + priority: -16215 } } } @@ -21645,21 +18432,21 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16222 + priority: -16216 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16223 + priority: -16217 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16224 + priority: -16218 } } element { @@ -21669,11 +18456,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16225 + priority: -16219 } } element { @@ -21683,11 +18470,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16226 + priority: -16220 } } element { @@ -21697,11 +18484,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16227 + priority: -16221 } } } @@ -21711,21 +18498,21 @@ cont { scale: 12 area { color: 0xCDE5EA - priority: -16228 + priority: -16222 } } element { scale: 13 area { color: 0xCDE5EA - priority: -16229 + priority: -16223 } } element { scale: 14 area { color: 0xCDE5EA - priority: -16230 + priority: -16224 } } element { @@ -21735,11 +18522,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA - priority: -16231 + priority: -16225 } } element { @@ -21749,11 +18536,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA - priority: -16232 + priority: -16226 } } element { @@ -21763,11 +18550,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA - priority: -16233 + priority: -16227 } } } @@ -21777,42 +18564,42 @@ cont { scale: 12 area { color: 0xEDE8D2 - priority: -16234 + priority: -16228 } } element { scale: 13 area { color: 0xEDE8D2 - priority: -16235 + priority: -16229 } } element { scale: 14 area { color: 0xEDE8D2 - priority: -16236 + priority: -16230 } } element { scale: 15 area { color: 0xEDE8D2 - priority: -16237 + priority: -16231 } } element { scale: 16 area { color: 0xEDE8D2 - priority: -16238 + priority: -16232 } } element { scale: 17 area { color: 0xEDE8D2 - priority: -16239 + priority: -16233 } } } @@ -21822,21 +18609,21 @@ cont { scale: 12 area { color: 0xF8ECEC - priority: -16240 + priority: -16234 } } element { scale: 13 area { color: 0xF8ECEC - priority: -16241 + priority: -16235 } } element { scale: 14 area { color: 0xF8ECEC - priority: -16242 + priority: -16236 } } element { @@ -21846,11 +18633,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xF8ECEC - priority: -16243 + priority: -16237 } } element { @@ -21860,11 +18647,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xF8ECEC - priority: -16244 + priority: -16238 } } element { @@ -21874,11 +18661,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xF8ECEC - priority: -16245 + priority: -16239 } } } @@ -21891,7 +18678,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -21901,7 +18688,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -21911,7 +18698,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -21921,21 +18708,21 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16246 + priority: -16240 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16247 + priority: -16241 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16248 + priority: -16242 } } element { @@ -21945,11 +18732,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16249 + priority: -16243 } } element { @@ -21959,11 +18746,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16250 + priority: -16244 } } element { @@ -21973,11 +18760,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16251 + priority: -16245 } } } @@ -21987,14 +18774,14 @@ cont { scale: 13 area { color: 0xD1EAD1 - priority: -16252 + priority: -16246 } } element { scale: 14 area { color: 0xD1EAD1 - priority: -16253 + priority: -16247 } } element { @@ -22004,11 +18791,11 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD1EAD1 - priority: -16254 + priority: -16248 } } element { @@ -22018,11 +18805,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD1EAD1 - priority: -16255 + priority: -16249 } } element { @@ -22032,11 +18819,11 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xD1EAD1 - priority: -16256 + priority: -16250 } } } @@ -22046,42 +18833,42 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16257 + priority: -16251 } } element { scale: 13 area { color: 0xCFECB7 - priority: -16258 + priority: -16252 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16259 + priority: -16253 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16260 + priority: -16254 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16261 + priority: -16255 } } element { scale: 17 area { color: 0xCFECB7 - priority: -16262 + priority: -16256 } } } @@ -22091,42 +18878,42 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16263 + priority: -16257 } } element { scale: 13 area { color: 0xCFECB7 - priority: -16264 + priority: -16258 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16265 + priority: -16259 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16266 + priority: -16260 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16267 + priority: -16261 } } element { scale: 17 area { color: 0xCFECB7 - priority: -16268 + priority: -16262 } } } @@ -22136,35 +18923,35 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16269 + priority: -16263 } } element { scale: 13 area { color: 0xDDB298 - priority: -16270 + priority: -16264 } } element { scale: 14 area { color: 0xDDB298 - priority: -16271 + priority: -16265 } } element { scale: 15 area { color: 0xDDB298 - priority: -16272 + priority: -16266 } } element { scale: 16 area { color: 0xDDB298 - priority: -16273 + priority: -16267 } } element { @@ -22175,7 +18962,7 @@ cont { } area { color: 0xDDB298 - priority: -16274 + priority: -16268 } } } @@ -22185,28 +18972,28 @@ cont { scale: 13 area { color: 0xCFECB7 - priority: -16275 + priority: -16269 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16276 + priority: -16270 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16277 + priority: -16271 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16278 + priority: -16272 } } element { @@ -22217,7 +19004,7 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } } } @@ -22227,42 +19014,42 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16279 + priority: -16273 } } element { scale: 13 area { color: 0xCFECB7 - priority: -16280 + priority: -16274 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16281 + priority: -16275 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16282 + priority: -16276 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16283 + priority: -16277 } } element { scale: 17 area { color: 0xCFECB7 - priority: -16284 + priority: -16278 } symbol { name: "golfcourse" @@ -22300,7 +19087,7 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16285 + priority: -16279 } } element { @@ -22310,11 +19097,11 @@ cont { height: 12 color: 0x5CA800 } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16286 + priority: -16280 } } element { @@ -22324,11 +19111,11 @@ cont { height: 12 color: 0x5CA800 } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16287 + priority: -16281 } } element { @@ -22339,11 +19126,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16288 + priority: -16282 } } element { @@ -22354,11 +19141,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16289 + priority: -16283 } } element { @@ -22369,11 +19156,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16290 + priority: -16284 } } } @@ -22383,7 +19170,7 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16291 + priority: -16285 } } element { @@ -22393,11 +19180,11 @@ cont { height: 12 color: 0x5CA800 } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16292 + priority: -16286 } } element { @@ -22407,11 +19194,11 @@ cont { height: 12 color: 0x5CA800 } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16293 + priority: -16287 } } element { @@ -22422,11 +19209,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16294 + priority: -16288 } } element { @@ -22437,11 +19224,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16295 + priority: -16289 } } element { @@ -22452,11 +19239,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16296 + priority: -16290 } } } @@ -22466,7 +19253,7 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16297 + priority: -16291 } } element { @@ -22476,11 +19263,11 @@ cont { height: 12 color: 0x5CA800 } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16298 + priority: -16292 } } element { @@ -22490,11 +19277,11 @@ cont { height: 12 color: 0x5CA800 } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16299 + priority: -16293 } } element { @@ -22505,11 +19292,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16300 + priority: -16294 } } element { @@ -22520,11 +19307,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16301 + priority: -16295 } } element { @@ -22535,11 +19322,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16302 + priority: -16296 } } } @@ -22549,7 +19336,7 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16303 + priority: -16297 } } element { @@ -22559,11 +19346,11 @@ cont { height: 12 color: 0x5CA800 } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16304 + priority: -16298 } } element { @@ -22573,11 +19360,11 @@ cont { height: 12 color: 0x5CA800 } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16305 + priority: -16299 } } element { @@ -22588,11 +19375,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16306 + priority: -16300 } } element { @@ -22603,11 +19390,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16307 + priority: -16301 } } element { @@ -22618,11 +19405,11 @@ cont { color: 0x5CA800 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16308 + priority: -16302 } } } @@ -22632,42 +19419,42 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16309 + priority: -16303 } } element { scale: 13 area { color: 0xCFECB7 - priority: -16310 + priority: -16304 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16311 + priority: -16305 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16312 + priority: -16306 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16313 + priority: -16307 } } element { scale: 17 area { color: 0xCFECB7 - priority: -16314 + priority: -16308 } } } @@ -22677,35 +19464,35 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16315 + priority: -16309 } } element { scale: 13 area { color: 0xDDB298 - priority: -16316 + priority: -16310 } } element { scale: 14 area { color: 0xDDB298 - priority: -16317 + priority: -16311 } } element { scale: 15 area { color: 0xDDB298 - priority: -16318 + priority: -16312 } } element { scale: 16 area { color: 0xDDB298 - priority: -16319 + priority: -16313 } } element { @@ -22716,7 +19503,7 @@ cont { } area { color: 0xDDB298 - priority: -16320 + priority: -16314 } } } @@ -22726,42 +19513,42 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16321 + priority: -16315 } } element { scale: 13 area { color: 0xCFECB7 - priority: -16322 + priority: -16316 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16323 + priority: -16317 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16324 + priority: -16318 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16325 + priority: -16319 } } element { scale: 17 area { color: 0xCFECB7 - priority: -16326 + priority: -16320 } symbol { name: "playground" @@ -22775,35 +19562,35 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16327 + priority: -16321 } } element { scale: 13 area { color: 0xDDB298 - priority: -16328 + priority: -16322 } } element { scale: 14 area { color: 0xDDB298 - priority: -16329 + priority: -16323 } } element { scale: 15 area { color: 0xDDB298 - priority: -16330 + priority: -16324 } } element { scale: 16 area { color: 0xDDB298 - priority: -16331 + priority: -16325 } } element { @@ -22814,7 +19601,7 @@ cont { } area { color: 0xDDB298 - priority: -16332 + priority: -16326 } } } @@ -22824,28 +19611,28 @@ cont { scale: 13 area { color: 0xDDB298 - priority: -16333 + priority: -16327 } } element { scale: 14 area { color: 0xDDB298 - priority: -16334 + priority: -16328 } } element { scale: 15 area { color: 0xDDB298 - priority: -16335 + priority: -16329 } } element { scale: 16 area { color: 0xDDB298 - priority: -16336 + priority: -16330 } } element { @@ -22856,7 +19643,7 @@ cont { } area { color: 0xDDB298 - priority: -16337 + priority: -16331 } } } @@ -22876,35 +19663,35 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16338 + priority: -16332 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16339 + priority: -16333 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16340 + priority: -16334 } } element { scale: 15 area { color: 0xD0E8C4 - priority: -16341 + priority: -16335 } } element { scale: 16 area { color: 0xD0E8C4 - priority: -16342 + priority: -16336 } } element { @@ -22915,11 +19702,11 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16343 + priority: -16337 } } } @@ -22929,35 +19716,35 @@ cont { scale: 12 area { color: 0xD0E8C4 - priority: -16344 + priority: -16338 } } element { scale: 13 area { color: 0xD0E8C4 - priority: -16345 + priority: -16339 } } element { scale: 14 area { color: 0xD0E8C4 - priority: -16346 + priority: -16340 } } element { scale: 15 area { color: 0xD0E8C4 - priority: -16347 + priority: -16341 } } element { scale: 16 area { color: 0xD0E8C4 - priority: -16348 + priority: -16342 } } element { @@ -22968,11 +19755,11 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xD0E8C4 - priority: -16349 + priority: -16343 } } } @@ -22982,35 +19769,35 @@ cont { scale: 13 area { color: 0xCDE5EA - priority: -16350 + priority: -16344 } } element { scale: 14 area { color: 0xCDE5EA - priority: -16351 + priority: -16345 } } element { scale: 15 area { color: 0xCDE5EA - priority: -16352 + priority: -16346 } } element { scale: 16 area { color: 0xCDE5EA - priority: -16353 + priority: -16347 } } element { scale: 17 area { color: 0xCDE5EA - priority: -16354 + priority: -16348 } } } @@ -23021,11 +19808,11 @@ cont { lines { width: 0.7 color: 0xD0E8C4 - priority: 1004 + priority: 1000 } area { color: 0xD0E8C4 - priority: -15996 + priority: -16349 } } element { @@ -23033,59 +19820,83 @@ cont { lines { width: 0.9 color: 0xD0E8C4 - priority: 1005 + priority: 1000 } area { color: 0xD0E8C4 - priority: -15995 + priority: -16350 } } element { scale: 14 lines { + width: 3.6 + color: 0x808080 + priority: 0 + cap: BUTTCAP + } + lines { width: 1.6 color: 0xD0E8C4 - priority: 1019 + priority: 1000 } area { color: 0xD0E8C4 - priority: -15981 + priority: -16351 } } element { scale: 15 lines { + width: 4.9 + color: 0x808080 + priority: 0 + cap: BUTTCAP + } + lines { width: 2.9 color: 0xD0E8C4 - priority: 1019 + priority: 1000 } area { color: 0xD0E8C4 - priority: -15981 + priority: -16352 } } element { scale: 16 lines { + width: 7.8 + color: 0x808080 + priority: 0 + cap: BUTTCAP + } + lines { width: 5.8 color: 0xD0E8C4 - priority: 1020 + priority: 1000 } area { color: 0xD0E8C4 - priority: -15980 + priority: -16353 } } element { scale: 17 lines { + width: 8 + color: 0x808080 + priority: 0 + cap: BUTTCAP + } + lines { width: 6 color: 0xD0E8C4 - priority: 1024 + priority: 1000 } area { color: 0xD0E8C4 - priority: -15976 + priority: -16354 } } } @@ -23134,7 +19945,7 @@ cont { lines { width: 2 color: 0x707070 - priority: 1508 + priority: 1000 } } element { @@ -23142,7 +19953,7 @@ cont { lines { width: 4 color: 0x707070 - priority: 1728 + priority: 1773 } } element { @@ -23150,7 +19961,7 @@ cont { lines { width: 6.4 color: 0x707070 - priority: 1783 + priority: 1856 } } } @@ -23177,7 +19988,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1097 + priority: 1158 } } element { @@ -23190,7 +20001,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1105 + priority: 1170 } } element { @@ -23203,7 +20014,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1157 + priority: 1258 } } element { @@ -23211,7 +20022,7 @@ cont { lines { width: 1 color: 0xC0BC9C - priority: 1185 + priority: 1000 } } element { @@ -23227,7 +20038,7 @@ cont { lines { width: 1 color: 0xB0AC8C - priority: 1185 + priority: 1273 } } element { @@ -23243,7 +20054,7 @@ cont { lines { width: 3 color: 0xB0AC8C - priority: 1185 + priority: 1273 } } } @@ -23264,17 +20075,17 @@ cont { lines { width: 0.1 color: 0xD0D0D0 - priority: 1390 + priority: 1468 } lines { width: 0.6 color: 0xE4E4E4 - priority: 1392 + priority: 1470 } lines { width: 0.8 color: 0xD0D0D0 - priority: 1391 + priority: 1000 } } element { @@ -23282,17 +20093,17 @@ cont { lines { width: 0.2 color: 0xD0D0D0 - priority: 1509 + priority: 1614 } lines { width: 1.2 color: 0xE4E4E4 - priority: 1511 + priority: 1619 } lines { width: 1.6 color: 0xD0D0D0 - priority: 1510 + priority: 1617 } } element { @@ -23300,17 +20111,17 @@ cont { lines { width: 0.4 color: 0xD0D0D0 - priority: 1729 + priority: 1775 } lines { width: 2.4 color: 0xE4E4E4 - priority: 1731 + priority: 1778 } lines { width: 3.2 color: 0xD0D0D0 - priority: 1730 + priority: 1000 } } element { @@ -23318,17 +20129,17 @@ cont { lines { width: 0.4 color: 0xD0D0D0 - priority: 1784 + priority: 1858 } lines { width: 2.4 color: 0xE4E4E4 - priority: 1786 + priority: 1863 } lines { width: 3.2 color: 0xD0D0D0 - priority: 1785 + priority: 1860 } } } @@ -23339,7 +20150,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1744 + priority: 1802 } lines { width: 0.8 @@ -23353,7 +20164,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1746 + priority: 1807 } } element { @@ -23361,7 +20172,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1815 + priority: 1921 } lines { width: 0.8 @@ -23375,7 +20186,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1817 + priority: 1926 } } } @@ -23391,7 +20202,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1744 + priority: 1802 } lines { width: 0.8 @@ -23405,7 +20216,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1746 + priority: 1807 } } element { @@ -23418,7 +20229,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1816 + priority: 1924 } lines { width: 0.8 @@ -23432,17 +20243,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1817 - } - } -} -cont { - name: "man_made-survey_point" - element { - scale: 17 - symbol { - name: "survey_point" - priority: 16000 + priority: 1926 } } } @@ -23522,11 +20323,11 @@ cont { element { scale: 12 lines { - width: 2.5 + width: 4 color: 0x202020 dashdot { - dd: 0.25 - dd: 0.25 + dd: 1 + dd: 1 } cap: BUTTCAP priority: 1000 @@ -23535,11 +20336,11 @@ cont { element { scale: 13 lines { - width: 5 + width: 4 color: 0x202020 dashdot { - dd: 0.5 - dd: 0.5 + dd: 1 + dd: 1 } cap: BUTTCAP priority: 1000 @@ -23548,7 +20349,7 @@ cont { element { scale: 14 lines { - width: 10 + width: 4 color: 0x202020 dashdot { dd: 1 @@ -23561,11 +20362,11 @@ cont { element { scale: 15 lines { - width: 20 + width: 4 color: 0x202020 dashdot { - dd: 2 - dd: 2 + dd: 1 + dd: 1 } cap: BUTTCAP priority: 1000 @@ -23574,11 +20375,11 @@ cont { element { scale: 16 lines { - width: 40 + width: 4 color: 0x202020 dashdot { - dd: 4 - dd: 4 + dd: 1 + dd: 1 } cap: BUTTCAP priority: 1000 @@ -23587,11 +20388,11 @@ cont { element { scale: 17 lines { - width: 80 + width: 4 color: 0x202020 dashdot { - dd: 8 - dd: 8 + dd: 1 + dd: 1 } cap: BUTTCAP priority: 1000 @@ -23617,7 +20418,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -23631,7 +20432,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -23645,7 +20446,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -23659,7 +20460,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -23708,7 +20509,7 @@ cont { color: 0x202020 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "cave_entrance" @@ -23723,7 +20524,7 @@ cont { color: 0x202020 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "cave_entrance" @@ -23738,7 +20539,7 @@ cont { color: 0x202020 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "cave_entrance" @@ -23753,7 +20554,7 @@ cont { color: 0x202020 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "cave_entrance" @@ -23897,7 +20698,7 @@ cont { lines { width: 0.75 color: 0xADD8E6 - priority: 1002 + priority: 1009 } } element { @@ -23905,7 +20706,7 @@ cont { lines { width: 0.8 color: 0xADD8E6 - priority: 1003 + priority: 1012 } } element { @@ -23913,7 +20714,7 @@ cont { lines { width: 1.6 color: 0xADD8E6 - priority: 1003 + priority: 1012 } } element { @@ -23921,7 +20722,7 @@ cont { lines { width: 3.2 color: 0xADD8E6 - priority: 1003 + priority: 1012 } } element { @@ -23929,7 +20730,7 @@ cont { lines { width: 6.4 color: 0xADD8E6 - priority: 1003 + priority: 1012 } } } @@ -23942,7 +20743,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -23952,7 +20753,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -23962,7 +20763,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -23975,7 +20776,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -23985,7 +20786,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -23995,7 +20796,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -24008,7 +20809,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24018,7 +20819,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24028,7 +20829,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -24142,7 +20943,7 @@ cont { height: 12 color: 0x5070D0 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24156,7 +20957,7 @@ cont { height: 12 color: 0x5070D0 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24170,7 +20971,7 @@ cont { height: 12 color: 0x5070D0 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24184,7 +20985,7 @@ cont { height: 12 color: 0x5070D0 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24288,7 +21089,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24298,7 +21099,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24308,7 +21109,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -24321,7 +21122,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24331,7 +21132,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24341,7 +21142,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -24362,7 +21163,7 @@ cont { color: 0x404040 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "peak-mini" @@ -24377,7 +21178,7 @@ cont { color: 0x404040 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "peak" @@ -24392,7 +21193,7 @@ cont { color: 0x404040 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "peak" @@ -24407,7 +21208,7 @@ cont { color: 0x404040 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "peak" @@ -24422,7 +21223,7 @@ cont { color: 0x404040 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "peak" @@ -24481,7 +21282,7 @@ cont { height: 12 color: 0x5070D0 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24495,7 +21296,7 @@ cont { height: 12 color: 0x5070D0 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24509,7 +21310,7 @@ cont { height: 12 color: 0x5070D0 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24547,7 +21348,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24557,7 +21358,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24567,7 +21368,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -24635,6 +21436,11 @@ cont { } element { scale: 15 + lines { + width: 5 + color: 0xCDE5EA + priority: 1000 + } path_text { primary { height: 12 @@ -24642,14 +21448,14 @@ cont { } priority: 16000 } - lines { - width: 5 - color: 0xCDE5EA - priority: 1045 - } } element { scale: 16 + lines { + width: 8 + color: 0xCDE5EA + priority: 1000 + } path_text { primary { height: 12 @@ -24657,14 +21463,14 @@ cont { } priority: 16000 } - lines { - width: 8 - color: 0xCDE5EA - priority: 1047 - } } element { scale: 17 + lines { + width: 16 + color: 0xCDE5EA + priority: 1000 + } path_text { primary { height: 12 @@ -24672,11 +21478,6 @@ cont { } priority: 16000 } - lines { - width: 16 - color: 0xCDE5EA - priority: 1049 - } } } cont { @@ -24684,6 +21485,7 @@ cont { element { scale: 16 symbol { + apply_for_type: 1 name: "tree" priority: 16000 } @@ -24691,6 +21493,7 @@ cont { element { scale: 17 symbol { + apply_for_type: 1 name: "tree" priority: 16000 } @@ -24705,7 +21508,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24715,7 +21518,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -24725,7 +21528,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -24753,7 +21556,7 @@ cont { color: 0x202020 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "vulcan" @@ -24768,7 +21571,7 @@ cont { color: 0x202020 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "vulcan" @@ -24783,7 +21586,7 @@ cont { color: 0x202020 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "vulcan" @@ -24798,7 +21601,7 @@ cont { color: 0x202020 offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "vulcan" @@ -24871,7 +21674,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24885,7 +21688,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24899,7 +21702,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -24913,7 +21716,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } area { color: 0xCDE5EA @@ -25245,7 +22048,7 @@ cont { step: 218 offset: 200 } - priority: 1849 + priority: 1997 } } element { @@ -25258,7 +22061,7 @@ cont { step: 218 offset: 200 } - priority: 1849 + priority: 1997 } } } @@ -25276,7 +22079,7 @@ cont { lines { width: 0.4 color: 0x202020 - priority: 1378 + priority: 1000 } lines { width: 4 @@ -25286,7 +22089,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 1381 + priority: 1000 } } element { @@ -25294,7 +22097,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1484 + priority: 1000 } lines { width: 8 @@ -25304,43 +22107,43 @@ cont { dd: 40 } cap: BUTTCAP - priority: 1487 + priority: 1582 } } element { scale: 16 lines { - width: 1.6 + width: 0.8 color: 0x202020 - priority: 1717 + priority: 1000 } lines { - width: 16 + width: 8 color: 0x202020 dashdot { - dd: 1.6 - dd: 80 + dd: 0.8 + dd: 40 } cap: BUTTCAP - priority: 1720 + priority: 1582 } } element { scale: 17 lines { - width: 3.2 + width: 0.8 color: 0x202020 - priority: 1772 + priority: 1000 } lines { - width: 32 + width: 8 color: 0x202020 dashdot { - dd: 1.6 - dd: 160 + dd: 0.8 + dd: 40 } cap: BUTTCAP - priority: 1775 + priority: 1582 } } } @@ -25351,7 +22154,7 @@ cont { lines { width: 1.6 color: 0x101010 - priority: 1490 + priority: 1000 } } element { @@ -25359,7 +22162,7 @@ cont { lines { width: 3.2 color: 0x101010 - priority: 1723 + priority: 1000 } } element { @@ -25367,7 +22170,7 @@ cont { lines { width: 6.4 color: 0x101010 - priority: 1778 + priority: 1000 } } } @@ -25390,12 +22193,12 @@ cont { dd: 20 } cap: BUTTCAP - priority: 1382 + priority: 1000 } lines { width: 0.4 color: 0x202020 - priority: 1379 + priority: 1000 } } element { @@ -25403,7 +22206,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1485 + priority: 1000 } lines { width: 8 @@ -25413,43 +22216,43 @@ cont { dd: 40 } cap: BUTTCAP - priority: 1488 + priority: 1000 } } element { scale: 16 lines { - width: 1.6 + width: 0.8 color: 0x202020 - priority: 1718 + priority: 1000 } lines { - width: 16 + width: 8 color: 0x202020 dashdot { - dd: 1.6 - dd: 80 + dd: 0.8 + dd: 40 } cap: BUTTCAP - priority: 1721 + priority: 1000 } } element { scale: 17 lines { - width: 3.2 + width: 0.8 color: 0x202020 - priority: 1773 + priority: 1000 } lines { - width: 32 + width: 8 color: 0x202020 dashdot { - dd: 1.6 - dd: 160 + dd: 0.8 + dd: 40 } cap: BUTTCAP - priority: 1776 + priority: 1000 } } } @@ -25465,7 +22268,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1489 + priority: 1587 } } element { @@ -25478,7 +22281,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1722 + priority: 1000 } } element { @@ -25491,7 +22294,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1777 + priority: 1000 } } } @@ -25509,7 +22312,7 @@ cont { lines { width: 0.4 color: 0x202020 - priority: 1377 + priority: 1000 } lines { width: 4 @@ -25519,7 +22322,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 1380 + priority: 1000 } } element { @@ -25527,7 +22330,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1483 + priority: 1000 } lines { width: 8 @@ -25537,43 +22340,43 @@ cont { dd: 40 } cap: BUTTCAP - priority: 1486 + priority: 1000 } } element { scale: 16 lines { - width: 1.6 + width: 0.8 color: 0x202020 - priority: 1716 + priority: 1000 } lines { - width: 16 + width: 8 color: 0x202020 dashdot { - dd: 1.6 - dd: 80 + dd: 0.8 + dd: 40 } cap: BUTTCAP - priority: 1719 + priority: 1000 } } element { scale: 17 lines { - width: 3.2 + width: 0.8 color: 0x202020 - priority: 1771 + priority: 1000 } lines { - width: 32 + width: 8 color: 0x202020 dashdot { - dd: 1.6 - dd: 160 + dd: 0.8 + dd: 40 } cap: BUTTCAP - priority: 1774 + priority: 1000 } } } @@ -25584,7 +22387,7 @@ cont { lines { width: 2.5 color: 0x505050 - priority: 1304 + priority: 1000 } } element { @@ -25592,31 +22395,31 @@ cont { lines { width: 5 color: 0x505050 - priority: 1372 + priority: 1000 } } element { scale: 15 lines { - width: 10 + width: 5 color: 0x505050 - priority: 1477 + priority: 1000 } } element { scale: 16 lines { - width: 20 + width: 5 color: 0x505050 - priority: 1713 + priority: 1000 } } element { scale: 17 lines { - width: 40 + width: 5 color: 0x505050 - priority: 1767 + priority: 1000 } } } @@ -25627,7 +22430,7 @@ cont { lines { width: 2.5 color: 0x202020 - priority: 1301 + priority: 1000 } } element { @@ -25635,31 +22438,31 @@ cont { lines { width: 5 color: 0x202020 - priority: 1369 + priority: 1000 } } element { scale: 15 lines { - width: 10 - color: 0x505050 - priority: 1477 + width: 5 + color: 0x202020 + priority: 1000 } } element { scale: 16 lines { - width: 20 + width: 5 color: 0x202020 - priority: 1710 + priority: 1000 } } element { scale: 17 lines { - width: 40 + width: 5 color: 0x202020 - priority: 1764 + priority: 1000 } } } @@ -25670,7 +22473,7 @@ cont { lines { width: 2.5 color: 0x404040 - priority: 1299 + priority: 1000 } } element { @@ -25678,31 +22481,31 @@ cont { lines { width: 5 color: 0x505050 - priority: 1372 + priority: 1000 } } element { scale: 15 lines { - width: 10 + width: 5 color: 0x505050 - priority: 1477 + priority: 1000 } } element { scale: 16 lines { - width: 20 - color: 0x404040 - priority: 1708 + width: 5 + color: 0x505050 + priority: 1000 } } element { scale: 17 lines { - width: 40 - color: 0x404040 - priority: 1762 + width: 5 + color: 0x505050 + priority: 1000 } } } @@ -25713,7 +22516,7 @@ cont { lines { width: 2.5 color: 0xF6800A - priority: 1302 + priority: 1000 } } element { @@ -25721,31 +22524,31 @@ cont { lines { width: 5 color: 0xF6800A - priority: 1370 + priority: 1000 } } element { scale: 15 lines { - width: 10 - color: 0x505050 - priority: 1477 + width: 5 + color: 0xF6800A + priority: 1000 } } element { scale: 16 lines { - width: 20 + width: 5 color: 0xF6800A - priority: 1711 + priority: 1000 } } element { scale: 17 lines { - width: 40 + width: 5 color: 0xF6800A - priority: 1765 + priority: 1000 } } } @@ -25755,8 +22558,8 @@ cont { scale: 13 lines { width: 2.5 - color: 0x505050 - priority: 1304 + color: 0xF6DD0A + priority: 1000 } } element { @@ -25764,31 +22567,31 @@ cont { lines { width: 5 color: 0xF6DD0A - priority: 1371 + priority: 1000 } } element { scale: 15 lines { - width: 10 - color: 0x505050 - priority: 1477 + width: 5 + color: 0xF6DD0A + priority: 1000 } } element { scale: 16 lines { - width: 20 - color: 0x505050 - priority: 1713 + width: 5 + color: 0xF6DD0A + priority: 1000 } } element { scale: 17 lines { - width: 40 + width: 5 color: 0xF6DD0A - priority: 1766 + priority: 1000 } } } @@ -25799,7 +22602,7 @@ cont { lines { width: 2.5 color: 0xFF4040 - priority: 1300 + priority: 1000 } } element { @@ -25807,31 +22610,31 @@ cont { lines { width: 5 color: 0xFF4040 - priority: 1368 + priority: 1000 } } element { scale: 15 lines { - width: 10 - color: 0x505050 - priority: 1477 + width: 5 + color: 0xFF4040 + priority: 1000 } } element { scale: 16 lines { - width: 20 - color: 0x505050 - priority: 1713 + width: 5 + color: 0xFF4040 + priority: 1000 } } element { scale: 17 lines { - width: 40 + width: 5 color: 0xFF4040 - priority: 1763 + priority: 1000 } } } @@ -25842,7 +22645,7 @@ cont { lines { width: 2.5 color: 0x40FF40 - priority: 1298 + priority: 1000 } } element { @@ -25850,31 +22653,31 @@ cont { lines { width: 5 color: 0x40FF40 - priority: 1366 + priority: 1000 } } element { scale: 15 lines { - width: 10 - color: 0x505050 - priority: 1477 + width: 5 + color: 0x40FF40 + priority: 1000 } } element { scale: 16 lines { - width: 20 - color: 0x505050 - priority: 1713 + width: 5 + color: 0x40FF40 + priority: 1000 } } element { scale: 17 lines { - width: 40 + width: 5 color: 0x40FF40 - priority: 1761 + priority: 1000 } } } @@ -25890,7 +22693,7 @@ cont { dd: 0.25 } cap: BUTTCAP - priority: 1313 + priority: 1000 } } element { @@ -25903,7 +22706,7 @@ cont { dd: 0.5 } cap: BUTTCAP - priority: 1376 + priority: 1000 } } element { @@ -25916,33 +22719,33 @@ cont { dd: 1 } cap: BUTTCAP - priority: 1481 + priority: 1000 } } element { scale: 16 lines { - width: 4 + width: 2 color: 0xC00000 dashdot { - dd: 12 - dd: 2 + dd: 6 + dd: 1 } cap: BUTTCAP - priority: 1715 + priority: 1000 } } element { scale: 17 lines { - width: 8 + width: 2 color: 0xC00000 dashdot { - dd: 24 - dd: 4 + dd: 6 + dd: 1 } cap: BUTTCAP - priority: 1770 + priority: 1000 } } } @@ -25953,7 +22756,7 @@ cont { lines { width: 1.25 color: 0xF0E0DC - priority: 1312 + priority: 1000 } } element { @@ -25961,7 +22764,7 @@ cont { lines { width: 2.5 color: 0xF0E0DC - priority: 1375 + priority: 1000 } } element { @@ -25969,7 +22772,7 @@ cont { lines { width: 5 color: 0xF0E0DC - priority: 1480 + priority: 1000 } } element { @@ -25977,7 +22780,7 @@ cont { lines { width: 10 color: 0xF0E0DC - priority: 1714 + priority: 1760 } } element { @@ -25985,7 +22788,7 @@ cont { lines { width: 20 color: 0xF0E0DC - priority: 1769 + priority: 1000 } } } @@ -26004,7 +22807,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26020,7 +22823,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26036,7 +22839,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26052,7 +22855,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26068,7 +22871,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26084,7 +22887,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26100,7 +22903,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26116,7 +22919,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26132,7 +22935,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26148,7 +22951,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26164,7 +22967,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } } @@ -26183,7 +22986,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26199,7 +23002,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26215,7 +23018,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26231,7 +23034,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26247,7 +23050,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26263,7 +23066,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26279,7 +23082,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26295,7 +23098,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26311,7 +23114,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26327,7 +23130,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26343,7 +23146,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26359,7 +23162,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } } @@ -26372,7 +23175,7 @@ cont { height: 18 color: 0x808078 } - priority: 16000 + priority: 15000 } } element { @@ -26382,7 +23185,7 @@ cont { height: 18 color: 0x808078 } - priority: 16000 + priority: 15000 } } element { @@ -26392,7 +23195,7 @@ cont { height: 18 color: 0x808078 } - priority: 16000 + priority: 15000 } } } @@ -26409,7 +23212,7 @@ cont { height: 12 color: 0x404040 } - priority: 16000 + priority: 15000 } } element { @@ -26425,7 +23228,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26441,7 +23244,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26455,7 +23258,7 @@ cont { height: 18 color: 0x808080 } - priority: 16000 + priority: 15000 } } element { @@ -26469,7 +23272,7 @@ cont { height: 26 color: 0x909080 } - priority: 16000 + priority: 15000 } } element { @@ -26483,7 +23286,7 @@ cont { height: 28 color: 0xA0A090 } - priority: 16000 + priority: 15000 } } element { @@ -26497,7 +23300,7 @@ cont { height: 28 color: 0xA0A090 } - priority: 16000 + priority: 15000 } } } @@ -26510,7 +23313,7 @@ cont { height: 14 color: 0xA0A0A0 } - priority: 16000 + priority: 15000 } } element { @@ -26521,7 +23324,7 @@ cont { color: 0xA0A0A0 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26532,7 +23335,7 @@ cont { color: 0xA0A090 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26543,7 +23346,7 @@ cont { color: 0xA0A090 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } } @@ -26556,7 +23359,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -26566,7 +23369,7 @@ cont { height: 12 color: 0x606060 } - priority: 16000 + priority: 15000 } } element { @@ -26576,7 +23379,7 @@ cont { height: 12 color: 0x606060 } - priority: 16000 + priority: 15000 } } element { @@ -26586,7 +23389,7 @@ cont { height: 12 color: 0x606060 } - priority: 16000 + priority: 15000 } } } @@ -26599,7 +23402,7 @@ cont { height: 12 color: 0x606060 } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -26613,7 +23416,7 @@ cont { height: 12 color: 0x606060 } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -26627,7 +23430,7 @@ cont { height: 16 color: 0x606060 } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -26641,7 +23444,7 @@ cont { height: 16 color: 0x606060 } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -26658,7 +23461,7 @@ cont { height: 12 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26668,7 +23471,7 @@ cont { height: 12 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26678,7 +23481,7 @@ cont { height: 12 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26688,7 +23491,7 @@ cont { height: 12 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26698,7 +23501,7 @@ cont { height: 12 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26708,7 +23511,7 @@ cont { height: 12 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26718,7 +23521,7 @@ cont { height: 12 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26728,7 +23531,7 @@ cont { height: 16 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26738,7 +23541,7 @@ cont { height: 16 color: 0x505050 } - priority: 16000 + priority: 15000 } } element { @@ -26748,7 +23551,7 @@ cont { height: 16 color: 0x505050 } - priority: 16000 + priority: 15000 } } } @@ -26761,7 +23564,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -26771,7 +23574,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -26781,7 +23584,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -26791,7 +23594,7 @@ cont { height: 16 color: 0x202020 } - priority: 16000 + priority: 15000 } } element { @@ -26801,7 +23604,7 @@ cont { height: 12 color: 0x202020 } - priority: 16000 + priority: 15000 } } } @@ -26818,7 +23621,7 @@ cont { height: 12 color: 0x606060 } - priority: 16000 + priority: 15000 } } element { @@ -26834,7 +23637,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26850,7 +23653,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26860,7 +23663,7 @@ cont { height: 16 color: 0x404040 } - priority: 16000 + priority: 15000 } } } @@ -26873,7 +23676,7 @@ cont { height: 12 color: 0x606060 } - priority: 16000 + priority: 15000 } } element { @@ -26883,7 +23686,7 @@ cont { height: 12 color: 0x606060 } - priority: 16000 + priority: 15000 } } } @@ -26896,7 +23699,7 @@ cont { height: 14 color: 0xC0C0B0 } - priority: 16000 + priority: 15000 } } element { @@ -26907,7 +23710,7 @@ cont { color: 0xB0B0A8 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26918,7 +23721,7 @@ cont { color: 0xC0C0B0 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } } @@ -26931,7 +23734,7 @@ cont { height: 11 color: 0xC0C0B0 } - priority: 16000 + priority: 15000 } } element { @@ -26941,7 +23744,7 @@ cont { height: 12 color: 0xC0C0B0 } - priority: 16000 + priority: 15000 } } element { @@ -26951,7 +23754,7 @@ cont { height: 13 color: 0xC0C0B0 } - priority: 16000 + priority: 15000 } } element { @@ -26961,7 +23764,7 @@ cont { height: 14 color: 0xC0C0B0 } - priority: 16000 + priority: 15000 } } element { @@ -26972,7 +23775,7 @@ cont { color: 0xB0B0A8 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -26983,7 +23786,7 @@ cont { color: 0xC0C0B0 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } } @@ -27000,7 +23803,7 @@ cont { height: 12 color: 0x909090 } - priority: 16000 + priority: 15014 } } element { @@ -27014,7 +23817,7 @@ cont { height: 14 color: 0x909090 } - priority: 16000 + priority: 15014 } } element { @@ -27028,7 +23831,7 @@ cont { height: 18 color: 0x909090 } - priority: 16000 + priority: 15014 } } element { @@ -27042,7 +23845,7 @@ cont { height: 18 color: 0x909090 } - priority: 16000 + priority: 15014 } } element { @@ -27056,7 +23859,7 @@ cont { height: 18 color: 0x909090 } - priority: 16000 + priority: 15014 } } element { @@ -27070,7 +23873,7 @@ cont { height: 20 color: 0x909090 } - priority: 16000 + priority: 15014 } } } @@ -27089,7 +23892,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -27105,7 +23908,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -27121,7 +23924,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -27137,7 +23940,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -27153,7 +23956,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } element { @@ -27169,7 +23972,7 @@ cont { color: 0x505050 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } } } @@ -27188,7 +23991,7 @@ cont { color: 0x606060 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -27208,7 +24011,7 @@ cont { color: 0x404040 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -27228,7 +24031,7 @@ cont { color: 0x707070 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -27248,7 +24051,7 @@ cont { color: 0x707070 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -27268,7 +24071,7 @@ cont { color: 0x707070 stroke_color: 0xEEEEDD } - priority: 16000 + priority: 15000 } area { color: 0xDDDAC9 @@ -27471,7 +24274,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1732 + priority: 1780 } lines { width: 0.8 @@ -27481,7 +24284,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1735 + priority: 1785 } } element { @@ -27489,7 +24292,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1787 + priority: 1780 } lines { width: 0.8 @@ -27499,12 +24302,12 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1790 + priority: 1785 } } } cont { - name: "power-line-submarine" + name: "power-line-underground" element { scale: 16 lines { @@ -27519,7 +24322,7 @@ cont { dd: 8.8 } cap: BUTTCAP - priority: 1734 + priority: 1782 } lines { width: 0.8 @@ -27529,71 +24332,14 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1735 + priority: 1785 } } element { scale: 17 lines { - width: 1.6 - color: 0x80FFFFFF - dashdot { - dd: 2.4 - dd: 4 - dd: 2.4 - dd: 4 - dd: 2.4 - dd: 8.8 - } - cap: BUTTCAP - priority: 1787 - } - lines { - width: 0.8 - color: 0x808080 - dashdot { - dd: 16 - dd: 8 - } - cap: BUTTCAP - priority: 1790 - } - } -} -cont { - name: "power-line-underground" - element { - scale: 16 - lines { - width: 1.6 - color: 0x80FFFFFF - dashdot { - dd: 2.4 - dd: 4 - dd: 2.4 - dd: 4 - dd: 2.4 - dd: 8.8 - } - cap: BUTTCAP - priority: 1732 - } - lines { width: 0.8 - color: 0x808080 - dashdot { - dd: 16 - dd: 8 - } - cap: BUTTCAP - priority: 1735 - } - } - element { - scale: 17 - lines { - width: 1.6 - color: 0x80FFFFFF + color: 0x80808080 dashdot { dd: 2.4 dd: 4 @@ -27603,7 +24349,7 @@ cont { dd: 8.8 } cap: BUTTCAP - priority: 1787 + priority: 1782 } lines { width: 0.8 @@ -27613,7 +24359,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1790 + priority: 1785 } } } @@ -27624,7 +24370,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1736 + priority: 1787 } lines { width: 0.8 @@ -27634,7 +24380,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1738 + priority: 1792 } lines { width: 0.8 @@ -27648,7 +24394,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1737 + priority: 1790 } } element { @@ -27656,7 +24402,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1791 + priority: 1865 } lines { width: 0.8 @@ -27666,7 +24412,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1793 + priority: 1868 } lines { width: 0.8 @@ -27680,7 +24426,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1792 + priority: 1000 } } } @@ -27787,7 +24533,7 @@ cont { lines { width: 0.25 color: 0xb3B2B2B2 - priority: 1130 + priority: 1209 } } element { @@ -27795,7 +24541,7 @@ cont { lines { width: 0.55 color: 0xb3B2B2B2 - priority: 1137 + priority: 1226 } } element { @@ -27803,7 +24549,7 @@ cont { lines { width: 1.6 color: 0x99B2B2B2 - priority: 1109 + priority: 1178 } lines { width: 1 @@ -27813,12 +24559,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1208 + priority: 1317 } lines { width: 1 color: 0x99FFFFFF - priority: 1192 + priority: 1282 } } element { @@ -27826,7 +24572,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1194 + priority: 1287 } lines { width: 2 @@ -27836,12 +24582,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1306 + priority: 1395 } lines { width: 2 color: 0x99FFFFFF - priority: 1289 + priority: 1368 } } element { @@ -27849,7 +24595,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1446 + priority: 1514 } lines { width: 2.4 @@ -27859,12 +24605,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1523 + priority: 1643 } lines { width: 2.4 color: 0x99FFFFFF - priority: 1508 + priority: 1612 } } element { @@ -27872,7 +24618,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1458 + priority: 1541 } lines { width: 2 @@ -27882,12 +24628,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1557 + priority: 1707 } lines { width: 2 color: 0x99FFFFFF - priority: 1541 + priority: 1670 } } } @@ -27898,7 +24644,7 @@ cont { lines { width: 0.25 color: 0xb3B2B2B2 - priority: 1130 + priority: 1209 } } element { @@ -27906,7 +24652,7 @@ cont { lines { width: 0.55 color: 0xb3B2B2B2 - priority: 1137 + priority: 1226 } } element { @@ -27914,7 +24660,7 @@ cont { lines { width: 1.6 color: 0x99B2B2B2 - priority: 1109 + priority: 1178 } lines { width: 1 @@ -27924,12 +24670,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1208 + priority: 1317 } lines { width: 1 color: 0x99FFFFFF - priority: 1192 + priority: 1282 } } element { @@ -27937,7 +24683,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1194 + priority: 1287 } lines { width: 2 @@ -27947,12 +24693,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1306 + priority: 1395 } lines { width: 2 color: 0x99FFFFFF - priority: 1289 + priority: 1368 } } element { @@ -27960,12 +24706,12 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1446 + priority: 1514 } lines { width: 10.4 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -27976,12 +24722,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1523 + priority: 1643 } lines { width: 2.4 color: 0x99FFFFFF - priority: 1508 + priority: 1612 } lines { width: 12.4 @@ -27995,12 +24741,12 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1458 + priority: 1541 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -28011,12 +24757,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1557 + priority: 1707 } lines { width: 2 color: 0x99FFFFFF - priority: 1541 + priority: 1670 } lines { width: 12 @@ -28031,29 +24777,9 @@ cont { element { scale: 12 lines { - width: 0.75 - color: 0xb3B2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1235 - } - lines { - width: 0.25 - color: 0xb3FFFFFF - priority: 1236 - } - lines { width: 0.25 - color: 0xe6B2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1239 + color: 0xb3B2B2B2 + priority: 1209 } } element { @@ -28061,27 +24787,7 @@ cont { lines { width: 0.55 color: 0xb3B2B2B2 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1137 - } - lines { - width: 0.55 - color: 0xb3FFFFFF - priority: 1247 - } - lines { - width: 0.55 - color: 0xe6B2B2B2 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1250 + priority: 1226 } } element { @@ -28089,12 +24795,7 @@ cont { lines { width: 1.6 color: 0x99B2B2B2 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1109 + priority: 1178 } lines { width: 1 @@ -28104,27 +24805,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1208 - } - lines { - width: 1 - color: 0x99FFFFFF - priority: 1192 + priority: 1317 } lines { width: 1 color: 0x99FFFFFF - priority: 1314 - } - lines { - width: 1 - color: 0xe6B2B2B2 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1316 + priority: 1282 } } element { @@ -28132,12 +24818,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1393 + priority: 1287 } lines { width: 2 @@ -28147,40 +24828,26 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1306 - } - lines { - width: 2 - color: 0x99FFFFFF - priority: 1289 + priority: 1395 } lines { width: 2 color: 0x99FFFFFF - priority: 1394 - } - lines { - width: 2 - color: 0xe6B2B2B2 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1395 + priority: 1368 } } element { scale: 16 lines { + width: 10.4 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { width: 3.2 color: 0x99B2B2B2 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1611 + priority: 1514 } lines { width: 2.4 @@ -28190,12 +24857,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1523 - } - lines { - width: 2.4 - color: 0x99FFFFFF - priority: 1508 + priority: 1643 } lines { width: 2.4 @@ -28203,27 +24865,28 @@ cont { priority: 1612 } lines { - width: 2.4 - color: 0xe6B2B2B2 + width: 12.4 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1613 } } element { scale: 17 lines { + width: 10 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { width: 3.2 color: 0x99B2B2B2 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1653 + priority: 1541 } lines { width: 2 @@ -28233,27 +24896,22 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1557 - } - lines { - width: 2 - color: 0x99FFFFFF - priority: 1541 + priority: 1707 } lines { width: 2 color: 0x99FFFFFF - priority: 1654 + priority: 1670 } lines { - width: 2 - color: 0xe6B2B2B2 + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1655 } } } @@ -28281,7 +24939,7 @@ cont { lines { width: 0.5 color: 0x80808080 - priority: 1129 + priority: 1207 } } element { @@ -28289,7 +24947,7 @@ cont { lines { width: 0.85 color: 0x80808080 - priority: 1136 + priority: 1224 } } element { @@ -28297,7 +24955,7 @@ cont { lines { width: 1.6 color: 0x4d808080 - priority: 1108 + priority: 1175 } lines { width: 1 @@ -28307,12 +24965,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1207 + priority: 1314 } lines { width: 1 color: 0x4dF2F2F2 - priority: 1191 + priority: 1280 } } element { @@ -28320,7 +24978,7 @@ cont { lines { width: 3.2 color: 0x4d808080 - priority: 1193 + priority: 1285 } lines { width: 2 @@ -28330,12 +24988,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1305 + priority: 1392 } lines { width: 2 color: 0x4dF2F2F2 - priority: 1288 + priority: 1365 } } element { @@ -28343,7 +25001,7 @@ cont { lines { width: 3.2 color: 0x4d808080 - priority: 1444 + priority: 1509 } lines { width: 2.4 @@ -28353,12 +25011,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1521 + priority: 1639 } lines { width: 2.4 color: 0x4dF2F2F2 - priority: 1506 + priority: 1607 } } element { @@ -28366,7 +25024,7 @@ cont { lines { width: 3.2 color: 0x4d808080 - priority: 1457 + priority: 1539 } lines { width: 2 @@ -28376,12 +25034,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1555 + priority: 1702 } lines { width: 2 color: 0x4dF2F2F2 - priority: 1539 + priority: 1665 } } } @@ -28392,7 +25050,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1135 + priority: 1221 } } element { @@ -28400,7 +25058,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1145 + priority: 1239 } } element { @@ -28408,12 +25066,12 @@ cont { lines { width: 2.4 color: 0x590909 - priority: 1117 + priority: 1195 } lines { width: 0.4 color: 0x590909 - priority: 1217 + priority: 1331 } lines { width: 1.7 @@ -28423,7 +25081,7 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1200 + priority: 1300 } } element { @@ -28431,12 +25089,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1201 + priority: 1302 } lines { width: 0.5 color: 0x4C0F0F - priority: 1315 + priority: 1407 } lines { width: 2 @@ -28446,7 +25104,7 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1297 + priority: 1380 } } element { @@ -28454,12 +25112,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1450 + priority: 1521 } lines { width: 0.6 color: 0x4C0F0F - priority: 1529 + priority: 1653 } lines { width: 2 @@ -28469,7 +25127,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1514 + priority: 1626 } } element { @@ -28477,12 +25135,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1466 + priority: 1560 } lines { width: 0.64 color: 0x4C0F0F - priority: 1566 + priority: 1729 } lines { width: 2 @@ -28492,7 +25150,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1548 + priority: 1685 } } } @@ -28503,7 +25161,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1135 + priority: 1221 } } element { @@ -28511,7 +25169,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1145 + priority: 1239 } } element { @@ -28519,12 +25177,12 @@ cont { lines { width: 2.4 color: 0x590909 - priority: 1117 + priority: 1195 } lines { width: 0.4 color: 0x590909 - priority: 1217 + priority: 1331 } lines { width: 1.7 @@ -28534,7 +25192,7 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1200 + priority: 1300 } } element { @@ -28542,12 +25200,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1201 + priority: 1302 } lines { width: 0.5 color: 0x4C0F0F - priority: 1315 + priority: 1407 } lines { width: 2 @@ -28557,7 +25215,7 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1297 + priority: 1380 } } element { @@ -28565,18 +25223,18 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1450 + priority: 1521 } lines { width: 8.6 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 0.6 color: 0x4C0F0F - priority: 1529 + priority: 1653 } lines { width: 2 @@ -28586,7 +25244,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1514 + priority: 1626 } lines { width: 10.6 @@ -28600,18 +25258,18 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1466 + priority: 1560 } lines { width: 8.64 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { width: 0.64 color: 0x4C0F0F - priority: 1566 + priority: 1729 } lines { width: 2 @@ -28621,7 +25279,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1548 + priority: 1685 } lines { width: 10.64 @@ -28636,57 +25294,17 @@ cont { element { scale: 12 lines { - width: 1.88 - color: 0x800000 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1261 - } - lines { - width: 1 - color: 0xFFFFFF - priority: 1262 - } - lines { width: 1 - color: 0xcc800000 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1266 + color: 0xA0A0A0 + priority: 1221 } } element { scale: 13 lines { - width: 1.95 - color: 0x800000 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1272 - } - lines { - width: 1.35 - color: 0xFFFFFF - priority: 1273 - } - lines { - width: 1.35 - color: 0xcc800000 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1275 + width: 1 + color: 0xA0A0A0 + priority: 1239 } } element { @@ -28694,17 +25312,12 @@ cont { lines { width: 2.4 color: 0x590909 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1117 + priority: 1195 } lines { width: 0.4 color: 0x590909 - priority: 1217 + priority: 1331 } lines { width: 1.7 @@ -28714,32 +25327,7 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1200 - } - lines { - width: 0.4 - color: 0xb3590909 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1340 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1336 - } - lines { - width: 1.7 - color: 0xb3E6B7B7 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1338 + priority: 1300 } } element { @@ -28747,17 +25335,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1201 + priority: 1302 } lines { width: 0.5 color: 0x4C0F0F - priority: 1315 + priority: 1407 } lines { width: 2 @@ -28767,50 +25350,26 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1297 - } - lines { - width: 0.5 - color: 0xb34C0F0F - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1421 + priority: 1380 } + } + element { + scale: 16 lines { - width: 2 + width: 8.6 color: 0xFFFFFF - priority: 1417 - } - lines { - width: 2 - color: 0xb3E6B7B7 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1419 } - } - element { - scale: 16 lines { width: 3.2 color: 0x4C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1634 + priority: 1521 } lines { width: 0.6 color: 0x4C0F0F - priority: 1529 + priority: 1653 } lines { width: 2 @@ -28820,50 +25379,36 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1514 + priority: 1626 } lines { - width: 0.6 - color: 0xb34C0F0F + width: 10.6 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1639 } + } + element { + scale: 17 lines { - width: 2 + width: 8.64 color: 0xFFFFFF - priority: 1635 - } - lines { - width: 2 - color: 0xb3E6B7B7 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 4 cap: BUTTCAP - priority: 1637 } - } - element { - scale: 17 lines { width: 3.2 color: 0x4C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1466 + priority: 1560 } lines { width: 0.64 color: 0x4C0F0F - priority: 1566 + priority: 1729 } lines { width: 2 @@ -28873,32 +25418,17 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1548 - } - lines { - width: 0.64 - color: 0xb34C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1681 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1677 + priority: 1685 } lines { - width: 2 - color: 0xb3E6B7B7 + width: 10.64 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1679 } } } @@ -28908,14 +25438,14 @@ cont { scale: 14 symbol { name: "railway-station-mini" - priority: 16000 + priority: 16146 } } element { scale: 15 symbol { name: "railway-station-mini" - priority: 16000 + priority: 16146 } caption { primary { @@ -28924,14 +25454,14 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15146 } } element { scale: 16 symbol { name: "railway-station-mini" - priority: 16000 + priority: 16146 } caption { primary { @@ -28940,7 +25470,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15146 } } element { @@ -28956,218 +25486,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - } -} -cont { - name: "railway-incline-tunnel" - element { - scale: 12 - lines { - width: 1.88 - color: 0x800000 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1259 - } - lines { - width: 1 - color: 0xFFFFFF - priority: 1260 - } - lines { - width: 1 - color: 0xcc800000 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1265 - } - } - element { - scale: 13 - lines { - width: 1.95 - color: 0x800000 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1270 - } - lines { - width: 1.35 - color: 0xFFFFFF - priority: 1271 - } - lines { - width: 1.35 - color: 0xcc800000 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1274 - } - } - element { - scale: 14 - lines { - width: 0.4 - color: 0xb3590909 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1339 - } - lines { - width: 2.4 - color: 0x590909 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1333 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1334 - } - lines { - width: 1.7 - color: 0xb3E6B7B7 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1337 - } - } - element { - scale: 15 - lines { - width: 0.5 - color: 0xb34C0F0F - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1420 - } - lines { - width: 3.2 - color: 0x4C0F0F - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1414 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1415 - } - lines { - width: 2 - color: 0xb3E6B7B7 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1418 - } - } - element { - scale: 16 - lines { - width: 0.6 - color: 0xb34C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1638 - } - lines { - width: 3.2 - color: 0x4C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1632 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1633 - } - lines { - width: 2 - color: 0xb3E6B7B7 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1636 - } - } - element { - scale: 17 - lines { - width: 0.64 - color: 0xb34C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1680 - } - lines { - width: 3.2 - color: 0x4C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1674 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1675 - } - lines { - width: 2 - color: 0xb3E6B7B7 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1678 + priority: 15000 } } } @@ -29195,7 +25514,7 @@ cont { lines { width: 1 color: 0x90D090 - priority: 1546 + priority: 1682 } } element { @@ -29203,7 +25522,7 @@ cont { lines { width: 1 color: 0x90D090 - priority: 1565 + priority: 1726 } } element { @@ -29211,7 +25530,7 @@ cont { lines { width: 2.4 color: 0x095909 - priority: 1546 + priority: 1682 } lines { width: 1.7 @@ -29221,12 +25540,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 1.7 color: 0xB7E6E6 - priority: 1555 + priority: 1702 } } element { @@ -29234,7 +25553,7 @@ cont { lines { width: 3.2 color: 0x0F4C0F - priority: 1546 + priority: 1682 } lines { width: 2 @@ -29244,12 +25563,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 2 color: 0xB7E6E6 - priority: 1555 + priority: 1702 } } element { @@ -29257,7 +25576,7 @@ cont { lines { width: 3.2 color: 0x0F4C0F - priority: 1546 + priority: 1682 } lines { width: 2 @@ -29267,12 +25586,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 2 color: 0xB7E6E6 - priority: 1555 + priority: 1702 } } element { @@ -29280,7 +25599,7 @@ cont { lines { width: 3.2 color: 0x0F4C0F - priority: 1464 + priority: 1556 } lines { width: 2 @@ -29290,12 +25609,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1562 + priority: 1719 } lines { width: 2 color: 0xB7E6E6 - priority: 1545 + priority: 1680 } } } @@ -29306,7 +25625,7 @@ cont { lines { width: 1 color: 0x90D090 - priority: 1546 + priority: 1682 } } element { @@ -29314,7 +25633,7 @@ cont { lines { width: 1 color: 0x90D090 - priority: 1565 + priority: 1726 } } element { @@ -29322,7 +25641,7 @@ cont { lines { width: 2.4 color: 0x095909 - priority: 1546 + priority: 1682 } lines { width: 1.7 @@ -29332,12 +25651,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 1.7 color: 0xB7E6E6 - priority: 1555 + priority: 1702 } } element { @@ -29345,7 +25664,7 @@ cont { lines { width: 3.2 color: 0x0F4C0F - priority: 1546 + priority: 1682 } lines { width: 2 @@ -29355,12 +25674,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 2 color: 0xB7E6E6 - priority: 1555 + priority: 1702 } } element { @@ -29368,12 +25687,12 @@ cont { lines { width: 3.2 color: 0x0F4C0F - priority: 1546 + priority: 1682 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -29384,12 +25703,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 2 color: 0xB7E6E6 - priority: 1555 + priority: 1702 } lines { width: 12 @@ -29403,12 +25722,12 @@ cont { lines { width: 3.2 color: 0x0F4C0F - priority: 1464 + priority: 1556 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -29419,12 +25738,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1562 + priority: 1719 } lines { width: 2 color: 0xB7E6E6 - priority: 1545 + priority: 1680 } lines { width: 12 @@ -29439,29 +25758,9 @@ cont { element { scale: 12 lines { - width: 1.88 - color: 0x008000 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1250 - } - lines { width: 1 - color: 0xFFFFFF - priority: 1251 - } - lines { - width: 1 - color: 0xcc008000 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1252 + color: 0x90D090 + priority: 1682 } } element { @@ -29469,27 +25768,7 @@ cont { lines { width: 1 color: 0x90D090 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1565 - } - lines { - width: 1.35 - color: 0xFFFFFF - priority: 1262 - } - lines { - width: 1.35 - color: 0xcc008000 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1263 + priority: 1726 } } element { @@ -29497,12 +25776,7 @@ cont { lines { width: 2.4 color: 0x095909 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1327 + priority: 1682 } lines { width: 1.7 @@ -29512,27 +25786,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 1.7 color: 0xB7E6E6 - priority: 1555 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1328 - } - lines { - width: 1.7 - color: 0xb3095909 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1329 + priority: 1702 } } element { @@ -29540,12 +25799,7 @@ cont { lines { width: 3.2 color: 0x0F4C0F - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1546 + priority: 1682 } lines { width: 2 @@ -29555,40 +25809,26 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 2 color: 0xB7E6E6 - priority: 1555 + priority: 1702 } + } + element { + scale: 16 lines { - width: 2 + width: 10 color: 0xFFFFFF - priority: 1406 - } - lines { - width: 2 - color: 0xb30F4C0F - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1407 } - } - element { - scale: 16 lines { width: 3.2 color: 0x0F4C0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1623 + priority: 1682 } lines { width: 2 @@ -29598,40 +25838,36 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1565 + priority: 1726 } lines { width: 2 color: 0xB7E6E6 - priority: 1555 + priority: 1702 } lines { - width: 2 - color: 0xFFFFFF - priority: 1624 - } - lines { - width: 2 - color: 0xb30F4C0F + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1625 } } element { scale: 17 lines { + width: 10 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { width: 3.2 color: 0x0F4C0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1464 + priority: 1556 } lines { width: 2 @@ -29641,27 +25877,22 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1562 + priority: 1719 } lines { width: 2 color: 0xB7E6E6 - priority: 1545 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1666 + priority: 1680 } lines { - width: 2 - color: 0xb30F4C0F + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1667 } } } @@ -29672,7 +25903,7 @@ cont { lines { width: 1 color: 0xD08080 - priority: 1136 + priority: 1224 } } element { @@ -29680,7 +25911,7 @@ cont { lines { width: 1 color: 0xD08080 - priority: 1146 + priority: 1000 } } element { @@ -29688,7 +25919,7 @@ cont { lines { width: 2 color: 0x590959 - priority: 1454 + priority: 1531 } lines { width: 1.7 @@ -29698,12 +25929,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1214 + priority: 1329 } lines { width: 1.7 color: 0xD08080 - priority: 1454 + priority: 1534 } } element { @@ -29711,7 +25942,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 2 @@ -29721,12 +25952,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 + priority: 1536 } } element { @@ -29734,7 +25965,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 2 @@ -29744,12 +25975,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 + priority: 1536 } } element { @@ -29757,7 +25988,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 2 @@ -29767,12 +25998,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 + priority: 1536 } } } @@ -29783,7 +26014,7 @@ cont { lines { width: 1 color: 0xD08080 - priority: 1136 + priority: 1224 } } element { @@ -29791,7 +26022,7 @@ cont { lines { width: 1 color: 0xD08080 - priority: 1146 + priority: 1000 } } element { @@ -29799,7 +26030,7 @@ cont { lines { width: 2 color: 0x590959 - priority: 1454 + priority: 1531 } lines { width: 1.7 @@ -29809,12 +26040,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1214 + priority: 1329 } lines { width: 1.7 color: 0xD08080 - priority: 1454 + priority: 1534 } } element { @@ -29822,7 +26053,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 2 @@ -29832,12 +26063,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 + priority: 1536 } } element { @@ -29845,12 +26076,12 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -29861,12 +26092,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 + priority: 1536 } lines { width: 12 @@ -29880,12 +26111,12 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -29896,12 +26127,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 + priority: 1536 } lines { width: 12 @@ -29918,68 +26149,23 @@ cont { lines { width: 1 color: 0xD08080 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1136 - } - lines { - width: 1 - color: 0xFFFFFF - priority: 1268 - } - lines { - width: 1 - color: 0xccB20000 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1269 + priority: 1224 } } element { scale: 13 lines { - width: 1.95 - color: 0xB20000 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1276 - } - lines { - width: 1.35 - color: 0xFFFFFF - priority: 1277 - } - lines { - width: 1.35 - color: 0xccB20000 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1278 + width: 1 + color: 0xD08080 + priority: 1000 } } element { scale: 14 lines { - width: 2.4 - color: 0x590909 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1341 + width: 2 + color: 0x590959 + priority: 1531 } lines { width: 1.7 @@ -29989,27 +26175,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1214 + priority: 1329 } lines { width: 1.7 color: 0xD08080 - priority: 1454 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1342 - } - lines { - width: 0.4 - color: 0xb3FFFFFF - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1343 + priority: 1534 } } element { @@ -30017,12 +26188,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1454 + priority: 1534 } lines { width: 2 @@ -30032,40 +26198,26 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 + priority: 1536 } + } + element { + scale: 16 lines { - width: 2 + width: 10 color: 0xFFFFFF - priority: 1422 - } - lines { - width: 0.5 - color: 0xb3FFFFFF - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1423 } - } - element { - scale: 16 lines { width: 3.2 - color: 0x4C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1640 + color: 0x4C0F4C + priority: 1534 } lines { width: 2 @@ -30075,40 +26227,36 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1641 + priority: 1536 } lines { - width: 0.6 - color: 0xb3FFFFFF + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1642 } } element { scale: 17 lines { - width: 3.2 - color: 0x4C0F0F - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 10 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP - priority: 1682 + } + lines { + width: 3.2 + color: 0x4C0F4C + priority: 1534 } lines { width: 2 @@ -30118,27 +26266,22 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xD08080 - priority: 1455 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1683 + priority: 1536 } lines { - width: 0.64 - color: 0xb3FFFFFF + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1684 } } } @@ -30149,7 +26292,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1132 + priority: 1214 } } element { @@ -30157,7 +26300,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1140 + priority: 1234 } } element { @@ -30165,7 +26308,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1111 + priority: 1182 } lines { width: 1.7 @@ -30175,12 +26318,12 @@ cont { dd: 5.5 } cap: BUTTCAP - priority: 1211 + priority: 1321 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1195 + priority: 1290 } } element { @@ -30188,7 +26331,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1197 + priority: 1295 } lines { width: 2 @@ -30198,12 +26341,12 @@ cont { dd: 11 } cap: BUTTCAP - priority: 1309 + priority: 1400 } lines { width: 2 color: 0xE6E6E6 - priority: 1292 + priority: 1373 } } element { @@ -30211,7 +26354,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1448 + priority: 1519 } lines { width: 2 @@ -30221,12 +26364,12 @@ cont { dd: 14 } cap: BUTTCAP - priority: 1525 + priority: 1648 } lines { width: 2 color: 0xE6E6E6 - priority: 1511 + priority: 1619 } } element { @@ -30234,7 +26377,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1462 + priority: 1551 } lines { width: 2 @@ -30244,12 +26387,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1560 + priority: 1714 } lines { width: 2 color: 0xE6E6E6 - priority: 1543 + priority: 1675 } } } @@ -30260,7 +26403,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1132 + priority: 1214 } } element { @@ -30268,7 +26411,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1140 + priority: 1234 } } element { @@ -30276,7 +26419,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1111 + priority: 1182 } lines { width: 1.7 @@ -30286,12 +26429,12 @@ cont { dd: 5.5 } cap: BUTTCAP - priority: 1211 + priority: 1321 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1195 + priority: 1290 } } element { @@ -30299,7 +26442,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1197 + priority: 1295 } lines { width: 2 @@ -30309,12 +26452,12 @@ cont { dd: 11 } cap: BUTTCAP - priority: 1309 + priority: 1400 } lines { width: 2 color: 0xE6E6E6 - priority: 1292 + priority: 1373 } } element { @@ -30322,12 +26465,12 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1448 + priority: 1519 } lines { width: 11.2 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -30338,12 +26481,12 @@ cont { dd: 14 } cap: BUTTCAP - priority: 1525 + priority: 1648 } lines { width: 2 color: 0xE6E6E6 - priority: 1511 + priority: 1619 } lines { width: 13.2 @@ -30357,12 +26500,12 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1462 + priority: 1551 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -30373,12 +26516,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1560 + priority: 1714 } lines { width: 2 color: 0xE6E6E6 - priority: 1543 + priority: 1675 } lines { width: 12 @@ -30395,27 +26538,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1244 - } - lines { - width: 1.25 - color: 0xFFFFFF - priority: 1245 - } - lines { - width: 1.25 - color: 0xe6404040 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1246 + priority: 1214 } } element { @@ -30423,27 +26546,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1140 - } - lines { - width: 1.35 - color: 0xFFFFFF - priority: 1256 - } - lines { - width: 1.35 - color: 0xe6404040 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1257 + priority: 1234 } } element { @@ -30451,12 +26554,7 @@ cont { lines { width: 2.4 color: 0x606060 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1111 + priority: 1182 } lines { width: 1.7 @@ -30466,27 +26564,12 @@ cont { dd: 5.5 } cap: BUTTCAP - priority: 1211 + priority: 1321 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1195 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1322 - } - lines { - width: 1.7 - color: 0xd9404040 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1323 + priority: 1290 } } element { @@ -30494,12 +26577,7 @@ cont { lines { width: 3.2 color: 0x333333 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1197 + priority: 1295 } lines { width: 2 @@ -30509,40 +26587,26 @@ cont { dd: 11 } cap: BUTTCAP - priority: 1309 + priority: 1400 } lines { width: 2 color: 0xE6E6E6 - priority: 1292 + priority: 1373 } + } + element { + scale: 16 lines { - width: 2 + width: 11.2 color: 0xFFFFFF - priority: 1400 - } - lines { - width: 2 - color: 0xd9333333 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1401 } - } - element { - scale: 16 lines { width: 3.2 color: 0x333333 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1448 + priority: 1519 } lines { width: 2 @@ -30552,40 +26616,36 @@ cont { dd: 14 } cap: BUTTCAP - priority: 1525 + priority: 1648 } lines { width: 2 color: 0xE6E6E6 - priority: 1511 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1618 + priority: 1619 } lines { - width: 2 - color: 0xd9333333 + width: 13.2 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1619 } } element { scale: 17 lines { + width: 10 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { width: 3.2 color: 0x333333 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1659 + priority: 1551 } lines { width: 2 @@ -30595,27 +26655,22 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1560 + priority: 1714 } lines { width: 2 color: 0xE6E6E6 - priority: 1543 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1660 + priority: 1675 } lines { - width: 2 - color: 0xd9333333 + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1661 } } } @@ -30626,7 +26681,7 @@ cont { lines { width: 4 color: 0xBBBBBB - priority: 1470 + priority: 1570 } area { color: 0xBBBBBB @@ -30638,7 +26693,7 @@ cont { lines { width: 8 color: 0xBBBBBB - priority: 1498 + priority: 1000 } area { color: 0xBBBBBB @@ -30649,27 +26704,11 @@ cont { cont { name: "railway-preserved" element { - scale: 10 - lines { - width: 0.5 - color: 0xC0C0C0 - priority: 1072 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xC0C0C0 - priority: 1072 - } - } - element { scale: 12 lines { width: 1 color: 0xC0C0C0 - priority: 1133 + priority: 1217 } } element { @@ -30677,7 +26716,7 @@ cont { lines { width: 1.35 color: 0xB0B0B0 - priority: 1141 + priority: 1236 } } element { @@ -30685,7 +26724,7 @@ cont { lines { width: 2.4 color: 0x909090 - priority: 1112 + priority: 1185 } lines { width: 1.7 @@ -30695,12 +26734,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1212 + priority: 1324 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1196 + priority: 1000 } } element { @@ -30708,7 +26747,7 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1198 + priority: 1297 } lines { width: 2 @@ -30718,12 +26757,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1310 + priority: 1402 } lines { width: 2 color: 0xE6E6E6 - priority: 1293 + priority: 1375 } } element { @@ -30731,7 +26770,7 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1449 + priority: 1000 } lines { width: 2 @@ -30741,12 +26780,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1526 + priority: 1651 } lines { width: 2 color: 0xE6E6E6 - priority: 1512 + priority: 1621 } } element { @@ -30754,7 +26793,7 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1463 + priority: 1553 } lines { width: 2 @@ -30764,39 +26803,23 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1561 + priority: 1717 } lines { width: 2 color: 0xE6E6E6 - priority: 1544 + priority: 1678 } } } cont { name: "railway-preserved-bridge" element { - scale: 10 - lines { - width: 0.5 - color: 0xC0C0C0 - priority: 1072 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xC0C0C0 - priority: 1072 - } - } - element { scale: 12 lines { width: 1 color: 0xC0C0C0 - priority: 1133 + priority: 1217 } } element { @@ -30804,7 +26827,7 @@ cont { lines { width: 1.35 color: 0xB0B0B0 - priority: 1141 + priority: 1236 } } element { @@ -30812,7 +26835,7 @@ cont { lines { width: 2.4 color: 0x909090 - priority: 1112 + priority: 1185 } lines { width: 1.7 @@ -30822,12 +26845,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1212 + priority: 1324 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1196 + priority: 1000 } } element { @@ -30835,7 +26858,7 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1198 + priority: 1297 } lines { width: 2 @@ -30845,12 +26868,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1310 + priority: 1402 } lines { width: 2 color: 0xE6E6E6 - priority: 1293 + priority: 1375 } } element { @@ -30858,12 +26881,12 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1449 + priority: 1000 } lines { width: 11.2 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -30874,12 +26897,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1526 + priority: 1651 } lines { width: 2 color: 0xE6E6E6 - priority: 1512 + priority: 1621 } lines { width: 13.2 @@ -30893,12 +26916,12 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1463 + priority: 1553 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -30909,12 +26932,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1561 + priority: 1717 } lines { width: 2 color: 0xE6E6E6 - priority: 1544 + priority: 1678 } lines { width: 12 @@ -30927,75 +26950,19 @@ cont { cont { name: "railway-preserved-tunnel" element { - scale: 10 - lines { - width: 0.5 - color: 0xC0C0C0 - priority: 1072 - } - } - element { - scale: 11 - lines { - width: 1 - color: 0xC0C0C0 - priority: 1072 - } - } - element { scale: 12 lines { - width: 1.88 - color: 0x595959 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1247 - } - lines { width: 1 - color: 0xFFFFFF - priority: 1248 - } - lines { - width: 1 - color: 0xe6595959 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1249 + color: 0xC0C0C0 + priority: 1217 } } element { scale: 13 lines { - width: 1.95 - color: 0x595959 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1258 - } - lines { width: 1.35 - color: 0xFFFFFF - priority: 1259 - } - lines { - width: 1.35 - color: 0xe6595959 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1260 + color: 0xB0B0B0 + priority: 1236 } } element { @@ -31003,12 +26970,7 @@ cont { lines { width: 2.4 color: 0x909090 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1112 + priority: 1185 } lines { width: 1.7 @@ -31018,27 +26980,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1212 + priority: 1324 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1196 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1325 - } - lines { - width: 1.7 - color: 0xd9505050 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1326 + priority: 1000 } } element { @@ -31046,12 +26993,7 @@ cont { lines { width: 3.2 color: 0x909090 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1402 + priority: 1297 } lines { width: 2 @@ -31061,83 +27003,26 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1310 + priority: 1402 } lines { width: 2 color: 0xE6E6E6 - priority: 1293 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1403 - } - lines { - width: 2 - color: 0xd9333333 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1404 + priority: 1375 } } element { scale: 16 lines { - width: 3.2 - color: 0x909090 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1449 - } - lines { - width: 2 - color: 0x333333 - dashdot { - dd: 12 - dd: 12 - } - cap: BUTTCAP - priority: 1526 - } - lines { - width: 2 - color: 0xE6E6E6 - priority: 1512 - } - lines { - width: 2 + width: 11.2 color: 0xFFFFFF - priority: 1621 - } - lines { - width: 2 - color: 0xd9333333 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 4 cap: BUTTCAP - priority: 1622 } - } - element { - scale: 17 lines { width: 3.2 color: 0x909090 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1463 + priority: 1000 } lines { width: 2 @@ -31147,598 +27032,61 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1561 + priority: 1651 } lines { width: 2 color: 0xE6E6E6 - priority: 1544 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1663 - } - lines { - width: 2 - color: 0xd9333333 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1664 - } - } -} -cont { - name: "railway-proposed" - element { - scale: 12 - lines { - width: 0.5 - color: 0xB2B2B2 - dashdot { - dd: 0.5 - dd: 0.5 - } - cap: BUTTCAP - priority: 1128 - } - } - element { - scale: 13 - lines { - width: 0.85 - color: 0xB2B2B2 - dashdot { - dd: 0.75 - dd: 0.75 - } - cap: BUTTCAP - priority: 1135 - } - } - element { - scale: 14 - lines { - width: 2.4 - color: 0xB2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1107 - } - lines { - width: 1.7 - color: 0xB2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - dd: 1.5 - dd: 4.5 - } - cap: BUTTCAP - priority: 1206 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1190 - } - } - element { - scale: 15 - lines { - width: 3.2 - color: 0xB2B2B2 - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1192 - } - lines { - width: 2 - color: 0xB2B2B2 - dashdot { - dd: 3 - dd: 3 - dd: 3 - dd: 9 - } - cap: BUTTCAP - priority: 1304 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1287 - } - } - element { - scale: 16 - lines { - width: 3.2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - } - cap: BUTTCAP - priority: 1443 + priority: 1621 } lines { - width: 2.4 - color: 0xB2B2B2 + width: 13.2 + color: 0x707070 + priority: 0 dashdot { - dd: 4 - dd: 4 - dd: 4 - dd: 12 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1520 - } - lines { - width: 2.4 - color: 0xFFFFFF - priority: 1505 } } element { scale: 17 lines { - width: 3.2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - } - cap: BUTTCAP - priority: 1456 - } - lines { - width: 2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - dd: 4 - dd: 12 - } - cap: BUTTCAP - priority: 1554 - } - lines { - width: 2 + width: 10 color: 0xFFFFFF - priority: 1538 - } - } -} -cont { - name: "railway-proposed-bridge" - element { - scale: 12 - lines { - width: 0.5 - color: 0xB2B2B2 - dashdot { - dd: 0.5 - dd: 0.5 - } - cap: BUTTCAP - priority: 1128 - } - } - element { - scale: 13 - lines { - width: 0.85 - color: 0xB2B2B2 - dashdot { - dd: 0.75 - dd: 0.75 - } - cap: BUTTCAP - priority: 1135 - } - } - element { - scale: 14 - lines { - width: 2.4 - color: 0xB2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1107 - } - lines { - width: 1.7 - color: 0xB2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - dd: 1.5 - dd: 4.5 - } + priority: 4 cap: BUTTCAP - priority: 1206 } lines { - width: 1.7 - color: 0xFFFFFF - priority: 1190 - } - } - element { - scale: 15 - lines { width: 3.2 - color: 0xB2B2B2 - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1192 - } - lines { - width: 2 - color: 0xB2B2B2 - dashdot { - dd: 3 - dd: 3 - dd: 3 - dd: 9 - } - cap: BUTTCAP - priority: 1304 + color: 0x909090 + priority: 1553 } lines { width: 2 - color: 0xFFFFFF - priority: 1287 - } - } - element { - scale: 16 - lines { - width: 3.2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - } - cap: BUTTCAP - priority: 1443 - } - lines { - width: 11.2 - color: 0xFFFFFF - priority: 1 - cap: BUTTCAP - } - lines { - width: 2.4 - color: 0xB2B2B2 + color: 0x333333 dashdot { - dd: 4 - dd: 4 - dd: 4 dd: 12 - } - cap: BUTTCAP - priority: 1520 - } - lines { - width: 2.4 - color: 0xFFFFFF - priority: 1505 - } - lines { - width: 13.2 - color: 0x707070 - priority: 0 - cap: BUTTCAP - } - } - element { - scale: 17 - lines { - width: 3.2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - } - cap: BUTTCAP - priority: 1456 - } - lines { - width: 10 - color: 0xFFFFFF - priority: 1 - cap: BUTTCAP - } - lines { - width: 2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - dd: 4 dd: 12 } cap: BUTTCAP - priority: 1554 + priority: 1717 } lines { width: 2 - color: 0xFFFFFF - priority: 1538 + color: 0xE6E6E6 + priority: 1678 } lines { width: 12 color: 0x707070 priority: 0 - cap: BUTTCAP - } - } -} -cont { - name: "railway-proposed-tunnel" - element { - scale: 12 - lines { - width: 1.12 - color: 0xB2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1228 - } - lines { - width: 0.5 - color: 0xFFFFFF - dashdot { - dd: 0.5 - dd: 0.5 - } - cap: BUTTCAP - priority: 1229 - } - lines { - width: 0.5 - color: 0xe6B2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1231 - } - } - element { - scale: 13 - lines { - width: 0.85 - color: 0xB2B2B2 - dashdot { - dd: 0.75 - dd: 0.75 - } - cap: BUTTCAP - priority: 1135 - } - lines { - width: 0.85 - color: 0xFFFFFF - dashdot { - dd: 0.75 - dd: 0.75 - } - cap: BUTTCAP - priority: 1240 - } - lines { - width: 0.85 - color: 0xe6B2B2B2 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1242 - } - } - element { - scale: 14 - lines { - width: 2.4 - color: 0xB2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1107 - } - lines { - width: 1.7 - color: 0xB2B2B2 - dashdot { - dd: 1.5 - dd: 1.5 - dd: 1.5 - dd: 4.5 - } - cap: BUTTCAP - priority: 1206 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1190 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1307 - } - lines { - width: 1.7 - color: 0xe6B2B2B2 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1309 - } - } - element { - scale: 15 - lines { - width: 3.2 - color: 0xB2B2B2 dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1387 - } - lines { - width: 2 - color: 0xB2B2B2 - dashdot { - dd: 3 - dd: 3 - dd: 3 - dd: 9 - } - cap: BUTTCAP - priority: 1304 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1287 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1388 - } - lines { - width: 2 - color: 0xe6B2B2B2 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1389 - } - } - element { - scale: 16 - lines { - width: 3.2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - } - cap: BUTTCAP - priority: 1443 - } - lines { - width: 2.4 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - dd: 4 - dd: 12 - } - cap: BUTTCAP - priority: 1520 - } - lines { - width: 2.4 - color: 0xFFFFFF - priority: 1505 - } - lines { - width: 2.4 - color: 0xFFFFFF - priority: 1606 - } - lines { - width: 2.4 - color: 0xe6B2B2B2 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1607 - } - } - element { - scale: 17 - lines { - width: 3.2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - } - cap: BUTTCAP - priority: 1456 - } - lines { - width: 2 - color: 0xB2B2B2 - dashdot { - dd: 4 - dd: 4 - dd: 4 - dd: 12 - } - cap: BUTTCAP - priority: 1554 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1538 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1647 - } - lines { - width: 2 - color: 0xe6B2B2B2 - dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1649 } } } @@ -31749,7 +27097,7 @@ cont { lines { width: 1.56 color: 0xB0B0B0 - priority: 1015 + priority: 1043 } } element { @@ -31757,7 +27105,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1070 + priority: 1139 } } element { @@ -31765,7 +27113,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1070 + priority: 1139 } } element { @@ -31773,7 +27121,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1131 + priority: 1212 } } element { @@ -31781,7 +27129,7 @@ cont { lines { width: 1.85 color: 0xB0B0B0 - priority: 1139 + priority: 1231 } } element { @@ -31792,17 +27140,17 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } lines { width: 1.8 color: 0xE6E6E6 - priority: 1194 + priority: 1287 } lines { width: 3 color: 0x888888 - priority: 1110 + priority: 1180 } lines { width: 1.8 @@ -31812,12 +27160,7 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1210 - } - circle { - radius: 3 - color: 0x3050D8 - priority: 16000 + priority: 1319 } } element { @@ -31828,17 +27171,17 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } lines { width: 2.4 color: 0xE6E6E6 - priority: 1291 + priority: 1370 } lines { width: 4 color: 0x666666 - priority: 1196 + priority: 1292 } lines { width: 2.4 @@ -31848,12 +27191,7 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1308 - } - circle { - radius: 4 - color: 0xFFFF00 - priority: 16000 + priority: 1373 } } element { @@ -31864,22 +27202,17 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } lines { width: 2.4 color: 0xE6E6E6 - priority: 1510 + priority: 1617 } lines { width: 4 color: 0x666666 - priority: 1447 - } - circle { - radius: 6 - color: 0x3050D8 - priority: 16000 + priority: 1517 } lines { width: 2.4 @@ -31889,7 +27222,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1524 + priority: 1646 } } element { @@ -31900,22 +27233,17 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } lines { width: 3.2 color: 0xE6E6E6 - priority: 1542 + priority: 1673 } lines { width: 4.4 color: 0x666666 - priority: 1461 - } - circle { - radius: 5.6 - color: 0x3050D8 - priority: 16000 + priority: 1548 } lines { width: 3.2 @@ -31925,7 +27253,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1559 + priority: 1712 } } } @@ -31936,7 +27264,7 @@ cont { lines { width: 1.56 color: 0xB0B0B0 - priority: 1015 + priority: 1043 } } element { @@ -31944,7 +27272,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1070 + priority: 1139 } } element { @@ -31952,7 +27280,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1070 + priority: 1139 } } element { @@ -31960,7 +27288,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1131 + priority: 1212 } } element { @@ -31968,7 +27296,7 @@ cont { lines { width: 1.85 color: 0xB0B0B0 - priority: 1139 + priority: 1231 } } element { @@ -31979,17 +27307,17 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } lines { width: 1.8 color: 0xE6E6E6 - priority: 1194 + priority: 1287 } lines { width: 3 color: 0x888888 - priority: 1110 + priority: 1180 } lines { width: 1.8 @@ -31999,12 +27327,7 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1210 - } - circle { - radius: 3 - color: 0x3050D8 - priority: 16000 + priority: 1319 } } element { @@ -32015,17 +27338,17 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } lines { width: 2.4 color: 0xE6E6E6 - priority: 1291 + priority: 1370 } lines { width: 4 color: 0x666666 - priority: 1196 + priority: 1292 } lines { width: 2.4 @@ -32035,12 +27358,7 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1308 - } - circle { - radius: 4 - color: 0xFFFF00 - priority: 16000 + priority: 1373 } } element { @@ -32051,22 +27369,17 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } lines { width: 2.4 color: 0xE6E6E6 - priority: 1510 + priority: 1617 } lines { width: 4 color: 0x666666 - priority: 1447 - } - circle { - radius: 6 - color: 0x3050D8 - priority: 16000 + priority: 1517 } lines { width: 2.4 @@ -32076,12 +27389,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1524 + priority: 1646 } lines { width: 10.4 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -32099,22 +27412,17 @@ cont { color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } lines { width: 3.2 color: 0xE6E6E6 - priority: 1542 + priority: 1673 } lines { width: 4.4 color: 0x666666 - priority: 1461 - } - circle { - radius: 5.6 - color: 0x3050D8 - priority: 16000 + priority: 1548 } lines { width: 3.2 @@ -32124,12 +27432,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1559 + priority: 1712 } lines { width: 11.2 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -32147,7 +27455,7 @@ cont { lines { width: 1.56 color: 0xB0B0B0 - priority: 1015 + priority: 1043 } } element { @@ -32155,43 +27463,23 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1070 + priority: 1139 } } element { scale: 11 lines { - width: 0.12 - color: 0x666666 - priority: 1073 + width: 1 + color: 0xC0C0C0 + priority: 1139 } } element { scale: 12 lines { - width: 2.38 - color: 0x888888 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1241 - } - lines { - width: 1.75 - color: 0xFFFFFF - priority: 1242 - } - lines { - width: 1.75 - color: 0x888888 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1243 + width: 1 + color: 0xC0C0C0 + priority: 1212 } } element { @@ -32199,63 +27487,28 @@ cont { lines { width: 1.85 color: 0xB0B0B0 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1139 - } - lines { - width: 1.85 - color: 0xFFFFFF - priority: 1253 - } - lines { - width: 1.85 - color: 0x888888 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1254 + priority: 1231 } } element { scale: 14 - lines { - width: 3 - color: 0x888888 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1318 - } caption { primary { height: 12 color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16318 + priority: 15000 } lines { width: 1.8 color: 0xE6E6E6 - priority: 1194 + priority: 1287 } lines { width: 3 color: 0x888888 - priority: 1110 - } - circle { - radius: 3 - color: 0x3050D8 - priority: 16000 + priority: 1180 } lines { width: 1.8 @@ -32265,58 +27518,28 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1210 - } - lines { - width: 1.8 - color: 0xFFFFFF priority: 1319 } - lines { - width: 1.8 - color: 0x888888 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1320 - } } element { scale: 15 - lines { - width: 4 - color: 0x666666 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1396 - } caption { primary { height: 12 color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16396 + priority: 15000 } lines { width: 2.4 color: 0xE6E6E6 - priority: 1291 + priority: 1370 } lines { width: 4 color: 0x666666 - priority: 1196 - } - circle { - radius: 4 - color: 0xFFFF00 - priority: 16000 + priority: 1292 } lines { width: 2.4 @@ -32326,58 +27549,38 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1308 - } - lines { - width: 2.4 - color: 0xFFFFFF - priority: 1397 - } - lines { - width: 2.4 - color: 0x666666 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1398 + priority: 1373 } } element { scale: 16 - lines { - width: 4 - color: 0x666666 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1614 - } caption { primary { height: 12 color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16614 + priority: 15000 } lines { width: 2.4 color: 0xE6E6E6 - priority: 1510 + priority: 1617 } lines { width: 4 color: 0x666666 - priority: 1447 + priority: 1517 } - circle { - radius: 6 - color: 0x3050D8 - priority: 16000 + lines { + width: 12.4 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } lines { width: 2.4 @@ -32387,58 +27590,44 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1524 + priority: 1646 } lines { - width: 2.4 + width: 10.4 color: 0xFFFFFF - priority: 1615 - } - lines { - width: 2.4 - color: 0x666666 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 4 cap: BUTTCAP - priority: 1616 } } element { scale: 17 - lines { - width: 4.4 - color: 0x666666 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1656 - } caption { primary { height: 12 color: 0x3050D8 stroke_color: 0xFFFFFF } - priority: 16656 + priority: 15000 } lines { width: 3.2 color: 0xE6E6E6 - priority: 1542 + priority: 1673 } lines { width: 4.4 color: 0x666666 - priority: 1461 + priority: 1548 } - circle { - radius: 5.6 - color: 0x3050D8 - priority: 16000 + lines { + width: 13.2 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } lines { width: 3.2 @@ -32448,22 +27637,13 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1559 + priority: 1712 } lines { - width: 3.2 + width: 11.2 color: 0xFFFFFF - priority: 1657 - } - lines { - width: 3.2 - color: 0x666666 - dashdot { - dd: 3.2 - dd: 3.2 - } + priority: 4 cap: BUTTCAP - priority: 1658 } } } @@ -32479,7 +27659,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1445 + priority: 1512 } lines { width: 2.4 @@ -32493,12 +27673,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1522 + priority: 1641 } lines { width: 2.4 color: 0xb3FFFFFF - priority: 1507 + priority: 1609 } } element { @@ -32511,7 +27691,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1460 + priority: 1546 } lines { width: 2 @@ -32525,12 +27705,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1556 + priority: 1704 } lines { width: 2 color: 0xb3FFFFFF - priority: 1540 + priority: 1668 } } } @@ -32541,7 +27721,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1149 + priority: 1243 } } element { @@ -32549,7 +27729,7 @@ cont { lines { width: 1.6 color: 0x909090 - priority: 1120 + priority: 1202 } lines { width: 1 @@ -32559,12 +27739,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1221 + priority: 1339 } lines { width: 1 color: 0xE6E6E6 - priority: 1203 + priority: 1307 } } element { @@ -32572,7 +27752,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1205 + priority: 1312 } lines { width: 1.4 @@ -32582,12 +27762,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1318 + priority: 1414 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1301 + priority: 1387 } } element { @@ -32595,7 +27775,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1453 + priority: 1529 } lines { width: 1.2 @@ -32605,12 +27785,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1532 + priority: 1660 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1518 + priority: 1634 } } element { @@ -32618,7 +27798,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1469 + priority: 1568 } lines { width: 1.36 @@ -32628,12 +27808,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1570 + priority: 1739 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1551 + priority: 1692 } } } @@ -32644,7 +27824,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1149 + priority: 1243 } } element { @@ -32652,7 +27832,7 @@ cont { lines { width: 1.6 color: 0x909090 - priority: 1120 + priority: 1202 } lines { width: 1 @@ -32662,12 +27842,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1221 + priority: 1339 } lines { width: 1 color: 0xE6E6E6 - priority: 1203 + priority: 1307 } } element { @@ -32675,7 +27855,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1205 + priority: 1312 } lines { width: 1.4 @@ -32685,12 +27865,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1318 + priority: 1414 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1301 + priority: 1387 } } element { @@ -32698,12 +27878,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1453 + priority: 1529 } lines { width: 9.2 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -32714,12 +27894,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1532 + priority: 1660 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1518 + priority: 1634 } lines { width: 11.2 @@ -32733,12 +27913,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1469 + priority: 1568 } lines { width: 10.4 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -32749,12 +27929,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1570 + priority: 1739 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1551 + priority: 1692 } lines { width: 12.4 @@ -32769,42 +27949,17 @@ cont { element { scale: 13 lines { - width: 1.45 - color: 0x404040 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1281 - } - lines { - width: 0.85 - color: 0xFFFFFF - priority: 1282 - } - lines { - width: 0.85 - color: 0x404040 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1284 + width: 1 + color: 0xB0B0B0 + priority: 1243 } } element { scale: 14 lines { width: 1.6 - color: 0x404040 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1348 + color: 0x909090 + priority: 1202 } lines { width: 1 @@ -32814,27 +27969,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1221 + priority: 1339 } lines { width: 1 color: 0xE6E6E6 - priority: 1203 - } - lines { - width: 1 - color: 0xFFFFFF - priority: 1349 - } - lines { - width: 1 - color: 0x404040 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1352 + priority: 1307 } } element { @@ -32842,12 +27982,7 @@ cont { lines { width: 2.4 color: 0x333333 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1205 + priority: 1312 } lines { width: 1.4 @@ -32857,40 +27992,26 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1318 + priority: 1414 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1301 + priority: 1387 } + } + element { + scale: 16 lines { - width: 1.4 + width: 9.2 color: 0xFFFFFF - priority: 1429 - } - lines { - width: 1.4 - color: 0x333333 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1432 } - } - element { - scale: 16 lines { width: 2.4 color: 0x333333 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1647 + priority: 1529 } lines { width: 1.2 @@ -32900,40 +28021,36 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1532 + priority: 1660 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1518 - } - lines { - width: 1.2 - color: 0xFFFFFF - priority: 1648 + priority: 1634 } lines { - width: 1.2 - color: 0x333333 + width: 11.2 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1651 } } element { scale: 17 lines { + width: 10.4 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { width: 2.4 color: 0x333333 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1469 + priority: 1568 } lines { width: 1.36 @@ -32943,27 +28060,22 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1570 + priority: 1739 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1551 - } - lines { - width: 1.36 - color: 0xFFFFFF - priority: 1690 + priority: 1692 } lines { - width: 1.36 - color: 0x333333 + width: 12.4 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1693 } } } @@ -32974,7 +28086,7 @@ cont { lines { width: 1.6 color: 0xB0B0B0 - priority: 1118 + priority: 1197 } lines { width: 1 @@ -32984,12 +28096,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1219 + priority: 1334 } lines { width: 1 color: 0x909090 - priority: 1201 + priority: 1302 } } element { @@ -32997,7 +28109,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1203 + priority: 1307 } lines { width: 1.4 @@ -33007,12 +28119,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1316 + priority: 1409 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1299 + priority: 1382 } } element { @@ -33020,7 +28132,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1451 + priority: 1524 } lines { width: 1.2 @@ -33030,12 +28142,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1530 + priority: 1656 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1516 + priority: 1629 } } element { @@ -33043,7 +28155,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1467 + priority: 1563 } lines { width: 1.36 @@ -33053,12 +28165,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1568 + priority: 1734 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1549 + priority: 1687 } } } @@ -33069,7 +28181,7 @@ cont { lines { width: 1.6 color: 0xB0B0B0 - priority: 1118 + priority: 1197 } lines { width: 1 @@ -33079,12 +28191,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1219 + priority: 1334 } lines { width: 1 color: 0x909090 - priority: 1201 + priority: 1302 } } element { @@ -33092,7 +28204,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1203 + priority: 1307 } lines { width: 1.4 @@ -33102,12 +28214,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1316 + priority: 1409 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1299 + priority: 1382 } } element { @@ -33115,12 +28227,12 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1451 + priority: 1524 } lines { width: 9.2 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -33131,12 +28243,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1530 + priority: 1656 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1516 + priority: 1629 } lines { width: 11.2 @@ -33150,12 +28262,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1467 + priority: 1563 } lines { width: 9.36 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -33166,12 +28278,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1568 + priority: 1734 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1549 + priority: 1687 } lines { width: 11.36 @@ -33187,13 +28299,8 @@ cont { scale: 14 lines { width: 1.6 - color: 0x606060 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1344 + color: 0xB0B0B0 + priority: 1197 } lines { width: 1 @@ -33203,27 +28310,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1219 + priority: 1334 } lines { width: 1 color: 0x909090 - priority: 1201 - } - lines { - width: 1 - color: 0xFFFFFF - priority: 1345 - } - lines { - width: 1 - color: 0x606060 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1350 + priority: 1302 } } element { @@ -33231,12 +28323,7 @@ cont { lines { width: 2.4 color: 0x606060 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1424 + priority: 1307 } lines { width: 1.4 @@ -33246,40 +28333,26 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1316 + priority: 1409 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1299 + priority: 1382 } + } + element { + scale: 16 lines { - width: 1.4 + width: 9.2 color: 0xFFFFFF - priority: 1425 - } - lines { - width: 1.4 - color: 0x606060 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1430 } - } - element { - scale: 16 lines { width: 2.4 color: 0x606060 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1643 + priority: 1524 } lines { width: 1.2 @@ -33289,40 +28362,36 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1530 + priority: 1656 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1516 - } - lines { - width: 1.2 - color: 0xFFFFFF - priority: 1644 + priority: 1629 } lines { - width: 1.2 - color: 0x606060 + width: 11.2 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1649 } } element { scale: 17 lines { - width: 2.4 - color: 0x606060 - dashdot { - dd: 3.2 - dd: 3.2 - } + width: 9.36 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP - priority: 1685 + } + lines { + width: 2.4 + color: 0x333333 + priority: 1563 } lines { width: 1.36 @@ -33332,27 +28401,22 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1568 + priority: 1734 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1549 - } - lines { - width: 1.36 - color: 0xFFFFFF - priority: 1686 + priority: 1687 } lines { - width: 1.36 - color: 0x606060 + width: 11.36 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1691 } } } @@ -33362,14 +28426,14 @@ cont { scale: 14 symbol { name: "railway-station-mini" - priority: 16000 + priority: 16146 } } element { scale: 15 symbol { name: "railway-station-mini" - priority: 16000 + priority: 16146 } caption { primary { @@ -33378,14 +28442,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 10 } - priority: 16000 + priority: 15146 } } element { scale: 16 symbol { name: "railway-station" - priority: 16000 + priority: 16146 } caption { primary { @@ -33394,14 +28458,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 10 } - priority: 16000 + priority: 15146 } } element { scale: 17 symbol { name: "railway-station" - priority: 16000 + priority: 16146 } caption { primary { @@ -33410,7 +28474,7 @@ cont { stroke_color: 0xF8FCFF offset_y: 10 } - priority: 16000 + priority: 15146 } } } @@ -33420,7 +28484,7 @@ cont { scale: 13 symbol { name: "subway-station-s" - priority: 16000 + priority: 16146 } caption { primary { @@ -33429,14 +28493,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 10 } - priority: 16000 + priority: 15146 } } element { scale: 14 symbol { name: "subway-station-s" - priority: 16000 + priority: 16146 } caption { primary { @@ -33445,14 +28509,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 10 } - priority: 16000 + priority: 15146 } } element { scale: 15 symbol { name: "subway-station-m" - priority: 16000 + priority: 16146 } caption { primary { @@ -33461,14 +28525,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 10 } - priority: 16000 + priority: 15146 } } element { scale: 16 symbol { name: "subway-station-l" - priority: 16000 + priority: 16146 } caption { primary { @@ -33477,14 +28541,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 10 } - priority: 16000 + priority: 15146 } } element { scale: 17 symbol { name: "subway-station-l" - priority: 16000 + priority: 16146 } caption { primary { @@ -33493,7 +28557,7 @@ cont { stroke_color: 0xF8FCFF offset_y: 10 } - priority: 16000 + priority: 15146 } } } @@ -33504,7 +28568,7 @@ cont { lines { width: 3.2 color: 0x0F0F4C - priority: 1465 + priority: 1558 } lines { width: 2 @@ -33514,12 +28578,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 + priority: 1682 } } element { @@ -33527,7 +28591,7 @@ cont { lines { width: 3.2 color: 0x0F0F4C - priority: 1465 + priority: 1558 } lines { width: 2 @@ -33537,12 +28601,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 + priority: 1682 } } element { @@ -33550,7 +28614,7 @@ cont { lines { width: 3.2 color: 0x0F0F4C - priority: 1465 + priority: 1558 } lines { width: 2 @@ -33560,12 +28624,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 + priority: 1682 } } } @@ -33576,7 +28640,7 @@ cont { lines { width: 3.2 color: 0x0F0F4C - priority: 1465 + priority: 1558 } lines { width: 2 @@ -33586,12 +28650,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 + priority: 1682 } } element { @@ -33599,12 +28663,12 @@ cont { lines { width: 3.2 color: 0x0F0F4C - priority: 1465 + priority: 1558 } lines { width: 11.2 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -33615,12 +28679,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 + priority: 1682 } lines { width: 13.2 @@ -33634,12 +28698,12 @@ cont { lines { width: 3.2 color: 0x0F0F4C - priority: 1465 + priority: 1558 } lines { width: 11.2 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -33650,12 +28714,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 + priority: 1682 } lines { width: 13.2 @@ -33672,12 +28736,7 @@ cont { lines { width: 3.2 color: 0x0F0F4C - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1411 + priority: 1558 } lines { width: 2 @@ -33687,40 +28746,26 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 + priority: 1682 } + } + element { + scale: 16 lines { - width: 2 + width: 11.2 color: 0xFFFFFF - priority: 1412 - } - lines { - width: 2 - color: 0xb30F0F4C - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1413 } - } - element { - scale: 16 lines { width: 3.2 color: 0x0F0F4C - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1629 + priority: 1558 } lines { width: 2 @@ -33730,40 +28775,36 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1630 + priority: 1682 } lines { - width: 2 - color: 0xb30F0F4C + width: 13.2 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1631 } } element { scale: 17 lines { + width: 11.2 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { width: 3.2 color: 0x0F0F4C - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1671 + priority: 1558 } lines { width: 2 @@ -33773,27 +28814,22 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1564 + priority: 1724 } lines { width: 2 color: 0xB7B7E6 - priority: 1546 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1672 + priority: 1682 } lines { - width: 2 - color: 0xb30F0F4C + width: 13.2 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1673 } } } @@ -33821,7 +28857,7 @@ cont { lines { width: 2 color: 0x590959 - priority: 1454 + priority: 1531 } lines { width: 1.7 @@ -33831,12 +28867,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1214 + priority: 1329 } lines { width: 1.7 color: 0xE6B7E6 - priority: 1454 + priority: 1534 } } element { @@ -33844,7 +28880,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 2 @@ -33854,12 +28890,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 + priority: 1536 } } element { @@ -33867,7 +28903,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 2 @@ -33877,12 +28913,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 + priority: 1536 } } element { @@ -33890,7 +28926,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 2 @@ -33900,12 +28936,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 + priority: 1536 } } } @@ -33916,7 +28952,7 @@ cont { lines { width: 2 color: 0x590959 - priority: 1454 + priority: 1531 } lines { width: 1.7 @@ -33926,12 +28962,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1214 + priority: 1329 } lines { width: 1.7 color: 0xE6B7E6 - priority: 1454 + priority: 1534 } } element { @@ -33939,7 +28975,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 2 @@ -33949,12 +28985,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 + priority: 1536 } } element { @@ -33962,12 +28998,12 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -33978,12 +29014,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 + priority: 1536 } lines { width: 12 @@ -33997,12 +29033,12 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1454 + priority: 1534 } lines { width: 10 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -34013,12 +29049,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 + priority: 1536 } lines { width: 12 @@ -34031,72 +29067,11 @@ cont { cont { name: "railway-tram-tunnel" element { - scale: 12 - lines { - width: 1.88 - color: 0x800080 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1253 - } - lines { - width: 1 - color: 0xFFFFFF - priority: 1254 - } - lines { - width: 1 - color: 0xcc800080 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1255 - } - } - element { - scale: 13 - lines { - width: 1.95 - color: 0x800080 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1264 - } - lines { - width: 1.35 - color: 0xFFFFFF - priority: 1265 - } - lines { - width: 1.35 - color: 0xcc800080 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1266 - } - } - element { scale: 14 lines { width: 2 color: 0x590959 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1454 + priority: 1531 } lines { width: 1.7 @@ -34106,27 +29081,12 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1214 + priority: 1329 } lines { width: 1.7 color: 0xE6B7E6 - priority: 1454 - } - lines { - width: 1.7 - color: 0xFFFFFF - priority: 1331 - } - lines { - width: 1.7 - color: 0xb3590959 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1332 + priority: 1534 } } element { @@ -34134,12 +29094,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1454 + priority: 1534 } lines { width: 2 @@ -34149,40 +29104,26 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 + priority: 1536 } + } + element { + scale: 16 lines { - width: 2 + width: 10 color: 0xFFFFFF - priority: 1409 - } - lines { - width: 2 - color: 0xb34C0F4C - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1410 } - } - element { - scale: 16 lines { width: 3.2 color: 0x4C0F4C - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1626 + priority: 1534 } lines { width: 2 @@ -34192,40 +29133,36 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1627 + priority: 1536 } lines { - width: 2 - color: 0xb34C0F4C + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1628 } } element { scale: 17 lines { + width: 10 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { width: 3.2 color: 0x4C0F4C - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1668 + priority: 1534 } lines { width: 2 @@ -34235,27 +29172,22 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1459 + priority: 1543 } lines { width: 2 color: 0xE6B7E6 - priority: 1455 - } - lines { - width: 2 - color: 0xFFFFFF - priority: 1669 + priority: 1536 } lines { - width: 2 - color: 0xb34C0F4C + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1670 } } } @@ -34270,7 +29202,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "tramway-mini" @@ -34286,7 +29218,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15000 } symbol { name: "tramway-mini" @@ -34295,6 +29227,10 @@ cont { } element { scale: 17 + symbol { + name: "tramway" + priority: 16000 + } caption { primary { height: 12 @@ -34302,11 +29238,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 - } - symbol { - name: "tramway" - priority: 16000 + priority: 15000 } } } @@ -34317,7 +29249,7 @@ cont { lines { width: 0.5 color: 0x404040 - priority: 1138 + priority: 1229 } } element { @@ -34325,7 +29257,7 @@ cont { lines { width: 0.85 color: 0x404040 - priority: 1148 + priority: 1241 } } element { @@ -34333,7 +29265,7 @@ cont { lines { width: 1.6 color: 0x404040 - priority: 1119 + priority: 1200 } lines { width: 1 @@ -34343,12 +29275,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1220 + priority: 1336 } lines { width: 1 color: 0xE6E6E6 - priority: 1202 + priority: 1304 } } element { @@ -34366,12 +29298,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1317 + priority: 1412 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1300 + priority: 1385 } } element { @@ -34379,7 +29311,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1452 + priority: 1526 } lines { width: 1.2 @@ -34389,12 +29321,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1531 + priority: 1658 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1517 + priority: 1631 } } element { @@ -34402,7 +29334,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1468 + priority: 1565 } lines { width: 1.36 @@ -34412,12 +29344,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1569 + priority: 1736 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1550 + priority: 1690 } } } @@ -34428,7 +29360,7 @@ cont { lines { width: 0.5 color: 0x404040 - priority: 1138 + priority: 1229 } } element { @@ -34436,7 +29368,7 @@ cont { lines { width: 0.85 color: 0x404040 - priority: 1148 + priority: 1241 } } element { @@ -34444,7 +29376,7 @@ cont { lines { width: 1.6 color: 0x404040 - priority: 1119 + priority: 1200 } lines { width: 1 @@ -34454,12 +29386,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1220 + priority: 1336 } lines { width: 1 color: 0xE6E6E6 - priority: 1202 + priority: 1304 } } element { @@ -34477,12 +29409,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1317 + priority: 1412 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1300 + priority: 1385 } } element { @@ -34490,12 +29422,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1452 + priority: 1526 } lines { width: 9.2 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -34506,12 +29438,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1531 + priority: 1658 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1517 + priority: 1631 } lines { width: 11.2 @@ -34525,12 +29457,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1468 + priority: 1565 } lines { width: 9.36 color: 0xFFFFFF - priority: 1 + priority: 4 cap: BUTTCAP } lines { @@ -34541,12 +29473,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1569 + priority: 1736 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1550 + priority: 1690 } lines { width: 11.36 @@ -34561,29 +29493,9 @@ cont { element { scale: 12 lines { - width: 1.12 - color: 0x404040 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1272 - } - lines { width: 0.5 - color: 0xFFFFFF - priority: 1000 - } - lines { - width: 0.5 - color: 0xe6404040 - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1275 + color: 0x404040 + priority: 1229 } } element { @@ -34591,27 +29503,7 @@ cont { lines { width: 0.85 color: 0x404040 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1148 - } - lines { - width: 0.85 - color: 0xFFFFFF - priority: 1280 - } - lines { - width: 0.85 - color: 0xe6404040 - dashdot { - dd: 1.85 - dd: 1.85 - } - cap: BUTTCAP - priority: 1283 + priority: 1241 } } element { @@ -34619,12 +29511,7 @@ cont { lines { width: 1.6 color: 0x404040 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1346 + priority: 1200 } lines { width: 1 @@ -34634,27 +29521,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1220 + priority: 1336 } lines { width: 1 color: 0xE6E6E6 - priority: 1202 - } - lines { - width: 1 - color: 0xFFFFFF - priority: 1347 - } - lines { - width: 1 - color: 0xb3404040 - dashdot { - dd: 2.2 - dd: 2.2 - } - cap: BUTTCAP - priority: 1351 + priority: 1304 } } element { @@ -34662,12 +29534,7 @@ cont { lines { width: 2.4 color: 0x333333 - dashdot { - dd: 2.8 - dd: 2.8 - } - cap: BUTTCAP - priority: 1426 + priority: 1000 } lines { width: 1.4 @@ -34677,40 +29544,26 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1317 + priority: 1412 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1300 + priority: 1385 } + } + element { + scale: 16 lines { - width: 1.4 + width: 9.2 color: 0xFFFFFF - priority: 1427 - } - lines { - width: 1.4 - color: 0xb3333333 - dashdot { - dd: 2.8 - dd: 2.8 - } + priority: 4 cap: BUTTCAP - priority: 1431 } - } - element { - scale: 16 lines { width: 2.4 color: 0x333333 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1452 + priority: 1526 } lines { width: 1.2 @@ -34720,40 +29573,36 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1531 + priority: 1658 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1517 - } - lines { - width: 1.2 - color: 0xFFFFFF - priority: 1646 + priority: 1631 } lines { - width: 1.2 - color: 0xb3333333 + width: 11.2 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1650 } } element { scale: 17 lines { + width: 9.36 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { width: 2.4 color: 0x333333 - dashdot { - dd: 3.2 - dd: 3.2 - } - cap: BUTTCAP - priority: 1468 + priority: 1565 } lines { width: 1.36 @@ -34763,27 +29612,22 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1569 + priority: 1736 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1550 - } - lines { - width: 1.36 - color: 0xFFFFFF - priority: 1688 + priority: 1690 } lines { - width: 1.36 - color: 0xb3333333 + width: 11.36 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1692 } } } @@ -34799,7 +29643,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 1074 + priority: 1141 } } element { @@ -34812,7 +29656,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 1074 + priority: 1141 } } element { @@ -34825,7 +29669,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1018 + priority: 1046 } } element { @@ -34838,7 +29682,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1079 + priority: 1143 } } element { @@ -34851,7 +29695,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1079 + priority: 1143 } } element { @@ -34864,7 +29708,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1294 + priority: 1378 } } element { @@ -34877,7 +29721,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1316 + priority: 1409 } } element { @@ -34890,7 +29734,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1403 + priority: 1473 } } element { @@ -34903,7 +29747,7 @@ cont { dd: 5 } cap: BUTTCAP - priority: 1521 + priority: 1639 } } element { @@ -34916,7 +29760,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1747 + priority: 1809 } } element { @@ -34929,7 +29773,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1818 + priority: 1929 } } } @@ -34944,7 +29788,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bakery" @@ -34960,7 +29804,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "bakery" @@ -34979,7 +29823,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "car_repair" @@ -34995,7 +29839,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "car_repair" @@ -35014,7 +29858,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "clothes" @@ -35030,7 +29874,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "clothes" @@ -35049,7 +29893,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "supermarket" @@ -35065,7 +29909,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "supermarket" @@ -35084,7 +29928,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hairdresser" @@ -35100,7 +29944,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hairdresser" @@ -35119,7 +29963,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "kiosk" @@ -35135,7 +29979,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "kiosk" @@ -35154,7 +29998,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "supermarket" @@ -35170,7 +30014,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "supermarket" @@ -35432,7 +30276,7 @@ cont { color: 0x303030 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xF0E0DC @@ -35447,7 +30291,7 @@ cont { color: 0x303030 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xF0E0DC @@ -35462,7 +30306,7 @@ cont { color: 0x303030 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xF0E0DC @@ -35528,11 +30372,11 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } area { color: 0xCFECB7 - priority: -16511 + priority: -15998 } symbol { name: "campsite" @@ -35546,35 +30390,35 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16512 + priority: -16511 } } element { scale: 13 area { color: 0xCFECB7 - priority: -16513 + priority: -16512 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16514 + priority: -16513 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16515 + priority: -16514 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16516 + priority: -16515 } } element { @@ -35585,11 +30429,11 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16517 + priority: -16516 } } } @@ -35604,7 +30448,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hostel" @@ -35620,7 +30464,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hostel" @@ -35639,7 +30483,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hostel" @@ -35655,7 +30499,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hostel" @@ -35674,7 +30518,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hotel" @@ -35690,7 +30534,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hotel" @@ -35739,7 +30583,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hotel" @@ -35755,7 +30599,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "hotel" @@ -35774,7 +30618,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "museum" @@ -35790,7 +30634,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } symbol { name: "museum" @@ -35804,35 +30648,35 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16518 + priority: -16517 } } element { scale: 13 area { color: 0xCFECB7 - priority: -16519 + priority: -16518 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16520 + priority: -16519 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16521 + priority: -16520 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16522 + priority: -16521 } } element { @@ -35844,11 +30688,11 @@ cont { stroke_color: 0xFFFFFF offset_y: 10 } - priority: 16000 + priority: 15002 } area { color: 0xCFECB7 - priority: -16523 + priority: -15998 } symbol { name: "picnic" @@ -35886,35 +30730,35 @@ cont { scale: 12 area { color: 0xCFECB7 - priority: -16524 + priority: -16522 } } element { scale: 13 area { color: 0xCFECB7 - priority: -16525 + priority: -16523 } } element { scale: 14 area { color: 0xCFECB7 - priority: -16526 + priority: -16524 } } element { scale: 15 area { color: 0xCFECB7 - priority: -16527 + priority: -16525 } } element { scale: 16 area { color: 0xCFECB7 - priority: -16528 + priority: -16526 } } element { @@ -35925,11 +30769,11 @@ cont { color: 0x404040 stroke_color: 0xFFFFFF } - priority: 16000 + priority: 15000 } area { color: 0xCFECB7 - priority: -16529 + priority: -16527 } } } @@ -35940,7 +30784,7 @@ cont { lines { width: 2.5 color: 0xCDE5EA - priority: 1112 + priority: 1014 } } element { @@ -35948,73 +30792,73 @@ cont { lines { width: 3 color: 0xCDE5EA - priority: 1112 + priority: 1014 } } element { scale: 14 - path_text { - primary { - height: 12 - color: 0x507CEA - } - priority: 16112 - } lines { width: 4 color: 0xCDE5EA - priority: 1044 + priority: 1014 } - } - element { - scale: 15 path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } + } + element { + scale: 15 lines { width: 4 color: 0xCDE5EA - priority: 1049 + priority: 1014 } - } - element { - scale: 16 path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } + } + element { + scale: 16 lines { width: 4.8 color: 0xCDE5EA - priority: 1051 + priority: 1014 } - } - element { - scale: 17 path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } + } + element { + scale: 17 lines { width: 8 color: 0xB0B0B0 - priority: 53 + priority: 14 cap: BUTTCAP } lines { width: 6.4 color: 0xCDE5EA - priority: 1053 + priority: 1014 + } + path_text { + primary { + height: 12 + color: 0x507CEA + } + priority: 16014 } } } @@ -36025,12 +30869,7 @@ cont { lines { width: 2.5 color: 0xCDE5EA - dashdot { - dd: 3.75 - dd: 3.75 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } } element { @@ -36038,37 +30877,22 @@ cont { lines { width: 3 color: 0xCDE5EA - dashdot { - dd: 4.5 - dd: 4.5 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } } element { scale: 14 lines { - width: 3 + width: 4 color: 0xCDE5EA - dashdot { - dd: 6 - dd: 6 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 - } - lines { - width: 4 - color: 0xCDE5EA - priority: 1044 + priority: 16014 } } element { @@ -36076,24 +30900,14 @@ cont { lines { width: 4 color: 0xCDE5EA - dashdot { - dd: 7.4 - dd: 7.4 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 - } - lines { - width: 4 - color: 0xCDE5EA - priority: 1049 + priority: 16014 } } element { @@ -36101,55 +30915,67 @@ cont { lines { width: 4.8 color: 0xCDE5EA - dashdot { - dd: 8.8 - dd: 8.8 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } lines { - width: 4.8 - color: 0xCDE5EA - priority: 1051 + width: 12.8 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { + width: 14.8 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { scale: 17 lines { + width: 8 + color: 0xB0B0B0 + priority: 14 + cap: BUTTCAP + } + lines { width: 6.4 color: 0xCDE5EA - dashdot { - dd: 12 - dd: 12 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } lines { - width: 8 - color: 0xB0B0B0 - priority: 53 + width: 14.4 + color: 0xFFFFFF + priority: 4 cap: BUTTCAP } lines { - width: 6.4 - color: 0xCDE5EA - priority: 1053 + width: 16.4 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -36160,7 +30986,7 @@ cont { lines { width: 0.38 color: 0x202020 - priority: 1062 + priority: 1119 } } element { @@ -36168,7 +30994,7 @@ cont { lines { width: 1.5 color: 0x202020 - priority: 1065 + priority: 1126 } } element { @@ -36176,7 +31002,7 @@ cont { lines { width: 3 color: 0x202020 - priority: 1067 + priority: 1131 } } element { @@ -36184,7 +31010,7 @@ cont { lines { width: 4 color: 0x202020 - priority: 1069 + priority: 1136 } } } @@ -36195,7 +31021,7 @@ cont { lines { width: 0.3 color: 0xCDE5EA - priority: 1024 + priority: 1058 } } element { @@ -36203,7 +31029,7 @@ cont { lines { width: 0.4 color: 0xCDE5EA - priority: 1031 + priority: 1065 } } element { @@ -36211,7 +31037,7 @@ cont { lines { width: 0.3 color: 0xCDE5EA - priority: 1046 + priority: 1087 } } element { @@ -36219,7 +31045,7 @@ cont { lines { width: 0.6 color: 0xCDE5EA - priority: 1051 + priority: 1095 } } element { @@ -36234,7 +31060,7 @@ cont { lines { width: 0.6 color: 0xCDE5EA - priority: 1053 + priority: 1100 } } element { @@ -36249,7 +31075,7 @@ cont { lines { width: 0.8 color: 0xCDE5EA - priority: 1055 + priority: 1104 } } } @@ -36258,14 +31084,9 @@ cont { element { scale: 12 lines { - width: 0.28 + width: 0.3 color: 0xCDE5EA - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1019 + priority: 1058 } } element { @@ -36273,12 +31094,7 @@ cont { lines { width: 0.4 color: 0xCDE5EA - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1031 + priority: 1065 } } element { @@ -36286,12 +31102,7 @@ cont { lines { width: 0.3 color: 0xCDE5EA - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1046 + priority: 1087 } } element { @@ -36299,62 +31110,69 @@ cont { lines { width: 0.6 color: 0xCDE5EA - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1051 + priority: 1095 } } element { scale: 16 - lines { - width: 0.4 - color: 0xCDE5EA - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1046 - } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16046 + priority: 16000 + } + lines { + width: 8.6 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 0.6 color: 0xCDE5EA - priority: 1053 + priority: 1100 } - } - element { - scale: 17 lines { - width: 0.8 - color: 0xCDE5EA + width: 10.6 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1048 } + } + element { + scale: 17 path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16048 + priority: 16000 + } + lines { + width: 8.8 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 0.8 color: 0xCDE5EA - priority: 1055 + priority: 1104 + } + lines { + width: 10.8 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -36364,84 +31182,84 @@ cont { scale: 6 area { color: 0xCDE5EA - priority: 1001 + priority: -16528 } } element { scale: 7 area { color: 0xCDE5EA - priority: 1001 + priority: -16529 } } element { scale: 8 area { color: 0xCDE5EA - priority: 1001 + priority: -16530 } } element { scale: 9 area { color: 0xCDE5EA - priority: 1001 + priority: -16531 } } element { scale: 10 area { color: 0xCDE5EA - priority: 1001 + priority: -16532 } } element { scale: 11 area { color: 0xCDE5EA - priority: 1001 + priority: -16533 } } element { scale: 12 area { color: 0xCDE5EA - priority: 1001 + priority: -16534 } } element { scale: 13 area { color: 0xCDE5EA - priority: 1001 + priority: -16535 } } element { scale: 14 area { color: 0xCDE5EA - priority: 1001 + priority: -16536 } } element { scale: 15 area { color: 0xCDE5EA - priority: 1001 + priority: -16537 } } element { scale: 16 area { color: 0xCDE5EA - priority: 1001 + priority: -16538 } } element { scale: 17 area { color: 0xCDE5EA - priority: 1001 + priority: -16539 } } } @@ -36452,7 +31270,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1023 + priority: 1056 } } element { @@ -36460,7 +31278,7 @@ cont { lines { width: 1.5 color: 0xCDE5EA - priority: 1030 + priority: 1063 } } element { @@ -36468,7 +31286,7 @@ cont { lines { width: 2.3 color: 0xCDE5EA - priority: 1045 + priority: 1000 } } element { @@ -36476,13 +31294,13 @@ cont { lines { width: 3.5 color: 0xB0B0B0 - priority: 50 + priority: 92 cap: BUTTCAP } lines { width: 2.8 color: 0xCDE5EA - priority: 1050 + priority: 1092 } } element { @@ -36497,13 +31315,13 @@ cont { lines { width: 5.2 color: 0xB0B0B0 - priority: 52 + priority: 97 cap: BUTTCAP } lines { width: 4 color: 0xCDE5EA - priority: 1052 + priority: 1097 } } element { @@ -36518,13 +31336,13 @@ cont { lines { width: 8 color: 0xB0B0B0 - priority: 54 + priority: 102 cap: BUTTCAP } lines { width: 6.4 color: 0xCDE5EA - priority: 1054 + priority: 1102 } } } @@ -36535,25 +31353,15 @@ cont { lines { width: 1 color: 0xCDE5EA - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1023 + priority: 1056 } } element { scale: 13 lines { - width: 1 + width: 1.5 color: 0xCDE5EA - dashdot { - dd: 2.25 - dd: 2.25 - } - cap: BUTTCAP - priority: 1026 + priority: 1063 } } element { @@ -36561,12 +31369,7 @@ cont { lines { width: 2.3 color: 0xCDE5EA - dashdot { - dd: 3.5 - dd: 3.5 - } - cap: BUTTCAP - priority: 1045 + priority: 1000 } } element { @@ -36574,84 +31377,87 @@ cont { lines { width: 3.5 color: 0xB0B0B0 - priority: 50 - dashdot { - dd: 5.2 - dd: 5.2 - } + priority: 92 cap: BUTTCAP } lines { width: 2.8 color: 0xCDE5EA - dashdot { - dd: 5.2 - dd: 5.2 - } - cap: BUTTCAP - priority: 1050 + priority: 1092 } } element { scale: 16 - lines { - width: 4 - color: 0xCDE5EA - dashdot { - dd: 8 - dd: 8 - } - cap: BUTTCAP - priority: 1045 - } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16045 + priority: 16000 + } + lines { + width: 12 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 5.2 color: 0xB0B0B0 - priority: 52 + priority: 97 cap: BUTTCAP } lines { width: 4 color: 0xCDE5EA - priority: 1052 + priority: 1097 } - } - element { - scale: 17 lines { - width: 6.4 - color: 0xCDE5EA + width: 14 + color: 0x707070 + priority: 0 dashdot { - dd: 12 - dd: 12 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1047 } + } + element { + scale: 17 path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16047 + priority: 16000 + } + lines { + width: 14.4 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 8 color: 0xB0B0B0 - priority: 54 + priority: 102 cap: BUTTCAP } lines { width: 6.4 color: 0xCDE5EA - priority: 1054 + priority: 1102 + } + lines { + width: 16.4 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -36662,13 +31468,13 @@ cont { lines { width: 6 color: 0x202020 - priority: 32 + priority: 68 cap: BUTTCAP } lines { width: 5 color: 0xF8F8F8 - priority: 1032 + priority: 1068 } } element { @@ -36676,13 +31482,13 @@ cont { lines { width: 10 color: 0x202020 - priority: 34 + priority: 73 cap: BUTTCAP } lines { width: 9 color: 0xF8F8F8 - priority: 1034 + priority: 1073 } } element { @@ -36690,13 +31496,13 @@ cont { lines { width: 12 color: 0x202020 - priority: 36 + priority: 75 cap: BUTTCAP } lines { width: 10 color: 0xF8F8F8 - priority: 1036 + priority: 1075 } } element { @@ -36704,13 +31510,13 @@ cont { lines { width: 16 color: 0x202020 - priority: 38 + priority: 78 cap: BUTTCAP } lines { width: 12 color: 0xF8F8F8 - priority: 1038 + priority: 1078 } } } @@ -36721,7 +31527,7 @@ cont { lines { width: 0.5 color: 0xCDE5EA - priority: 1112 + priority: 1014 } } element { @@ -36729,7 +31535,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1112 + priority: 1014 } } element { @@ -36737,7 +31543,7 @@ cont { lines { width: 2.5 color: 0xCDE5EA - priority: 1112 + priority: 1014 } } element { @@ -36745,7 +31551,7 @@ cont { lines { width: 3 color: 0xCDE5EA - priority: 1112 + priority: 1014 } } element { @@ -36755,7 +31561,7 @@ cont { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } lines { width: 4 @@ -36765,47 +31571,47 @@ cont { } element { scale: 15 - path_text { - primary { - height: 12 - color: 0x507CEA - } - priority: 16112 - } lines { width: 5 color: 0xCDE5EA - priority: 1045 + priority: 1014 } - } - element { - scale: 16 path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } + } + element { + scale: 16 lines { width: 8 color: 0xCDE5EA - priority: 1047 + priority: 1014 } - } - element { - scale: 17 path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } + } + element { + scale: 17 lines { width: 16 color: 0xCDE5EA - priority: 1049 + priority: 1014 + } + path_text { + primary { + height: 12 + color: 0x507CEA + } + priority: 16014 } } } @@ -36816,7 +31622,7 @@ cont { lines { width: 0.5 color: 0xCDE5EA - priority: 1112 + priority: 1014 } } element { @@ -36824,53 +31630,33 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1112 + priority: 1014 } } element { scale: 12 lines { - width: 2 + width: 2.5 color: 0xCDE5EA - dashdot { - dd: 3.75 - dd: 3.75 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } } element { scale: 13 lines { - width: 2 + width: 3 color: 0xCDE5EA - dashdot { - dd: 4.5 - dd: 4.5 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } } element { scale: 14 - lines { - width: 3 - color: 0xCDE5EA - dashdot { - dd: 6 - dd: 6 - } - cap: BUTTCAP - priority: 1112 - } path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } lines { width: 4 @@ -36881,26 +31667,16 @@ cont { element { scale: 15 lines { - width: 4 + width: 5 color: 0xCDE5EA - dashdot { - dd: 7.4 - dd: 7.4 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 - } - lines { - width: 5 - color: 0xCDE5EA - priority: 1045 + priority: 16014 } } element { @@ -36908,24 +31684,30 @@ cont { lines { width: 8 color: 0xCDE5EA - dashdot { - dd: 8.8 - dd: 8.8 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } lines { - width: 8 - color: 0xCDE5EA - priority: 1047 + width: 16 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { + width: 18 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } element { @@ -36933,24 +31715,30 @@ cont { lines { width: 16 color: 0xCDE5EA - dashdot { - dd: 12 - dd: 12 - } - cap: BUTTCAP - priority: 1112 + priority: 1014 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16112 + priority: 16014 } lines { - width: 16 - color: 0xCDE5EA - priority: 1049 + width: 24 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP + } + lines { + width: 26 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -36960,84 +31748,84 @@ cont { scale: 6 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 7 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 8 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 9 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 10 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 11 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 12 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 13 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 14 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 15 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 16 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } element { scale: 17 area { color: 0xCDE5EA - priority: 1113 + priority: -15986 } } } @@ -37048,7 +31836,7 @@ cont { lines { width: 0.75 color: 0xCDE5EA - priority: 1021 + priority: 1053 } } element { @@ -37056,7 +31844,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1028 + priority: 1060 } } element { @@ -37064,7 +31852,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1043 + priority: 1085 } } element { @@ -37072,7 +31860,7 @@ cont { lines { width: 2 color: 0xCDE5EA - priority: 1048 + priority: 1090 } } element { @@ -37087,7 +31875,7 @@ cont { lines { width: 2 color: 0xCDE5EA - priority: 1050 + priority: 1092 } } element { @@ -37102,7 +31890,7 @@ cont { lines { width: 2.2 color: 0xCDE5EA - priority: 1052 + priority: 1097 } } } @@ -37113,7 +31901,7 @@ cont { lines { width: 0.75 color: 0xCDE5EA - priority: 1021 + priority: 1053 } } element { @@ -37121,7 +31909,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1028 + priority: 1060 } } element { @@ -37134,7 +31922,7 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1041 + priority: 1080 } } element { @@ -37147,7 +31935,7 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1046 + priority: 1087 } } element { @@ -37160,19 +31948,19 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1048 + priority: 1090 } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16048 + priority: 16090 } lines { width: 2 color: 0xCDE5EA - priority: 1050 + priority: 1092 } } element { @@ -37185,19 +31973,19 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1051 + priority: 1095 } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16051 + priority: 16095 } lines { width: 2.2 color: 0xCDE5EA - priority: 1052 + priority: 1097 } } } @@ -37208,7 +31996,7 @@ cont { lines { width: 0.75 color: 0xCDE5EA - priority: 1021 + priority: 1053 } } element { @@ -37216,7 +32004,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1028 + priority: 1060 } } element { @@ -37229,7 +32017,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1043 + priority: 1085 } } element { @@ -37242,7 +32030,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1048 + priority: 1090 } } element { @@ -37255,19 +32043,19 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1049 + priority: 1000 } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16049 + priority: 16000 } lines { width: 2 color: 0xCDE5EA - priority: 1050 + priority: 1092 } } element { @@ -37280,19 +32068,19 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1050 + priority: 1092 } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16050 + priority: 16092 } lines { width: 2.2 color: 0xCDE5EA - priority: 1052 + priority: 1097 } } } @@ -37303,12 +32091,7 @@ cont { lines { width: 0.75 color: 0xCDE5EA - dashdot { - dd: 1.5 - dd: 1.5 - } - cap: BUTTCAP - priority: 1021 + priority: 1053 } } element { @@ -37316,12 +32099,7 @@ cont { lines { width: 1 color: 0xCDE5EA - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1028 + priority: 1060 } } element { @@ -37329,12 +32107,7 @@ cont { lines { width: 1 color: 0xCDE5EA - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1043 + priority: 1085 } } element { @@ -37342,62 +32115,69 @@ cont { lines { width: 2 color: 0xCDE5EA - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1048 + priority: 1090 } } element { scale: 16 - lines { - width: 1.2 - color: 0xCDE5EA - dashdot { - dd: 3 - dd: 3 - } - cap: BUTTCAP - priority: 1043 - } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16043 + priority: 16000 + } + lines { + width: 10 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 2 color: 0xCDE5EA - priority: 1050 + priority: 1092 } - } - element { - scale: 17 lines { - width: 1.6 - color: 0xCDE5EA + width: 12 + color: 0x707070 + priority: 0 dashdot { - dd: 3.2 - dd: 3.2 + dd: 5 + dd: 5 } cap: BUTTCAP - priority: 1045 } + } + element { + scale: 17 path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16045 + priority: 16000 + } + lines { + width: 10.2 + color: 0xFFFFFF + priority: 4 + cap: BUTTCAP } lines { width: 2.2 color: 0xCDE5EA - priority: 1052 + priority: 1097 + } + lines { + width: 12.2 + color: 0x707070 + priority: 0 + dashdot { + dd: 5 + dd: 5 + } + cap: BUTTCAP } } } @@ -37408,7 +32188,7 @@ cont { lines { width: 0.25 color: 0x000044 - priority: 1061 + priority: 1117 } } element { @@ -37416,7 +32196,7 @@ cont { lines { width: 1 color: 0x000044 - priority: 1064 + priority: 1124 } } element { @@ -37424,7 +32204,7 @@ cont { lines { width: 2 color: 0x000044 - priority: 1066 + priority: 1129 } } element { @@ -37432,7 +32212,7 @@ cont { lines { width: 3 color: 0x000044 - priority: 1068 + priority: 1134 } } } diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index d1ab8dabfb..c053bdb1af 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -233,7 +233,7 @@ highway|cycleway|tunnel;[highway=cycleway][tunnel?];;name;int_name;232; amenity|parking|permissive;[amenity=parking][access=permissive];;name;int_name;233; boundary|administrative|5;[boundary=administrative][admin_level=5];;name;int_name;234; highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235; -highway|track|destination;[highway=track][access=destination];;name;int_name;236; +highway|track|destination;[highway=track][access=destination];x;name;int_name;236;highway|track highway|trunk|junction;[highway=trunk][junction?];x;name;int_name;237;highway|trunk highway|residential|tunnel;[highway=residential][tunnel?];;name;int_name;238; aeroway|helipad;[aeroway=helipad];;name;int_name;239; @@ -282,7 +282,7 @@ boundary|administrative|3;[boundary=administrative][admin_level=3];;name;int_nam man_made|pipeline|water;[man_made=pipeline][water];x;name;int_name;282;man_made|pipeline boundary|administrative;[boundary=administrative];;name;int_name;283; highway|road|oneway;[highway=road][oneway?];x;name;int_name;284;highway|road -highway|path|destination;[highway=path][access=destination];;name;int_name;285; +highway|path|destination;[highway=path][access=destination];x;name;int_name;285;highway|path sport|athletics;[sport=athletics];;name;int_name;286; landuse|railway;[landuse=railway];;name;int_name;287; leisure|slipway;[leisure=slipway];;name;int_name;288; @@ -303,7 +303,7 @@ amenity|restaurant|hotel;[amenity=restaurant][hotel];;name;int_name;302; power|generator;[power=generator];;name;int_name;303; highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304; man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305; -amenity|parking|destination;[amenity=parking][access=destination];;name;int_name;306; +amenity|parking|destination;[amenity=parking][access=destination];x;name;int_name;306;amenity|parking highway|unsurfaced;[highway=unsurfaced];x;name;int_name;307;highway|unclassified highway|raceway;[highway=raceway];;name;int_name;308; highway|primary|tunnel;[highway=primary][tunnel?];;name;int_name;309; @@ -348,7 +348,7 @@ piste:type|downhill|advanced;[piste:type=downhill][piste:difficulty=advanced];;n sport|shooting;[sport=shooting];;name;int_name;348; place|country;[place=country];;name;int_name;349; highway|path|alpine_hiking;[highway=path][sac_scale][sac_scale=alpine_hiking];;name;int_name;350; -highway|footway|destination;[highway=footway][access=destination];;name;int_name;351; +highway|footway|destination;[highway=footway][access=destination];x;name;int_name;351;highway|footway sport|scuba_diving;[sport=scuba_diving];;name;int_name;352; highway|cycleway|permissive;[highway=cycleway][access=permissive];;name;int_name;353; highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354; @@ -362,11 +362,11 @@ highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;na highway|service|driveway|bridge;[highway=service][service=driveway][bridge?];;name;int_name;362; amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee?];;name;int_name;363; leisure|track|area;[leisure=track][area?];x;name;int_name;364; -highway|byway;[highway=byway];;name;int_name;365; +highway|byway;[highway=byway];x;name;int_name;365;highway|track piste:type|downhill|novice;[piste:type=downhill][piste:difficulty=novice];;name;int_name;366; railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367; noexit|motorcar;[noexit=motorcar];x;name;int_name;368; -highway|service|parking_aisle|tunnel;[highway=service][service=parking_aisle][tunnel?];;name;int_name;369; +highway|service|parking_aisle|tunnel;[highway=service][service=parking_aisle][tunnel?];x;name;int_name;369;highway|service|parking_aisle highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370; railway|construction;[railway=construction];x;name;int_name;371; highway|primary_link|junction;[highway=primary_link][junction?];x;name;int_name;372;highway|primary_link @@ -389,7 +389,7 @@ place|city|capital;[place=city][capital?];;name;int_name;388; aerialway|cable_car;[aerialway=cable_car];;name;int_name;389; piste:type|downhill;[piste:type=downhill];;name;int_name;390; sport|american_football;[sport=american_football];;name;int_name;391; -highway|cycleway|destination;[highway=cycleway][access=destination];;name;int_name;392; +highway|cycleway|destination;[highway=cycleway][access=destination];x;name;int_name;392;highway|cycleway man_made|cairn;[man_made=cairn];;name;int_name;393; railway|preserved|bridge;[railway=preserved][bridge?];;name;int_name;394; highway|path|demanding_alpine_hiking;[highway=path][sac_scale=demanding_alpine_hiking];;name;int_name;395; @@ -412,7 +412,7 @@ man_made|pipeline|oil;[man_made=pipeline][type=oil];x;name;int_name;411;man_made leisure|park|private;[leisure=park][access=private];;name;int_name;412; highway|secondary|motorroad;[highway=secondary][motorroad?];x;name;int_name;413;highway|secondary noexit|motor_vehicle;[noexit=motor_vehicle];;name;int_name;414; -highway|service|parking_aisle|bridge;[highway=service][service=parking_aisle][bridge?];;name;int_name;415; +highway|service|parking_aisle|bridge;[highway=service][service=parking_aisle][bridge?];x;name;int_name;415;highway|service|parking_aisle highway|motorway|tunnel;[highway=motorway][tunnel?];;name;int_name;416; railway|light_rail|tunnel;[railway=light_rail][tunnel?];;name;int_name;417; highway|service|parking_aisle|area;[highway=service][service=parking_aisle][area?];x;name;int_name;418;area:highway|service @@ -462,13 +462,13 @@ sport|handball;[sport=handball];;name;int_name;461; boundary|administrative|city;[boundary=administrative][border_type=city];;name;int_name;462; piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride];;name;int_name;463; amenity|restaurant|vegetarian;[amenity=restaurant][cuisine=vegetarian];;name;int_name;464; -communication|line|submarine;[communication=line][location=submarine];;name;int_name;465; +communication|line|submarine;[communication=line][location=submarine];x;name;int_name;465;communication|line piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466; landuse|salt_pond;[landuse=salt_pond];;name;int_name;467; landuse|reservoir|water_storage;[landuse=reservoir][reservoir=water_storage];x;name;int_name;468;natural|water railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469; highway|steps|area;[highway=steps][area?];x;name;int_name;470;area:highway|steps -railway|proposed;[railway=proposed];;name;int_name;471; +railway|proposed;[railway=proposed];x;name;int_name;471; highway|tertiary|construction;[highway=tertiary][construction?];x;name;int_name;472; landuse|wood|deciduous;[landuse=wood][wood=deciduous];x;name;int_name;473;highway|construction natural|grass;[natural=grass];;name;int_name;474;natural|wood @@ -509,7 +509,7 @@ landuse|reservoir|sewage;[landuse=reservoir][reservoir=sewage];x;name;int_name;5 railway|spur|bridge;[railway=spur][bridge?];;name;int_name;509; highway|track|disused;[highway=track][disused?];x;name;int_name;510; highway|tertiary_link|junction;[highway=tertiary_link][junction?];x;name;int_name;511;highway|tertiary_link -highway|track|grade3|destination;[highway=track][tracktype=grade3][access=destination];;name;int_name;512; +highway|track|grade3|destination;[highway=track][tracktype=grade3][access=destination];x;name;int_name;512;highway|track sport|curling;[sport=curling];;name;int_name;513; landuse|reservoir|evaporator;[landuse=reservoir][reservoir=evaporator];x;name;int_name;514;natural|water landuse|wood|coniferous;[landuse=wood][wood=coniferous];x;name;int_name;515;landuse|forest @@ -528,7 +528,7 @@ highway|footway|dyke;[highway=footway][dyke?];x;name;int_name;527;highway|footwa highway|primary_link|tunnel;[highway=primary_link][tunnel?];;name;int_name;528; highway|footway|alpine_hiking;[highway=footway][sac_scale=alpine_hiking];;name;int_name;529; natural|scrub|mixed;[natural=scrub][wood=mixed];x;name;int_name;530; -highway|byway|bridge;[highway=byway][bridge?];;name;int_name;531; +highway|byway|bridge;[highway=byway][bridge?];x;name;int_name;531;highway|track man_made|pipeline|hot_water;[man_made=pipeline][type=hot_water];x;name;int_name;532;man_made|pipeline leisure|landscape_reserve;[leisure=landscape_reserve];;name;int_name;533; leisure|playing_fields;[leisure=playing_fields];x;name;int_name;534; @@ -548,13 +548,13 @@ highway|track|construction;[highway=track][construction?];x;name;int_name;547;hi highway|minor|oneway;[highway=minor][oneway?];x;name;int_name;548;highway|unclassified highway|bridleway|cutting;[highway=bridleway][cutting?];x;name;int_name;549;highway|bridleway waterway|lock_gate;[waterway=lock_gate];;name;int_name;550; -railway|proposed|tunnel;[railway=proposed][tunnel?];;name;int_name;551; +railway|proposed|tunnel;[railway=proposed][tunnel?];x;name;int_name;551; highway|primary|disused;[highway=primary][disused?];x;name;int_name;552; highway|unsurfaced|private;[highway=unsurfaced][access=private];x;name;int_name;553;highway|unclassified highway|path|construction;[highway=path][construction?];x;name;int_name;554;highway|construction highway|footway|demanding_alpine_hiking;[highway=footway][sac_scale=demanding_alpine_hiking];;name;int_name;555; -railway|proposed|bridge;[railway=proposed][bridge?];;name;int_name;556; -highway|track|grade4|destination;[highway=track][tracktype=grade4][access=destination];;name;int_name;557; +railway|proposed|bridge;[railway=proposed][bridge?];x;name;int_name;556; +highway|track|grade4|destination;[highway=track][tracktype=grade4][access=destination];x;name;int_name;557;highway|track landuse|runway;[landuse=runway];x;name;int_name;558; natural|farm;[natural=farm];x;name;int_name;559;landuse|farmland highway|unsurfaced|oneway;[highway=unsurfaced][oneway?];x;name;int_name;560;highway|unclassified @@ -566,7 +566,7 @@ man_made|pipeline|sewage;[man_made=pipeline][type=sewage];x;name;int_name;565;ma highway|primary_link|construction;[highway=primary_link][construction?];x;name;int_name;566;highway|construction landuse|reservoir|tailings;[landuse=reservoir][reservoir=tailings];x;name;int_name;567;natural|water highway|secondary|disused;[highway=secondary][disused?];x;name;int_name;568; -highway|track|grade5|destination;[highway=track][tracktype=grade5][access=destination];;name;int_name;569; +highway|track|grade5|destination;[highway=track][tracktype=grade5][access=destination];x;name;int_name;569;highway|track natural|basin;[natural=basin];x;name;int_name;570;natural|water aerialway|chair_lift|5;[aerialway=chair_lift][piste:lift:occupancy=5];x;name;int_name;571; natural|reservoir;[natural=reservoir];x;name;int_name;572;natural|water @@ -581,16 +581,16 @@ highway|track|grade5|private;[highway=track][tracktype=grade5][access=private];; highway|track|grade5|area;[highway=track][tracktype=grade5][area?];x;name;int_name;581; natural|forest|deciduous;[natural=forest][wood=deciduous];x;name;int_name;582;landuse|forest highway|living_street|construction;[highway=living_street][construction?];x;name;int_name;583;highway|construction -highway|track|racetrack;[highway=raceway];;name;int_name;584; +highway|track|racetrack;[highway=raceway];x;name;int_name;584; highway|tertiary|disused;[highway=tertiary][disused?];x;name;int_name;585; highway|steps|disused;[highway=steps][disused?];x;name;int_name;586; aerialway|mixed_lift;[aerialway=mixed_lift];;name;int_name;587; railway|planned;[railway=planned];x;name;int_name;588; highway|footway|cycleway;[highway=footway][cycleway?];x;name;int_name;589;highway|footway -power|line|submarine;[power=line][location=submarine];;name;int_name;590; +power|line|submarine;[power=line][location=submarine];x;name;int_name;590;power|line highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];;name;int_name;591; highway|track|grade4|private;[highway=track][tracktype=grade4][access=private];;name;int_name;592; -highway|byway|permissive;[highway=byway][access=permissive];;name;int_name;593; +highway|byway|permissive;[highway=byway][access=permissive];x;name;int_name;593;highway|track natural|railway;[natural=railway];x;name;int_name;594; highway|service|dyke;[highway=service][man_made][dyke?];x;name;int_name;595;highway|service railway|incline;[railway=incline];x;name;int_name;596; @@ -604,14 +604,14 @@ highway|footpath|private;[highway=footpath][access=private];x;name;int_name;603; boundary|administrative|nation;[boundary=administrative][type=nation];;name;int_name;604; railway|dismantled|bridge;[railway=dismantled][bridge?];x;name;int_name;605; natural|landfill;[natural=landfill];x;name;int_name;606; -highway|byway|tunnel;[highway=byway][tunnel?];;name;int_name;607; +highway|byway|tunnel;[highway=byway][tunnel?];x;name;int_name;607;highway|track piste:lift|magic_carpet;[piste:lift=magic_carpet];;name;int_name;608; natural|scrub|coniferous;[natural=scrub][wood=coniferous];x;name;int_name;609; highway|unsurfaced|permissive;[highway=unsurfaced][access=permissive];x;name;int_name;610;highway|unclassified -highway|bridleway|destination;[highway=bridleway][access=destination];;name;int_name;611; +highway|bridleway|destination;[highway=bridleway][access=destination];x;name;int_name;611;highway|bridleway highway|motorway|disused;[highway=motorway][disused?];x;name;int_name;612; landuse|runway|disused;[landuse=runway][disused?];x;name;int_name;613; -highway|unsurfaced|destination;[highway=unsurfaced][access=destination];x;name;int_name;614; +highway|unsurfaced|destination;[highway=unsurfaced][access=destination];x;name;int_name;614;highway|unclassified natural|brownfield;[natural=brownfield];x;name;int_name;615; natural|village_green;[natural=village_green];x;name;int_name;616; highway|track|embankment;[highway=track][embankment?];x;name;int_name;617;highway|track @@ -620,7 +620,7 @@ piste:lift|j-bar;[piste:lift=j-bar];;name;int_name;619; landuse|scrub|deciduous;[landuse=scrub][wood=deciduous];x;name;int_name;620; highway|bridleway|area;[highway=bridleway][area?];x;name;int_name;621; natural|military;[natural=military];x;name;int_name;622; -highway|byway|private;[highway=byway][access=private];;name;int_name;623; +highway|byway|private;[highway=byway][access=private];x;name;int_name;623;highway|track natural|forest|mixed;[natural=forest][wood=mixed];x;name;int_name;624;landuse|forest highway|raceway|disused;[highway=raceway][disused?];x;name;int_name;625; railway|siding|bridge;[railway=siding][bridge?];;name;int_name;626; @@ -638,7 +638,7 @@ highway|tertiary|cycleway;[highway=tertiary][cycleway?];x;name;int_name;637; highway|trunk|area;[highway=trunk][area?];x;name;int_name;638; highway|secondary_link|construction;[highway=secondary_link][construction?];x;name;int_name;639;highway|construction landuse|street;[landuse=street];x;name;int_name;640; -leisure|park|destination;[leisure=park][access=destination];x;name;int_name;641; +leisure|park|destination;[leisure=park][access=destination];x;name;int_name;641;leisure|park highway|footway|t2;[highway=footway][t2];x;name;int_name;642;highway|footway landuse|raceway|disused;[landuse=raceway][disused?];x;name;int_name;643; highway|motorway_link|area;[highway=motorway_link][area?];x;name;int_name;644; @@ -656,7 +656,7 @@ highway|trunk_link|area;[highway=trunk_link][area?];x;name;int_name;655; railway|incline|tunnel;[railway=incline][tunnel?];;name;int_name;656; boundary|administrative|municipality;[boundary=administrative][border_type=municipality];;name;int_name;657; highway|path|t2;[highway=path][t2];x;name;int_name;658;highway|path -highway|byway|destination;[highway=byway][access=destination];;name;int_name;659; +highway|byway|destination;[highway=byway][access=destination];x;name;int_name;659;highway|bridleway natural|construction;[natural][construction?];x;name;int_name;660; communication|line;[communication=line];;name;int_name;661; highway|tertiary_link|motorroad;[highway=tertiary_link][motorroad?];x;name;int_name;662;highway|tertiary_link @@ -737,15 +737,15 @@ boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_ place|state|USA;[place=state][addr:country=US];;name;int_name;737; building|address;[building=address];;addr:housenumber;name;738; amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739; -highway|bridleway|dike;[highway=bridleway][dike?];x;name;int_name;740;highway|bridleway -highway|bridleway|dyke;[highway=bridleway][dyke?];x;name;int_name;741;highway|bridleway -highway|bridleway|embankment;[highway=bridleway][embankment?];x;name;int_name;742;highway|bridleway -highway|bridleway|levee;[highway=bridleway][levee?];x;name;int_name;743;highway|bridleway -highway|bridleway|no-access;[highway=bridleway][access=no];;name;int_name;744;highway|bridleway -highway|byway|area;[highway=byway][area?];x;name;int_name;745;highway|bridleway -highway|byway|construction;[highway=byway][construction?];x;name;int_name;746;highway|bridleway -highway|byway|disused;[highway=byway][disused?];x;name;int_name;747;highway|bridleway -highway|byway|no-access;[highway=byway][access=no];x;name;int_name;748;highway|bridleway +highway|bridleway|dike;[highway=bridleway][dike?];x;name;int_name;740;highway|track +highway|bridleway|dyke;[highway=bridleway][dyke?];x;name;int_name;741;highway|track +highway|bridleway|embankment;[highway=bridleway][embankment?];x;name;int_name;742;highway|track +highway|bridleway|levee;[highway=bridleway][levee?];x;name;int_name;743;highway|track +highway|bridleway|no-access;[highway=bridleway][access=no];x;name;int_name;744;highway|track +highway|byway|area;[highway=byway][area?];x;name;int_name;745;highway|track +highway|byway|construction;[highway=byway][construction?];x;name;int_name;746;highway|track +highway|byway|disused;[highway=byway][disused?];x;name;int_name;747;highway|track +highway|byway|no-access;[highway=byway][access=no];x;name;int_name;748;highway|track highway|cycleroad;[highway=cycleroad];x;name;int_name;749;highway|cycleway highway|cycleroad|area;[highway=cycleroad][area?];x;name;int_name;750;highway|cycleway highway|cycleroad|bridge;[highway=cycleroad][bridge?];x;name;int_name;751;highway|cycleway @@ -822,7 +822,7 @@ highway|track|grade3|no-access;[highway=track][tracktype=grade3][access=no];;nam highway|track|grade4|no-access;[highway=track][tracktype=grade4][access=no];;name;int_name;822; highway|track|grade5|no-access;[highway=track][tracktype=grade5][access=no];;name;int_name;823; highway|track|no-access;[highway=track][access=no];;name;int_name;824; -highway|track|race;[highway=raceway];;name;int_name;825; +highway|track|race;[highway=raceway];x;name;int_name;825; highway|trunk|cycleway;[highway=trunk][cycleway?];x;name;int_name;826;highway|trunk highway|trunk|cycleway-motorroad;[highway=trunk][cycleway?][motorroad?];x;name;int_name;827;highway|trunk highway|trunk|dike;[highway=trunk][dike?];x;name;int_name;828;highway|trunk @@ -838,7 +838,7 @@ highway|unsurfaced|cycleway;[highway=unsurfaced][cycleway?];x;name;int_name;837; highway|unsurfaced|disused;[highway=unsurfaced][disused?];x;name;int_name;838;highway|unclassified highway|unsurfaced|junction;[highway=unsurfaced][junction?];x;name;int_name;839;highway|unclassified highway|unsurfaced|no-access;[highway=unsurfaced][access=no];x;name;int_name;840;highway|unclassified -landuse|conservation|destination;[landuse=conservation][access=destination];;name;int_name;841; +landuse|conservation|destination;[landuse=conservation][access=destination];x;name;int_name;841; landuse|conservation|no-access;[landuse=conservation][access=no];;name;int_name;842; landuse|conservation|permissive;[landuse=conservation][access=permissive];;name;int_name;843; landuse|scrub|coniferous;[landuse=scrub][wood=coniferous];x;name;int_name;844; @@ -846,7 +846,7 @@ landuse|scrub|mixed;[landuse=scrub][wood=mixed];x;name;int_name;845; leisure|dog_park|tennis;[leisure=dog_park][sport=tennis];;name;int_name;846; leisure|park|no-access;[leisure=park][access=no];;name;int_name;847; leisure|playing_fields|tennis;[leisure=playing_fields][sport=tennis];;name;int_name;848; -leisure|recreation_ground|destination;[leisure=recreation_ground][access=destination];;name;int_name;849; +leisure|recreation_ground|destination;[leisure=recreation_ground][access=destination];x;name;int_name;849; leisure|recreation_ground|no-access;[leisure=recreation_ground][access=no];;name;int_name;850; man_made|pipeline|gas|overground;[man_made=pipeline][type=gas][location=overground];x;name;int_name;851;man_made|pipeline man_made|pipeline|heat|overground;[man_made=pipeline][type=heat][location=overground];x;name;int_name;852;man_made|pipeline diff --git a/data/normal.mapcss b/data/normal.mapcss index 3e562c6310..494ac1221f 100644 --- a/data/normal.mapcss +++ b/data/normal.mapcss @@ -32,6 +32,7 @@ area[leisure]::*, area[place]::*, area[aeroway]::*, area[tourism]::*, +area[waterway]::*, {fill-position: background} @@ -464,11 +465,6 @@ line|z8[highway=motorway] width: 2; linecap: none; } -line|z9[highway=trunk][tunnel?] -{ - color: #ffc444; - width: 1.25; -} line|z9[boundary=administrative][admin_level=4]::d2p2 { color: #eeeedd; @@ -633,12 +629,6 @@ line|z10-11[route=ferry] dashes: 3,2; linecap: none; } -line|z10[railway=preserved] -{ - color: silver; - width: 0.5; - z-index: 140; -} area|z12-[leisure=common], area|z12-[leisure=dog_park], area|z13-16[leisure=garden], @@ -749,14 +739,6 @@ area|z12-[landuse=railway], { fill-color: #e8e4d4; } -line|z10-12[highway=bridleway] -{ - color: #a9d355; - width: 0.7; - z-index: 186; - dashes: 2.25,3; - linecap: none; -} node|z10-11[place=city][capital?] { font-size: 18; @@ -848,12 +830,6 @@ node|z11-12[place=county] text-color: #a0a090; text-halo-color: #eeeedd; } -line|z11[railway=rail][tunnel?] -{ - color: #666666; - width: 0.12; - z-index: 141; -} line|z11[waterway=river] { color: #cde5ea; @@ -869,12 +845,6 @@ node|z11-13[aeroway=airport] text-offset: 10; text-halo-color: white; } -line|z11[railway=preserved] -{ - color: silver; - width: 1; - z-index: 140; -} line|z12[railway=construction] { color: #404040; @@ -883,15 +853,6 @@ line|z12[railway=construction] dashes: 1,1; linecap: none; } -line|z12[railway=tram][tunnel?]::d2p3 -{ - opacity: 0.2; - color: purple; - linecap: none; - width: 1; - z-index: 347; - dashes: 1.5,1.5; -} line|z12[boundary=administrative][type=nation] { color: yellow; @@ -899,56 +860,18 @@ line|z12[boundary=administrative][type=nation] z-index: 414; -x-kot-layer: top; } -line|z12[railway=abandoned][tunnel?]::d2p2 -{ - color: white; - width: 0.25; - z-index: 328; - opacity: 0.3; -} line|z12[railway=yard] { color: #404040; width: 0.5; z-index: 228; } -line|z12[highway=service][tunnel?] -{ - color: #e6e6e6; - width: 1; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway][construction?][tunnel?]::d2p2 -{ - color: white; - width: 0.75; - z-index: 316; - dashes: 1,1; - linecap: none; -} node|z12[place=city]::d1p3 { text: int_name; font-size: 16; text-color: grey; } -line|z12[railway=funicular][tunnel?]::d2p3 -{ - opacity: 0.2; - color: maroon; - linecap: none; - width: 1; - z-index: 358; - dashes: 1.5,1.5; -} -line|z12[highway=bridleway][tunnel?] -{ - color: #e6dda5; - width: 1; - dashes: 1.5,1.5; - linecap: none; -} node|z13-15[place=city]::d1p3, node|z12[place=city][capital?]::d2p3 { @@ -967,49 +890,6 @@ line|z12[boundary=administrative][border_type=country]::d2p2 z-index: 417; dashes: 12,12; } -line|z12[railway][disused?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: grey; - linecap: none; - width: 0.5; - z-index: 326; - dashes: 1.5,1.5; -} -line|z12[railway][construction?][tunnel?] -{ - color: #404040; - width: 1.38; - z-index: 315; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=incline][tunnel?]::d2p3 -{ - opacity: 0.2; - color: maroon; - linecap: none; - width: 1; - z-index: 357; - dashes: 1.5,1.5; -} -line|z12[railway=monorail][tunnel?] -{ - color: #b20000; - width: 1.88; - z-index: 359; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=proposed][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 0.5; - z-index: 323; - dashes: 1.5,1.5; -} line|z12[waterway=river] { color: #cde5ea; @@ -1020,18 +900,13 @@ area|z12-[natural=wetland][wetland=bog] { fill-color: #a0c3b8; } -line|z12[railway=monorail][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 360; -} area|z12-16[place=suburb]::d1p3, node|z12-16[place=suburb]::d1p3 { text: int_name; font-size: 12; text-color: #a0a0a0; + z-index: 20; } line|z12[railway=narrow_gauge] { @@ -1039,69 +914,12 @@ line|z12[railway=narrow_gauge] width: 1; z-index: 222; } -line|z12[highway=residential][tunnel?]::d2p2 -{ - color: white; - width: 0.7; - z-index: 268; -} -line|z12[mapswithme=grid] -{ - color: #202020; - width: 2.5; - dashes: 0.25,0.25; - linecap: none; -} line|z12[railway=light_rail] { color: #90d090; width: 1; z-index: 668; } -line|z12[waterway=stream][tunnel?] -{ - color: #cde5ea; - width: 0.56; - z-index: 60; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[highway=motorway][tunnel?] -{ - color: #202020; - width: 5.5; - z-index: 312; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=yard][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #404040; - linecap: none; - width: 0.5; - z-index: 367; - dashes: 1.5,1.5; -} -line|z12[highway=secondary][tunnel?]::d2p2 -{ - color: white; - width: 2.75; -} -line|z12[railway=proposed][tunnel?]::d2p2 -{ - color: white; - width: 0.5; - z-index: 321; - dashes: 0.5,0.5; - linecap: none; -} -line|z12[railway=narrow_gauge][tunnel?]::d2p2 -{ - color: white; - width: 1.25; - z-index: 337; -} area|z13-[amenity=parking][!access], area|z13-[amenity=parking][access?], area|z12-14[landuse=commercial], @@ -1113,15 +931,6 @@ node|z15-[landuse=commercial]::d1p2 { fill-color: #f8f8d8; } -line|z12[railway=monorail][tunnel?]::d2p3 -{ - opacity: 0.2; - color: #b20000; - linecap: none; - width: 1; - z-index: 361; - dashes: 1.5,1.5; -} line|z12[highway=track][tracktype=grade3] { color: #d79331; @@ -1143,11 +952,6 @@ line|z12[highway=track][tracktype=grade1] color: #d79331; width: 1; } -line|z12[railway=yard][tunnel?]::d2p2 -{ - color: white; - width: 0.5; -} line|z12[aeroway=runway] { casing-linecap: none; @@ -1178,28 +982,13 @@ line|z12[highway=trunk] casing-width: 1; casing-color: #d8a050; } -line|z12[railway][disused?][tunnel?] -{ - color: grey; - width: 1.12; - z-index: 324; - dashes: 1.5,1.5; - linecap: none; -} line|z12[highway=track][tracktype=grade4] { color: #d79331; width: 0.7; - z-index: 194; dashes: 2.25,2.25,0.75,2.25; linecap: none; } -line|z12[railway=incline][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 352; -} area|z12-14[landuse=military], area|z15-[landuse=military]::d1p2, node|z15-[landuse=military]::d1p2 @@ -1207,22 +996,6 @@ node|z15-[landuse=military]::d1p2 fill-color: #d0d050; fill-opacity: 0.5; } -line|z12[railway=incline][tunnel?] -{ - color: maroon; - width: 1.88; - z-index: 351; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=proposed] -{ - color: #b2b2b2; - width: 0.5; - z-index: 217; - dashes: 0.5,0.5; - linecap: none; -} line|z12[railway=preserved] { color: silver; @@ -1233,12 +1006,6 @@ area|z12-[landuse=conservation] { fill-color: #cfeca8; } -line|z12[highway=track][tunnel?]::d2p2 -{ - color: white; - width: 0.7; - z-index: 257; -} line|z12[railway=abandoned] { color: #b2b2b2; @@ -1267,29 +1034,6 @@ line|z12[boundary=administrative][border_type=state] z-index: 413; dashes: 12,4,4,4; } -line|z12[railway=light_rail][tunnel?]::d2p3 -{ - opacity: 0.2; - color: green; - linecap: none; - width: 1; - z-index: 344; - dashes: 1.5,1.5; -} -line|z12[highway=motorway][tunnel?]::d2p2 -{ - color: white; - width: 5.25; - z-index: 313; -} -line|z12[waterway=river][tunnel?] -{ - color: #cde5ea; - width: 2; - z-index: 59; - dashes: 3.75,3.75; - linecap: none; -} line|z12[railway=monorail] { color: #d08080; @@ -1300,63 +1044,14 @@ line|z12[leisure=track] { color: #d0e8c4; width: 0.7; - z-index: 36; } line|z12[highway=track][tracktype=grade2] { color: #d79331; width: 0.7; - z-index: 192; dashes: 4.5,3; linecap: none; } -line|z12[railway=narrow_gauge][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #404040; - linecap: none; - width: 1.25; - z-index: 338; - dashes: 1.5,1.5; -} -line|z12[railway=narrow_gauge][tunnel?] -{ - color: silver; - width: 1; - z-index: 336; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[highway=tertiary][tunnel?] -{ - color: #e6e6e6; - width: 1; - z-index: 271; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[highway=bridleway][tunnel?]::d2p2 -{ - color: white; - width: 0.7; - z-index: 252; - dashes: 2.25,3; - linecap: none; -} -line|z12[highway=trunk][tunnel?]::d2p2 -{ - color: white; - width: 4.25; - z-index: 310; -} -line|z12[railway=yard][tunnel?] -{ - color: #404040; - width: 1.12; - z-index: 364; - dashes: 1.5,1.5; - linecap: none; -} area|z13-16[amenity=college], area|z13-16[amenity=kindergarten], area|z13-16[amenity=school], @@ -1378,34 +1073,6 @@ line|z12[highway=tertiary] casing-width: 0.5; casing-color: #c8c860; } -line|z12[waterway=drain][tunnel?] -{ - color: #cde5ea; - width: 0.75; - z-index: 62; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[highway=primary][tunnel?] -{ - color: #202020; - width: 3.5; - z-index: 306; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=rail][tunnel?]::d2p2 -{ - color: white; - width: 1.75; - z-index: 334; -} -line|z12[railway=tram][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 346; -} line|z12[highway=secondary] { color: #fffb80; @@ -1414,70 +1081,24 @@ line|z12[highway=secondary] casing-width: 1; casing-color: #c8c860; } -line|z12[railway=light_rail][tunnel?] -{ - color: green; - width: 1.88; - z-index: 342; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=preserved][tunnel?] -{ - color: #595959; - width: 1.88; - z-index: 339; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=rail][tunnel?]::d2p3 -{ - color: #888888; - width: 1.75; - z-index: 335; - dashes: 1.5,1.5; - linecap: none; -} line|z12[railway=rail] { color: silver; width: 1; z-index: 221; } -line|z12[railway=funicular][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 354; -} line|z12[railway=funicular] { color: #a0a0a0; width: 1; z-index: 225; } -line|z12[highway=cycleway][tunnel?] -{ - color: #90bc90; - width: 1; - z-index: 99; - dashes: 1.5,1.5; - linecap: none; -} line|z12[waterway=drain] { color: #cde5ea; width: 1; z-index: 67; } -line|z12[railway=abandoned][tunnel?] -{ - color: #b2b2b2; - width: 0.75; - z-index: 327; - dashes: 1.5,1.5; - linecap: none; -} area|z12[place=city], area|z13[place=town], node|z12[place=city], @@ -1496,83 +1117,22 @@ line|z12[highway=track][tracktype=grade5] dashes: 0.75,2.25; linecap: none; } -line|z12[railway=tram][tunnel?] -{ - color: purple; - width: 1.88; - z-index: 345; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=abandoned][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 0.25; - z-index: 331; - dashes: 1.5,1.5; -} -line|z12[railway=proposed][tunnel?] -{ - color: #b2b2b2; - width: 1.12; - z-index: 320; - dashes: 1.5,1.5; - linecap: none; -} area|z12-[landuse=residential] { fill-color: #ede8d2; } -line|z12[highway=secondary_link][tunnel?]::d2p2 -{ - color: white; - width: 1.69; -} area|z12-14[landuse=retail], area|z15-[landuse=retail]::d1p2, node|z15-[landuse=retail]::d1p2 { fill-color: #f8ecec; } -line|z12[highway=tertiary][tunnel?]::d2p2 -{ - color: white; - width: 0.7; - z-index: 272; -} line|z12[waterway=ditch] { color: #cde5ea; width: 0.3; z-index: 68; } -line|z12[waterway=ditch][tunnel?] -{ - color: #cde5ea; - width: 0.28; - z-index: 63; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=preserved][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #595959; - linecap: none; - width: 1; - z-index: 341; - dashes: 1.5,1.5; -} -line|z12[highway=cycleway][tunnel?]::d2p2 -{ - color: white; - width: 0.7; - z-index: 100; - dashes: 2.25,3; - linecap: none; -} line|z12[waterway=stream] { color: #cde5ea; @@ -1587,38 +1147,6 @@ line|z12[route=ferry] dashes: 3,2; linecap: none; } -line|z12[highway=secondary][tunnel?] -{ - color: #202020; - width: 3; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[highway=primary_link][tunnel?] -{ - color: #202020; - width: 1.75; - z-index: 297; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[highway=track][tunnel?] -{ - opacity: 0.75; - color: #fff2de; - linecap: none; - width: 1; - z-index: 473; - dashes: 1.5,1.5; -} -line|z12[highway=service][tunnel?]::d2p2 -{ - color: white; - width: 0.7; - z-index: 263; - dashes: 4.5,2.25; - linecap: none; -} line|z12[boundary=administrative][border_type=country] { color: yellow; @@ -1626,14 +1154,6 @@ line|z12[boundary=administrative][border_type=country] z-index: 415; -x-kot-layer: top; } -line|z12[highway=trunk][tunnel?] -{ - color: #202020; - width: 4.5; - z-index: 309; - dashes: 1.5,1.5; - linecap: none; -} area|z12-13[natural=volcano], area|z14-[natural=volcano]::d1p2, node|z12-13[natural=volcano], @@ -1647,21 +1167,6 @@ area|z15-[landuse=farmyard]::d1p2, { fill-color: #e4e4e4; } -line|z12[railway][disused?][tunnel?]::d2p2 -{ - color: white; - width: 0.5; - z-index: 325; - opacity: 0.5; -} -line|z12[waterway=canal][tunnel?] -{ - color: #cde5ea; - width: 2; - z-index: 61; - dashes: 3.75,3.75; - linecap: none; -} line|z12[boundary=administrative][admin_level=2] { color: yellow; @@ -1669,21 +1174,6 @@ line|z12[boundary=administrative][admin_level=2] z-index: 409; -x-kot-layer: top; } -line|z12[highway=primary_link][tunnel?]::d2p2 -{ - color: white; - width: 1.69; - z-index: 298; -} -line|z12[railway][construction?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #404040; - linecap: none; - width: 0.75; - z-index: 317; - dashes: 1.5,1.5; -} node|z12[place=city][capital?] { font-size: 22; @@ -1692,36 +1182,13 @@ node|z12[place=city][capital?] text-color: #606060; text-halo-color: #eeeedd; } -line|z12[highway=tertiary][tunnel?]::d2p3 -{ - color: #202020; - width: 1.62; - z-index: 289; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[railway=rail][tunnel?] -{ - color: #888888; - width: 2.38; - z-index: 333; - dashes: 1.5,1.5; - linecap: none; -} -line|z12[highway=path][horse?] -{ - color: #a9d355; - width: 0.7; - z-index: 188; - dashes: 2.25,3; - linecap: none; -} area|z12[place=suburb], node|z12[place=suburb] { text: name; font-size: 12; text-color: #909090; + z-index: 20; } line|z12-13[highway=primary], line|z12-13[highway=trunk] @@ -1737,12 +1204,6 @@ area|z12-[aeroway=terminal] { fill-color: #d4c894; } -line|z12[railway=light_rail][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 343; -} line|z12[highway=motorway] { color: #f08800; @@ -1752,25 +1213,6 @@ line|z12[highway=motorway] casing-width: 1; casing-color: #b87c04; } -line|z12[highway=tertiary][tunnel?]::d2p4 -{ - color: white; - width: 1.44; - z-index: 290; -} -line|z12[highway=primary][tunnel?]::d2p2 -{ - color: white; - width: 3.25; -} -line|z12[highway=residential][tunnel?] -{ - color: #e6e6e6; - width: 1; - z-index: 267; - dashes: 1.5,1.5; - linecap: none; -} line|z12[boundary=national_park] { color: #4ef94b; @@ -1791,13 +1233,6 @@ line|z12[highway=raceway] width: 0.38; z-index: 180; } -line|z12[highway=secondary_link][tunnel?] -{ - color: #202020; - width: 1.75; - dashes: 1.5,1.5; - linecap: none; -} line|z12[boundary=administrative][admin_level=2]::d2p2 { color: #f9574b; @@ -1816,13 +1251,6 @@ line|z12[waterway=canal] { color: #cde5ea; width: 2.5; - z-index: 66; -} -line|z12[railway=preserved][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 340; } line|z12[railway=disused] { @@ -1842,14 +1270,6 @@ node|z17-[leisure=golf_course]::d1p3 { z-index: 48; } -line|z12[railway=funicular][tunnel?] -{ - color: maroon; - width: 1.88; - z-index: 353; - dashes: 1.5,1.5; - linecap: none; -} area|z12[natural=peak], area|z13[natural=peak]::d1p2, node|z12[natural=peak], @@ -1875,37 +1295,12 @@ line|z12[boundary=administrative][type=nation]::d2p2 z-index: 416; dashes: 12,12; } -line|z13[railway=yard][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #404040; - linecap: none; - width: 0.85; - z-index: 376; - dashes: 1.85,1.85; -} -line|z13[highway=bridleway][tunnel?] -{ - color: #e6dda5; - width: 1.2; - z-index: 261; - dashes: 1.85,1.85; - linecap: none; -} line|z13[waterway=drain] { color: #cde5ea; width: 1.5; z-index: 77; } -line|z13[waterway=canal][tunnel?] -{ - color: #cde5ea; - width: 2; - z-index: 69; - dashes: 4.5,4.5; - linecap: none; -} area|z13-14[landuse=landfill], area|z13-14[landuse=quarry], area|z15-[landuse=landfill]::d1p2, @@ -1915,51 +1310,10 @@ node|z15-[landuse=quarry]::d1p2 { fill-color: #e9dd72; } -line|z13[railway=proposed][tunnel?] -{ - color: #b2b2b2; - width: 1.45; - z-index: 331; - dashes: 1.85,1.85; - linecap: none; -} line|z13[piste:type=sled] { color: #f0e0dc; width: 1.25; - z-index: 407; -} -line|z13[railway=proposed][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 0.85; - z-index: 334; - dashes: 1.85,1.85; -} -line|z13[railway=incline][tunnel?] -{ - color: maroon; - width: 1.95; - z-index: 362; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway=preserved][tunnel?]::d2p2 -{ - color: white; - width: 1.35; - z-index: 351; -} -line|z13[railway=tram][tunnel?]::d2p3 -{ - opacity: 0.2; - color: purple; - linecap: none; - width: 1.35; - z-index: 358; - dashes: 1.85,1.85; } line|z13-14[highway=byway] { @@ -1967,14 +1321,6 @@ line|z13-14[highway=byway] width: 1; z-index: 91; } -line|z13[railway=rail][tunnel?] -{ - color: #888888; - width: 2.45; - z-index: 344; - dashes: 1.85,1.85; - linecap: none; -} area|z13-14[landuse=vineyard], area|z15-[landuse=vineyard]::d1p2, node|z15-[landuse=vineyard]::d1p2 @@ -1990,14 +1336,6 @@ line|z13[boundary=national_park] z-index: 443; dashes: 12,4,4,4; } -line|z13[railway=yard][tunnel?] -{ - color: #404040; - width: 1.45; - z-index: 371; - dashes: 1.85,1.85; - linecap: none; -} line|z13[boundary=administrative][border_type=country] { color: yellow; @@ -2005,12 +1343,6 @@ line|z13[boundary=administrative][border_type=country] z-index: 440; -x-kot-layer: top; } -line|z13[highway=trunk][tunnel?]::d2p2 -{ - color: white; - width: 6.5; - z-index: 321; -} line|z13[highway=secondary] { color: #fffb80; @@ -2019,32 +1351,6 @@ line|z13[highway=secondary] casing-width: 1; casing-color: #c8c860; } -line|z13[highway=track][tunnel?]::d2p2 -{ - color: white; - width: 0.9; - z-index: 268; -} -line|z13[highway=tertiary][tunnel?] -{ - color: #202020; - width: 3; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[highway=secondary][tunnel?]::d2p2 -{ - color: white; - width: 4.5; -} -line|z13[highway=cycleway][tunnel?] -{ - color: #90bc90; - width: 1.2; - z-index: 99; - dashes: 1.85,1.85; - linecap: none; -} line|z13[highway=tertiary] { color: #ffff90; @@ -2052,20 +1358,6 @@ line|z13[highway=tertiary] casing-width: 1; casing-color: #c8c860; } -line|z13[highway=unclassified][tunnel?]::d2p2 -{ - color: white; - width: 2.75; -} -line|z13[railway=monorail][tunnel?]::d2p3 -{ - opacity: 0.2; - color: #b20000; - linecap: none; - width: 1.35; - z-index: 370; - dashes: 1.85,1.85; -} line|z13[waterway=river] { color: #cde5ea; @@ -2163,15 +1455,6 @@ node|z17-[place=islet] font-size: 12; text-color: #202020; } -line|z13[highway=track][tunnel?] -{ - opacity: 0.75; - color: #fff2de; - linecap: none; - width: 1.2; - z-index: 267; - dashes: 1.85,1.85; -} area|z13[aeroway=aerodrome], node|z13[aeroway=aerodrome] { @@ -2186,84 +1469,27 @@ line|z13[railway=siding] width: 1; z-index: 239; } -line|z13[railway][construction?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #404040; - linecap: none; - width: 1.35; - z-index: 328; - dashes: 1.85,1.85; -} line|z13[piste:type=nordic] { color: #c00000; width: 0.5; - z-index: 408; dashes: 1.5,0.25; linecap: none; } +line|z13[piste:type=downhill] +{ + color: #505050; + width: 2.5; +} line|z13[piste:type=downhill][piste:difficulty=freeride] { color: #f6dd0a; width: 2.5; - z-index: 398; -} -line|z13[railway=light_rail][tunnel?] -{ - color: green; - width: 1.95; - z-index: 353; - dashes: 1.85,1.85; - linecap: none; } line|z13[highway=tertiary_link] { color: #ffff90; width: 2.75; - z-index: 216; -} -line|z13[highway=motorway][tunnel?] -{ - color: #202020; - width: 8; - z-index: 323; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway=abandoned][tunnel?] -{ - color: #b2b2b2; - width: 1.15; - z-index: 338; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway=rail][tunnel?]::d2p2 -{ - color: white; - width: 1.85; - z-index: 345; -} -line|z13[railway=light_rail][tunnel?]::d2p2 -{ - color: white; - width: 1.35; - z-index: 354; -} -line|z13[railway=tram][tunnel?]::d2p2 -{ - color: white; - width: 1.35; - z-index: 357; -} -line|z13[highway=unclassified][tunnel?] -{ - color: #202020; - width: 3; - z-index: 99; - dashes: 1.85,1.85; - linecap: none; } line|z13[boundary=administrative][border_type=region] { @@ -2274,37 +1500,6 @@ line|z13[boundary=administrative][border_type=region] z-index: 437; dashes: 12,4,4,4; } -line|z13[highway=bridleway][tunnel?]::d2p2 -{ - color: white; - width: 0.9; - z-index: 262; - dashes: 2.25,3; - linecap: none; -} -line|z13[waterway=ditch][tunnel?] -{ - color: #cde5ea; - width: 0.3; - z-index: 71; - dashes: 3,3; - linecap: none; -} -line|z13[railway][construction?][tunnel?] -{ - color: #404040; - width: 1.95; - z-index: 326; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway][disused?][tunnel?]::d2p2 -{ - color: white; - width: 0.85; - z-index: 336; - opacity: 0.5; -} line|z13[route=ferry] { color: #98b8e8; @@ -2313,29 +1508,12 @@ line|z13[route=ferry] dashes: 3,2; linecap: none; } -line|z13[waterway=stream][tunnel?] -{ - color: #cde5ea; - width: 0.75; - z-index: 68; - dashes: 3,3; - linecap: none; -} line|z13[waterway=ditch] { color: #cde5ea; width: 0.4; z-index: 78; } -line|z13[railway=abandoned][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 0.55; - z-index: 342; - dashes: 1.85,1.85; -} line|z13-15[highway=secondary] { font-size: 12; @@ -2351,34 +1529,6 @@ line|z13[highway=raceway] width: 0.75; z-index: 190; } -line|z13[railway=abandoned][tunnel?]::d2p2 -{ - color: white; - width: 0.55; - z-index: 339; - opacity: 0.3; -} -line|z13[highway=tertiary][tunnel?]::d2p2 -{ - color: white; - width: 2.75; - z-index: 283; -} -line|z13[railway=proposed] -{ - color: #b2b2b2; - width: 0.85; - z-index: 225; - dashes: 0.75,0.75; - linecap: none; -} - -line|z13[railway=yard][tunnel?]::d2p2 -{ - color: white; - width: 0.85; - z-index: 372; -} line|z13[waterway=stream] { color: #cde5ea; @@ -2398,12 +1548,6 @@ line|z13[highway=primary_link] color: #ffc444; width: 2.75; } -line|z13[railway=siding][tunnel?]::d2p2 -{ - color: white; - width: 0.85; - z-index: 374; -} line|z13[railway=funicular] { color: #a0a0a0; @@ -2420,7 +1564,6 @@ line|z13[highway=construction] { color: #d0d0d0; width: 2.75; - z-index: 383; dashes: 4,4; linecap: none; } @@ -2428,7 +1571,6 @@ line|z13[leisure=track] { color: #d0e8c4; width: 0.9; - z-index: 42; } line|z13[highway=ford] { @@ -2438,12 +1580,6 @@ line|z13[highway=ford] casing-width: 0.12; casing-color: #202020; } -line|z13[railway=funicular][tunnel?]::d2p2 -{ - color: white; - width: 1.35; - z-index: 365; -} line|z13[boundary=administrative][border_type=country]::d2p2 { color: #f9574b; @@ -2453,14 +1589,6 @@ line|z13[boundary=administrative][border_type=country]::d2p2 z-index: 442; dashes: 12,12; } -line|z13[waterway=river][tunnel?] -{ - color: #cde5ea; - width: 2; - z-index: 67; - dashes: 4.5,4.5; - linecap: none; -} line|z13[railway=abandoned] { color: #b2b2b2; @@ -2476,51 +1604,6 @@ line|z13[highway=bridleway] dashes: 2.25,3; linecap: none; } -line|z13[highway=footway][tunnel?]::d2p2 -{ - color: white; - width: 0.9; - z-index: 245; - dashes: 2.25,3; - linecap: none; -} -line|z13[highway=motorway][tunnel?]::d2p2 -{ - color: white; - width: 7.5; - z-index: 324; -} -line|z13[railway=siding][tunnel?] -{ - color: #404040; - width: 1.45; - z-index: 373; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway=proposed][tunnel?]::d2p2 -{ - color: white; - width: 0.85; - z-index: 332; - dashes: 0.75,0.75; - linecap: none; -} -line|z13[railway=rail][tunnel?]::d2p3 -{ - color: #888888; - width: 1.85; - z-index: 346; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[highway=secondary][tunnel?] -{ - color: #202020; - width: 5; - dashes: 1.85,1.85; - linecap: none; -} line|z13[highway=unclassified] { color: white; @@ -2528,22 +1611,6 @@ line|z13[highway=unclassified] z-index: 427; linecap: none; } -line|z13[railway][disused?][tunnel?] -{ - color: grey; - width: 1.45; - z-index: 335; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway][construction?][tunnel?]::d2p2 -{ - color: white; - width: 1.35; - z-index: 327; - dashes: 1.5,1.5; - linecap: none; -} line|z13[railway=disused] { color: grey; @@ -2551,27 +1618,6 @@ line|z13[railway=disused] z-index: 226; opacity: 0.5; } -line|z13[piste:type=downhill] -{ - color: #505050; - width: 2.5; - z-index: 399; -} -line|z13[highway=tertiary][tunnel?]::d2p3 -{ - color: #202020; - width: 3.12; - z-index: 299; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[highway=primary][tunnel?] -{ - color: #202020; - width: 5.5; - dashes: 1.85,1.85; - linecap: none; -} line|z13[aeroway=runway] { casing-linecap: none; @@ -2591,26 +1637,6 @@ line|z13[boundary=administrative][admin_level=2] z-index: 433; -x-kot-layer: top; } -line|z13[railway=incline][tunnel?]::d2p2 -{ - color: white; - width: 1.35; - z-index: 363; -} -line|z13[highway=road][tunnel?] -{ - color: #202020; - width: 3; - z-index: 293; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[highway=road][tunnel?]::d2p2 -{ - color: white; - width: 2.75; - z-index: 294; -} line|z13[railway=construction] { color: #404040; @@ -2641,32 +1667,9 @@ line|z13[highway=cycleway] { color: #4dbf4d; width: 1; - z-index: 194; dashes: 2.25,3; linecap: none; } -line|z13[railway][disused?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: grey; - linecap: none; - width: 0.85; - z-index: 337; - dashes: 1.85,1.85; -} -line|z13[highway=cycleway][tunnel?]::d2p2 -{ - color: white; - width: 0.9; - z-index: 100; - dashes: 2.25,3; - linecap: none; -} -line|z13[highway=secondary_link][tunnel?]::d2p2 -{ - color: white; - width: 2.75; -} node|z13[aerialway=station] { symbol-shape: circle; @@ -2681,14 +1684,6 @@ node|z13-15[natural=peak] font-size: 12; text-color: #404040; } -line|z13[highway=path][horse?] -{ - color: #a9d355; - width: 0.9; - z-index: 197; - dashes: 2.25,3; - linecap: none; -} line|z13[boundary=administrative][type=nation]::d2p2 { color: #f9574b; @@ -2698,11 +1693,11 @@ line|z13[boundary=administrative][type=nation]::d2p2 z-index: 441; dashes: 12,12; } -line|z13[highway=residential] +line|z13[highway=residential], +line|z13[highway=living_street] { color: white; width: 1; - z-index: 427; } line|z13[aeroway=taxiway] { @@ -2716,19 +1711,6 @@ line|z13[aeroway=taxiway] casing-width: 0.25; casing-color: #202020; } -line|z13[highway=secondary_link][tunnel?] -{ - color: #202020; - width: 3; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway=narrow_gauge][tunnel?]::d2p2 -{ - color: white; - width: 1.35; - z-index: 348; -} area|z17-[amenity=shelter], area|z16-[amenity=townhall], area|z16[landuse=forest][wood=deciduous], @@ -2766,7 +1748,6 @@ line|z13[piste:type=downhill][piste:difficulty=intermediate] { color: #ff4040; width: 2.5; - z-index: 395; } line|z13[highway=track][tracktype=grade4] { @@ -2776,45 +1757,13 @@ line|z13[highway=track][tracktype=grade4] dashes: 2.25,2.25,0.75,2.25; linecap: none; } -line|z13[highway=trunk][tunnel?] -{ - color: #202020; - width: 7; - z-index: 320; - dashes: 1.85,1.85; - linecap: none; -} line|z13[piste:type=downhill][piste:difficulty=advanced] { color: #202020; width: 2.5; - z-index: 396; } -line|z13[waterway=drain][tunnel?] -{ - color: #cde5ea; - width: 1; - z-index: 70; - dashes: 2.25,2.25; - linecap: none; -} -line|z13[railway=monorail][tunnel?]::d2p2 -{ - color: white; - width: 1.35; - z-index: 369; -} -line|z13[railway=incline][tunnel?]::d2p3 -{ - opacity: 0.2; - color: maroon; - linecap: none; - width: 1.35; - z-index: 366; - dashes: 1.85,1.85; -} -line|z13[highway=primary]::d1p2, -line|z13[highway=trunk]::d1p2 +line|z13[highway=primary], +line|z13[highway=trunk] { color: #ffc444; width: 5; @@ -2856,62 +1805,19 @@ line|z13[highway=track][tracktype=grade1] { color: #d79331; width: 1; - z-index: 201; -} -line|z13[highway=primary_link][tunnel?] -{ - color: #202020; - width: 3; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway=light_rail][tunnel?]::d2p3 -{ - opacity: 0.2; - color: green; - linecap: none; - width: 1.35; - z-index: 355; - dashes: 1.85,1.85; } -line|z13[highway=motorway]::d1p2 +line|z13[highway=motorway] { color: #f08800; width: 8; - z-index: 536; casing-linecap: none; casing-width: 1; casing-color: #b87c04; } -line|z13[highway=service][tunnel?] -{ - color: #e6e6e6; - width: 1.2; - z-index: 273; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[railway=funicular][tunnel?] -{ - color: maroon; - width: 1.95; - z-index: 364; - dashes: 1.85,1.85; - linecap: none; -} -line|z13[highway=footway][tunnel?] -{ - color: #d0ccac; - width: 1.2; - z-index: 244; - dashes: 1.85,1.85; - linecap: none; -} line|z13[railway=monorail] { color: #d08080; width: 1; - z-index: 236; } area|z13-14[leisure=park], node|z13-14[leisure=park] @@ -2920,14 +1826,6 @@ node|z13-14[leisure=park] font-size: 12; text-color: #5ca800; } -line|z13[railway=narrow_gauge][tunnel?] -{ - color: #404040; - width: 1.95; - z-index: 347; - dashes: 1.85,1.85; - linecap: none; -} area|z13[place=city][capital?], node|z13[place=city][capital?] { @@ -2935,20 +1833,6 @@ node|z13[place=city][capital?] font-size: 24; text-color: grey; } -line|z13[railway=funicular][tunnel?]::d2p3 -{ - opacity: 0.2; - color: maroon; - linecap: none; - width: 1.35; - z-index: 367; - dashes: 1.85,1.85; -} -line|z13[highway=primary_link][tunnel?]::d2p2 -{ - color: white; - width: 2.75; -} area|z13-[leisure=dog_park][sport=tennis], area|z13-[leisure=pitch][sport=tennis], area|z13-[leisure=playground][sport=tennis], @@ -2964,22 +1848,6 @@ line|z13[highway=track][tracktype=grade2] dashes: 4.5,3; linecap: none; } -line|z13[highway=service][tunnel?]::d2p2 -{ - color: white; - width: 0.9; - z-index: 274; - dashes: 4.5,2.25; - linecap: none; -} -line|z13[railway=tram][tunnel?] -{ - color: purple; - width: 1.95; - z-index: 356; - dashes: 1.85,1.85; - linecap: none; -} line|z13[railway=narrow_gauge] { color: #a0a0a0; @@ -2999,36 +1867,10 @@ line|z13[boundary=administrative][type=nation] z-index: 439; -x-kot-layer: top; } -line|z13[highway=residential][tunnel?] -{ - color: #202020; - width: 3; - z-index: 278; - dashes: 1.85,1.85; - linecap: none; -} line|z13[waterway=canal] { color: #cde5ea; width: 3; - z-index: 76; -} -line|z13[railway=narrow_gauge][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #404040; - linecap: none; - width: 1.35; - z-index: 349; - dashes: 1.85,1.85; -} -line|z13[railway=monorail][tunnel?] -{ - color: #b20000; - width: 1.95; - z-index: 368; - dashes: 1.85,1.85; - linecap: none; } line|z13[railway=rail] { @@ -3046,7 +1888,6 @@ line|z13[piste:type=downhill][piste:difficulty=easy] { color: #404040; width: 2.5; - z-index: 394; } area|z13[place=city], node|z13[place=city] @@ -3057,14 +1898,6 @@ node|z13[place=city] text-color: #404040; text-halo-color: #eeeedd; } -line|z13[railway=siding][tunnel?]::d2p3 -{ - color: #404040; - width: 0.85; - z-index: 377; - dashes: 1.85,1.85; - linecap: none; -} area|z13[landuse=construction], area|z13-14[landuse=greenfield], area|z15-[landuse=greenfield]::d1p2, @@ -3076,7 +1909,6 @@ line|z13[highway=track] { color: #d79331; width: 1; - z-index: 200; dashes: 6,2.25; linecap: none; } @@ -3084,47 +1916,11 @@ line|z13[piste:type=downhill][piste:difficulty=novice] { color: #40ff40; width: 2.5; - z-index: 393; } line|z13[piste:type=downhill][piste:difficulty=expert] { color: #f6800a; width: 2.5; - z-index: 397; -} -line|z13[mapswithme=grid] -{ - color: #202020; - width: 5; - dashes: 0.5,0.5; - linecap: none; -} -line|z13[railway=preserved][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #595959; - linecap: none; - width: 1.35; - z-index: 352; - dashes: 1.85,1.85; -} -line|z13[highway=primary][tunnel?]::d2p2 -{ - color: white; - width: 5; -} -line|z13[highway=residential][tunnel?]::d2p2 -{ - color: white; - width: 2.75; -} -line|z13[railway=preserved][tunnel?] -{ - color: #595959; - width: 1.95; - z-index: 350; - dashes: 1.85,1.85; - linecap: none; } line|z13[man_made=cutline] { @@ -3134,17 +1930,13 @@ line|z13[man_made=cutline] dashes: 2.25,3; linecap: none; } -area|z15-[highway=path][area?], -area|z13-[highway=road][area?] -{ - fill-color: #d0d0d0; -} area|z13[place=suburb], node|z13[place=suburb] { text: name; font-size: 14; text-color: #909090; + z-index: 20; } line|z14[railway=spur]::d1p2 { @@ -3158,43 +1950,13 @@ line|z14[railway=yard] width: 1.6; z-index: 208; } -line|z14[railway=incline][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 430; -} -line|z14[railway=abandoned][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 1; - z-index: 411; - dashes: 2.2,2.2; -} line|z14[highway=cycleway] { color: #4dbf4d; width: 1; - z-index: 248; dashes: 3,4; linecap: none; } -line|z14[railway=proposed]::d1p2 -{ - color: white; - width: 1.7; - z-index: 281; -} -line|z14[highway=unclassified][tunnel?] -{ - color: #101010; - width: 4.5; - z-index: 99; - dashes: 2.2,2.2; - linecap: none; -} line|z14[highway=raceway] { color: #e8e4d4; @@ -3268,14 +2030,6 @@ line|z14[railway=monorail]::d1p2 width: 1.7; z-index: 556; } -line|z14[highway=steps][tunnel?]::d2p2 -{ - color: white; - width: 1.6; - z-index: 317; - dashes: 1,3; - linecap: none; -} line|z14[railway=light_rail] { color: #095909; @@ -3299,14 +2053,6 @@ line|z14[highway=steps] dashes: 1,3; linecap: none; } -line|z14[highway=bridleway][tunnel?] -{ - color: #e6dda5; - width: 2; - z-index: 340; - dashes: 2.2,2.2; - linecap: none; -} line|z14[highway=ford] { color: #cde5ea; @@ -3324,14 +2070,6 @@ line|z14[piste:lift=t-bar] text-position: line; text-color: #202020; } -line|z14[railway=preserved][tunnel?] -{ - color: #909090; - width: 2.4; - z-index: 419; - dashes: 2.2,2.2; - linecap: none; -} line|z14[railway=construction]::d1p3 { color: #606060; @@ -3340,30 +2078,13 @@ line|z14[railway=construction]::d1p3 dashes: 1.5,1.5,1.5,4.5; linecap: none; } -line|z14[highway=motorway][tunnel?]::d2p2 -{ - color: white; - width: 8; - z-index: 394; -} area|z14-[power=generator][generator:type=photovoltaic]::d2p2, node|z14-[power=generator][generator:type=photovoltaic]::d2p2 { icon-image: power_photovoltaic.svg; } -line|z14[waterway=ditch][tunnel?] -{ - color: #cde5ea; - width: 0.28; - z-index: 97; - dashes: 3,3; - linecap: none; -} -area|z16-[aerialway=station], -area|z14-[railway=rail], line|z14-[railway=rail], -node|z16-[aerialway=station], -node|z14-[railway=rail] +node|z16-[aerialway=station] { font-size: 12; text-halo-radius: 2; @@ -3375,48 +2096,19 @@ line|z14[piste:lift=platter]::d1p2 { color: #202020; width: 0.4; - z-index: 475; -} -line|z14[railway=tram][tunnel?] -{ - color: #590959; - width: 2.4; - z-index: 425; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[railway=light_rail][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 423; } line|z14[piste:lift=j-bar]::d2p2 { color: #202020; width: 0.4; - z-index: 474; } line|z14[highway=construction] { color: #d0d0d0; width: 3.5; - z-index: 455; dashes: 4,4; linecap: none; } -area|z14[waterway=dock]::d1p2 -{ - z-index: 105; -} -line|z14[waterway=stream][tunnel?] -{ - color: #cde5ea; - width: 0.75; - z-index: 94; - dashes: 3,3; - linecap: none; -} area|z14-[earthquake:damage=spontaneous_camp], area|z14-16[tourism=camp_site]::d1p2, node|z14-[earthquake:damage=spontaneous_camp], @@ -3424,20 +2116,12 @@ node|z14-16[tourism=camp_site]::d1p2 { icon-image: earthquakecamp.svg; } -line|z14[highway=motorway_link]::d1p2 +line|z14[highway=motorway_link] { color: #f08800; width: 5.5; z-index: 275; } -line|z14[highway=motorway][tunnel?] -{ - color: #202020; - width: 9; - z-index: 393; - dashes: 2.2,2.2; - linecap: none; -} line|z14[railway=construction] { color: #606060; @@ -3446,61 +2130,10 @@ line|z14[railway=construction] dashes: 1.5,1.5; linecap: none; } -line|z14[railway=narrow_gauge][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 417; -} -line|z14[railway=narrow_gauge][tunnel?] -{ - color: #404040; - width: 2.4; - z-index: 416; - dashes: 2.2,2.2; - linecap: none; -} -area|z14[landuse=reservoir]::d1p2, -area|z16[natural=marsh]::d1p2, -area|z17-[natural=pond]::d1p2 -{ - z-index: 116; -} -line|z14[waterway=drain][tunnel?] -{ - color: #cde5ea; - width: 1.8; - z-index: 96; - dashes: 3.5,3.5; - linecap: none; -} -line|z14[piste:type=downhill][piste:difficulty=easy] +line|z14-[piste:type=downhill][piste:difficulty=easy] { color: #404040; width: 5; - z-index: 463; -} -line|z14[railway=yard][tunnel?] -{ - color: #404040; - width: 1.6; - z-index: 442; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[waterway=river][tunnel?] -{ - color: #cde5ea; - width: 3; - z-index: 93; - dashes: 6,6; - linecap: none; -} -line|z14[highway=unclassified][tunnel?]::d2p2 -{ - color: white; - width: 3.5; - z-index: 100; } line|z14[highway=primary], line|z14[highway=trunk] @@ -3512,37 +2145,22 @@ line|z14[highway=trunk] text-color: #303030; text-halo-color: #ffc444; } -line|z14[highway=path][bicycle?][tunnel?]::d3p2 -{ - color: white; - width: 1.6; - z-index: 332; - dashes: 3,4; - linecap: none; -} line|z14[railway=spur] { color: #b0b0b0; width: 1.6; z-index: 207; } -line|z14[railway][construction?][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 397; -} line|z14[railway=narrow_gauge]::d1p2 { color: #e6e6e6; width: 1.7; z-index: 286; } -line|z14[piste:type=downhill] +line|z14-[piste:type=downhill] { color: #505050; width: 5; - z-index: 468; } line|z14[boundary=administrative][type=nation] { @@ -3551,12 +2169,6 @@ line|z14[boundary=administrative][type=nation] z-index: 532; -x-kot-layer: top; } -line|z14[highway=primary][tunnel?]::d2p2 -{ - color: white; - width: 6; - z-index: 389; -} line|z14[highway=motorway]::d1p2 { color: #f08800; @@ -3570,15 +2182,8 @@ line|z14[leisure=track] { color: #d0e8c4; width: 1.6; - z-index: 63; -} -line|z14[highway=service][tunnel?] -{ - color: #202020; - width: 2; - z-index: 352; - dashes: 2.2,2.2; - linecap: none; + casing-color: grey; + casing-width: 1; } line|z14[aeroway=runway] { @@ -3592,15 +2197,6 @@ line|z14[aeroway=runway] casing-width: 2; casing-color: #202020; } -line|z14[railway=tram][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #590959; - linecap: none; - width: 1.7; - z-index: 427; - dashes: 2.2,2.2; -} line|z14[route=ferry] { color: #98b8e8; @@ -3609,57 +2205,22 @@ line|z14[route=ferry] dashes: 3,2; linecap: none; } -area|z14[railway=rail]::d1p3, line|z14[railway=rail]::d1p3, -node|z14[railway=rail]::d1p3 { color: #888888; z-index: 198; width: 3; } -line|z14[railway=yard][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #404040; - linecap: none; - width: 1; - z-index: 447; - dashes: 2.2,2.2; -} -line|z14[piste:type=downhill][piste:difficulty=advanced] +line|z14-[piste:type=downhill][piste:difficulty=advanced] { color: #202020; width: 5; - z-index: 465; -} -line|z14[railway=monorail]::d1p3, -line|z14[railway=tram]::d1p3 -{ - color: #590959; - width: 1.7; - z-index: 306; - dashes: 3.6,5.4; - linecap: none; -} -line|z14[railway=preserved][tunnel?]::d2p3 -{ - opacity: 0.15; - color: #505050; - linecap: none; - width: 1.7; - z-index: 421; - dashes: 2.2,2.2; -} -area|z14[power=generator][power_source=hydro]::d2p3, -node|z14[power=generator][power_source=hydro]::d2p3 -{ - z-index: 494; } + line|z14[piste:type=sled] { color: #f0e0dc; width: 2.5; - z-index: 471; } line|z14[natural=spring]::d1p2, line|z14[waterway=river]::d1p2 @@ -3667,11 +2228,10 @@ line|z14[waterway=river]::d1p2 color: #cde5ea; width: 4; } -line|z14[piste:type=downhill][piste:difficulty=intermediate] +line|z14-[piste:type=downhill][piste:difficulty=intermediate] { color: #ff4040; width: 5; - z-index: 464; } line|z14[boundary=administrative][border_type=country] { @@ -3680,39 +2240,11 @@ line|z14[boundary=administrative][border_type=country] z-index: 533; -x-kot-layer: top; } -line|z14[highway=residential][access=private] -{ - color: white; - width: 3; - z-index: 427; - casing-width: 1; - casing-color: #c8c8af; -} -line|z14[railway=spur][tunnel?]::d2p3 -{ - color: #606060; - width: 1; - z-index: 446; - dashes: 2.2,2.2; - linecap: none; -} area|z15-[tourism=alpine_hut], node|z15-[tourism=alpine_hut] { icon-image: alpine_hut.svg; } -line|z14[railway=spur][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 441; -} -line|z14[highway=motorway_link][tunnel?]::d2p2 -{ - color: white; - width: 5.5; - z-index: 386; -} area|z14[natural=wetland]::d1p2, area|z15[waterway=dock]::d1p2 { @@ -3735,20 +2267,6 @@ line|z14[railway=preserved]::d1p3 dashes: 4.5,4.5; linecap: none; } -line|z14[railway=proposed][tunnel?] -{ - color: #b2b2b2; - width: 2.4; - z-index: 401; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=primary_link][tunnel?]::d2p2 -{ - color: white; - width: 4.5; - z-index: 381; -} line|z14[man_made=cutline] { color: #c0bc9c; @@ -3757,12 +2275,6 @@ line|z14[man_made=cutline] dashes: 3,4; linecap: none; } -line|z14[railway=funicular][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 432; -} area|z14-16[amenity=shelter], area|z17-[amenity=shelter]::d1p2, node|z14-16[amenity=shelter], @@ -3776,15 +2288,6 @@ line|z14[railway=siding] width: 1.6; z-index: 209; } -line|z14[railway=incline][tunnel?]::d2p4 -{ - opacity: 0.3; - color: #590909; - linecap: none; - width: 0.4; - z-index: 435; - dashes: 2.2,2.2; -} line|z14[boundary=administrative][admin_level=5] { color: #f9574b; @@ -3794,35 +2297,13 @@ line|z14[boundary=administrative][admin_level=5] z-index: 522; dashes: 12,12; } -line|z14[railway=tram]::d1p2 -{ - color: #e6b7e6; - width: 1.7; - z-index: 556; -} -line|z14[highway=path][bicycle?][tunnel?] -{ - color: #90bc90; - width: 2; - z-index: 331; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[railway=narrow_gauge][tunnel?]::d2p3 -{ - opacity: 0.15; - color: #404040; - linecap: none; - width: 1.7; - z-index: 418; - dashes: 2.2,2.2; -} + line|z14[highway=residential], -line|z14[highway=unclassified] +line|z14[highway=unclassified], +line|z14[highway=living_street] { color: white; width: 3; - z-index: 427; casing-linecap: none; casing-width: 1; casing-color: #c8c8af; @@ -3836,41 +2317,18 @@ node|z14[place=town] text-color: #505050; text-halo-color: #eeeedd; } -line|z14[railway][construction?][tunnel?] -{ - color: #606060; - width: 2.4; - z-index: 396; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=pedestrian][tunnel?] -{ - color: #707070; - width: 4.2; - z-index: 325; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[piste:type=downhill][piste:difficulty=expert] +line|z14-[piste:type=downhill][piste:difficulty=expert] { color: #f6800a; width: 5; - z-index: 466; } -line|z14[highway=tertiary]::d1p2 +line|z14[highway=tertiary] { color: #ffff90; - z-index: 459; casing-width: 1; width: 3; casing-color: #c8c860; } -line|z14[highway=secondary][tunnel?]::d2p2 -{ - color: white; - width: 6; -} area|z14-[man_made=wastewater_plant]::d1p2, node|z14-[man_made=wastewater_plant]::d1p2 { @@ -3888,42 +2346,38 @@ line|z14[highway=track] { color: #d79331; width: 1; - z-index: 253; dashes: 8,3; linecap: none; } +line|z14[railway=monorail]::d1p3, +line|z14[railway=tram]::d1p3 +{ + color: #590959; + width: 1.7; + z-index: 306; + dashes: 3.6,5.4; + linecap: none; +} +line|z14[railway=tram]::d1p2 +{ + color: #e6b7e6; + width: 1.7; + z-index: 556; +} line|z14[railway=monorail], line|z14[railway=tram] { color: #590959; width: 2; - z-index: 556; + z-index: 555; } line|z14[piste:lift=platter]::d1p3 { color: #202020; width: 4; - z-index: 478; dashes: 0.4,20; linecap: none; } -line|z14[railway=rail][tunnel?] -{ - color: #888888; - width: 3; - z-index: 413; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[railway][disused?][tunnel?] -{ - opacity: 0.7; - color: grey; - linecap: none; - width: 1.6; - z-index: 405; - dashes: 2.2,2.2; -} line|z14[highway=bridleway] { color: #8fbf4d; @@ -3947,31 +2401,13 @@ line|z14[waterway=dam] width: 0.38; z-index: 124; } -line|z14[railway=light_rail][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #095909; - linecap: none; - width: 1.7; - z-index: 424; - dashes: 2.2,2.2; -} line|z14[piste:lift=j-bar]::d2p3 { color: #202020; width: 4; - z-index: 477; dashes: 0.4,20; linecap: none; } -line|z14[highway=path][horse?][tunnel?]::d3p2 -{ - color: white; - width: 1.6; - z-index: 335; - dashes: 3,4; - linecap: none; -} line|z14[railway=disused] { color: grey; @@ -3979,32 +2415,10 @@ line|z14[railway=disused] z-index: 196; opacity: 0.7; } -line|z14[railway][disused?][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 406; - opacity: 0.7; -} -line|z14[highway=primary_link]::d1p2 +line|z14[highway=primary_link] { color: #ffc444; width: 4.5; - z-index: 273; -} -line|z14[railway=monorail][tunnel?] -{ - color: #590909; - width: 2.4; - z-index: 437; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[railway=rail][tunnel?]::d2p2 -{ - color: white; - width: 1.8; - z-index: 414; } line|z14[railway=construction]::d1p2 { @@ -4018,61 +2432,6 @@ line|z14[railway=funicular]::d1p3 width: 0.4; z-index: 309; } -line|z14[highway=cycleway][tunnel?]::d2p2 -{ - color: white; - width: 1.6; - z-index: 100; - dashes: 3,4; - linecap: none; -} -line|z14[railway=funicular][tunnel?]::d2p4 -{ - opacity: 0.3; - color: #590909; - linecap: none; - width: 0.4; - z-index: 436; - dashes: 2.2,2.2; -} -line|z14[highway=tertiary][tunnel?]::d2p2 -{ - color: white; - width: 4.5; - z-index: 373; -} -line|z14[railway=abandoned][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 409; - opacity: 0.4; -} -area|z14[aeroway=terminal]::d1p2 -{ - z-index: 240; -} -line|z14[railway=yard][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 443; -} -line|z14[railway=preserved][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 420; -} -line|z14[railway=incline][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #e6b7b7; - linecap: none; - width: 1.7; - z-index: 433; - dashes: 2.2,2.2; -} line|z14[waterway=lock] { color: #f8f8f8; @@ -4081,35 +2440,6 @@ line|z14[waterway=lock] casing-width: 0.5; casing-color: #202020; } -line|z14[highway=road][tunnel?]::d2p2 -{ - color: white; - width: 3.5; - z-index: 369; -} -line|z14[highway=tertiary][tunnel?] -{ - color: #202020; - width: 5.5; - z-index: 372; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=secondary][tunnel?] -{ - color: #202020; - width: 7; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[railway=proposed]::d1p3 -{ - color: #b2b2b2; - width: 1.7; - z-index: 298; - dashes: 1.5,1.5,1.5,4.5; - linecap: none; -} line|z14-[natural=spring], line|z14-[waterway=canal], line|z14-[waterway=river] @@ -4125,19 +2455,10 @@ line|z14[railway=yard]::d1p2 width: 1; z-index: 294; } -line|z14[piste:type=downhill][piste:difficulty=freeride] +line|z14-[piste:type=downhill][piste:difficulty=freeride] { color: #f6dd0a; width: 5; - z-index: 467; -} -line|z14[highway=primary][tunnel?] -{ - color: #202020; - width: 7; - z-index: 388; - dashes: 2.2,2.2; - linecap: none; } line|z14[boundary=administrative][admin_level=2] { @@ -4146,9 +2467,7 @@ line|z14[boundary=administrative][admin_level=2] z-index: 525; -x-kot-layer: top; } -area|z14[railway=rail]::d1p5, -line|z14[railway=rail]::d1p5, -node|z14[railway=rail]::d1p5 +line|z14[railway=rail]::d1p5 { color: #888888; width: 1.8; @@ -4174,24 +2493,13 @@ line|z14[highway=tertiary_link] { color: #ffff90; width: 4.5; - z-index: 269; } -area|z14[railway=rail]::d1p4, -line|z14[railway=rail]::d1p4, -node|z14[railway=rail]::d1p4 +line|z14[railway=rail]::d1p4 { color: #e6e6e6; width: 1.8; z-index: 285; } -line|z14[highway=bridleway][tunnel?]::d2p2 -{ - color: white; - width: 1.6; - z-index: 341; - dashes: 3,4; - linecap: none; -} line|z14[railway=abandoned]::d1p2 { color: white; @@ -4199,12 +2507,6 @@ line|z14[railway=abandoned]::d1p2 z-index: 283; opacity: 0.4; } -line|z14[railway=monorail][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 438; -} line|z14[railway=siding]::d1p3 { color: #404040; @@ -4213,14 +2515,6 @@ line|z14[railway=siding]::d1p3 dashes: 3,6; linecap: none; } -line|z14[highway=path][tunnel?]::d2p2 -{ - color: white; - width: 1.6; - z-index: 338; - dashes: 3,4; - linecap: none; -} line|z14[boundary=administrative][border_type=country]::d2p2 { color: #f9574b; @@ -4253,29 +2547,12 @@ node|z15-[landuse=construction]::d1p2 { fill-color: #e0e0d0; } -line|z14[waterway=canal]::d1p2 +line|z14[waterway=canal] { color: #cde5ea; width: 4; - z-index: 102; } -line|z14[highway=track][tunnel?] -{ - opacity: 0.75; - color: #fff2de; - linecap: none; - width: 2; - z-index: 346; - dashes: 2.2,2.2; -} -line|z14[highway=secondary_link][tunnel?] -{ - color: #202020; - width: 5.5; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=secondary]::d1p2 +line|z14[highway=secondary] { color: #fffb80; width: 5; @@ -4287,38 +2564,6 @@ line|z14[railway=preserved]::d1p2 { color: #e6e6e6; width: 1.7; - z-index: 287; -} -line|z14[highway=steps][tunnel?] -{ - color: #d0ccac; - width: 2; - z-index: 316; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=footway][tunnel?]::d2p2 -{ - color: white; - width: 1.6; - z-index: 320; - dashes: 3,4; - linecap: none; -} -line|z14[railway=abandoned][tunnel?] -{ - opacity: 0.4; - color: #b2b2b2; - linecap: none; - width: 1.6; - z-index: 408; - dashes: 2.2,2.2; -} -line|z14[railway=siding][tunnel?]::d2p2 -{ - color: white; - width: 1; - z-index: 445; } line|z14[railway=siding]::d1p2 { @@ -4326,27 +2571,6 @@ line|z14[railway=siding]::d1p2 width: 1; z-index: 295; } -line|z14[railway=tram][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 426; -} -line|z14[highway=service][tunnel?]::d2p2 -{ - color: white; - width: 1.8; - z-index: 353; -} -line|z14[railway=monorail][tunnel?]::d2p3 -{ - opacity: 0.3; - color: white; - linecap: none; - width: 0.4; - z-index: 439; - dashes: 2.2,2.2; -} line|z14[boundary=administrative][border_type=county] { color: #f9574b; @@ -4361,10 +2585,10 @@ node|z14-[power=generator]::d1p2 { icon-image: power_generic.svg; } -line|z14[mapswithme=grid] +line|z12-[mapswithme=grid] { color: #202020; - width: 10; + width: 4; dashes: 1,1; linecap: none; } @@ -4374,18 +2598,12 @@ node|z14-16[place=suburb] text: name; font-size: 18; text-color: #909090; -} -line|z14[highway=trunk][tunnel?]::d2p2 -{ - color: white; - width: 8; - z-index: 391; + z-index: 20; } line|z14[piste:lift=t-bar]::d2p2 { color: #202020; width: 0.4; - z-index: 473; } line|z14[railway=disused]::d1p2 { @@ -4394,15 +2612,6 @@ line|z14[railway=disused]::d1p2 z-index: 282; opacity: 0.7; } -line|z14[railway][construction?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #606060; - linecap: none; - width: 1.7; - z-index: 398; - dashes: 2.2,2.2; -} area|z14-[power=generator], area|z14-[power=station], area|z14-[power=sub_station], @@ -4410,55 +2619,25 @@ node|z14-[power=generator] { fill-color: #bebebe; } -line|z14[highway=path][horse?][tunnel?] -{ - color: #e6dda5; - width: 2; - z-index: 334; - dashes: 2.2,2.2; - linecap: none; -} line|z14[man_made=pier]::d1p2 { color: #d0d0d0; width: 0.8; - z-index: 487; -} -line|z14[railway=siding][tunnel?]::d2p3 -{ - color: #404040; - width: 1; - z-index: 448; - dashes: 2.2,2.2; - linecap: none; -} -area|z14[natural=marsh]::d1p2 -{ - z-index: 109; } line|z14[highway=track][tracktype=grade1] { color: #d79331; width: 2; - z-index: 254; } line|z14[highway=pedestrian] { color: #d0ccac; width: 1; - z-index: 261; -} -line|z14[highway=residential][tunnel?]::d2p2 -{ - color: white; - width: 3.5; - z-index: 358; } line|z14[waterway=drain] { color: #cde5ea; width: 2.3; - z-index: 103; } area|z14[aeroway=airport], node|z14[aeroway=airport] @@ -4483,28 +2662,6 @@ line|z14[railway=preserved] width: 2.4; z-index: 200; } -line|z14[highway=secondary_link][tunnel?]::d2p2 -{ - color: white; - width: 4.5; -} -line|z14[railway=proposed][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 1.7; - z-index: 404; - dashes: 2.2,2.2; -} -line|z14[highway=cycleway][tunnel?] -{ - color: #90bc90; - width: 2; - z-index: 99; - dashes: 2.2,2.2; - linecap: none; -} area|z14-[power=generator][power_source=hydro]::d2p2, node|z14-[power=generator][power_source=hydro]::d2p2 { @@ -4526,14 +2683,6 @@ line|z14[railway=yard]::d1p3 dashes: 3,6; linecap: none; } -line|z14[highway=trunk][tunnel?] -{ - color: #202020; - width: 9; - z-index: 390; - dashes: 2.2,2.2; - linecap: none; -} line|z14[boundary=administrative][border_type=state] { color: #f9574b; @@ -4549,74 +2698,19 @@ line|z14[railway=narrow_gauge] width: 2.4; z-index: 199; } -line|z14[railway=proposed] -{ - color: #b2b2b2; - width: 2.4; - z-index: 195; - dashes: 1.5,1.5; - linecap: none; -} -line|z14[railway=siding][tunnel?] -{ - color: #404040; - width: 1.6; - z-index: 444; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=living_street][tunnel?] -{ - color: #101010; - width: 4.5; - z-index: 363; - dashes: 2.2,2.2; - linecap: none; -} area|z16-[power=tower], node|z16-[power=tower] { icon-image: power-tower.svg; } -line|z14[railway=spur][tunnel?] -{ - color: #606060; - width: 1.6; - z-index: 440; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=path][horse?] -{ - color: #8fbf4d; - width: 1.6; - z-index: 250; - dashes: 3,4; - linecap: none; -} area|z14-[natural=beach] { fill-color: #eecc55; } -line|z14[railway=funicular][tunnel?] -{ - color: #590909; - width: 2.4; - z-index: 431; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=living_street][tunnel?]::d2p2 -{ - color: white; - width: 3.5; - z-index: 364; -} -line|z14[piste:type=downhill][piste:difficulty=novice] +line|z14-[piste:type=downhill][piste:difficulty=novice] { color: #40ff40; width: 5; - z-index: 462; } line|z14[railway=disused]::d1p3 { @@ -4627,37 +2721,20 @@ line|z14[railway=disused]::d1p3 z-index: 299; dashes: 4.5,4.5; } -line|z14[highway=primary]::d1p2, -line|z14[highway=trunk]::d1p2 +line|z14[highway=primary], +line|z14[highway=trunk] { color: #ffc444; width: 7; - z-index: 482; casing-linecap: none; casing-width: 1; casing-color: #d8a050; } -line|z14[railway=incline][tunnel?] -{ - color: #590909; - width: 2.4; - z-index: 429; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=secondary_link]::d1p2 +line|z14[highway=secondary_link] { color: #fffb80; width: 4.5; } -line|z14[highway=path][tunnel?] -{ - color: #d0ccac; - width: 2; - z-index: 337; - dashes: 2.2,2.2; - linecap: none; -} line|z14[waterway=ditch] { color: #cde5ea; @@ -4677,19 +2754,10 @@ node|z14-[power=generator][power_source=wind]::d2p2 { icon-image: power_wind.svg; } -line|z14[highway=living_street] -{ - color: white; - width: 3.5; - z-index: 268; - casing-width: 0.35; - casing-color: #101010; -} line|z14[piste:lift=t-bar]::d2p3 { color: #202020; width: 4; - z-index: 476; dashes: 0.4,20; linecap: none; } @@ -4730,18 +2798,6 @@ node|z14[place=village] text-color: #404040; text-halo-color: #eeeedd; } -line|z14[highway=pedestrian][tunnel?]::d2p2 -{ - color: white; - width: 3.5; - z-index: 326; -} -line|z14[railway=proposed][tunnel?]::d2p2 -{ - color: white; - width: 1.7; - z-index: 402; -} line|z14[railway=light_rail]::d1p2 { color: #b7e6e6; @@ -4754,22 +2810,6 @@ line|z14[waterway=stream] width: 1; z-index: 101; } -line|z14[highway=residential][tunnel?] -{ - color: #101010; - width: 4.5; - z-index: 357; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[railway=rail][tunnel?]::d2p3 -{ - color: #888888; - width: 1.8; - z-index: 415; - dashes: 2.2,2.2; - linecap: none; -} area|z14-16[place=locality]::d1p3, node|z14-16[place=locality]::d1p3 { @@ -4777,27 +2817,10 @@ node|z14-16[place=locality]::d1p3 font-size: 12; text-color: #909090; } -line|z14[highway=footway][tunnel?] -{ - color: #d0ccac; - width: 2; - z-index: 319; - dashes: 2.2,2.2; - linecap: none; -} -line|z14[highway=road]::d1p2 +line|z14[highway=road] { color: #d0d0d0; width: 3.5; - z-index: 264; -} -line|z14[railway=light_rail][tunnel?] -{ - color: #095909; - width: 2.4; - z-index: 422; - dashes: 2.2,2.2; - linecap: none; } node|z14[aerialway=station] { @@ -4805,14 +2828,6 @@ node|z14[aerialway=station] symbol-fill-color: #3050d8; symbol-size: 2; } -line|z14[highway=motorway_link][tunnel?] -{ - color: #202020; - width: 6.5; - z-index: 385; - dashes: 2.2,2.2; - linecap: none; -} line|z14[boundary=administrative][admin_level=2]::d2p2 { color: #f9574b; @@ -4836,34 +2851,10 @@ line|z14[man_made=pier] width: 0.1; z-index: 486; } -line|z14[highway=track][tunnel?]::d2p2 -{ - color: white; - width: 1.6; - z-index: 347; -} -line|z14[railway=funicular][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #e6b7b7; - linecap: none; - width: 1.7; - z-index: 434; - dashes: 2.2,2.2; -} -line|z14[highway=road][tunnel?] -{ - color: #101010; - width: 4.5; - z-index: 368; - dashes: 2.2,2.2; - linecap: none; -} line|z14[piste:type=nordic] { color: #c00000; width: 1; - z-index: 472; dashes: 3,0.5; linecap: none; } @@ -4873,14 +2864,6 @@ line|z14[railway=funicular] width: 2.4; z-index: 205; } -line|z14[highway=primary_link][tunnel?] -{ - color: #202020; - width: 5.5; - z-index: 380; - dashes: 2.2,2.2; - linecap: none; -} area|z14[aeroway=aerodrome], area|z16-[highway=motorway_junction]::d1p1, node|z14[aeroway=aerodrome], @@ -4900,15 +2883,6 @@ line|z14[railway=spur]::d1p3 dashes: 3,6; linecap: none; } -line|z14[railway][disused?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: grey; - linecap: none; - width: 1; - z-index: 407; - dashes: 2.2,2.2; -} line|z14[waterway=weir] { color: #000044; @@ -4921,10 +2895,7 @@ line|z14[natural=glacier] width: 0.8; z-index: 8; } -area|z14[railway=rail]::d1p2, -line|z14[railway=rail]::d1p2, -node|z15[aerialway=station], -node|z14[railway=rail]::d1p2 +node|z15[aerialway=station] { symbol-shape: circle; symbol-fill-color: #3050d8; @@ -4938,14 +2909,6 @@ line|z14[railway=funicular]::d1p2 dashes: 3.6,5.4; linecap: none; } -line|z14[waterway=canal][tunnel?] -{ - color: #cde5ea; - width: 3; - z-index: 95; - dashes: 6,6; - linecap: none; -} line|z15[railway=spur]::d1p3 { color: #606060; @@ -4954,12 +2917,6 @@ line|z15[railway=spur]::d1p3 dashes: 6,12; linecap: none; } -line|z15[highway=unclassified][tunnel?]::d2p2 -{ - color: white; - width: 7; - z-index: 100; -} line|z15[boundary=administrative][border_type=county] { color: #f9574b; @@ -4969,17 +2926,6 @@ line|z15[boundary=administrative][border_type=county] z-index: 686; dashes: 4,20; } -line|z15[highway=bridleway][tunnel?]::d2p2 -{ - color: white; - width: 3.2; - z-index: 439; -} -area|z15-[highway=bridleway][area?], -area|z15-[highway=path][horse?][area?] -{ - fill-color: #d3cb98; -} line|z15-[railway=subway]::d1p3 { color: #0f0f4c; @@ -4988,69 +2934,30 @@ line|z15-[railway=subway]::d1p3 dashes: 9.6,14.4; linecap: none; } -line|z15[waterway=river][tunnel?] -{ - color: #cde5ea; - width: 4; - z-index: 98; - dashes: 7.4,7.4; - linecap: none; -} area|z15[amenity=hospital], node|z15[amenity=hospital] { icon-image: hospital0.svg; } -line|z15[railway=yard][tunnel?] -{ - color: #333333; - width: 2.4; - z-index: 522; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=pedestrian][tunnel?] -{ - color: #707070; - width: 7.8; - z-index: 425; - dashes: 2.8,2.8; - linecap: none; -} line|z15[man_made=cutline] { color: #c0bc9c; width: 1; - z-index: 276; -} -line|z15[highway=secondary_link][tunnel?]::d2p2 -{ - color: white; - width: 9; } line|z15[highway=footway] { color: #d0ccbc; width: 1; - z-index: 266; -} -line|z15[highway=motorway][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 477; } line|z15[highway=path] { color: silver; width: 2; - z-index: 353; } line|z15[highway=raceway] { color: #e8e4d4; width: 3; - z-index: 358; } line|z15[boundary=administrative][admin_level=2]::d2p2 { @@ -5077,12 +2984,6 @@ line|z15-16[highway=motorway]::d1p2 casing-width: 2; casing-color: #b87c04; } -line|z15[piste:type=downhill][piste:difficulty=easy] -{ - color: #404040; - width: 10; - z-index: 584; -} line|z15[railway=disused] { color: grey; @@ -5090,15 +2991,6 @@ line|z15[railway=disused] z-index: 284; opacity: 0.7; } -line|z15[railway=narrow_gauge][tunnel?]::d2p3 -{ - opacity: 0.15; - color: #333333; - linecap: none; - width: 2; - z-index: 497; - dashes: 2.8,2.8; -} line|z15[railway=preserved]::d1p2 { color: #e6e6e6; @@ -5109,14 +3001,6 @@ line|z15[piste:lift=magic_carpet] { color: #101010; width: 1.6; - z-index: 608; -} -line|z15[highway=secondary][tunnel?] -{ - color: #707070; - width: 10.4; - dashes: 2.8,2.8; - linecap: none; } line|z15[railway=abandoned] { @@ -5125,21 +3009,12 @@ line|z15[railway=abandoned] z-index: 285; opacity: 0.4; } -line|z15[railway=rail][tunnel?] -{ - color: #666666; - width: 4; - z-index: 492; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=primary]::d1p2, -line|z15[highway=trunk]::d1p2, -line|z15[highway=trunk_link]::d1p2 +line|z15[highway=primary], +line|z15[highway=trunk], +line|z15[highway=trunk_link] { color: #ffc444; width: 8; - z-index: 482; casing-linecap: none; casing-width: 2; casing-color: #d8a050; @@ -5160,27 +3035,10 @@ line|z15[railway=siding]::d1p3 dashes: 6,12; linecap: none; } -line|z15[railway=monorail][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 482; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[piste:lift=j-bar] +line|z15-[piste:lift=j-bar] { color: #202020; width: 0.8; - z-index: 602; -} -line|z15[waterway=ditch][tunnel?] -{ - color: #cde5ea; - width: 0.4; - z-index: 102; - dashes: 3,3; - linecap: none; } area|z15[building=address], node|z15[building=address] @@ -5195,12 +3053,6 @@ line|z15[waterway=weir] width: 1; z-index: 128; } -line|z15[highway=residential][tunnel?]::d2p2 -{ - color: white; - width: 7; - z-index: 452; -} line|z15[highway=track][tracktype=grade1] { color: #d79331; @@ -5211,13 +3063,11 @@ line|z15[highway=track] { color: #c0a87c; width: 2; - z-index: 364; } -line|z15[waterway=canal]::d1p2 +line|z15[waterway=canal] { color: #cde5ea; width: 4; - z-index: 107; } node|z15-[place=village]::d1p4 { @@ -5227,46 +3077,6 @@ node|z15-[place=village]::d1p4 text-color: #909090; text-halo-color: #eeeedd; } -line|z15[railway=proposed][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 484; -} -line|z15[railway=light_rail][tunnel?] -{ - color: #0f4c0f; - width: 3.2; - z-index: 501; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[railway=proposed]::d1p2 -{ - color: white; - width: 2; - z-index: 382; -} -line|z15[railway=monorail][tunnel?]::d2p3 -{ - opacity: 0.3; - color: white; - linecap: none; - width: 0.5; - z-index: 519; - dashes: 2.8,2.8; -} -line|z15[highway=path][horse?] -{ - color: #d3cb98; - width: 3.2; - z-index: 351; -} -area|z15-[highway=cycleway][area?], -area|z15-[highway=path][bicycle?][area?] -{ - fill-color: #90bc90; -} line|z15[highway=primary], line|z15[highway=trunk], line|z15[highway=trunk_link] @@ -5285,20 +3095,6 @@ node|z17-[amenity=parking][access=public]::d2p2 { icon-image: parking-permissive.svg; } -line|z15[highway=primary][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 471; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=path][bicycle?][tunnel?]::d3p2 -{ - color: white; - width: 3.2; - z-index: 430; -} line|z15[highway=pedestrian] { color: #e8e8e8; @@ -5312,12 +3108,6 @@ node|z15-[tourism=viewpoint] { icon-image: viewpoint.svg; } -line|z15[highway=path][horse?][tunnel?]::d3p2 -{ - color: white; - width: 3.2; - z-index: 433; -} line|z15[railway=siding]::d1p2 { color: #e6e6e6; @@ -5335,45 +3125,27 @@ line|z15[railway=preserved] width: 3.2; z-index: 289; } -line|z15[railway=rail][tunnel?]::d2p3 -{ - color: #666666; - width: 2.4; - z-index: 494; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[aeroway=runway] +line|z15-[aeroway=runway] { casing-linecap: none; color: #d4dcbd; linecap: none; width: 20; - z-index: 414; linejoin: bevel; casing-linejoin: bevel; casing-width: 4; casing-color: #202020; } -line|z15[highway=steps][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 417; - dashes: 1.2,0.4; - linecap: none; -} line|z15[highway=track][tracktype=grade4] { color: #c0a87c; width: 2.8; z-index: 362; } -line|z15[piste:lift=t-bar] +line|z15-[piste:lift=t-bar] { color: #202020; width: 0.8; - z-index: 601; } line|z15[boundary=administrative][admin_level=5] { @@ -5384,11 +3156,10 @@ line|z15[boundary=administrative][admin_level=5] z-index: 676; dashes: 12,12; } -line|z15[piste:lift=t-bar]::d2p2 +line|z15-[piste:lift=t-bar]::d2p2 { color: #202020; width: 8; - z-index: 604; dashes: 0.8,40; linecap: none; } @@ -5396,7 +3167,6 @@ line|z15[highway=byway] { color: #c0a87c; width: 2; - z-index: 91; } area|z15-[tourism=attraction], node|z15-[tourism=attraction] @@ -5417,7 +3187,7 @@ line|z15[highway=track][tracktype=grade3] color: #c0a87c; width: 2; } -line|z15[highway=primary_link]::d1p2 +line|z15[highway=primary_link] { color: #ffc444; width: 9; @@ -5428,14 +3198,7 @@ line|z15[railway=spur] width: 2.4; z-index: 295; } -area|z15[railway=rail]::d1p3, -line|z15[railway=rail]::d1p3, -node|z15[railway=rail]::d1p3 -{ - color: #666666; - z-index: 287; - width: 4; -} + line|z15[boundary=administrative][border_type=region] { color: #f9574b; @@ -5445,120 +3208,44 @@ line|z15[boundary=administrative][border_type=region] z-index: 688; dashes: 12,4,4,4; } -line|z15[railway=proposed] -{ - color: #b2b2b2; - width: 3.2; - z-index: 283; - dashes: 3,3; - linecap: none; -} -line|z15[railway=proposed]::d1p3 -{ - color: #b2b2b2; - width: 2; - z-index: 399; - dashes: 3,3,3,9; - linecap: none; -} -line|z15[highway=primary][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 472; -} line|z15[waterway=stream][intermittent=yes] { color: #cde5ea; width: 2; - z-index: 105; dashes: 2.4,0.8; linecap: none; } -line|z15[railway=yard][tunnel?]::d2p3 +line|z15[railway=rail]::d1p3 { - opacity: 0.3; - color: #333333; - linecap: none; - width: 1.4; - z-index: 527; - dashes: 2.8,2.8; + color: #666666; + z-index: 287; + width: 4; } -area|z15[railway=rail]::d1p5, -line|z15[railway=rail]::d1p5, -node|z15[railway=rail]::d1p5 +line|z15[railway=rail]::d1p5 { color: #666666; width: 2.4; - z-index: 403; dashes: 9,9; linecap: none; + z-index: 387; } -line|z15[railway=incline][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 510; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[railway=preserved][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 499; -} -line|z15[highway=footway][tunnel?] -{ - color: #707070; - width: 2.8; - z-index: 419; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=path][bicycle?][tunnel?] +line|z15[railway=rail]::d1p4 { - color: #707070; - width: 4; - z-index: 429; - dashes: 2.8,2.8; - linecap: none; + color: #e6e6e6; + width: 2.4; + z-index: 386; } area|z15-[aeroway=helipad], node|z15-[aeroway=helipad] { icon-image: helipad.svg; } -line|z15[piste:type=downhill][piste:difficulty=intermediate] -{ - color: #ff4040; - width: 10; - z-index: 585; -} -line|z15[railway=subway][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #0f0f4c; - linecap: none; - width: 2; - z-index: 509; - dashes: 2.8,2.8; -} -line|z15[railway=funicular][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 512; - dashes: 2.8,2.8; - linecap: none; -} line|z15[boundary=administrative][admin_level=8] { color: #f9574b; linecap: none; -x-kot-layer: top; width: 1; - z-index: 673; dashes: 12,4,4,4; } line|z15[railway=narrow_gauge]::d1p2 @@ -5571,27 +3258,8 @@ line|z15[leisure=track] { color: #d0e8c4; width: 2.9; - z-index: 63; -} -line|z15[highway=trunk][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 473; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[railway=rail][tunnel?]::d2p2 -{ - color: white; - width: 2.4; - z-index: 493; -} -line|z15[highway=living_street]::d1p3 -{ - color: white; - width: 7; - z-index: 369; + casing-color: grey; + casing-width: 1; } area|z15-16[place=village], node|z15-16[place=village] @@ -5610,52 +3278,12 @@ line|z15[highway=secondary] casing-width: 1; casing-color: #c8c860; } -line|z15[highway=primary_link][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 467; - dashes: 2.8,2.8; - linecap: none; -} -area|z15[railway=rail]::d1p4, -line|z15[railway=rail]::d1p4, -node|z15[railway=rail]::d1p4 -{ - color: #e6e6e6; - width: 2.4; - z-index: 386; -} line|z15-[railway=tram]::d1p2 { color: #e6b7e6; width: 2; z-index: 561; } -line|z15[highway=motorway_link][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 470; -} -line|z15[railway][disused?][tunnel?] -{ - opacity: 0.7; - color: grey; - linecap: none; - width: 3.2; - z-index: 486; - dashes: 2.8,2.8; -} -line|z15[railway=abandoned][tunnel?] -{ - opacity: 0.4; - color: #b2b2b2; - linecap: none; - width: 3.2; - z-index: 489; - dashes: 2.8,2.8; -} area|z15-[railway=halt], area|z17-[railway=tram_stop], node|z15-[railway=halt], @@ -5675,30 +3303,6 @@ line|z15[boundary=administrative][admin_level=7] z-index: 674; -x-kot-layer: top; } -line|z15[railway=tram][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 505; -} -line|z15[railway][disused?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: grey; - linecap: none; - width: 2; - z-index: 488; - dashes: 2.8,2.8; -} -line|z15[railway=light_rail][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #0f4c0f; - linecap: none; - width: 2; - z-index: 503; - dashes: 2.8,2.8; -} line|z15[boundary=administrative][border_type=city] { color: #f9574b; @@ -5708,45 +3312,27 @@ line|z15[boundary=administrative][border_type=city] z-index: 685; dashes: 12,4,4,4; } -line|z15[railway=siding][tunnel?] -{ - color: #333333; - width: 2.4; - z-index: 524; - dashes: 2.8,2.8; - linecap: none; -} line|z15-[railway=subway]::d1p2 { color: #b7b7e6; width: 2; z-index: 668; } -line|z15[piste:lift=platter] +line|z15-[piste:lift=platter] { color: #202020; width: 0.8; - z-index: 603; } -line|z15[highway=road]::d1p2 +line|z15[highway=road] { color: #d0d0d0; width: 7; - z-index: 371; } area|z15-[landuse=garages]::d1p2, node|z15-[landuse=garages]::d1p2 { fill-color: #e1e1e5; } -line|z15[railway=spur][tunnel?]::d2p3 -{ - color: #606060; - width: 1.4; - z-index: 526; - dashes: 2.8,2.8; - linecap: none; -} line|z15[railway=yard]::d1p2 { color: #e6e6e6; @@ -5759,21 +3345,6 @@ line|z15-16[railway=light_rail]::d1p2 width: 2; z-index: 677; } -line|z15[railway][disused?][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 487; - opacity: 0.7; -} -line|z15[waterway=stream][tunnel?] -{ - color: #cde5ea; - width: 1.6; - z-index: 99; - dashes: 3,3; - linecap: none; -} line|z15-16[railway=light_rail] { color: #0f4c0f; @@ -5788,14 +3359,6 @@ line|z15[highway=steps] dashes: 1.2,0.4; linecap: none; } -line|z15[highway=track][tunnel?] -{ - color: #d79331; - width: 4; - z-index: 444; - dashes: 2.8,2.8; - linecap: none; -} line|z15[highway=track][tracktype=grade2] { color: #c0a87c; @@ -5819,26 +3382,13 @@ line|z15[railway=preserved]::d1p3 dashes: 9,9; linecap: none; } -line|z15[piste:type=nordic] +line|z15-[piste:type=nordic] { color: #c00000; width: 2; - z-index: 598; dashes: 6,1; linecap: none; } -line|z15[highway=footway][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 420; -} -line|z15[highway=primary_link][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 468; -} line|z15[railway=light_rail]::d1p3 { color: #0f4c0f; @@ -5847,14 +3397,6 @@ line|z15[railway=light_rail]::d1p3 dashes: 7.6,10.8; linecap: none; } -line|z15[railway][construction?][tunnel?] -{ - color: #606060; - width: 3.2; - z-index: 479; - dashes: 2.8,2.8; - linecap: none; -} line|z15[highway=raceway]::d2p2 { color: red; @@ -5872,23 +3414,6 @@ node|z15-[leisure=park] text-color: #5ca800; text-halo-color: white; } -line|z15[railway][construction?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #606060; - linecap: none; - width: 2; - z-index: 481; - dashes: 2.8,2.8; -} -line|z15[highway=secondary_link][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 461; - dashes: 2.8,2.8; - linecap: none; -} line|z15[railway=funicular]::d1p2 { color: #e6b7b7; @@ -5897,40 +3422,12 @@ line|z15[railway=funicular]::d1p2 dashes: 7.2,10.8; linecap: none; } -line|z15[highway=secondary][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 465; -} line|z15[waterway=ditch] { color: #cde5ea; width: 0.6; z-index: 109; } -line|z15[highway=residential][tunnel?] -{ - color: #707070; - width: 8.4; - z-index: 451; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[railway=siding][tunnel?]::d2p3 -{ - color: #333333; - width: 1.4; - z-index: 528; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=path][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 436; -} line|z15-[highway=residential], line|z15-[highway=unclassified] { @@ -5953,29 +3450,7 @@ line|z15[waterway=stream] width: 2; z-index: 106; } -line|z15[highway=byway][tunnel?] -{ - color: #505050; - width: 4; - z-index: 441; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=motorway][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 476; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=living_street]::d1p2 -{ - color: #707070; - width: 7.8; - z-index: 208; -} -line|z15[aeroway=taxiway] +line|z15-[aeroway=taxiway] { casing-linecap: none; color: #d4dcbd; @@ -5987,11 +3462,10 @@ line|z15[aeroway=taxiway] casing-width: 2; casing-color: #202020; } -line|z15[highway=tertiary_link]::d1p2 +line|z15[highway=tertiary_link] { color: #ffff90; width: 9; - z-index: 372; } line|z15[highway=raceway] { @@ -5999,31 +3473,6 @@ line|z15[highway=raceway] width: 6; z-index: 342; } -line|z15[highway=bridleway][tunnel?] -{ - color: #707070; - width: 4; - z-index: 438; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=road][tunnel?] -{ - color: #707070; - width: 8.4; - z-index: 456; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[railway=incline][tunnel?]::d2p4 -{ - opacity: 0.3; - color: #4c0f0f; - linecap: none; - width: 0.5; - z-index: 516; - dashes: 2.8,2.8; -} line|z15[highway=bridleway] { color: #d3cb98; @@ -6055,21 +3504,7 @@ line|z15[boundary=administrative][admin_level=10] z-index: 671; dashes: 4,20; } -line|z15[highway=path][horse?][tunnel?] -{ - color: #707070; - width: 4; - z-index: 432; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=track][tunnel?]::d2p2 -{ - color: white; - width: 2.8; - z-index: 445; -} -line|z15[piste:lift=j-bar]::d2p2 +line|z15-[piste:lift=j-bar]::d2p2 { color: #202020; width: 8; @@ -6077,38 +3512,12 @@ line|z15[piste:lift=j-bar]::d2p2 dashes: 0.8,40; linecap: none; } -line|z15[railway=proposed][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 2; - z-index: 485; - dashes: 2.8,2.8; -} line|z15[railway=spur]::d1p2 { color: #e6e6e6; width: 1.4; z-index: 394; } -line|z15[highway=residential][access=private]::d2p2 -{ - color: white; - z-index: 427; - casing-width: 1; - width: 4; - casing-color: #c8c8af; -} -line|z15[railway=funicular][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #e6b7b7; - linecap: none; - width: 2; - z-index: 515; - dashes: 2.8,2.8; -} line|z15[boundary=administrative][type=nation] { color: yellow; @@ -6116,25 +3525,11 @@ line|z15[boundary=administrative][type=nation] z-index: 690; -x-kot-layer: top; } -line|z15[railway=light_rail][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 502; -} line|z15[highway=secondary_link] { color: #fffb80; width: 9; } -line|z15[railway=tram][tunnel?] -{ - color: #4c0f4c; - width: 3.2; - z-index: 504; - dashes: 2.8,2.8; - linecap: none; -} line|z15[piste:lift=rope_tow] { color: #d8d8c4; @@ -6173,18 +3568,6 @@ line|z15[railway=tram]::d1p3 dashes: 7.2,10.8; linecap: none; } -line|z15[highway=service][tunnel?]::d2p2 -{ - color: white; - width: 3.2; - z-index: 450; -} -line|z15[railway=monorail][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 518; -} line|z15[railway=abandoned]::d1p2 { color: white; @@ -6192,18 +3575,6 @@ line|z15[railway=abandoned]::d1p2 z-index: 384; opacity: 0.4; } -line|z15[highway=cycleway][tunnel?]::d2p2 -{ - color: white; - width: 3.2; - z-index: 100; -} -line|z15[railway=funicular][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 513; -} line|z15-[railway=monorail], line|z15-[railway=tram] { @@ -6215,24 +3586,14 @@ line|z15[highway=path][bicycle?] { color: #90bc90; width: 1; - z-index: 660; } line|z15[highway=construction] { color: #d0d0d0; width: 7; - z-index: 537; dashes: 4,4; linecap: none; } -line|z15[railway=subway][tunnel?] -{ - color: #0f0f4c; - width: 3.2; - z-index: 507; - dashes: 2.8,2.8; - linecap: none; -} line|z15[aerialway=gondola] { color: #202020; @@ -6243,14 +3604,6 @@ area|z15-[highway=byway][area?] { fill-color: #efadaa; } -line|z15[waterway=canal][tunnel?] -{ - color: #cde5ea; - width: 4; - z-index: 100; - dashes: 7.4,7.4; - linecap: none; -} line|z15[railway=narrow_gauge]::d1p3 { color: #333333; @@ -6287,36 +3640,10 @@ line|z15[boundary=administrative][border_type=country]::d2p2 z-index: 693; dashes: 12,12; } -line|z15[waterway=drain][tunnel?] -{ - color: #cde5ea; - width: 2.8; - z-index: 101; - dashes: 5.2,5.2; - linecap: none; -} -line|z15[railway=tram][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #4c0f4c; - linecap: none; - width: 2; - z-index: 506; - dashes: 2.8,2.8; -} area|z15-[highway=track][tracktype=grade1][area?] { fill-color: #fffaf2; } -line|z15[railway=incline][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #e6b7b7; - linecap: none; - width: 2; - z-index: 514; - dashes: 2.8,2.8; -} line|z15[waterway=stream][intermittent=ephemeral] { color: #cde5ea; @@ -6333,15 +3660,6 @@ line|z15[railway=construction] dashes: 3,3; linecap: none; } -line|z15[railway=preserved][tunnel?]::d2p3 -{ - opacity: 0.15; - color: #333333; - linecap: none; - width: 2; - z-index: 500; - dashes: 2.8,2.8; -} line|z15[waterway=lock] { color: #f8f8f8; @@ -6350,13 +3668,6 @@ line|z15[waterway=lock] casing-width: 0.5; casing-color: #202020; } -line|z15[mapswithme=grid] -{ - color: #202020; - width: 20; - dashes: 2,2; - linecap: none; -} line|z15[boundary=administrative][admin_level=9] { color: #f9574b; @@ -6372,68 +3683,23 @@ line|z15[man_made=pier]::d1p2 width: 1.6; z-index: 631; } -line|z15[piste:type=downhill][piste:difficulty=novice] -{ - color: #40ff40; - width: 10; - z-index: 583; -} -line|z15[highway=cycleway][tunnel?] -{ - color: #707070; - width: 4; - z-index: 99; - dashes: 2.8,2.8; - linecap: none; -} line|z15[natural=glacier] { color: lightblue; width: 1.6; z-index: 8; } -line|z15[railway=narrow_gauge][tunnel?] -{ - color: #333333; - width: 3.2; - z-index: 495; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=steps][tunnel?] -{ - color: #707070; - width: 2.8; - z-index: 416; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=unclassified][tunnel?] -{ - color: #707070; - width: 8.4; - z-index: 99; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[railway=siding][tunnel?]::d2p2 -{ - color: white; - width: 1.4; - z-index: 525; -} line|z15[highway=service] { color: #fdfdfd; width: 3; z-index: 305; } -line|z15[natural=spring]::d1p2, -line|z15[waterway=river]::d1p2 +line|z15[natural=spring], +line|z15[waterway=river] { color: #cde5ea; width: 5; - z-index: 103; } line|z15[aerialway=mixed_lift] { @@ -6441,12 +3707,6 @@ line|z15[aerialway=mixed_lift] width: 0.8; z-index: 613; } -line|z15[piste:type=downhill][piste:difficulty=freeride] -{ - color: #f6dd0a; - width: 10; - z-index: 588; -} line|z15[railway=disused]::d1p2 { color: #f2f2f2; @@ -6466,46 +3726,12 @@ line|z15[aerialway=cable_car] width: 0.8; z-index: 609; } -line|z15[railway=yard][tunnel?]::d2p2 -{ - color: white; - width: 1.4; - z-index: 523; -} -line|z15[railway=spur][tunnel?] -{ - color: #606060; - width: 2.4; - z-index: 520; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[highway=pedestrian][tunnel?]::d2p2 -{ - color: white; - width: 7; - z-index: 426; -} -line|z15[highway=path][tunnel?] -{ - color: #707070; - width: 2.8; - z-index: 435; - dashes: 2.8,2.8; - linecap: none; -} line|z15[man_made=pier]::d1p3 { color: #e4e4e4; width: 1.2; z-index: 632; } -line|z15[piste:type=downhill][piste:difficulty=expert] -{ - color: #f6800a; - width: 10; - z-index: 587; -} line|z15[boundary=administrative][border_type=suburb] { color: #f9574b; @@ -6547,12 +3773,6 @@ line|z15[waterway=dam] width: 1.5; z-index: 129; } -line|z15[highway=tertiary][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 459; -} area|z15-16[landuse=construction], node|z15-16[landuse=construction] { @@ -6560,23 +3780,6 @@ node|z15-16[landuse=construction] font-size: 12; text-color: #808070; } -line|z15[highway=tertiary][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 458; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[railway=abandoned][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 2; - z-index: 491; - dashes: 2.8,2.8; -} line|z15[railway=abandoned]::d1p3 { opacity: 0.4; @@ -6586,62 +3789,18 @@ line|z15[railway=abandoned]::d1p3 z-index: 401; dashes: 9,9; } -line|z15[railway][construction?][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 480; -} -line|z15[highway=living_street]::d1p4 -{ - color: #d0ccac; - width: 7; - z-index: 370; - dashes: 1.7,2.4; - linecap: none; -} -line|z15[railway=abandoned][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 490; - opacity: 0.4; -} line|z15[man_made=breakwater] { color: #707070; width: 2; - z-index: 629; } -line|z15[highway=tertiary]::d1p2 +line|z15[highway=tertiary] { color: #ffff90; - z-index: 459; casing-width: 1; width: 4; casing-color: #c8c860; } -line|z15[railway=funicular][tunnel?]::d2p4 -{ - opacity: 0.3; - color: #4c0f0f; - linecap: none; - width: 0.5; - z-index: 517; - dashes: 2.8,2.8; -} -line|z15[highway=living_street][tunnel?]::d2p2 -{ - color: white; - width: 7; - z-index: 454; -} -line|z15[railway=spur][tunnel?]::d2p2 -{ - color: white; - width: 1.4; - z-index: 521; -} line|z15[highway=ford] { color: #cde5ea; @@ -6650,64 +3809,29 @@ line|z15[highway=ford] casing-width: 0.7; casing-color: #707070; } -line|z15[railway=proposed][tunnel?] -{ - color: #b2b2b2; - width: 3.2; - z-index: 483; - dashes: 2.8,2.8; - linecap: none; -} area|z15-[highway=footway][area?] { fill-color: #f8f0e8; } -line|z15[highway=living_street][tunnel?] -{ - color: #707070; - width: 8.4; - z-index: 453; - dashes: 2.8,2.8; - linecap: none; -} line|z15-[railway=monorail]::d1p2 { color: #d08080; width: 2; z-index: 561; } -line|z15[highway=byway][tunnel?]::d2p2 -{ - color: white; - width: 1.6; - z-index: 442; -} -line|z15[piste:lift=platter]::d1p2 +line|z15-[piste:lift=platter]::d1p2 { color: #202020; width: 8; - z-index: 606; dashes: 0.8,40; linecap: none; } -line|z15[highway=road][tunnel?]::d2p2 -{ - color: white; - width: 7; - z-index: 457; -} line|z15[railway=construction]::d1p2 { color: #f2f2f2; width: 2; z-index: 381; } -line|z15[railway=subway][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 508; -} line|z15[highway=motorway_link]::d1p2 { color: #f08800; @@ -6724,7 +3848,8 @@ line|z15[boundary=administrative][type=nation]::d2p2 dashes: 12,12; } line|z15[highway=residential], -line|z15[highway=unclassified] +line|z15[highway=unclassified], +line|z15[highway=living_street] { color: white; width: 4; @@ -6736,27 +3861,6 @@ line|z15[piste:type=sled] { color: #f0e0dc; width: 5; - z-index: 597; -} -line|z15[highway=trunk][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 474; -} -line|z15[railway=incline][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 511; -} -line|z15[highway=service][tunnel?] -{ - color: #707070; - width: 4; - z-index: 449; - dashes: 2.8,2.8; - linecap: none; } line|z15[boundary=administrative][border_type=country] { @@ -6784,30 +3888,6 @@ node|z16-[amenity=fuel]::d1p2 { icon-image: petrolstation.svg; } -line|z15[highway=motorway_link][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 469; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[railway=narrow_gauge][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 496; -} -line|z15[piste:type=downhill][piste:difficulty=advanced] -{ - color: #202020; - width: 10; - z-index: 586; -} -area|z15-[highway=track][area?] -{ - fill-color: #c0a87c; -} area|z15-[leisure=nature_reserve]::d1p2, node|z15-[leisure=nature_reserve]::d1p2 { @@ -6824,20 +3904,6 @@ line|z15[railway=narrow_gauge] width: 3.2; z-index: 288; } -line|z15[railway=preserved][tunnel?] -{ - color: #909090; - width: 3.2; - z-index: 498; - dashes: 2.8,2.8; - linecap: none; -} -line|z15[piste:type=downhill] -{ - color: #505050; - width: 10; - z-index: 589; -} line|z15[boundary=administrative][border_type=municipality] { color: #f9574b; @@ -6872,7 +3938,6 @@ line|z15[highway=cycleway] { color: #90bc90; width: 1; - z-index: 349; } line|z15[railway=funicular]::d1p3 { @@ -6886,26 +3951,10 @@ line|z15[highway=track][tracktype=grade5] width: 2.8; z-index: 363; } -area|z15[railway=rail]::d1p2, -line|z15[railway=rail]::d1p2, -node|z15[railway=rail]::d1p2 -{ - symbol-shape: circle; - symbol-fill-color: yellow; - symbol-size: 4; -} area|z15-[highway=pedestrian][area?] { fill-color: #f0f0f0; } -line|z16[highway=cycleway][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 319; - dashes: 8,1; - linecap: none; -} area|z17-[highway=bus_stop], area|z16[railway=tram_stop], node|z17-[highway=bus_stop], @@ -6926,39 +3975,10 @@ line|z16[communication=line]::d1p2 dashes: 8,4; linecap: none; } -line|z16[highway=bridleway][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 10.4; - z-index: 473; -} -line|z16[piste:type=downhill][piste:difficulty=freeride] -{ - color: #f6dd0a; - width: 20; - z-index: 838; -} -line|z16[railway=narrow_gauge][tunnel?] -{ - color: #333333; - width: 3.2; - z-index: 742; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[piste:type=nordic] -{ - color: #c00000; - width: 4; - z-index: 841; - dashes: 12,2; - linecap: none; -} line|z16[highway=path][sac_scale=demanding_mountain_hiking] { color: red; width: 1.2; - z-index: 825; dashes: 0.16,2.4; linecap: none; } @@ -6976,13 +3996,6 @@ line|z16[boundary=administrative][admin_level=5] z-index: 932; dashes: 12,12; } -line|z16[mapswithme=grid] -{ - color: #202020; - width: 40; - dashes: 4,4; - linecap: none; -} line|z16[railway=narrow_gauge]::d1p3 { color: #333333; @@ -6991,28 +4004,6 @@ line|z16[railway=narrow_gauge]::d1p3 dashes: 14,14; linecap: none; } -line|z16[highway=trunk][embankment?]::d2p7 -{ - color: #6f4a18; - width: 19.2; - z-index: 265; -} -line|z16[piste:lift=t-bar]::d2p2 -{ - color: #202020; - width: 16; - z-index: 845; - dashes: 1.6,80; - linecap: none; -} -line|z16[highway=motorway_link][tunnel?] -{ - color: #707070; - width: 13.6; - z-index: 715; - dashes: 3.2,3.2; - linecap: none; -} line|z16[waterway=lock] { color: #f8f8f8; @@ -7047,11 +4038,10 @@ line|z16[highway=bridleway]::d1p2 width: 6.4; z-index: 599; } -line|z16[highway=primary_link]::d1p2 +line|z16[highway=primary_link] { color: #ffc444; width: 12; - z-index: 622; } line|z16[railway=spur] { @@ -7059,73 +4049,23 @@ line|z16[railway=spur] width: 2.4; z-index: 547; } -line|z16[barrier=bollard]::d1p2, -node|z16[barrier=bollard]::d1p2 -{ - color: red; - linecap: none; - width: 0.4; - z-index: 878; - dashes: 0.0,2.0; -} -area|z16-[amenity=bank]::d1p2, -node|z16-[amenity=bank]::d1p2 -{ - icon-image: bank.svg; -} + line|z16[highway=track][tracktype=grade1] { color: #d79331; width: 3; - z-index: 604; -} -line|z16[highway=path][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 275; - dashes: 0.4,4,0.4,4; - linecap: none; } area|z16-[amenity=restaurant]::d1p2, node|z16-[amenity=restaurant]::d1p2 { icon-image: restaurant.svg; } -line|z16[highway=trunk][embankment?]::d2p6 -{ - color: #6f4a18; - width: 28.8; - z-index: 263; - dashes: 0.4,4,0.4,4; - linecap: none; -} line|z16[railway=funicular] { color: #4c0f0f; width: 3.2; z-index: 546; } -line|z16[aeroway=taxiway] -{ - casing-linecap: none; - color: #d4dcbd; - linecap: none; - width: 16; - z-index: 656; - linejoin: bevel; - casing-linejoin: bevel; - casing-width: 4; - casing-color: #202020; -} -line|z16[highway=steps][tunnel?] -{ - color: #707070; - width: 4.8; - z-index: 657; - dashes: 3.2,3.2; - linecap: none; -} line|z16[man_made=pier]::d1p3 { color: #e4e4e4; @@ -7139,18 +4079,6 @@ line|z16[boundary=administrative][admin_level=2] z-index: 934; -x-kot-layer: top; } -line|z16[highway=cycleway][cutting?] -{ - color: #6f4a18; - width: 24; - z-index: 305; -} -line|z16[highway=trunk][embankment?]::d2p3 -{ - color: #3a7019; - width: 19.2; - z-index: 157; -} line|z16[boundary=administrative][border_type=country] { color: yellow; @@ -7275,6 +4203,7 @@ node|z17-[tourism=picnic_site] text-color: #404040; text-offset: 10; text-halo-color: white; + z-index: 1; } line|z16[railway=disused] { @@ -7283,18 +4212,6 @@ line|z16[railway=disused] z-index: 540; opacity: 0.7; } -line|z16[highway=service][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 10.4; - z-index: 257; -} -line|z16[piste:lift=t-bar] -{ - color: #202020; - width: 1.6; - z-index: 842; -} line|z16[boundary=administrative][admin_level=10] { color: #f9574b; @@ -7304,82 +4221,18 @@ line|z16[boundary=administrative][admin_level=10] z-index: 927; dashes: 4,20; } -line|z16[railway][disused?][tunnel?] -{ - opacity: 0.7; - color: grey; - linecap: none; - width: 3.2; - z-index: 733; - dashes: 3.2,3.2; -} -line|z16[highway=residential][access=private]::d2p2 -{ - color: white; - z-index: 427; - casing-width: 2; - width: 6; - casing-color: #c8c8af; -} -line|z16[highway=living_street]::d1p2 -{ - color: #707070; - width: 10; - z-index: 479; -} -line|z16[highway=tertiary][tunnel?] -{ - color: #707070; - width: 13.6; - z-index: 707; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[railway=yard]::d1p2 -{ - color: #e6e6e6; - width: 1.2; - z-index: 639; -} -area|z16-[amenity=atm]::d1p2, -node|z16-[amenity=atm]::d1p2 +area|z16-[amenity=atm], +node|z16-[amenity=atm] { icon-image: atm.svg; } -line|z16[railway][construction?][tunnel?]::d2p2 -{ - color: white; - width: 2.4; - z-index: 726; -} line|z16[highway=construction] { color: #d0d0d0; width: 9; - z-index: 795; dashes: 4,4; linecap: none; } -line|z16[highway=footway][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 325; -} -line|z16[railway=proposed]::d1p2 -{ - color: white; - width: 2.4; - z-index: 626; -} -line|z16[highway=path][tunnel?] -{ - color: #707070; - width: 4.8; - z-index: 674; - dashes: 3.2,3.2; - linecap: none; -} line|z16[highway=byway]::d1p2 { color: #c0a87c; @@ -7390,22 +4243,11 @@ line|z16[highway=path][route=hiking] { color: red; width: 1.2; - z-index: 821; } -line|z16[highway=cycleway]::d1p2 +line|z16[highway=cycleway] { color: #90bc90; width: 2; - z-index: 594; -} -line|z16[railway=light_rail][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #0f4c0f; - linecap: none; - width: 2; - z-index: 750; - dashes: 3.2,3.2; } line|z16[railway=light_rail]::d1p3 { @@ -7427,21 +4269,6 @@ node|z16-[amenity=hunting_stand]::d1p2 { icon-image: hunting_closed_high.svg; } -line|z16[highway=path][embankment?]::d2p7 -{ - color: #6f4a18; - width: 11.2; - z-index: 282; -} -line|z16[railway=monorail][tunnel?]::d2p3 -{ - opacity: 0.3; - color: white; - linecap: none; - width: 0.6; - z-index: 767; - dashes: 3.2,3.2; -} line|z16[waterway=dam] { color: #202020; @@ -7452,7 +4279,6 @@ line|z16[highway=track][tracktype=grade4] { color: #c0a87c; width: 5.6; - z-index: 607; } line|z16[railway=spur]::d1p2 { @@ -7460,39 +4286,12 @@ line|z16[railway=spur]::d1p2 width: 1.2; z-index: 638; } -line|z16[railway=monorail][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 765; - dashes: 3.2,3.2; - linecap: none; -} line|z16[leisure=track] { color: #d0e8c4; + casing-color: grey; + casing-width: 1; width: 5.8; - z-index: 64; -} -line|z16[highway=primary][tunnel?] -{ - color: #707070; - width: 13.6; - z-index: 718; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=trunk][cutting?] -{ - color: #6f4a18; - width: 33.6; - z-index: 296; -} -line|z16[highway=trunk][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 721; } line|z16[railway=spur]::d1p3 { @@ -7525,11 +4324,10 @@ line|z16[waterway=drain]::d1p2 casing-width: 0.6; casing-color: #b0b0b0; } -line|z16[highway=road]::d1p2 +line|z16[highway=road] { color: #d0d0d0; width: 9; - z-index: 614; } line|z16-[highway=motorway] { @@ -7553,56 +4351,6 @@ line|z16[highway=secondary] casing-width: 2; casing-color: #c8c860; } -line|z16[waterway=canal][tunnel?] -{ - color: #cde5ea; - width: 4.8; - z-index: 102; - dashes: 8.8,8.8; - linecap: none; -} -line|z16[highway=road][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 703; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=living_street]::d1p4 -{ - color: #d0ccac; - width: 9; - z-index: 616; - dashes: 2.2,3.2; - linecap: none; -} -line|z16[highway=trunk][embankment?]::d2p2 -{ - color: #3a7019; - width: 28.8; - z-index: 150; - dashes: 0.4,4,0.4,4; - linecap: none; -} -line|z16[aeroway=runway] -{ - casing-linecap: none; - color: #d4dcbd; - linecap: none; - width: 40; - z-index: 655; - linejoin: bevel; - casing-linejoin: bevel; - casing-width: 8; - casing-color: #202020; -} -line|z16[highway=motorway][tunnel?]::d2p2 -{ - color: white; - width: 13.6; - z-index: 723; -} area|z16-[shop=car_repair]::d1p2, node|z16-[shop=car_repair]::d1p2 { @@ -7617,26 +4365,6 @@ line|z16[boundary=administrative][border_type=country]::d2p2 z-index: 945; dashes: 12,12; } -line|z16[highway=steps][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 316; - dashes: 4,0.4,4,0.4; - linecap: none; -} -line|z16[highway=path][bicycle?][tunnel?]::d3p2 -{ - color: white; - width: 6.4; - z-index: 670; -} -line|z16[highway=primary_link][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 714; -} area|z16-[amenity=bench], node|z16-[amenity=bench] { @@ -7648,24 +4376,11 @@ line|z16[highway=raceway]::d2p3 width: 6; z-index: 603; } -line|z16[highway=motorway][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 20.8; - z-index: 301; -} area|z16-[power=pole], node|z16-[power=pole] { icon-image: power-pole.svg; } -line|z17-[highway=bridleway][cutting?]::d2p4, -line|z16[highway=track][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 329; -} area|z16-[natural=peak], node|z16-[natural=peak] { @@ -7674,12 +4389,6 @@ node|z16-[natural=peak] font-size: 16; text-color: #404040; } -line|z16[highway=living_street]::d1p3 -{ - color: white; - width: 9; - z-index: 615; -} line|z16[route=ferry] { color: #a8c8d8; @@ -7688,14 +4397,6 @@ line|z16[route=ferry] dashes: 12,8; linecap: none; } -line|z16[highway=trunk][embankment?] -{ - color: #3a7019; - width: 34.4; - z-index: 144; - dashes: 0.4,8.4; - linecap: none; -} area|z16-[landuse=allotments], area|z16-[landuse=basin], area|z16-[landuse=brownfield], @@ -7773,14 +4474,6 @@ node|z16[place=islet] font-size: 16; text-color: #202020; } -line|z16[waterway=ditch][tunnel?] -{ - color: #cde5ea; - width: 0.4; - z-index: 104; - dashes: 3,3; - linecap: none; -} line|z16[railway=razed] { opacity: 0.3; @@ -7790,14 +4483,6 @@ line|z16[railway=razed] z-index: 541; dashes: 2.4,2.4; } -line|z16[railway=tram][tunnel?] -{ - color: #4c0f4c; - width: 3.2; - z-index: 751; - dashes: 3.2,3.2; - linecap: none; -} line|z16[railway=abandoned] { color: #b2b2b2; @@ -7805,14 +4490,6 @@ line|z16[railway=abandoned] z-index: 542; opacity: 0.4; } -line|z16[highway=path][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 268; - dashes: 0.4,8.4; - linecap: none; -} area|z16[aerialway=station]::d1p2, node|z16[aerialway=station]::d1p2 { @@ -7820,51 +4497,11 @@ node|z16[aerialway=station]::d1p2 symbol-fill-color: #3050d8; symbol-size: 4; } -line|z16[highway=path][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 10.4; - z-index: 254; -} -area|z16[power=generator][power_source=wind]::d2p3, -node|z16[power=generator][power_source=wind]::d2p3 -{ - z-index: 865; -} -line|z16[highway=motorway][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 18.4; - z-index: 161; -} -line|z16[waterway=drain][tunnel?] -{ - color: #cde5ea; - width: 4; - z-index: 103; - dashes: 8,8; - linecap: none; -} -line|z16[railway=subway][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #0f0f4c; - linecap: none; - width: 2; - z-index: 756; - dashes: 3.2,3.2; -} area|z16-[amenity=bicycle_rental]::d1p2, node|z16-[amenity=bicycle_rental]::d1p2 { icon-image: bicycle_rental.svg; } -line|z16[highway=service][embankment?]::d2p3 -{ - color: #3a7019; - width: 11.2; - z-index: 234; -} line|z16[highway=pedestrian] { color: #e8e8e8; @@ -7873,20 +4510,6 @@ line|z16[highway=pedestrian] width: 4; casing-color: #c0bc9c; } -line|z16[railway=funicular][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 760; -} -line|z16[highway=trunk][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 32.8; - z-index: 298; - dashes: 4,0.4,4,0.4; - linecap: none; -} line|z16[power=minor_line] { color: white; @@ -7894,14 +4517,6 @@ line|z16[power=minor_line] z-index: 862; opacity: 0.5; } -line|z16[highway=motorway][tunnel?] -{ - color: #707070; - width: 15.2; - z-index: 722; - dashes: 3.2,3.2; - linecap: none; -} area|z16-[amenity=theatre]::d1p2, node|z16-[amenity=theatre]::d1p2 { @@ -7934,28 +4549,12 @@ node|z16-[amenity=embassy]::d1p2 { icon-image: embassy.svg; } -line|z16[highway=track][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 280; - dashes: 0.4,4,0.4,4; - linecap: none; -} -area|z16[railway=rail]::d1p3, -line|z16[railway=rail]::d1p3, -node|z16[railway=rail]::d1p3 +line|z16[railway=rail]::d1p3 { color: #666666; z-index: 543; width: 4; } -line|z16[highway=footway][tunnel?]::d2p2 -{ - color: white; - width: 4; - z-index: 271; -} area|z16-[tourism=guest_house]::d1p2, area|z16-[tourism=hostel]::d1p2, node|z16-[tourism=guest_house]::d1p2, @@ -7963,49 +4562,10 @@ node|z16-[tourism=hostel]::d1p2 { icon-image: hostel.svg; } -line|z16[highway=footway][embankment?]::d2p7 -{ - color: #6f4a18; - width: 11.2; - z-index: 283; -} -line|z16[railway=siding][tunnel?]::d2p3 -{ - color: #333333; - width: 1.2; - z-index: 776; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[railway=spur][tunnel?] -{ - color: #606060; - width: 2.4; - z-index: 768; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[railway=proposed][tunnel?] -{ - color: #b2b2b2; - width: 3.2; - z-index: 730; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=path][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 310; - dashes: 4,0.4,4,0.4; - linecap: none; -} line|z16[highway=path][sac_scale=mountain_hiking] { color: red; width: 1.2; - z-index: 823; dashes: 2,2; linecap: none; } @@ -8034,9 +4594,7 @@ line|z16-[railway=tram]::d1p3 dashes: 9.6,14.4; linecap: none; } -area|z16[railway=rail]::d1p4, -line|z16[railway=rail]::d1p4, -node|z16[railway=rail]::d1p4 +line|z16[railway=rail]::d1p4 { color: #e6e6e6; width: 2.4; @@ -8047,17 +4605,10 @@ node|z16-[railway=subway_entrance] { icon-image: subway.svg; } -line|z16[highway=service][cutting?] -{ - color: #6f4a18; - width: 24; - z-index: 307; -} line|z16[piste:lift=rope_tow] { color: #d8d8c4; width: 2; - z-index: 848; dashes: 4,4; linecap: none; } @@ -8070,11 +4621,10 @@ line|z16-[waterway=stream] text-position: line; text-color: white; } -line|z16[highway=path]::d1p2 +line|z16[highway=path] { color: silver; width: 2; - z-index: 598; } line|z16[barrier=hedge] { @@ -8082,45 +4632,18 @@ line|z16[barrier=hedge] width: 0.4; z-index: 879; } -line|z16[railway=preserved][tunnel?] -{ - color: #909090; - width: 3.2; - z-index: 745; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=tertiary]::d1p2 +line|z16[highway=tertiary] { color: #ffff90; - z-index: 459; casing-width: 2; width: 6; casing-color: #c8c860; } -line|z16[highway=secondary_link][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 710; -} area|z16-[amenity=restaurant][hotel]::d2p2, node|z16-[amenity=restaurant][hotel]::d2p2 { icon-image: hotel_and_restaurant.svg; } -line|z16[piste:lift=j-bar] -{ - color: #202020; - width: 1.6; - z-index: 843; -} -line|z16[highway=trunk][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 20.8; - z-index: 302; -} line|z16[boundary=administrative][border_type=county] { color: #f9574b; @@ -8130,21 +4653,6 @@ line|z16[boundary=administrative][border_type=county] z-index: 939; dashes: 4,20; } -line|z16[railway=siding][tunnel?]::d2p2 -{ - color: white; - width: 1.2; - z-index: 773; -} -line|z16[railway=funicular][tunnel?]::d2p4 -{ - opacity: 0.3; - color: #4c0f0f; - linecap: none; - width: 0.6; - z-index: 764; - dashes: 3.2,3.2; -} line|z16[boundary=administrative][admin_level=8] { color: #f9574b; @@ -8197,64 +4705,18 @@ node|z17-[amenity=toilets]::d1p2 { icon-image: toilets.svg; } -line|z16[railway=spur][tunnel?]::d2p3 -{ - color: #606060; - width: 1.2; - z-index: 774; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=path][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 182; - dashes: 0.4,8.4; - linecap: none; -} line|z16[highway=path][sac_scale=difficult_alpine_hiking] { color: blue; width: 1.2; - z-index: 831; dashes: 0.16,2.4; linecap: none; } -line|z16[highway=path][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 317; - dashes: 8.4,0.4; - linecap: none; -} -line|z16[highway=path][horse?]::d2p2 -{ - color: #d3cb98; - width: 6.4; - z-index: 596; -} line|z16[highway=footway] { color: #d0ccbc; width: 2; } -line|z16[highway=service][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 321; - dashes: 8.4,0.4; - linecap: none; -} -line|z17-[highway=cycleway][cutting?]::d2p4, -line|z16[highway=service][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 328; -} line|z16[boundary=administrative][border_type=suburb] { color: #f9574b; @@ -8307,29 +4769,7 @@ node|z16[amenity=restaurant] text-color: #404040; text-offset: 10; text-halo-color: white; -} -line|z16[highway=footway][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 318; - dashes: 8.4,0.4; - linecap: none; -} -line|z16[highway=steps][tunnel?]::d2p2 -{ - color: white; - width: 4; - z-index: 658; - dashes: 2.4,0.8; - linecap: none; -} -line|z16[highway=residential][tunnel?] -{ - color: #707070; - width: 10.4; - dashes: 3.2,3.2; - linecap: none; + z-index: 1; } area|z16-[natural=cave_entrance], area|z16-[natural=volcano], @@ -8356,15 +4796,6 @@ node|z16[barrier=toll_booth] symbol-fill-color: #707070; symbol-size: 1.2; } -line|z16[railway=abandoned][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 2.4; - z-index: 738; - dashes: 3.2,3.2; -} line|z16[boundary=administrative][admin_level=2]::d2p2 { color: #f9574b; @@ -8374,12 +4805,6 @@ line|z16[boundary=administrative][admin_level=2]::d2p2 z-index: 935; dashes: 12,12; } -line|z16[railway=tram][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 752; -} line|z16[railway=preserved]::d1p2 { color: #e6e6e6; @@ -8395,45 +4820,6 @@ line|z16[railway=abandoned]::d1p3 z-index: 645; dashes: 12,12; } -line|z16[railway=proposed]::d1p3 -{ - color: #b2b2b2; - width: 2.4; - z-index: 642; - dashes: 4,4,4,12; - linecap: none; -} -line|z16[highway=service][tunnel?] -{ - color: #707070; - width: 7.2; - z-index: 692; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=bridleway][embankment?]::d2p3, -line|z16[highway=track][embankment?]::d2p3 -{ - color: #3a7019; - width: 11.2; - z-index: 235; -} -area|z16[railway=rail]::d1p2, -line|z16[railway=rail]::d1p2, -node|z16[railway=rail]::d1p2 -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 6; -} -line|z16[waterway=river][tunnel?] -{ - color: #cde5ea; - width: 8; - z-index: 100; - dashes: 8.8,8.8; - linecap: none; -} line|z16[highway=footway][sac_scale=mountain_hiking] { color: red; @@ -8442,28 +4828,6 @@ line|z16[highway=footway][sac_scale=mountain_hiking] dashes: 2,2; linecap: none; } -line|z16[highway=bridleway][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 313; - dashes: 4,0.4,4,0.4; - linecap: none; -} -line|z16[waterway=stream][tunnel?] -{ - color: #cde5ea; - width: 1.2; - z-index: 101; - dashes: 3,3; - linecap: none; -} -line|z16[highway=unclassified][tunnel?]::d2p2 -{ - color: white; - width: 8.8; - z-index: 100; -} line|z16[communication=line][location=underground] { color: #f080f0; @@ -8472,11 +4836,6 @@ line|z16[communication=line][location=underground] dashes: 1.2,2,1.2,2,1.2,4.4; linecap: none; } -area|z16[building], -node|z16[building] -{ - z-index: 584; -} line|z16[man_made=pipeline]::d1p2 { color: #a0a0a0; @@ -8519,40 +4878,11 @@ line|z16[boundary=administrative][type=nation]::d2p2 z-index: 944; dashes: 12,12; } -line|z16[highway=cycleway][tunnel?]::d2p2 -{ - color: white; - width: 6.4; - z-index: 100; -} -line|z16[railway=light_rail][tunnel?] -{ - color: #0f4c0f; - width: 3.2; - z-index: 748; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=track][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 212; - dashes: 0.4,4,0.4,4; - linecap: none; -} area|z16-[amenity=fire_station]::d1p2, node|z16-[amenity=fire_station]::d1p2 { icon-image: firebrigade.svg; } -line|z16[highway=bridleway][embankment?]::d2p7, -line|z17-[highway=footway][embankment?]::d2p7 -{ - color: #6f4a18; - width: 11.2; - z-index: 285; -} line|z16[railway=construction]::d1p3 { color: #606060; @@ -8573,23 +4903,6 @@ node|z17-[amenity=taxi]::d1p2 { icon-image: taxi.svg; } -line|z16[railway=abandoned][tunnel?] -{ - opacity: 0.4; - color: #b2b2b2; - linecap: none; - width: 3.2; - z-index: 736; - dashes: 3.2,3.2; -} -line|z16[highway=motorway][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 32.8; - z-index: 297; - dashes: 4,0.4,4,0.4; - linecap: none; -} line|z16[railway=preserved]::d1p3 { color: #333333; @@ -8623,30 +4936,10 @@ node|z17-[amenity=fountain]::d1p3 { icon-image: fountain.svg; } -line|z16[highway=path][cutting?] -{ - color: #6f4a18; - width: 24; - z-index: 303; -} -line|z16[railway=spur][tunnel?]::d2p2 -{ - color: white; - width: 1.2; - z-index: 769; -} -line|z16[railway=abandoned][tunnel?]::d2p2 -{ - color: white; - width: 2.4; - z-index: 737; - opacity: 0.4; -} line|z16[waterway=stream][intermittent=yes] { color: #cde5ea; width: 2; - z-index: 107; dashes: 2.4,0.8; linecap: none; } @@ -8656,35 +4949,10 @@ line|z16[barrier=wall] width: 1; z-index: 887; } -line|z16[piste:lift=j-bar]::d2p2 -{ - color: #202020; - width: 16; - z-index: 846; - dashes: 1.6,80; - linecap: none; -} line|z16[highway=path][sac_scale][sac_scale=alpine_hiking] { color: blue; width: 1.2; - z-index: 827; -} -line|z16[highway=service][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 272; - dashes: 0.4,8.4; - linecap: none; -} -line|z16[highway=track][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 322; - dashes: 8.4,0.4; - linecap: none; } line|z16[barrier=city_wall]::d1p2 { @@ -8694,28 +4962,6 @@ line|z16[barrier=city_wall]::d1p2 dashes: 0.0,2.0; linecap: none; } -line|z16[highway=secondary_link][tunnel?] -{ - color: #707070; - width: 13.6; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[railway=incline][tunnel?]::d2p4 -{ - opacity: 0.3; - color: #4c0f0f; - linecap: none; - width: 0.6; - z-index: 763; - dashes: 3.2,3.2; -} -line|z16[highway=motorway_link][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 716; -} line|z16[railway=siding] { color: #333333; @@ -8727,12 +4973,6 @@ node|z16-[amenity=car_rental]::d1p2 { icon-image: car_rental.svg; } -line|z16[railway=yard][tunnel?]::d2p2 -{ - color: white; - width: 1.2; - z-index: 771; -} line|z16[railway=siding]::d1p2 { color: #e6e6e6; @@ -8746,40 +4986,6 @@ node|z16[building=address] font-size: 11; text-color: #808070; } -line|z16[highway=living_street][tunnel?]::d2p2 -{ - color: white; - width: 8.8; - z-index: 700; -} -line|z16[highway=service][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 314; - dashes: 4,0.4,4,0.4; - linecap: none; -} -line|z16[piste:type=downhill][piste:difficulty=intermediate] -{ - color: #ff4040; - width: 20; - z-index: 835; -} -line|z16[highway=track][tunnel?]::d2p2 -{ - color: white; - width: 5.6; - z-index: 684; -} -line|z16[highway=service][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 211; - dashes: 0.4,4,0.4,4; - linecap: none; -} area|z16-[amenity=drinking_water], node|z16-[amenity=drinking_water] { @@ -8797,25 +5003,12 @@ line|z16[highway=footway][sac_scale=alpine_hiking] width: 1.2; z-index: 828; } -line|z16[highway=cycleway][cutting?]::d2p4, -line|z17-[highway=path][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 326; -} line|z16[man_made=breakwater] { color: #707070; width: 4; z-index: 854; } -line|z16[highway=path][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 324; -} line|z16[barrier=fence]::d1p2 { color: #b0b0b0; @@ -8824,72 +5017,18 @@ line|z16[barrier=fence]::d1p2 dashes: 0.0,2.0; linecap: none; } -line|z16[highway=path][tunnel?]::d2p2 -{ - color: white; - width: 4; - z-index: 675; -} -line|z16[railway=incline][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #e6b7b7; - linecap: none; - width: 2; - z-index: 761; - dashes: 3.2,3.2; -} line|z16[highway=track][tracktype=grade3] { color: #c0a87c; width: 2; z-index: 606; } -line|z16[railway=yard][tunnel?] -{ - color: #333333; - width: 2.4; - z-index: 770; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[railway=yard][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #333333; - linecap: none; - width: 1.2; - z-index: 775; - dashes: 3.2,3.2; -} -line|z16[highway=bridleway][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 185; - dashes: 0.4,8.4; - linecap: none; -} line|z16[railway=funicular]::d1p3 { color: #4c0f0f; width: 0.6; z-index: 651; } -line|z16[highway=track][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 315; - dashes: 4,0.4,4,0.4; - linecap: none; -} -line|z16[piste:type=downhill][piste:difficulty=novice] -{ - color: #40ff40; - width: 20; - z-index: 833; -} area|z16-[amenity=marketplace]::d1p2, area|z16-[shop=convenience]::d1p2, area|z16-[shop=supermarket]::d1p2, @@ -8908,37 +5047,12 @@ node|z17-[amenity=pharmacy]::d1p2 { icon-image: pharmacy.svg; } -line|z16[highway=trunk][embankment?]::d2p5 -{ - color: #6f4a18; - width: 34.4; - z-index: 261; - dashes: 0.4,8.4; - linecap: none; -} -line|z16[railway=proposed][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 2.4; - z-index: 732; - dashes: 3.2,3.2; -} line|z16[aerialway=cable_car] { color: #202020; width: 1.6; z-index: 850; } -line|z16[highway=track][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 187; - dashes: 0.4,8.4; - linecap: none; -} area|z16[railway=platform], line|z16[railway=platform] { @@ -8946,42 +5060,6 @@ line|z16[railway=platform] width: 4; z-index: 580; } -line|z16[railway=monorail][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 766; -} -line|z16[highway=living_street][tunnel?] -{ - color: #707070; - width: 10.4; - z-index: 699; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=track][tunnel?] -{ - color: #d79331; - width: 7.2; - z-index: 683; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[power=line][location=underground] -{ - color: grey; - width: 0.8; - z-index: 859; - dashes: 2.4,4,2.4,4,2.4,8.8; - linecap: none; -} -line|z16[highway=motorway][cutting?] -{ - color: #6f4a18; - width: 33.6; - z-index: 295; -} line|z16[highway=service] { color: white; @@ -9000,95 +5078,21 @@ line|z16[waterway=stream]::d1p2 width: 2; z-index: 108; } -line|z16[railway=funicular][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 759; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=motorway][embankment?] -{ - color: #3a7019; - width: 34.4; - z-index: 143; - dashes: 0.4,8.4; - linecap: none; -} -line|z16[highway=bridleway][embankment?]::d2p3, -line|z17-[highway=footway][embankment?]::d2p3 -{ - color: #3a7019; - width: 11.2; - z-index: 233; -} -line|z16[railway=yard] -{ - color: #333333; - width: 2.4; - z-index: 548; -} line|z16[man_made=cutline]::d1p2 { color: #b0ac8c; width: 1; z-index: 276; } -line|z16[highway=bridleway][cutting?] -{ - color: #6f4a18; - width: 24; - z-index: 306; -} -area|z16[aeroway=terminal]::d1p2 -{ - z-index: 583; -} -line|z16[highway=motorway][embankment?]::d2p5 -{ - color: #6f4a18; - width: 34.4; - z-index: 260; - dashes: 0.4,8.4; - linecap: none; -} area|z16-[amenity=place_of_worship]::d1p2, node|z16-[amenity=place_of_worship]::d1p2 { icon-image: religion.svg; } -line|z17-[highway=bridleway][embankment?]::d2p7, -line|z16[highway=track][embankment?]::d2p7 -{ - color: #6f4a18; - width: 11.2; - z-index: 287; -} line|z16[barrier=retaining_wall] { color: #b0b0b0; width: 1; - z-index: 889; -} -line|z16[highway=footway][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 311; - dashes: 4,0.4,4,0.4; - linecap: none; -} -line|z16[highway=residential][tunnel?]::d2p2 -{ - color: white; - width: 8.8; -} -line|z16[highway=steps][cutting?] -{ - color: #6f4a18; - width: 24; - z-index: 309; } line|z16[highway=footway][sac_scale=demanding_alpine_hiking] { @@ -9098,23 +5102,6 @@ line|z16[highway=footway][sac_scale=demanding_alpine_hiking] dashes: 2,2; linecap: none; } -line|z16[highway=footway][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 276; - dashes: 0.4,4,0.4,4; - linecap: none; -} -area|z16[amenity=bus_station], -area|z17-[amenity=bus_station]::d1p2, -area|z17-[highway=bus_stop]::d1p2, -node|z16[amenity=bus_station], -node|z17-[amenity=bus_station]::d1p2, -node|z17-[highway=bus_stop]::d1p2 -{ - icon-image: bus.svg; -} line|z16[communication=line] { color: white; @@ -9122,62 +5109,17 @@ line|z16[communication=line] z-index: 870; opacity: 0.5; } -line|z16[highway=footway][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 269; - dashes: 0.4,8.4; - linecap: none; -} -line|z16[highway=secondary][tunnel?] -{ - color: #707070; - width: 13.6; - z-index: 711; - dashes: 3.2,3.2; - linecap: none; -} line|z16[highway=raceway] { color: white; width: 6.8; z-index: 460; } -line|z16[highway=byway][tunnel?]::d2p2 -{ - color: white; - width: 3.2; - z-index: 681; -} -line|z16[highway=service][service=parking_aisle][tunnel?]::d3p2 -{ - color: white; - width: 2; - z-index: 690; -} -line|z16[natural=spring]::d1p2, -line|z16[waterway=river]::d1p2 +line|z16[natural=spring], +line|z16[waterway=river] { color: #cde5ea; width: 8; - z-index: 105; -} -line|z16[railway=proposed] -{ - color: #b2b2b2; - width: 3.2; - z-index: 539; - dashes: 4,4; - linecap: none; -} -line|z16[highway=cycleway][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 312; - dashes: 4,1,4,1; - linecap: none; } area|z16-[shop=hairdresser]::d1p2, node|z16-[shop=hairdresser]::d1p2 @@ -9189,27 +5131,6 @@ node|z16-[railway=crossing] { icon-image: railway-crossing-small.svg; } -line|z16[railway=preserved][tunnel?]::d2p3 -{ - opacity: 0.15; - color: #333333; - linecap: none; - width: 2; - z-index: 747; - dashes: 3.2,3.2; -} -line|z16[piste:lift=platter] -{ - color: #202020; - width: 1.6; - z-index: 844; -} -line|z16[piste:type=downhill] -{ - color: #505050; - width: 20; - z-index: 839; -} area|z16-[barrier=lift_gate], node|z16-[barrier=lift_gate] { @@ -9242,12 +5163,6 @@ line|z16[boundary=administrative][border_type=state] z-index: 941; dashes: 12,4,4,4; } -line|z16[piste:type=downhill][piste:difficulty=expert] -{ - color: #f6800a; - width: 20; - z-index: 837; -} area|z16[amenity=speed_trap], area|z17-[amenity=speed_trap]::d1p2, node|z16[amenity=speed_trap], @@ -9255,18 +5170,6 @@ node|z17-[amenity=speed_trap]::d1p2 { icon-image: speed_trap.svg; } -line|z16[highway=trunk][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 18.4; - z-index: 162; -} -line|z16[highway=pedestrian][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 665; -} area|z16-[historic=memorial]::d1p2, area|z16-[historic=monument]::d1p2, node|z16-[historic=memorial]::d1p2, @@ -9281,70 +5184,12 @@ line|z16[boundary=administrative][admin_level=7] z-index: 930; -x-kot-layer: top; } -line|z16[highway=tertiary_link]::d1p2 +line|z16[highway=tertiary_link] { color: #ffff90; width: 12; - z-index: 618; -} -line|z16[highway=service][service=parking_aisle][tunnel?] -{ - color: #707070; - width: 2.4; - z-index: 689; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[railway=proposed][tunnel?]::d2p2 -{ - color: white; - width: 2.4; - z-index: 731; } - -line|z16[highway=byway][tunnel?] -{ - color: #505050; - width: 8; - z-index: 680; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=service][cutting?]::d2p4, -line|z16[highway=steps][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 330; -} -line|z16[highway=bridleway][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 271; - dashes: 0.4,8.4; - linecap: none; -} -line|z16[highway=footway][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 208; - dashes: 0.4,4,0.4,4; - linecap: none; -} -line|z16[railway][disused?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: grey; - linecap: none; - width: 2.4; - z-index: 735; - dashes: 3.2,3.2; -} -area|z16[railway=rail]::d1p5, -line|z16[railway=rail]::d1p5, -node|z16[railway=rail]::d1p5 +line|z16[railway=rail]::d1p5 { color: #666666; width: 2.4; @@ -9352,28 +5197,10 @@ node|z16[railway=rail]::d1p5 dashes: 12,12; linecap: none; } -line|z16[highway=bridleway][tunnel?] -{ - color: #707070; - width: 7.2; - z-index: 677; - dashes: 3.2,3.2; - linecap: none; -} line|z16[man_made=pier]::d1p2 { color: #d0d0d0; width: 3.2; - z-index: 856; -} -line|z16[railway=tram][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #4c0f4c; - linecap: none; - width: 2; - z-index: 753; - dashes: 3.2,3.2; } line|z16[barrier=city_wall] { @@ -9386,12 +5213,6 @@ line|z16-[railway=platform]::d1p2 { fill-color: #bbbbbb; } -line|z16[railway=light_rail][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 749; -} line|z16[boundary=administrative][border_type=municipality] { color: #f9574b; @@ -9413,35 +5234,13 @@ line|z16-[highway=motorway_link]::d1p2 width: 12; z-index: 527; } -line|z16[piste:lift=platter]::d1p2 -{ - color: #202020; - width: 16; - z-index: 847; - dashes: 1.6,80; - linecap: none; -} line|z16[highway=path][sac_scale=demanding_alpine_hiking] { color: blue; width: 1.2; - z-index: 829; dashes: 2,2; linecap: none; } -line|z16[highway=road][tunnel?]::d2p2 -{ - color: white; - width: 9; - z-index: 704; -} -line|z16[power=line] -{ - color: white; - width: 1.6; - z-index: 858; - opacity: 0.5; -} line|z16[railway=razed]::d1p2 { color: white; @@ -9465,13 +5264,12 @@ line|z16[railway=abandoned]::d1p2 z-index: 629; opacity: 0.4; } -line|z16[highway=primary]::d1p2, -line|z16[highway=trunk]::d1p2, -line|z16[highway=trunk_link]::d1p2 +line|z16[highway=primary], +line|z16[highway=trunk], +line|z16[highway=trunk_link] { color: #ffc444; width: 14; - z-index: 482; casing-linecap: none; casing-width: 2; casing-color: #d8a050; @@ -9484,16 +5282,9 @@ line|z16[highway=steps]::d1p2 linecap: none; dashes: 2.4,0.8; } -line|z16-[highway=footway][tunnel?] -{ - color: #707070; - width: 4.8; - z-index: 266; - dashes: 3.2,3.2; - linecap: none; -} line|z16[highway=residential], -line|z16[highway=unclassified] +line|z16[highway=unclassified], +line|z16[highway=living_street] { color: white; width: 6; @@ -9514,11 +5305,10 @@ node|z16-[historic=castle]::d1p2 { icon-image: castle.svg; } -line|z16[waterway=canal]::d1p2 +line|z16[waterway=canal] { color: #cde5ea; width: 4.8; - z-index: 109; } line|z16[highway=raceway]::d2p2 { @@ -9536,12 +5326,6 @@ line|z16[barrier=hedge]::d1p2 dashes: 0.0,2.0; linecap: none; } -line|z16[highway=bridleway][tunnel?]::d2p2 -{ - color: white; - width: 6.4; - z-index: 678; -} area|z16-[amenity=police]::d1p2, node|z16-[amenity=police]::d1p2 { @@ -9570,36 +5354,12 @@ line|z16[boundary=administrative][border_type=city] z-index: 938; dashes: 12,4,4,4; } -line|z16[highway=motorway][embankment?]::d2p2 -{ - color: #3a7019; - width: 28.8; - z-index: 149; - dashes: 0.4,4,0.4,4; - linecap: none; -} -line|z16[railway=rail][tunnel?] -{ - color: #666666; - width: 4; - z-index: 739; - dashes: 3.2,3.2; - linecap: none; -} line|z16[highway=raceway] { color: #e8e4d4; width: 12; z-index: 587; } -line|z16[highway=service][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 186; - dashes: 0.4,8.4; - linecap: none; -} area|z16[amenity=hospital], area|z17-[amenity=hospital]::d1p2, node|z16[amenity=hospital], @@ -9613,62 +5373,20 @@ line|z16[waterway=ditch]::d1p2 width: 0.6; z-index: 111; } -line|z16[highway=path][horse?][tunnel?] -{ - color: #707070; - width: 7.2; - z-index: 671; - dashes: 3.2,3.2; - linecap: none; -} line|z16[railway=construction]::d1p2 { color: #f2f2f2; width: 2.4; z-index: 625; } -line|z16[highway=bridleway][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 278; - dashes: 0.4,4,0.4,4; - linecap: none; -} -area|z16-[natural=tree], node|z16-[natural=tree] { icon-image: tree.svg; } -line|z16[highway=bridleway][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 210; - dashes: 0.4,4,0.4,4; - linecap: none; -} -line|z16[highway=path][bicycle?]::d2p2 +line|z16[highway=path][bicycle?] { color: #90bc90; width: 2; - z-index: 660; -} -line|z16[highway=trunk][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 27.2; - z-index: 300; - dashes: 8.4,0.4; - linecap: none; -} -line|z16[highway=service][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 279; - dashes: 0.4,4,0.4,4; - linecap: none; } line|z16[boundary=administrative][type=nation] { @@ -9677,73 +5395,7 @@ line|z16[boundary=administrative][type=nation] z-index: 942; -x-kot-layer: top; } -area|z16-[amenity=pub]::d1p2, -node|z16-[amenity=pub]::d1p2 -{ - icon-image: pub.svg; -} -line|z16[highway=footway][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 10.4; - z-index: 255; -} -line|z16[piste:type=downhill][piste:difficulty=easy] -{ - color: #404040; - width: 20; - z-index: 834; -} -line|z16[highway=bridleway][cutting?]::d2p4, -line|z17-[highway=footway][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 327; -} -area|z16[amenity=parking][!access]::d1p2, -area|z16[amenity=parking][access?]::d1p2, -node|z16[amenity=parking][!access]::d1p2, -node|z16[amenity=parking][access?]::d1p2 -{ - icon-image: parking-mini.svg; -} -area|z16[highway=bus_stop]::d1p2, -node|z16[highway=bus_stop]::d1p2 -{ - icon-image: bus-mini.svg; -} -area|z16[amenity=recycling], -area|z17-[amenity=recycling]::d1p2, -node|z16[amenity=recycling], -node|z17-[amenity=recycling]::d1p2 -{ - icon-image: recycling.svg; -} -line|z16[railway][construction?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #606060; - linecap: none; - width: 2.4; - z-index: 727; - dashes: 3.2,3.2; -} -area|z16[amenity=telephone], -area|z17-[amenity=telephone]::d1p2, -node|z16[amenity=telephone], -node|z17-[amenity=telephone]::d1p2 -{ - icon-image: telephone.svg; -} -line|z16[railway=subway][tunnel?] -{ - color: #0f0f4c; - width: 3.2; - z-index: 754; - dashes: 3.2,3.2; - linecap: none; -} + line|z16-[highway=secondary_link] { color: #fffb80; @@ -9754,42 +5406,6 @@ node|z16-[amenity=cafe] { icon-image: cafe.svg; } -line|z16[highway=footway][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 183; - dashes: 0.4,8.4; - linecap: none; -} -line|z16[highway=steps][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 323; - dashes: 8.4,0.4; - linecap: none; -} -line|z16[highway=motorway][embankment?]::d2p3 -{ - color: #3a7019; - width: 19.2; - z-index: 156; -} -line|z16[highway=footway][cutting?] -{ - color: #6f4a18; - width: 24; - z-index: 304; -} -line|z16[highway=track][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 273; - dashes: 0.4,8.4; - linecap: none; -} line|z16[man_made=pipeline] { color: white; @@ -9797,21 +5413,6 @@ line|z16[man_made=pipeline] z-index: 874; opacity: 0.5; } -line|z16[highway=bridleway][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 320; - dashes: 8.4,0.4; - linecap: none; -} -line|z16[railway][disused?][tunnel?]::d2p2 -{ - color: white; - width: 2.4; - z-index: 734; - opacity: 0.7; -} area|z16-[amenity=car_sharing]::d1p2, node|z16-[amenity=car_sharing]::d1p2 { @@ -9825,24 +5426,6 @@ line|z16[waterway=stream][intermittent=ephemeral] dashes: 1.6,1.6; linecap: none; } -line|z16[railway=incline][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 758; -} -line|z16[highway=track][cutting?] -{ - color: #6f4a18; - width: 24; - z-index: 308; -} -line|z16[highway=path][embankment?]::d2p3 -{ - color: #3a7019; - width: 11.2; - z-index: 231; -} line|z16[waterway=weir] { color: #000044; @@ -9861,35 +5444,11 @@ line|z16[piste:lift=magic_carpet] { color: #101010; width: 3.2; - z-index: 849; -} -line|z16[highway=path][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 207; - dashes: 0.4,4,0.4,4; - linecap: none; } line|z16[railway=preserved] { color: #909090; width: 3.2; - z-index: 545; -} -line|z16[communication=line][location=submarine] -{ - color: #f080f0; - width: 0.4; - z-index: 872; - dashes: 1.2,2,1.2,2,1.2,4.4; - linecap: none; -} -line|z16[highway=service][embankment?]::d2p7 -{ - color: #6f4a18; - width: 11.2; - z-index: 286; } area|z16-[amenity=cinema]::d1p2, node|z16-[amenity=cinema]::d1p2 @@ -9905,14 +5464,6 @@ node|z16-[tourism=museum]::d1p2 { icon-image: museum.svg; } -line|z16[highway=path][bicycle?][tunnel?] -{ - color: #707070; - width: 7.2; - z-index: 669; - dashes: 3.2,3.2; - linecap: none; -} line|z16[barrier=retaining_wall]::d1p2 { color: #b0b0b0; @@ -9921,43 +5472,6 @@ line|z16[barrier=retaining_wall]::d1p2 dashes: 0.0,2.0; linecap: none; } -line|z16[railway=narrow_gauge][tunnel?]::d2p3 -{ - opacity: 0.15; - color: #333333; - linecap: none; - width: 2; - z-index: 744; - dashes: 3.2,3.2; -} -line|z16[highway=motorway][embankment?]::d2p6 -{ - color: #6f4a18; - width: 28.8; - z-index: 262; - dashes: 0.4,4,0.4,4; - linecap: none; -} -line|z16[highway=service][tunnel?]::d2p2 -{ - color: white; - width: 6.4; - z-index: 693; -} -line|z16[railway=siding][tunnel?] -{ - color: #333333; - width: 2.4; - z-index: 772; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[railway=narrow_gauge][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 743; -} line|z16[railway=siding]::d1p3 { color: #333333; @@ -9966,28 +5480,6 @@ line|z16[railway=siding]::d1p3 dashes: 8,16; linecap: none; } -line|z16[highway=cycleway][tunnel?] -{ - color: #707070; - width: 7.2; - z-index: 99; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[piste:type=downhill][piste:difficulty=advanced] -{ - color: #202020; - width: 20; - z-index: 836; -} -line|z16[highway=trunk][tunnel?] -{ - color: #707070; - width: 13.6; - z-index: 720; - dashes: 3.2,3.2; - linecap: none; -} line|z16-[highway=primary], line|z16-[highway=trunk], line|z16-[highway=trunk_link] @@ -10019,24 +5511,12 @@ line|z16-[man_made=cutline] text-color: #606060; text-halo-color: white; } -line|z16[highway=primary][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 719; -} line|z16[natural=glacier] { color: lightblue; width: 3.2; z-index: 8; } -line|z16[railway=rail][tunnel?]::d2p2 -{ - color: white; - width: 2.4; - z-index: 740; -} line|z16[boundary=administrative][admin_level=9] { color: #f9574b; @@ -10046,93 +5526,40 @@ line|z16[boundary=administrative][admin_level=9] z-index: 928; dashes: 12,12; } -line|z16[railway=rail][tunnel?]::d2p3 -{ - color: #666666; - width: 2.4; - z-index: 741; - dashes: 3.2,3.2; - linecap: none; -} line|z16[highway=track] { color: #c0a87c; width: 4; } -line|z16[railway=preserved][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 746; -} area|z16-[amenity=post_office]::d1p2, node|z16-[amenity=post_office]::d1p2 { icon-image: postoffice.svg; } -line|z16[highway=tertiary][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 708; -} -line|z16[highway=primary_link][tunnel?] -{ - color: #707070; - width: 13.6; - z-index: 713; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=motorway][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 27.2; - z-index: 299; - dashes: 8.4,0.4; - linecap: none; -} -line|z16[highway=footway][embankment?]::d2p3 -{ - color: #3a7019; - width: 11.2; - z-index: 451; -} -line|z16[railway=funicular][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #e6b7b7; - linecap: none; - width: 2; - z-index: 762; - dashes: 3.2,3.2; -} line|z16[aerialway=mixed_lift] { color: #202020; width: 1.6; z-index: 853; } -line|z16[railway=yard]::d1p3 +line|z16[railway=yard]::railfill { - color: #333333; + color: #e6e6e6; width: 1.2; - z-index: 653; - dashes: 8,16; - linecap: none; + z-index: 639; } -line|z16[highway=path][horse?][tunnel?]::d3p2 +line|z16[railway=yard]::railborder { - color: white; - width: 6.4; - z-index: 672; + color: #333333; + width: 2.4; + z-index: 548; } -line|z16[highway=unclassified][tunnel?] +line|z16[railway=yard]::raildash { - color: #707070; - width: 10.4; - z-index: 99; - dashes: 3.2,3.2; + color: #333333; + width: 1.2; + z-index: 653; + dashes: 8,16; linecap: none; } area|z16[amenity=library], @@ -10142,138 +5569,44 @@ node|z17-[amenity=library]::d1p2 { icon-image: library.svg; } -line|z16[railway=incline][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 757; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[power=line][location=submarine] -{ - color: grey; - width: 0.8; - z-index: 860; - dashes: 2.4,4,2.4,4,2.4,8.8; - linecap: none; -} -line|z16[highway=secondary][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 712; -} area|z16-[shop=clothes]::d1p2, node|z16-[shop=clothes]::d1p2 { icon-image: clothes.svg; } -line|z16[railway=subway][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 755; -} -line|z16[highway=motorway][embankment?]::d2p7 -{ - color: #6f4a18; - width: 19.2; - z-index: 264; -} line|z16[aerialway=gondola] { color: #202020; width: 1.6; z-index: 851; } -line|z16[highway=pedestrian][tunnel?] +line|z16-[power=line] { - color: #707070; - width: 10; - z-index: 664; - dashes: 3.2,3.2; - linecap: none; -} -line|z16[highway=track][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 10.4; - z-index: 258; + color: white; + width: 1.6; + z-index: 858; + opacity: 0.5; } -line|z16[railway][construction?][tunnel?] +line|z16-[power=line]::d1p2 { - color: #606060; - width: 3.2; - z-index: 725; - dashes: 3.2,3.2; + color: grey; + width: 0.8; + z-index: 861; + dashes: 16,8; linecap: none; } -line|z16[power=line]::d1p2 +line|z16-[power=line][location=underground] { color: grey; width: 0.8; - z-index: 861; - dashes: 16,8; + z-index: 859; + dashes: 2.4,4,2.4,4,2.4,8.8; linecap: none; } line|z17-[piste:lift=magic_carpet] { color: #101010; width: 6.4; - z-index: 908; -} -line|z17-[highway=track][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 275; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[highway=trunk][embankment?] -{ - color: #3a7019; - width: 34.4; - z-index: 146; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[railway=light_rail][tunnel?] -{ - color: #0f4c0f; - width: 3.2; - z-index: 790; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=secondary_link][tunnel?] -{ - color: #707070; - width: 14.4; - z-index: 742; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=bridleway][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 9.6; - z-index: 258; -} -line|z17-[highway=motorway][embankment?]::d2p7 -{ - color: #6f4a18; - width: 19.2; - z-index: 266; -} -line|z17-[highway=bridleway][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 315; - dashes: 4,0.8,4,0.8; - linecap: none; } line|z17-[railway=rail]::d1p3 { @@ -10318,28 +5651,6 @@ line|z17-[boundary=administrative][border_type=county] z-index: 973; dashes: 4,20; } -line|z17-[highway=motorway][cutting?] -{ - color: #6f4a18; - width: 34.4; - z-index: 297; -} -line|z17-[highway=bridleway][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 187; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[waterway=drain][tunnel?] -{ - color: #cde5ea; - width: 6.4; - z-index: 105; - dashes: 12,12; - linecap: none; -} area|z17-[sport=gymnastics], area|z17-[sport=multi], area|z17-[sport=skiing], @@ -10349,14 +5660,6 @@ node|z17-[sport=skiing] { icon-image: gymnastics-borderless.svg; } -line|z17-[highway=service][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 274; - dashes: 0.8,8.8; - linecap: none; -} line|z17-[communication=line]::d1p2 { color: #f080f0; @@ -10365,14 +5668,6 @@ line|z17-[communication=line]::d1p2 dashes: 8,4; linecap: none; } -line|z17-[highway=service][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 213; - dashes: 0.8,4,0.8,4; - linecap: none; -} area|z17-[leisure=playground]::d1p2, node|z17-[leisure=playground]::d1p2 { @@ -10406,52 +5701,13 @@ node|z17-[sport=scuba_diving] { icon-image: diving-borderless.svg; } -line|z17-[waterway=river][tunnel?] -{ - color: #cde5ea; - width: 16; - z-index: 102; - dashes: 12,12; - linecap: none; -} -line|z17-[highway=path][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 270; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[highway=path][horse?][tunnel?] -{ - color: #707070; - width: 8; - z-index: 705; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[waterway=canal]::d1p2 +line|z17-[waterway=canal] { width: 6.4; - z-index: 111; color: #cde5ea; casing-width: 0.8; casing-color: #b0b0b0; } -line|z17-[highway=motorway][tunnel?]::d2p2 -{ - color: white; - width: 13.6; - z-index: 764; -} -line|z17-[highway=motorway][tunnel?] -{ - color: #707070; - width: 16; - z-index: 763; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[barrier=retaining_wall]::d1p2 { color: #b0b0b0; @@ -10460,14 +5716,6 @@ line|z17-[barrier=retaining_wall]::d1p2 dashes: 0.0,4.0; linecap: none; } -line|z17-[piste:lift=platter]::d1p2 -{ - color: #202020; - width: 32; - z-index: 906; - dashes: 1.6,160; - linecap: none; -} line|z17-[boundary=administrative][type=nation]::d2p2 { color: #f9574b; @@ -10477,14 +5725,6 @@ line|z17-[boundary=administrative][type=nation]::d2p2 z-index: 978; dashes: 12,12; } -line|z17-[railway=spur][tunnel?]::d2p3 -{ - color: #606060; - width: 1.36; - z-index: 816; - dashes: 3.2,3.2; - linecap: none; -} area|z17-[building=address], area|z17-[building], node|z17-[building=address], @@ -10494,17 +5734,6 @@ node|z17-[building] font-size: 11; text-color: #404040; } -line|z17-[highway=secondary_link][tunnel?]::d2p2 -{ - color: white; - width: 12; -} -line|z17-[highway=path][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 9.6; - z-index: 256; -} line|z17-[waterway=lock] { color: #f8f8f8; @@ -10513,14 +5742,6 @@ line|z17-[waterway=lock] casing-width: 2; casing-color: #202020; } -line|z17-[highway=footway][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 271; - dashes: 0.8,8.8; - linecap: none; -} area|z17-[sport=cricket], node|z17-[sport=cricket] { @@ -10534,30 +5755,6 @@ line|z17-[man_made=pipeline]::d1p2 dashes: 1.2,2,1.2,2,1.2,4.4; linecap: none; } -line|z17-[highway=path][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 319; - dashes: 8.8,0.8; - linecap: none; -} -line|z17-[highway=service][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 281; - dashes: 0.8,4,0.8,4; - linecap: none; -} -line|z17-[highway=motorway_link][tunnel?] -{ - color: #707070; - width: 14.4; - z-index: 754; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[highway=steps]::d1p2 { width: 4; @@ -10574,36 +5771,13 @@ line|z17-[man_made=pipeline][location=overground] dashes: 8,4; linecap: none; } -line|z17-[highway=cycleway][tunnel?] -{ - color: #707070; - width: 8; - z-index: 99; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[highway=path][sac_scale=demanding_alpine_hiking] { color: blue; width: 0.8; - z-index: 887; dashes: 4,4; linecap: none; } -line|z17-[highway=trunk][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 32.8; - z-index: 300; - dashes: 4,0.8,4,0.8; - linecap: none; -} -line|z17-[highway=motorway][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 20.8; - z-index: 303; -} line|z17-[boundary=administrative][admin_level=2]::d2p2 { color: #f9574b; @@ -10617,64 +5791,21 @@ line|z17-[highway=path][sac_scale=demanding_mountain_hiking] { color: red; width: 0.8; - z-index: 883; dashes: 0.08,1.2; linecap: none; } -line|z17-[highway=tertiary][tunnel?] -{ - color: #707070; - width: 14.4; - z-index: 739; - dashes: 3.2,3.2; - linecap: none; -} -area|z17-[railway=rail]::d1p2, -line|z17-[railway=rail]::d1p2, -node|z17-[railway=rail]::d1p2 -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 5.6; -} -line|z17-[piste:type=downhill] -{ - color: #505050; - width: 40; - z-index: 897; -} line|z17-[railway=narrow_gauge]::d1p2 { color: #e6e6e6; width: 2; z-index: 665; } -line|z17-[highway=steps][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 332; -} -line|z17-[highway=service][tunnel?]::d2p2 -{ - color: white; - width: 6.8; - z-index: 721; -} line|z17-[railway=light_rail] { color: #0f4c0f; width: 3.2; z-index: 571; } -line|z17-[highway=footway][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 278; - dashes: 0.8,4,0.8,4; - linecap: none; -} line|z17-[power=minor_line]::d1p3 { color: grey; @@ -10695,19 +5826,10 @@ line|z17-[aerialway=mixed_lift] width: 3.2; z-index: 912; } -line|z17-[piste:lift=j-bar]::d2p2 -{ - color: #202020; - width: 32; - z-index: 905; - dashes: 1.6,160; - linecap: none; -} line|z17-[highway=construction] { color: #d0d0d0; width: 10; - z-index: 819; dashes: 4,4; linecap: none; } @@ -10715,47 +5837,12 @@ line|z17-[highway=track][tracktype=grade4] { color: #c0a87c; width: 5.6; - z-index: 639; -} -line|z17-[highway=steps][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 318; - dashes: 4,0.8,4,0.8; - linecap: none; -} -line|z17-[railway=preserved][tunnel?]::d2p3 -{ - opacity: 0.15; - color: #333333; - linecap: none; - width: 2; - z-index: 789; - dashes: 3.2,3.2; } -line|z17-[natural=spring]::d1p2, -line|z17-[waterway=river]::d1p2 +line|z17-[natural=spring], +line|z17-[waterway=river] { color: #cde5ea; width: 16; - z-index: 107; -} -line|z17-[railway=yard][tunnel?] -{ - color: #333333; - width: 2.4; - z-index: 812; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[waterway=stream][tunnel?] -{ - color: #cde5ea; - width: 1.6; - z-index: 103; - dashes: 3.2,3.2; - linecap: none; } line|z17-[highway=raceway] { @@ -10763,26 +5850,11 @@ line|z17-[highway=raceway] width: 13.6; z-index: 474; } -line|z17-[mapswithme=grid] -{ - color: #202020; - width: 80; - dashes: 8,8; - linecap: none; -} area|z17-[tourism=camp_site]::d1p3, node|z17-[tourism=camp_site]::d1p3 { icon-image: campsite.svg; } -line|z17-[highway=service][tunnel?] -{ - color: #707070; - width: 8; - z-index: 720; - dashes: 3.2,3.2; - linecap: none; -} area|z17-[leisure=slipway], node|z17-[leisure=slipway] { @@ -10797,15 +5869,6 @@ line|z17-[boundary=administrative][border_type=country]::d2p2 z-index: 979; dashes: 12,12; } -line|z17-[railway][construction?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #606060; - linecap: none; - width: 2; - z-index: 768; - dashes: 3.2,3.2; -} area|z17-[amenity=parking][location=underground][fee?], area|z17-[amenity=parking][parking=multi-storey][fee?], node|z17-[amenity=parking][location=underground][fee?], @@ -10813,61 +5876,15 @@ node|z17-[amenity=parking][parking=multi-storey][fee?] { icon-image: parking_roof_fee-permissive.svg; } -line|z17-[railway=proposed][tunnel?] -{ - color: #b2b2b2; - width: 3.2; - z-index: 771; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[railway=monorail][tunnel?]::d2p3 -{ - opacity: 0.3; - color: white; - linecap: none; - width: 0.64; - z-index: 809; - dashes: 3.2,3.2; -} line|z17-[railway=yard] { color: #333333; width: 2.4; z-index: 577; } -line|z17-[highway=steps][tunnel?] -{ - color: #707070; - width: 4.8; - z-index: 695; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=motorway][embankment?]::d2p2 -{ - color: #3a7019; - width: 28.8; - z-index: 151; - dashes: 0.8,4,0.8,4; - linecap: none; -} -line|z17-[highway=service][service=parking_aisle][tunnel?] -{ - color: #707070; - width: 4.8; - z-index: 715; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=living_street][tunnel?]::d2p2 -{ - color: white; - width: 10.8; - z-index: 729; -} line|z17-[highway=residential], -line|z17-[highway=unclassified] +line|z17-[highway=unclassified], +line|z17-[highway=living_street] { color: white; width: 8; @@ -10875,31 +5892,13 @@ line|z17-[highway=unclassified] casing-width: 2; casing-color: #c8c8af; } -line|z17-[railway=narrow_gauge][tunnel?]::d2p3 -{ - opacity: 0.15; - color: #333333; - linecap: none; - width: 2; - z-index: 786; - dashes: 3.2,3.2; -} line|z17-[highway=path][sac_scale=mountain_hiking] { color: red; width: 0.8; - z-index: 881; dashes: 4,4; linecap: none; } -line|z17-[railway=siding][tunnel?] -{ - color: #333333; - width: 2.4; - z-index: 814; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[boundary=administrative][type=nation] { color: yellow; @@ -10926,9 +5925,7 @@ node|z17-[power=generator]::d1p3 { z-index: 927; } -area|z17-[railway=rail]::d1p5, -line|z17-[railway=rail]::d1p5, -node|z17-[railway=rail]::d1p5 +line|z17-[railway=rail]::d1p5 { color: #666666; width: 3.2; @@ -10936,35 +5933,13 @@ node|z17-[railway=rail]::d1p5 dashes: 12,12; linecap: none; } -line|z17-[highway=footway][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 320; - dashes: 8.8,0.8; - linecap: none; -} -line|z17-[railway=abandoned][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 2; - z-index: 780; - dashes: 3.2,3.2; -} line|z17-[highway=service][service=driveway] { color: white; width: 4; - z-index: 643; - casing-width: 0.4; + casing-width: 0.5; casing-color: #707070; } -area|z17-[leisure=landscape_reserve]::d1p2 -{ - z-index: 138; -} line|z17-[communication=line] { color: white; @@ -10972,14 +5947,6 @@ line|z17-[communication=line] z-index: 930; opacity: 0.5; } -line|z17-[highway=track][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 324; - dashes: 8.8,0.8; - linecap: none; -} area|z17-[sport=equestrian], node|z17-[sport=equestrian] { @@ -11017,14 +5984,6 @@ line|z17-[highway=raceway]::d2p3 width: 12; z-index: 635; } -line|z17-[highway=motorway][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 27.2; - z-index: 301; - dashes: 8.8,0.8; - linecap: none; -} line|z17-[boundary=administrative][admin_level=5] { color: #f9574b; @@ -11040,14 +5999,6 @@ line|z17-[man_made=pier] width: 0.4; z-index: 914; } -line|z17-[highway=primary][tunnel?] -{ - color: #707070; - width: 14.4; - z-index: 757; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[boundary=administrative][admin_level=6] { color: #f9574b; @@ -11066,13 +6017,8 @@ line|z17-[leisure=track] { color: #d0e8c4; width: 6; - z-index: 68; -} -line|z17-[railway=spur][tunnel?]::d2p2 -{ - color: white; - width: 1.36; - z-index: 811; + casing-color: grey; + casing-width: 1; } line|z17-[railway=spur]::d1p2 { @@ -11080,53 +6026,11 @@ line|z17-[railway=spur]::d1p2 width: 1.36; z-index: 671; } -line|z17-[highway=path][bicycle?][tunnel?] -{ - color: #707070; - width: 8; - z-index: 703; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[railway=tram][tunnel?] -{ - color: #4c0f4c; - width: 3.2; - z-index: 793; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=track][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 214; - dashes: 0.8,4,0.8,4; - linecap: none; -} area|z17-[sport=curling], node|z17-[sport=curling] { icon-image: curling-borderless.svg; } -area|z17-[aeroway=terminal]::d1p2 -{ - z-index: 621; -} -line|z17-[highway=steps][cutting?] -{ - color: #6f4a18; - width: 24.8; - z-index: 311; -} -line|z17-[highway=path][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 277; - dashes: 0.8,4,0.8,4; - linecap: none; -} line|z17-[railway=preserved]::d1p2 { color: #e6e6e6; @@ -11146,6 +6050,7 @@ node|z17-[place=suburb] text: name; font-size: 20; text-color: #909090; + z-index: 20; } area|z17-[place=village], node|z17-[place=village] @@ -11156,14 +6061,6 @@ node|z17-[place=village] text-color: #707070; text-halo-color: #eeeedd; } -line|z17-[highway=road][tunnel?] -{ - color: #707070; - width: 13.2; - z-index: 736; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[boundary=administrative][border_type=city] { color: #f9574b; @@ -11173,14 +6070,6 @@ line|z17-[boundary=administrative][border_type=city] z-index: 972; dashes: 12,4,4,4; } -line|z17-[highway=secondary][tunnel?] -{ - color: #707070; - width: 14.4; - z-index: 745; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[railway=disused]::d1p3 { opacity: 0.7; @@ -11196,25 +6085,10 @@ node|z17-[man_made=cairn] symbol-fill-color: white; symbol-size: 3.2; } -line|z17-[piste:lift=platter] -{ - color: #202020; - width: 3.2; - z-index: 903; -} line|z17-[aerialway=chair_lift] { color: #202020; width: 3.2; - z-index: 911; -} -line|z17-[highway=footway][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 210; - dashes: 0.8,4,0.8,4; - linecap: none; } area|z17-[amenity=parking][location=underground], area|z17-[amenity=parking][parking=multi-storey], @@ -11223,53 +6097,15 @@ node|z17-[amenity=parking][parking=multi-storey] { icon-image: parking_roof-permissive.svg; } -line|z17-[highway=cycleway][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 321; - dashes: 8,1; - linecap: none; -} -line|z17-[highway=path][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 184; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[highway=pedestrian][tunnel?]::d2p2 -{ - color: white; - width: 10.8; - z-index: 702; -} -line|z17-[highway=track][tunnel?]::d2p2 -{ - color: white; - width: 5.6; - z-index: 714; -} -line|z17-[power=line][location=submarine] -{ - color: grey; - width: 0.8; - z-index: 919; - dashes: 2.4,4,2.4,4,2.4,8.8; - linecap: none; -} -line|z17-[highway=primary_link]::d1p2 +line|z17-[highway=primary_link] { color: #ffc444; width: 12; - z-index: 653; } line|z17-[highway=raceway] { color: #e8e4d4; width: 12; - z-index: 624; } area|z17-[tourism=picnic_site]::d1p3, node|z17-[tourism=picnic_site]::d1p3 @@ -11297,64 +6133,11 @@ node|z17-[amenity=parking][fee?] { icon-image: parking_fee.svg; } -line|z17-[piste:type=downhill][piste:difficulty=freeride] -{ - color: #f6dd0a; - width: 40; - z-index: 896; -} -line|z17-[highway=track][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 12.8; - z-index: 331; -} -line|z17-[highway=footway][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 185; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[communication=line][location=submarine] -{ - color: #f080f0; - width: 0.8; - z-index: 932; - dashes: 1.2,2,1.2,2,1.2,4.4; - linecap: none; -} area|z17-[railway=platform], line|z17-[railway=platform] { color: #bbbbbb; width: 8; - z-index: 617; -} -line|z17-[highway=residential][tunnel?] -{ - color: #707070; - width: 13.2; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[railway=incline][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #e6b7b7; - linecap: none; - width: 2; - z-index: 803; - dashes: 3.2,3.2; -} -line|z17-[railway][construction?][tunnel?] -{ - color: #606060; - width: 3.2; - z-index: 766; - dashes: 3.2,3.2; - linecap: none; } line|z17-[barrier=wall] { @@ -11370,25 +6153,11 @@ line|z17-[communication=line][location=underground] dashes: 1.2,2,1.2,2,1.2,4.4; linecap: none; } -line|z17-[highway=path][bicycle?][tunnel?]::d3p2 -{ - color: white; - width: 6.8; - z-index: 704; -} area|z17-[man_made=windmill], node|z17-[man_made=windmill] { icon-image: windmill.svg; } -line|z17-[highway=bridleway][embankment?]::d2p5 -{ - color: #6f4a18; - width: 24.8; - z-index: 273; - dashes: 0.8,8.8; - linecap: none; -} line|z17-[boundary=administrative][admin_level=11] { color: #f9574b; @@ -11398,29 +6167,6 @@ line|z17-[boundary=administrative][admin_level=11] z-index: 961; dashes: 0.8,5.2; } -line|z17-[railway=monorail][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 807; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[railway][disused?][tunnel?]::d2p3 -{ - opacity: 0.1; - color: grey; - linecap: none; - width: 2; - z-index: 777; - dashes: 3.2,3.2; -} -line|z17-[piste:type=downhill][piste:difficulty=novice] -{ - color: #40ff40; - width: 40; - z-index: 891; -} line|z17-[railway=siding]::d1p3 { color: #333333; @@ -11434,28 +6180,11 @@ node|z17-[sport=swimming] { icon-image: swimming-borderless.svg; } -line|z17-[highway=residential][tunnel?]::d2p2 -{ - color: white; - width: 10.8; -} area|z17-[amenity=kindergarten], node|z17-[amenity=kindergarten] { icon-image: kindergarten2.svg; } -line|z17-[highway=unclassified][tunnel?]::d2p2 -{ - color: white; - width: 10.8; - z-index: 100; -} -line|z17-[railway=monorail][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 808; -} line|z17-[highway=raceway]::d2p2 { color: red; @@ -11479,12 +6208,6 @@ line|z17-[highway=secondary] casing-width: 2; casing-color: #c8c860; } -line|z17-[highway=trunk][cutting?]::d2p4 -{ - color: #f8f8f8; - width: 20.8; - z-index: 304; -} line|z17-[highway=service] { color: white; @@ -11508,21 +6231,11 @@ line|z17-[highway=bridleway]::d1p2 { color: #d3cb98; width: 6.8; - z-index: 633; -} -line|z17-[railway=rail][tunnel?]::d2p3 -{ - color: #666666; - width: 3.2; - z-index: 783; - dashes: 3.2,3.2; - linecap: none; } line|z17-[piste:lift=rope_tow] { color: #d8d8c4; width: 4; - z-index: 907; dashes: 8,8; linecap: none; } @@ -11538,12 +6251,6 @@ line|z17-[railway=siding]::d1p2 width: 1.36; z-index: 673; } -line|z17-[highway=cycleway][tunnel?]::d2p2 -{ - color: white; - width: 6.8; - z-index: 100; -} line|z17-[man_made=cutline]::d1p2 { color: #b0ac8c; @@ -11563,10 +6270,11 @@ node|z17-[place=suburb]::d1p3 text: int_name; font-size: 14; text-color: #a0a0a0; + z-index: 20; } -line|z17-[highway=primary]::d1p2, -line|z17-[highway=trunk]::d1p2, -line|z17-[highway=trunk_link]::d1p2 +line|z17-[highway=primary], +line|z17-[highway=trunk], +line|z17-[highway=trunk_link] { color: #ffc444; width: 16; @@ -11574,135 +6282,33 @@ line|z17-[highway=trunk_link]::d1p2 casing-width: 2; casing-color: #d8a050; } -line|z17-[railway=subway][tunnel?] -{ - color: #0f0f4c; - width: 3.2; - z-index: 796; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=path][bicycle?]::d2p2 +line|z17-[highway=path][bicycle?] { color: #90bc90; width: 3; - z-index: 660; } area|z17-[sport=tennis], node|z17-[sport=tennis] { icon-image: tennis-borderless.svg; } -line|z17-[aeroway=runway] -{ - casing-linecap: none; - color: #d4dcbd; - linecap: none; - width: 40; - z-index: 693; - linejoin: bevel; - casing-linejoin: bevel; - casing-width: 8; - casing-color: #202020; -} + line|z17-[highway=track][tracktype=grade2] { color: #c0a87c; width: 3; - z-index: 637; -} -line|z17-[highway=path][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 312; - dashes: 4,0.8,4,0.8; - linecap: none; -} -line|z17-[highway=track][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 189; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[highway=service][embankment?]::d2p7 -{ - color: #6f4a18; - width: 11.2; - z-index: 288; -} -line|z17-[highway=path][embankment?]::d2p7 -{ - color: #6f4a18; - width: 11.2; - z-index: 284; -} -line|z17-[highway=motorway][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 17.6; - z-index: 163; } area|z17-[sport=soccer], node|z17-[sport=soccer] { icon-image: soccer-borderless.svg; } -line|z17-[highway=steps][tunnel?]::d2p2 -{ - color: white; - width: 3.6; - z-index: 696; - dashes: 2.4,0.8; - linecap: none; -} -line|z17-[highway=motorway][embankment?] -{ - color: #3a7019; - width: 34.4; - z-index: 145; - dashes: 0.8,8.8; - linecap: none; -} line|z17-[man_made=pier]::d1p3 { color: #e4e4e4; width: 2.4; z-index: 916; } -line|z17-[highway=bridleway][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 322; - dashes: 8.8,0.8; - linecap: none; -} -line|z17-[highway=path][tunnel?] -{ - color: #707070; - width: 4.8; - z-index: 707; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=service][cutting?] -{ - color: #6f4a18; - width: 24.8; - z-index: 309; -} -line|z17-[railway=proposed][tunnel?]::d2p3 -{ - opacity: 0.1; - color: #b2b2b2; - linecap: none; - width: 2; - z-index: 774; - dashes: 3.2,3.2; -} area|z17-[amenity=parking][access=permissive][fee?], area|z17-[amenity=parking][access=public][fee?], node|z17-[amenity=parking][access=permissive][fee?], @@ -11710,14 +6316,6 @@ node|z17-[amenity=parking][access=public][fee?] { icon-image: parking_fee-permissive.svg; } -line|z17-[railway=preserved][tunnel?] -{ - color: #909090; - width: 3.2; - z-index: 787; - dashes: 3.2,3.2; - linecap: none; -} area|z17-[sport=shooting], node|z17-[sport=shooting] { @@ -11749,45 +6347,6 @@ line|z17-[railway=abandoned] z-index: 565; opacity: 0.4; } -line|z17-[highway=primary][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 758; -} -line|z17-[highway=footway][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 9.6; - z-index: 473; -} -line|z17-[railway=rail][tunnel?] -{ - color: #666666; - width: 4.4; - z-index: 781; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=residential][access=private] -{ - color: white; - casing-width: 2; - width: 8; - casing-color: #c8c8af; -} -line|z17-[highway=bridleway][cutting?] -{ - color: #6f4a18; - width: 24.8; - z-index: 308; -} -line|z17-[railway=subway][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 797; -} line|z17-[barrier=retaining_wall] { color: #b0b0b0; @@ -11800,66 +6359,7 @@ line|z17-[highway=byway]::d1p2 width: 6; z-index: 91; } -line|z17-[railway=yard][tunnel?]::d2p2 -{ - color: white; - width: 1.36; - z-index: 813; -} -line|z17-[railway=rail][tunnel?]::d2p2 -{ - color: white; - width: 3.2; - z-index: 782; -} -line|z17-[highway=service][embankment?]::d2p3 -{ - color: #3a7019; - width: 11.2; - z-index: 236; -} -area|z17-[sport=handball], -node|z17-[sport=handball] -{ - icon-image: handball-borderless.svg; -} -line|z17-[railway=proposed] -{ - color: #b2b2b2; - width: 3.2; - z-index: 563; - dashes: 4,4; - linecap: none; -} -line|z17-[waterway=ditch][tunnel?] -{ - color: #cde5ea; - width: 0.8; - z-index: 106; - dashes: 3.2,3.2; - linecap: none; -} -area|z17-[sport=golf], -node|z17-[sport=golf] -{ - icon-image: golfCourse.svg; -} -line|z17-[highway=pedestrian][tunnel?] -{ - color: #707070; - width: 12; - z-index: 701; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[railway=incline][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 799; - dashes: 3.2,3.2; - linecap: none; -} + line|z17-[railway=construction] { color: #606060; @@ -11875,15 +6375,6 @@ line|z17-[railway=disused] z-index: 564; opacity: 0.7; } -line|z17-[railway=abandoned][tunnel?] -{ - opacity: 0.4; - color: #b2b2b2; - linecap: none; - width: 3.2; - z-index: 778; - dashes: 3.2,3.2; -} line|z17-[railway=light_rail]::d1p3 { color: #0f4c0f; @@ -11892,71 +6383,16 @@ line|z17-[railway=light_rail]::d1p3 dashes: 9.6,14.4; linecap: none; } -area|z17-[railway=rail]::d1p4, -line|z17-[railway=rail]::d1p4, -node|z17-[railway=rail]::d1p4 +line|z17-[railway=rail]::d1p4 { color: #e6e6e6; width: 3.2; z-index: 664; } -line|z17-[piste:lift=t-bar] -{ - color: #202020; - width: 3.2; - z-index: 901; -} -line|z17-[railway=light_rail][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #0f4c0f; - linecap: none; - width: 2; - z-index: 792; - dashes: 3.2,3.2; -} -area|z17-[barrier=gate], -node|z17-[barrier=gate] -{ - icon-image: gate.svg; -} -line|z17-[highway=trunk][embankment?]::d2p6 -{ - color: #6f4a18; - width: 28.8; - z-index: 265; - dashes: 0.8,4,0.8,4; - linecap: none; -} -line|z17-[highway=road][tunnel?]::d2p2 -{ - color: white; - width: 10; - z-index: 737; -} -line|z17-[highway=service][service=driveway][tunnel?]::d3p2 -{ - color: white; - width: 4; - z-index: 718; -} -line|z17-[highway=path][horse?][tunnel?]::d3p2 -{ - color: white; - width: 6.8; - z-index: 706; -} -line|z17-[highway=path]::d1p2 +line|z17-[highway=path] { color: silver; width: 3; - z-index: 632; -} -line|z17-[highway=track][embankment?]::d2p3 -{ - color: #3a7019; - width: 11.2; - z-index: 237; } line|z17-[railway=spur] { @@ -11964,14 +6400,6 @@ line|z17-[railway=spur] width: 2.4; z-index: 576; } -line|z17-[highway=path][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 209; - dashes: 0.8,4,0.8,4; - linecap: none; -} line|z17-[barrier=city_wall] { color: #b0b0b0; @@ -11986,12 +6414,6 @@ line|z17-[railway=construction]::d1p3 dashes: 4,4,4,12; linecap: none; } -line|z17-[railway=incline][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 800; -} line|z17-[boundary=administrative][admin_level=10] { color: #f9574b; @@ -12001,48 +6423,12 @@ line|z17-[boundary=administrative][admin_level=10] z-index: 962; dashes: 4,20; } -line|z17-[piste:type=nordic] -{ - color: #c00000; - width: 8; - z-index: 900; - dashes: 24,4; - linecap: none; -} -line|z17-[railway=funicular][tunnel?] -{ - color: #4c0f0f; - width: 3.2; - z-index: 801; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[railway=siding] { color: #333333; width: 2.4; z-index: 578; } -line|z17-[highway=living_street]::d1p3 -{ - color: white; - width: 10.8; - z-index: 648; -} -line|z17-[highway=trunk][embankment?]::d2p2 -{ - color: #3a7019; - width: 28.8; - z-index: 152; - dashes: 0.8,4,0.8,4; - linecap: none; -} -line|z17-[highway=service][service=parking_aisle][tunnel?]::d3p2 -{ - color: white; - width: 4; - z-index: 716; -} line|z17-[barrier=fence]::d1p2 { color: #b0b0b0; @@ -12051,23 +6437,6 @@ line|z17-[barrier=fence]::d1p2 dashes: 0.0,4.0; linecap: none; } -line|z17-[railway=funicular][tunnel?]::d2p4 -{ - opacity: 0.3; - color: #4c0f0f; - linecap: none; - width: 0.64; - z-index: 806; - dashes: 3.2,3.2; -} -line|z17-[highway=motorway][embankment?]::d2p6 -{ - color: #6f4a18; - width: 28.8; - z-index: 264; - dashes: 0.8,4,0.8,4; - linecap: none; -} line|z17-[highway=path][route=hiking] { color: red; @@ -12081,18 +6450,6 @@ line|z17-[railway=disused]::d1p2 z-index: 661; opacity: 0.7; } -line|z17-[railway=funicular][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 802; -} -line|z17-[highway=tertiary][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 740; -} line|z17-[boundary=administrative][border_type=region] { color: #f9574b; @@ -12102,35 +6459,6 @@ line|z17-[boundary=administrative][border_type=region] z-index: 974; dashes: 12,4,4,4; } -line|z17-[highway=trunk][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 761; -} -line|z17-[railway][disused?][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 776; - opacity: 0.7; -} -line|z17-[highway=trunk][tunnel?] -{ - color: #707070; - width: 14.4; - z-index: 760; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=living_street]::d1p4 -{ - color: #d0ccac; - width: 10.8; - z-index: 649; - dashes: 2.8,4; - linecap: none; -} line|z17-[barrier=bollard], node|z17-[barrier=block], node|z17-[barrier=bollard], @@ -12141,85 +6469,19 @@ node|z17-[barrier=toll_booth] symbol-fill-color: #707070; symbol-size: 1.6; } -line|z17-[highway=path][horse?]::d2p2 -{ - color: #d3cb98; - width: 6.8; - z-index: 630; -} -line|z17-[power=line]::d1p2 -{ - color: grey; - width: 0.8; - z-index: 920; - dashes: 16,8; - linecap: none; -} -line|z17-[highway=byway][tunnel?]::d2p2 -{ - color: white; - width: 3.2; - z-index: 712; -} -area|z17-[leisure=golf_course]::d1p2, -node|z17-[leisure=golf_course]::d1p2 -{ - icon-image: golfcourse.svg; -} -line|z17-[piste:type=downhill][piste:difficulty=easy] -{ - color: #404040; - width: 40; - z-index: 892; -} line|z17-[highway=footway][sac_scale=hiking] { color: red; width: 0.8; z-index: 880; } -area|z17-[sport=baseball], -node|z17-[sport=baseball] -{ - icon-image: baseball-borderless.svg; -} -line|z17-[railway=proposed]::d1p3 -{ - color: #b2b2b2; - width: 2; - z-index: 676; - dashes: 4,4,4,12; - linecap: none; -} -line|z17-[highway=service][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 316; - dashes: 4,0.8,4,0.8; - linecap: none; -} -line|z17-[highway=footway][tunnel?]::d2p2 -{ - color: white; - width: 3.6; - z-index: 271; -} -line|z17-[highway=trunk][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 27.2; - z-index: 302; - dashes: 8.8,0.8; - linecap: none; -} + line|z17-[boundary=administrative][border_type=state] { color: #f9574b; linecap: none; -x-kot-layer: top; width: 2; - z-index: 975; dashes: 12,4,4,4; } area|z17-[building], @@ -12229,80 +6491,18 @@ node|z17-[building] font-size: 11; text-color: #404040; } -line|z17-[highway=footway][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 313; - dashes: 4,0.8,4,0.8; - linecap: none; -} -line|z17-[railway][construction?][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 767; -} -line|z17-[railway=abandoned][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 779; - opacity: 0.4; -} line|z17-[highway=footway][sac_scale=alpine_hiking] { color: blue; width: 0.8; z-index: 886; } -line|z17-[highway=service][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 323; - dashes: 8.8,0.8; - linecap: none; -} -line|z17-[highway=track][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 317; - dashes: 4,0.8,4,0.8; - linecap: none; -} -line|z17-[highway=bridleway][tunnel?]::d2p2 -{ - color: white; - width: 6.8; - z-index: 710; -} line|z17-[highway=track][tracktype=grade3] { color: #c0a87c; width: 4; - z-index: 638; -} -line|z17-[railway=proposed]::d1p2 -{ - color: white; - width: 2; - z-index: 660; -} -line|z17-[highway=service][embankment?] -{ - color: #3a7019; - width: 24.8; - z-index: 188; - dashes: 0.8,8.8; - linecap: none; -} -area|z17-[railway=tram_stop]::d1p2, -node|z17-[railway=tram_stop]::d1p2 -{ - icon-image: tramway.svg; } + line|z17-[waterway=stream][intermittent=yes] { color: #cde5ea; @@ -12319,21 +6519,6 @@ line|z17-[highway=footway][sac_scale=difficult_alpine_hiking] dashes: 0.08,1.2; linecap: none; } -line|z17-[highway=living_street][tunnel?] -{ - color: #707070; - width: 13.2; - z-index: 728; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=primary_link][tunnel?] -{ - color: #707070; - width: 14.4; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[railway=razed] { opacity: 0.3; @@ -12343,39 +6528,10 @@ line|z17-[railway=razed] z-index: 567; dashes: 2.4,2.4; } -line|z17-[piste:type=downhill][piste:difficulty=advanced] -{ - color: #202020; - width: 40; - z-index: 894; -} -line|z17-[highway=living_street]::d1p2 -{ - color: #707070; - width: 12; - z-index: 508; -} -line|z17-[waterway=canal][tunnel?] -{ - color: #cde5ea; - width: 6.4; - z-index: 104; - dashes: 12,12; - linecap: none; -} -line|z17-[highway=motorway][embankment?]::d2p5 -{ - color: #6f4a18; - width: 34.4; - z-index: 262; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[highway=tertiary_link]::d1p2 +line|z17-[highway=tertiary_link] { color: #ffff90; width: 12; - z-index: 650; } line|z17-[highway=footway][sac_scale=demanding_alpine_hiking] { @@ -12400,18 +6556,6 @@ line|z17-[railway=funicular] width: 3.2; z-index: 574; } -line|z17-[highway=path][cutting?] -{ - color: #6f4a18; - width: 24.8; - z-index: 305; -} -line|z17-[highway=trunk][embankment?]::d2p3 -{ - color: #3a7019; - width: 19.2; - z-index: 159; -} line|z17-[man_made=pier]::d1p2 { color: #d0d0d0; @@ -12435,89 +6579,21 @@ line|z17-[barrier=city_wall]::d1p2 dashes: 0.0,4.0; linecap: none; } -area|z17-[tourism=information][office], -node|z17-[tourism=information][office] -{ - icon-image: information-office.svg; -} + line|z17-[railway=light_rail]::d1p2 { color: #b7e6e6; width: 2; z-index: 667; } -line|z17-[piste:lift=j-bar] -{ - color: #202020; - width: 3.2; - z-index: 902; -} line|z17-[power=minor_line]::d1p2 { color: grey; width: 0.8; - z-index: 922; dashes: 1.2,2,1.2,2,1.2,4.4; linecap: none; } -line|z17-[railway=proposed][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 772; -} -line|z17-[highway=unclassified][tunnel?] -{ - color: #707070; - width: 13.2; - z-index: 99; - dashes: 3.2,3.2; - linecap: none; -} -area|z17-[man_made=survey_point], -node|z17-[man_made=survey_point] -{ - icon-image: survey_point.svg; -} -line|z17-[highway=path][embankment?]::d2p3 -{ - color: #3a7019; - width: 11.2; - z-index: 232; -} -line|z17-[highway=footway][cutting?] -{ - color: #6f4a18; - width: 24.8; - z-index: 306; -} -line|z17-[highway=bridleway][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 280; - dashes: 0.8,4,0.8,4; - linecap: none; -} -line|z17-[highway=cycleway][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 23.2; - z-index: 314; - dashes: 4,1,4,1; - linecap: none; -} -line|z17-[railway=preserved][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 788; -} -area|z17-[amenity=parking][parking=park_and_ride], -node|z17-[amenity=parking][parking=park_and_ride] -{ - icon-image: park_and_ride-permissive.svg; -} + area|z17-[aerialway=station]::d1p2, node|z17-[aerialway=station]::d1p2 { @@ -12525,18 +6601,6 @@ node|z17-[aerialway=station]::d1p2 symbol-fill-color: #3050d8; symbol-size: 3.2; } -line|z17-[aeroway=taxiway] -{ - casing-linecap: none; - color: #d4dcbd; - linecap: none; - width: 16; - z-index: 694; - linejoin: bevel; - casing-linejoin: bevel; - casing-width: 4; - casing-color: #202020; -} line|z17-[railway=funicular]::d1p2 { color: #e6b7b7; @@ -12556,31 +6620,12 @@ line|z17-[aerialway=gondola] width: 3.2; z-index: 910; } -line|z17-[piste:type=downhill][piste:difficulty=intermediate] -{ - color: #ff4040; - width: 40; - z-index: 893; -} line|z17-[railway=preserved] { color: #909090; width: 3.2; z-index: 570; } -line|z17-[highway=trunk][embankment?]::d2p5 -{ - color: #6f4a18; - width: 34.4; - z-index: 263; - dashes: 0.8,8.8; - linecap: none; -} -line|z17-[highway=secondary][tunnel?]::d2p2 -{ - color: white; - width: 12; -} line|z17-[boundary=administrative][border_type=municipality] { color: #f9574b; @@ -12590,31 +6635,6 @@ line|z17-[boundary=administrative][border_type=municipality] z-index: 971; dashes: 12,4,4,4; } -line|z17-[railway=funicular][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #e6b7b7; - linecap: none; - width: 2; - z-index: 804; - dashes: 3.2,3.2; -} -line|z17-[highway=motorway][cutting?]::d2p2 -{ - color: #f8f8f8; - width: 32.8; - z-index: 299; - dashes: 4,0.8,4,0.8; - linecap: none; -} -line|z17-[railway=spur][tunnel?] -{ - color: #606060; - width: 2.4; - z-index: 810; - dashes: 3.2,3.2; - linecap: none; -} line|z17-[railway=preserved]::d1p3 { color: #333333; @@ -12623,21 +6643,6 @@ line|z17-[railway=preserved]::d1p3 dashes: 12,12; linecap: none; } -line|z17-[highway=track][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 9.6; - z-index: 260; -} -line|z17-[railway][disused?][tunnel?] -{ - opacity: 0.7; - color: grey; - linecap: none; - width: 3.2; - z-index: 775; - dashes: 3.2,3.2; -} line|z17-[man_made=breakwater] { color: #707070; @@ -12653,28 +6658,6 @@ line|z17-[boundary=administrative][admin_level=8] z-index: 964; dashes: 12,4,4,4; } -line|z17-[railway=yard][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #333333; - linecap: none; - width: 1.36; - z-index: 817; - dashes: 3.2,3.2; -} -line|z17-[railway=siding][tunnel?]::d2p3 -{ - color: #333333; - width: 1.36; - z-index: 818; - dashes: 3.2,3.2; - linecap: none; -} -area|z17-[sport=athletics], -node|z17-[sport=athletics] -{ - icon-image: athletics-borderless.svg; -} line|z17-[waterway=stream][intermittent=ephemeral] { color: #cde5ea; @@ -12683,39 +6666,10 @@ line|z17-[waterway=stream][intermittent=ephemeral] dashes: 1.6,1.6; linecap: none; } -line|z17-[highway=service][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 9.6; - z-index: 259; -} -line|z17-[highway=cycleway]::d1p2 +line|z17-[highway=cycleway] { color: #90bc90; width: 3; - z-index: 628; -} -line|z17-[barrier=bollard]::d1p2, -node|z17-[barrier=bollard]::d1p2 -{ - color: red; - linecap: none; - width: 0.8; - z-index: 951; - dashes: 0.0,4.0; -} -area|z17-[man_made=lighthouse], -node|z17-[man_made=lighthouse] -{ - icon-image: lighthouse.svg; -} -line|z17-[highway=service][service=driveway][tunnel?] -{ - color: #707070; - width: 4.8; - z-index: 717; - dashes: 3.2,3.2; - linecap: none; } area|z17-[landuse=construction], node|z17-[landuse=construction] @@ -12724,17 +6678,7 @@ node|z17-[landuse=construction] font-size: 14; text-color: #404040; } -line|z17-[highway=motorway_link][tunnel?]::d2p2 -{ - color: white; - width: 12; - z-index: 755; -} -area|z17-[tourism=information], -node|z17-[tourism=information] -{ - icon-image: information.svg; -} + line|z17-[highway=motorway]::d1p2 { color: #f08800; @@ -12744,33 +6688,10 @@ line|z17-[highway=motorway]::d1p2 casing-width: 2; casing-color: #b87c04; } -line|z17-[highway=road]::d1p2 +line|z17-[highway=road] { color: #d0d0d0; width: 10; - z-index: 647; -} -line|z17-[highway=trunk][cutting?] -{ - color: #6f4a18; - width: 34.4; - z-index: 298; -} -area|z17-[amenity=post_box]::d1p2, -node|z17-[amenity=post_box]::d1p2 -{ - icon-image: postbox.svg; -} -area|z17-[sport=bowls], -node|z17-[sport=bowls] -{ - icon-image: bowls-borderless.svg; -} -line|z17-[highway=motorway][embankment?]::d2p3 -{ - color: #3a7019; - width: 19.2; - z-index: 158; } line|z17-[railway=funicular]::d1p3 { @@ -12783,36 +6704,11 @@ line|z17-[highway=footway] color: #c0bcac; width: 3; } -line|z17-[railway=tram][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #4c0f4c; - linecap: none; - width: 2; - z-index: 795; - dashes: 3.2,3.2; -} line|z17-[highway=steps] { color: #a0a090; width: 6; } -line|z17-[highway=track][tunnel?] -{ - color: #d79331; - width: 8; - z-index: 713; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=steps][cutting?]::d2p3 -{ - color: #f8f8f8; - width: 19.2; - z-index: 325; - dashes: 8.8,0.8; - linecap: none; -} line|z17-[waterway=drain]::d1p2 { width: 6.4; @@ -12821,11 +6717,6 @@ line|z17-[waterway=drain]::d1p2 casing-width: 0.8; casing-color: #b0b0b0; } -area|z17-[sport=archery], -node|z17-[sport=archery] -{ - icon-image: archery-borderless.svg; -} line|z17-[highway=secondary] { font-size: 16; @@ -12835,25 +6726,6 @@ line|z17-[highway=secondary] text-color: #404040; text-halo-color: #fffb80; } -line|z17-[highway=trunk][embankment?]::d2p4 -{ - color: #f8f8f8; - width: 17.6; - z-index: 164; -} -line|z17-[piste:lift=t-bar]::d2p2 -{ - color: #202020; - width: 32; - z-index: 904; - dashes: 1.6,160; - linecap: none; -} -area|z17-[leisure=stadium]::d1p3, -node|z17-[leisure=stadium]::d1p3 -{ - z-index: 64; -} line|z17-[highway=track][tracktype=grade5] { color: #c0a87c; @@ -12875,64 +6747,17 @@ line|z17-[highway=path][sac_scale=difficult_alpine_hiking] dashes: 0.08,1.2; linecap: none; } -line|z17-[railway=narrow_gauge][tunnel?] -{ - color: #333333; - width: 3.2; - z-index: 784; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[highway=path][tunnel?]::d2p2 -{ - color: white; - width: 3.6; - z-index: 708; -} line|z17-[highway=track][tracktype=grade1] { color: #d79331; width: 4; - z-index: 636; -} -line|z17-[highway=byway][tunnel?] -{ - color: #505050; - width: 8; - z-index: 711; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[railway=light_rail][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 791; -} -line|z17-[highway=trunk][embankment?]::d2p7 -{ - color: #6f4a18; - width: 19.2; - z-index: 267; } line|z17-[boundary=administrative][admin_level=2] { color: yellow; width: 6; - z-index: 968; -x-kot-layer: top; } -area|z17-[sport=basketball], -node|z17-[sport=basketball] -{ - icon-image: basketball-borderless.svg; -} -line|z17-[railway=narrow_gauge][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 785; -} line|z17-[railway=abandoned]::d1p2 { color: white; @@ -12954,59 +6779,14 @@ line|z17-[railway=yard]::d1p3 dashes: 7.2,16.8; linecap: none; } -line|z17-[railway=tram][tunnel?]::d2p2 -{ - color: white; - width: 2; - z-index: 794; -} -line|z17-[highway=bridleway][embankment?]::d2p2 -{ - color: #3a7019; - width: 20; - z-index: 212; - dashes: 0.8,4,0.8,4; - linecap: none; -} line|z17-[highway=path][sac_scale][sac_scale=alpine_hiking] { color: blue; width: 0.8; - z-index: 885; -} -line|z17-[railway=subway][tunnel?]::d2p3 -{ - opacity: 0.3; - color: #0f0f4c; - linecap: none; - width: 2; - z-index: 798; - dashes: 3.2,3.2; -} -line|z17-[piste:type=downhill][piste:difficulty=expert] -{ - color: #f6800a; - width: 40; - z-index: 895; -} -line|z17-[highway=track][cutting?] -{ - color: #6f4a18; - width: 24.8; - z-index: 310; -} -line|z17-[power=line][location=underground] -{ - color: grey; - width: 0.8; - z-index: 918; - dashes: 2.4,4,2.4,4,2.4,8.8; - linecap: none; } -line|z17-[highway=tertiary]::d1p2 +line|z17-[highway=tertiary] { color: #ffff90; - z-index: 459; casing-width: 2; width: 12; casing-color: #c8c860; @@ -13038,10 +6818,6 @@ line|z17-[barrier=hedge] width: 1; z-index: 952; } -area|z17-[natural=wetland]::d1p2 -{ - z-index: 119; -} line|z17-[highway=footway][sac_scale=mountain_hiking] { color: red; @@ -13054,36 +6830,6 @@ line|z17-[piste:type=sled] { color: #f0e0dc; width: 20; - z-index: 899; -} -line|z17-[highway=bridleway][tunnel?] -{ - color: #707070; - width: 8; - z-index: 709; - dashes: 3.2,3.2; - linecap: none; -} -line|z17-[railway=incline][tunnel?]::d2p4 -{ - opacity: 0.3; - color: #4c0f0f; - linecap: none; - width: 0.64; - z-index: 805; - dashes: 3.2,3.2; -} -line|z17-[highway=track][embankment?]::d2p7 -{ - color: #6f4a18; - width: 11.2; - z-index: 289; -} -line|z17-[railway=siding][tunnel?]::d2p2 -{ - color: white; - width: 1.36; - z-index: 815; } line|z17-[railway=narrow_gauge]::d1p3 { @@ -13093,26 +6839,7 @@ line|z17-[railway=narrow_gauge]::d1p3 dashes: 14.4,14.4; linecap: none; } -line|z17-[power=line] -{ - color: white; - width: 1.6; - z-index: 917; - opacity: 0.5; -} -area|z17-[amenity=school]::d1p2, -node|z17-[amenity=school]::d1p2 -{ - icon-image: school.svg; -} -line|z17-[highway=track][embankment?]::d2p6 -{ - color: #6f4a18; - width: 20; - z-index: 282; - dashes: 0.8,4,0.8,4; - linecap: none; -} + line|z17-[power=minor_line] { color: white; @@ -13121,17 +6848,11 @@ line|z17-[power=minor_line] opacity: 0.5; } -line|z17-[highway=primary_link][tunnel?]::d2p2 -{ - color: white; - width: 12; -} - area[waterway=riverbank], line[waterway=river], line[waterway=canal] { - z-index: 200; + z-index: 20; } area|z15-[area:highway=footway], @@ -13150,9 +6871,21 @@ line[highway=steps] z-index: 50; } +line[highway=steps], +{ + z-index: 50.6; +} + +line[highway=cycleway], +line[highway=track] +{ + z-index: 50.5; +} + area|z15-[area:highway=service], area|z15-[area:highway=residential], -area|z15-[area:highway=unclassified] +area|z15-[area:highway=unclassified], +area|z15-[area:highway=living_street] { fill-color: white; } @@ -13164,23 +6897,22 @@ line[highway=unclassified] } area|z15-[area:highway=living_street] {fill-color: #707070;} -line[highway=living_street] {z-index: 51} +line[highway=living_street] {z-index: 50} area|z15-[area:highway=primary] {fill-color: #ffc444} -line[highway=primary]{z-index: 52} +line[highway=primary], line[highway=primary_link]{z-index: 54} area|z15-[area:highway=secondary]{fill-color: #fffb80} -line[highway=secondary]{z-index: 53} +line[highway=secondary], line[highway=secondary_link]{z-index: 53} area|z15-[area:highway=tertiary]{fill-color: #fffb80} -line[highway=tertiary] {z-index: 54} +line[highway=tertiary], line[highway=tertiary_link]{z-index: 52} area|z15-[area:highway=motorway]{fill-color: #f08800} -line[highway=motorway]{z-index: 55} +line[highway=motorway], line[highway=motorway_link]{z-index: 55} area|z15-[area:highway=trunk]{fill-color: #ffc444} -line[highway=trunk]{z-index: 56} - +line[highway=trunk], line[highway=trunk_link]{z-index: 56} area[area:highway] { @@ -13194,47 +6926,150 @@ node|z17-[entrance] symbol-size: 1; } -line[access][access!=yes] -{ - opacity: 0.2; +node|z15-[railway=station], +area|z15-[railway=station], +node|z13-[railway=station][transport=subway] +{ + font-size: 12; + text-halo-radius: 2; + text: name; + text-color: #3050d8; + text-offset: 10; + text-halo-color: #f8fcff; + z-index: 150; } -line|z16-[bridge?]::bridgewhite + +/* POI icons */ + +area|z17-[tourism=information][office], +node|z17-[tourism=information][office] { - z-index: 3; - casing-width: eval(prop("width")/2+4); - casing-linecap: none; - casing-color: white; + icon-image: information-office.svg; } -line|z16-[bridge?]::bridgeblack +area|z17-[barrier=gate], +node|z17-[barrier=gate] { - casing-width: eval(prop("width")/2+5); - casing-linecap: none; - casing-color: #707070; + icon-image: gate.svg; +} +area|z16[highway=bus_stop], +node|z16[highway=bus_stop] +{ + icon-image: bus-mini.svg; + z-index: 20; +} +area|z16-[amenity=bus_station], +area|z17-[highway=bus_stop], +node|z16-[amenity=bus_station], +node|z17-[highway=bus_stop] +{ + icon-image: bus.svg; + z-index: 20; +} +area|z17-[railway=tram_stop], +node|z17-[railway=tram_stop] +{ + icon-image: tramway.svg; +} +area|z17-[amenity=parking][parking=park_and_ride], +node|z17-[amenity=parking][parking=park_and_ride] +{ + icon-image: park_and_ride-permissive.svg; +} +area|z16[amenity=parking][!access]::d1p2, +area|z16[amenity=parking][access?]::d1p2, +node|z16[amenity=parking][!access]::d1p2, +node|z16[amenity=parking][access?]::d1p2 +{ + icon-image: parking-mini.svg; +} +area|z17-[man_made=lighthouse], +node|z17-[man_made=lighthouse] +{ + icon-image: lighthouse.svg; +} +area|z17-[tourism=information], +node|z17-[tourism=information] +{ + icon-image: information.svg; } -line|z16-[oneway?]::arrows + +area|z17-[amenity=post_box]::d1p2, +node|z17-[amenity=post_box]::d1p2 { - pattern-offset: 200; - z-index: 1000; - pattern-image: arrow.svg; - pattern-spacing: 234; + icon-image: postbox.svg; +} +area|z16-[amenity=bank], +node|z16-[amenity=bank] +{ + icon-image: bank.svg; + z-index: 5; +} +area|z16-[amenity=pub]::d1p2, +node|z16-[amenity=pub]::d1p2 +{ + icon-image: pub.svg; } +node|z17-[amenity=recycling] +{ + icon-image: recycling.svg; +} +node|z16-[amenity=telephone] +{ + icon-image: telephone.svg; +} -node|z15-[railway=station], -node|z13-[railway=station][transport=subway] -{ - font-size: 12; - text-halo-radius: 2; - text: name; - text-color: #3050d8; - text-offset: 10; - text-halo-color: #f8fcff; +area|z17-[sport=handball], +node|z17-[sport=handball] +{ + icon-image: handball-borderless.svg; +} +area|z17-[sport=golf], +node|z17-[sport=golf] +{ + icon-image: golfCourse.svg; +} +area|z17-[leisure=golf_course]::d1p2, +node|z17-[leisure=golf_course]::d1p2 +{ + icon-image: golfcourse.svg; } +area|z17-[sport=baseball], +node|z17-[sport=baseball] +{ + icon-image: baseball-borderless.svg; +} +area|z17-[sport=athletics], +node|z17-[sport=athletics] +{ + icon-image: athletics-borderless.svg; +} +area|z17-[sport=bowls], +node|z17-[sport=bowls] +{ + icon-image: bowls-borderless.svg; +} +area|z17-[sport=archery], +node|z17-[sport=archery] +{ + icon-image: archery-borderless.svg; +} +area|z17-[sport=basketball], +node|z17-[sport=basketball] +{ + icon-image: basketball-borderless.svg; +} +area|z17-[amenity=school], +node|z17-[amenity=school] +{ + icon-image: school.svg; +} + area|z14-16[railway=halt], area|z14-15[railway=station], @@ -13242,6 +7077,7 @@ node|z14-16[railway=halt], node|z14-15[railway=station], { icon-image: railway-station-mini.svg; + z-index: 150; } area|z17-[railway=halt], @@ -13271,9 +7107,47 @@ node|z16-[railway=station][transport=subway] } -[highway][area?] -{fill-color: eval(prop("color")); width: 0; casing-width: 0} +/* Eval magic */ -/* line{casing-width: eval(cond(prop("casing-width")==0, 0, max(prop("casing-width"),1)))} */
\ No newline at end of file +line|z16-[bridge?]::bridgewhite, +line|z16-[tunnel?]::tunnelwhite, +{ + z-index: 3; + casing-width: eval(prop("width")/2+4); + casing-linecap: none; + casing-color: white; +} + +line|z16-[bridge?]::bridgeblack +{ + casing-width: eval(prop("width")/2+5); + casing-linecap: none; + casing-color: #707070; +} + +line|z16-[tunnel?]::tunnelblack +{ + casing-width: eval(prop("width")/2+5); + casing-linecap: none; + casing-color: #707070; + casing-dashes: 5,5; +} + +line|z16-[oneway?]::arrows +{ + pattern-offset: 200; + z-index: 1000; + pattern-image: arrow.svg; + pattern-spacing: 234; +} + +line[access][access!=yes]::* +{ + opacity: 0; + casing-opacity: 0; +} + +[highway][area?] +{fill-color: eval(prop("color")); width: 0; casing-width: 0}
\ No newline at end of file diff --git a/data/types.txt b/data/types.txt index badbed57bb..23d762c73a 100644 --- a/data/types.txt +++ b/data/types.txt @@ -233,7 +233,7 @@ highway|cycleway|tunnel amenity|parking|permissive boundary|administrative|5 highway|unclassified|tunnel -highway|track|destination +highway|track highway|trunk highway|residential|tunnel aeroway|helipad @@ -282,7 +282,7 @@ boundary|administrative|3 man_made|pipeline boundary|administrative highway|road -highway|path|destination +highway|path sport|athletics landuse|railway leisure|slipway @@ -303,7 +303,7 @@ amenity|restaurant|hotel power|generator highway|pedestrian|bridge man_made|pipeline|overground -amenity|parking|destination +amenity|parking highway|unclassified highway|raceway highway|primary|tunnel @@ -348,7 +348,7 @@ piste:type|downhill|advanced sport|shooting place|country highway|path|alpine_hiking -highway|footway|destination +highway|footway sport|scuba_diving highway|cycleway|permissive highway|unclassified|area @@ -362,11 +362,11 @@ highway|footway|mountain_hiking highway|service|driveway|bridge amenity|parking|multi-storey|fee mapswithme -highway|byway +highway|track piste:type|downhill|novice railway|narrow_gauge|bridge mapswithme -highway|service|parking_aisle|tunnel +highway|service|parking_aisle highway|bridleway|permissive mapswithme highway|primary_link @@ -389,7 +389,7 @@ place|city|capital aerialway|cable_car piste:type|downhill sport|american_football -highway|cycleway|destination +highway|cycleway man_made|cairn railway|preserved|bridge highway|path|demanding_alpine_hiking @@ -412,7 +412,7 @@ man_made|pipeline leisure|park|private highway|secondary noexit|motor_vehicle -highway|service|parking_aisle|bridge +highway|service|parking_aisle highway|motorway|tunnel railway|light_rail|tunnel area:highway|service @@ -462,13 +462,13 @@ sport|handball boundary|administrative|city piste:type|downhill|freeride amenity|restaurant|vegetarian -communication|line|submarine +communication|line piste:type|downhill|expert landuse|salt_pond natural|water railway|monorail|bridge area:highway|steps -railway|proposed +mapswithme mapswithme highway|construction natural|grass @@ -509,7 +509,7 @@ natural|water railway|spur|bridge mapswithme highway|tertiary_link -highway|track|grade3|destination +highway|track sport|curling natural|water landuse|forest @@ -528,7 +528,7 @@ highway|footway highway|primary_link|tunnel highway|footway|alpine_hiking mapswithme -highway|byway|bridge +highway|track man_made|pipeline leisure|landscape_reserve mapswithme @@ -548,13 +548,13 @@ highway|construction highway|unclassified highway|bridleway waterway|lock_gate -railway|proposed|tunnel +mapswithme mapswithme highway|unclassified highway|construction highway|footway|demanding_alpine_hiking -railway|proposed|bridge -highway|track|grade4|destination +mapswithme +highway|track mapswithme landuse|farmland highway|unclassified @@ -566,7 +566,7 @@ man_made|pipeline highway|construction natural|water mapswithme -highway|track|grade5|destination +highway|track natural|water mapswithme natural|water @@ -581,16 +581,16 @@ highway|track|grade5|private mapswithme landuse|forest highway|construction -highway|track|racetrack +mapswithme mapswithme mapswithme aerialway|mixed_lift mapswithme highway|footway -power|line|submarine +power|line highway|track|grade3|permissive highway|track|grade4|private -highway|byway|permissive +highway|track mapswithme highway|service mapswithme @@ -604,14 +604,14 @@ highway|footway boundary|administrative|nation mapswithme mapswithme -highway|byway|tunnel +highway|track piste:lift|magic_carpet mapswithme highway|unclassified -highway|bridleway|destination -mapswithme +highway|bridleway mapswithme mapswithme +highway|unclassified mapswithme mapswithme highway|track @@ -620,7 +620,7 @@ piste:lift|j-bar mapswithme mapswithme mapswithme -highway|byway|private +highway|track landuse|forest mapswithme railway|siding|bridge @@ -638,7 +638,7 @@ mapswithme mapswithme highway|construction mapswithme -mapswithme +leisure|park highway|footway mapswithme mapswithme @@ -656,7 +656,7 @@ mapswithme railway|incline|tunnel boundary|administrative|municipality highway|path -highway|byway|destination +highway|bridleway mapswithme communication|line highway|tertiary_link @@ -737,15 +737,15 @@ boundary|administrative|4|state place|state|USA building|address amenity|parking|no-access -highway|bridleway -highway|bridleway -highway|bridleway -highway|bridleway -highway|bridleway|no-access -highway|bridleway -highway|bridleway -highway|bridleway -highway|bridleway +highway|track +highway|track +highway|track +highway|track +highway|track +highway|track +highway|track +highway|track +highway|track highway|cycleway highway|cycleway highway|cycleway @@ -822,7 +822,7 @@ highway|track|grade3|no-access highway|track|grade4|no-access highway|track|grade5|no-access highway|track|no-access -highway|track|race +mapswithme highway|trunk highway|trunk highway|trunk @@ -838,7 +838,7 @@ highway|unclassified highway|unclassified highway|unclassified highway|unclassified -landuse|conservation|destination +mapswithme landuse|conservation|no-access landuse|conservation|permissive mapswithme @@ -846,7 +846,7 @@ mapswithme leisure|dog_park|tennis leisure|park|no-access leisure|playing_fields|tennis -leisure|recreation_ground|destination +mapswithme leisure|recreation_ground|no-access man_made|pipeline man_made|pipeline |