diff --git a/data/classificator.txt b/data/classificator.txt index 703eaa8082..42fe8d43db 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -56,9 +56,6 @@ world + fee - {} private - - public + - fee - - {} underground + fee - {} diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 74358c65ab..28cdb31932 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index d9e8520631..b2cd8ab3c9 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -5,7 +5,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1591 + priority: 1592 } } element { @@ -13,7 +13,7 @@ cont { lines { width: 1.6 color: 0x202020 - priority: 1762 + priority: 1763 } } element { @@ -32,7 +32,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1596 + priority: 1597 } } element { @@ -40,7 +40,7 @@ cont { lines { width: 1.6 color: 0x202020 - priority: 1767 + priority: 1768 } } element { @@ -59,7 +59,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1594 + priority: 1595 } } element { @@ -75,7 +75,7 @@ cont { lines { width: 3.2 color: 0x202020 - priority: 1850 + priority: 1851 } } } @@ -86,7 +86,7 @@ cont { lines { width: 0.8 color: 0x202020 - priority: 1599 + priority: 1600 } } element { @@ -403,7 +403,7 @@ cont { lines { width: 3 color: 0x202020 - priority: 234 + priority: 236 cap: BUTTCAP join: BEVELJOIN } @@ -412,7 +412,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1234 + priority: 1236 } } element { @@ -420,7 +420,7 @@ cont { lines { width: 3.5 color: 0x202020 - priority: 246 + priority: 248 cap: BUTTCAP join: BEVELJOIN } @@ -429,7 +429,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1246 + priority: 1248 } } element { @@ -437,7 +437,7 @@ cont { lines { width: 14 color: 0x202020 - priority: 339 + priority: 341 cap: BUTTCAP join: BEVELJOIN } @@ -446,7 +446,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1339 + priority: 1341 } } element { @@ -508,7 +508,7 @@ cont { lines { width: 0.74 color: 0x202020 - priority: 237 + priority: 239 cap: BUTTCAP join: BEVELJOIN } @@ -517,7 +517,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1237 + priority: 1239 } } element { @@ -525,7 +525,7 @@ cont { lines { width: 1.5 color: 0x202020 - priority: 249 + priority: 251 cap: BUTTCAP join: BEVELJOIN } @@ -534,7 +534,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1249 + priority: 1251 } } element { @@ -542,7 +542,7 @@ cont { lines { width: 6 color: 0x202020 - priority: 342 + priority: 343 cap: BUTTCAP join: BEVELJOIN } @@ -551,7 +551,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1342 + priority: 1343 } } element { @@ -559,7 +559,7 @@ cont { lines { width: 12 color: 0x202020 - priority: 418 + priority: 419 cap: BUTTCAP join: BEVELJOIN } @@ -568,7 +568,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1418 + priority: 1419 } } element { @@ -576,7 +576,7 @@ cont { lines { width: 12 color: 0x202020 - priority: 418 + priority: 419 cap: BUTTCAP join: BEVELJOIN } @@ -585,7 +585,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1418 + priority: 1419 } } element { @@ -593,7 +593,7 @@ cont { lines { width: 12 color: 0x202020 - priority: 418 + priority: 419 cap: BUTTCAP join: BEVELJOIN } @@ -602,7 +602,7 @@ cont { color: 0xD4DCBD cap: BUTTCAP join: BEVELJOIN - priority: 1418 + priority: 1419 } } } @@ -657,7 +657,7 @@ cont { scale: 16 symbol { name: "atm" - priority: 16002 + priority: 16004 } caption { primary { @@ -666,14 +666,14 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } } element { scale: 17 symbol { name: "atm" - priority: 16002 + priority: 16004 } caption { primary { @@ -682,7 +682,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } } } @@ -692,7 +692,7 @@ cont { scale: 16 symbol { name: "bank" - priority: 16007 + priority: 16009 } caption { primary { @@ -701,14 +701,14 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15007 + priority: 15009 } } element { scale: 17 symbol { name: "bank" - priority: 16007 + priority: 16009 } caption { primary { @@ -717,7 +717,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15007 + priority: 15009 } } } @@ -725,6 +725,10 @@ cont { name: "amenity-bar" element { scale: 16 + symbol { + name: "bar" + priority: 16004 + } caption { primary { height: 11 @@ -732,15 +736,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bar" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "bar" + priority: 16004 + } caption { primary { height: 12 @@ -748,11 +752,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bar" - priority: 16000 + priority: 15004 } } } @@ -777,6 +777,10 @@ cont { name: "amenity-bicycle_rental" element { scale: 16 + symbol { + name: "bicycle_rental" + priority: 16004 + } caption { primary { height: 11 @@ -784,15 +788,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bicycle_rental" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "bicycle_rental" + priority: 16004 + } caption { primary { height: 12 @@ -800,11 +804,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bicycle_rental" - priority: 16000 + priority: 15004 } } } @@ -812,6 +812,10 @@ cont { name: "amenity-bureau_de_change" element { scale: 16 + symbol { + name: "bureau_de_change" + priority: 16004 + } caption { primary { height: 11 @@ -819,15 +823,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bureau_de_change" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "bureau_de_change" + priority: 16004 + } caption { primary { height: 12 @@ -835,11 +839,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bureau_de_change" - priority: 16000 + priority: 15004 } } } @@ -849,14 +849,14 @@ cont { scale: 16 symbol { name: "bus" - priority: 16014 + priority: 16017 } } element { scale: 17 symbol { name: "bus" - priority: 16014 + priority: 16017 } caption { primary { @@ -865,7 +865,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15014 + priority: 15017 } } } @@ -875,7 +875,7 @@ cont { scale: 16 symbol { name: "cafe" - priority: 16002 + priority: 16004 } caption { primary { @@ -884,14 +884,14 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } } element { scale: 17 symbol { name: "cafe" - priority: 16002 + priority: 16004 } caption { primary { @@ -900,7 +900,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } } } @@ -908,6 +908,10 @@ cont { name: "amenity-car_rental" element { scale: 16 + symbol { + name: "car_rental" + priority: 16004 + } caption { primary { height: 11 @@ -915,15 +919,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "car_rental" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "car_rental" + priority: 16004 + } caption { primary { height: 12 @@ -931,11 +935,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "car_rental" - priority: 16000 + priority: 15004 } } } @@ -943,6 +943,10 @@ cont { name: "amenity-car_sharing" element { scale: 16 + symbol { + name: "car_sharing" + priority: 16004 + } caption { primary { height: 12 @@ -950,15 +954,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "car_sharing" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "car_sharing" + priority: 16004 + } caption { primary { height: 12 @@ -966,11 +970,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "car_sharing" - priority: 16000 + priority: 15004 } } } @@ -978,6 +978,10 @@ cont { name: "amenity-cinema" element { scale: 16 + symbol { + name: "cinema" + priority: 16004 + } caption { primary { height: 11 @@ -985,15 +989,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "cinema" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "cinema" + priority: 16004 + } caption { primary { height: 12 @@ -1001,11 +1005,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "cinema" - priority: 16000 + priority: 15004 } } } @@ -1055,6 +1055,10 @@ cont { name: "amenity-doctors" element { scale: 16 + symbol { + name: "pharmacy" + priority: 16004 + } caption { primary { height: 11 @@ -1062,15 +1066,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "pharmacy" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "pharmacy" + priority: 16004 + } caption { primary { height: 12 @@ -1078,11 +1082,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "pharmacy" - priority: 16000 + priority: 15004 } } } @@ -1107,6 +1107,10 @@ cont { name: "amenity-embassy" element { scale: 16 + symbol { + name: "embassy" + priority: 16004 + } caption { primary { height: 11 @@ -1114,15 +1118,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "embassy" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "embassy" + priority: 16004 + } caption { primary { height: 12 @@ -1130,11 +1134,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "embassy" - priority: 16000 + priority: 15004 } } } @@ -1142,6 +1142,10 @@ cont { name: "amenity-fast_food" element { scale: 16 + symbol { + name: "fastfood" + priority: 16004 + } caption { primary { height: 11 @@ -1149,15 +1153,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "fastfood" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "fastfood" + priority: 16004 + } caption { primary { height: 12 @@ -1165,11 +1169,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "fastfood" - priority: 16000 + priority: 15004 } } } @@ -1177,6 +1177,10 @@ cont { name: "amenity-fire_station" element { scale: 16 + symbol { + name: "firebrigade" + priority: 16004 + } caption { primary { height: 11 @@ -1184,15 +1188,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "firebrigade" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "firebrigade" + priority: 16004 + } caption { primary { height: 12 @@ -1200,11 +1204,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "firebrigade" - priority: 16000 + priority: 15004 } } } @@ -1212,17 +1212,21 @@ cont { name: "amenity-fountain" element { scale: 16 - area { - color: 0xCDE5EA - priority: 1001 - } symbol { name: "fountain" priority: 16000 } + area { + color: 0xCDE5EA + priority: 1001 + } } element { scale: 17 + symbol { + name: "fountain" + priority: 16004 + } caption { primary { height: 12 @@ -1230,11 +1234,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "fountain" - priority: 16000 + priority: 15004 } area { color: 0xCDE5EA @@ -1253,6 +1253,10 @@ cont { } element { scale: 16 + symbol { + name: "petrolstation" + priority: 16004 + } caption { primary { height: 11 @@ -1260,15 +1264,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "petrolstation" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "petrolstation" + priority: 16004 + } caption { primary { height: 12 @@ -1276,11 +1280,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "petrolstation" - priority: 16000 + priority: 15004 } } } @@ -1378,6 +1378,10 @@ cont { } element { scale: 17 + symbol { + name: "hospital" + priority: 16004 + } caption { primary { height: 12 @@ -1385,11 +1389,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hospital" - priority: 16000 + priority: 15004 } } } @@ -1397,6 +1397,10 @@ cont { name: "amenity-hunting_stand" element { scale: 16 + symbol { + name: "hunting_closed_high" + priority: 16004 + } caption { primary { height: 11 @@ -1404,15 +1408,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hunting_closed_high" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "hunting_closed_high" + priority: 16004 + } caption { primary { height: 12 @@ -1420,11 +1424,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hunting_closed_high" - priority: 16000 + priority: 15004 } } } @@ -1481,6 +1481,10 @@ cont { } element { scale: 17 + symbol { + name: "library" + priority: 16004 + } caption { primary { height: 12 @@ -1488,11 +1492,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "library" - priority: 16000 + priority: 15004 } } } @@ -1500,6 +1500,10 @@ cont { name: "amenity-marketplace" element { scale: 16 + symbol { + name: "supermarket" + priority: 16004 + } caption { primary { height: 12 @@ -1507,15 +1511,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "supermarket" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "supermarket" + priority: 16004 + } caption { primary { height: 12 @@ -1523,11 +1527,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "supermarket" - priority: 16000 + priority: 15004 } } } @@ -1535,6 +1535,10 @@ cont { name: "amenity-nightclub" element { scale: 16 + symbol { + name: "bar" + priority: 16004 + } caption { primary { height: 12 @@ -1542,15 +1546,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bar" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "bar" + priority: 16004 + } caption { primary { height: 12 @@ -1558,11 +1562,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bar" - priority: 16000 + priority: 15004 } } } @@ -1577,25 +1577,25 @@ cont { } element { scale: 16 - area { - color: 0xF8F8D8 - priority: 1001 - } symbol { name: "parking-mini" priority: 16000 } - } - element { - scale: 17 area { color: 0xF8F8D8 priority: 1001 } + } + element { + scale: 17 symbol { name: "parking" priority: 16000 } + area { + color: 0xF8F8D8 + priority: 1001 + } } } cont { @@ -1609,14 +1609,14 @@ cont { } element { scale: 16 - area { - color: 0xF8F8D8 - priority: 1001 - } symbol { name: "parking-mini" priority: 16000 } + area { + color: 0xF8F8D8 + priority: 1001 + } } element { scale: 17 @@ -1641,19 +1641,19 @@ cont { } element { scale: 16 - area { - color: 0xF8F8D8 - priority: 1001 - } symbol { name: "parking-mini" priority: 16000 } + area { + color: 0xF8F8D8 + priority: 1001 + } } element { scale: 17 symbol { - name: "parking_roof-permissive" + name: "parking" priority: 16000 } area { @@ -1673,14 +1673,14 @@ cont { } element { scale: 16 - area { - color: 0xF8F8D8 - priority: 1001 - } symbol { name: "parking-mini" priority: 16000 } + area { + color: 0xF8F8D8 + priority: 1001 + } } element { scale: 17 @@ -1705,14 +1705,14 @@ cont { } element { scale: 16 - area { - color: 0xF8F8D8 - priority: 1001 - } symbol { name: "parking-mini" priority: 16000 } + area { + color: 0xF8F8D8 + priority: 1001 + } } element { scale: 17 @@ -1771,19 +1771,19 @@ cont { } element { scale: 16 - area { - color: 0xF8F8D8 - priority: 1001 - } symbol { name: "parking-mini" priority: 16000 } + area { + color: 0xF8F8D8 + priority: 1001 + } } element { scale: 17 symbol { - name: "parking_roof-permissive" + name: "parking" priority: 16000 } area { @@ -1803,14 +1803,14 @@ cont { } element { scale: 16 - area { - color: 0xF8F8D8 - priority: 1001 - } symbol { name: "parking-mini" priority: 16000 } + area { + color: 0xF8F8D8 + priority: 1001 + } } element { scale: 17 @@ -1835,6 +1835,10 @@ cont { } element { scale: 17 + symbol { + name: "pharmacy" + priority: 16004 + } caption { primary { height: 12 @@ -1842,11 +1846,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "pharmacy" - priority: 16000 + priority: 15004 } } } @@ -1854,6 +1854,10 @@ cont { name: "amenity-place_of_worship" element { scale: 16 + symbol { + name: "religion" + priority: 16004 + } caption { primary { height: 11 @@ -1861,15 +1865,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "religion" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "religion" + priority: 16004 + } caption { primary { height: 12 @@ -1877,11 +1881,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "religion" - priority: 16000 + priority: 15004 } } } @@ -1889,6 +1889,10 @@ cont { name: "amenity-police" element { scale: 16 + symbol { + name: "police" + priority: 16004 + } caption { primary { height: 11 @@ -1896,15 +1900,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "police" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "police" + priority: 16004 + } caption { primary { height: 12 @@ -1912,11 +1916,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "police" - priority: 16000 + priority: 15004 } } } @@ -1924,6 +1924,10 @@ cont { name: "amenity-post_box" element { scale: 17 + symbol { + name: "postbox" + priority: 16004 + } caption { primary { height: 12 @@ -1931,11 +1935,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "postbox" - priority: 16000 + priority: 15004 } } } @@ -1943,6 +1943,10 @@ cont { name: "amenity-post_office" element { scale: 16 + symbol { + name: "postoffice" + priority: 16004 + } caption { primary { height: 11 @@ -1950,15 +1954,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "postoffice" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "postoffice" + priority: 16004 + } caption { primary { height: 12 @@ -1966,11 +1970,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "postoffice" - priority: 16000 + priority: 15004 } } } @@ -1978,6 +1978,10 @@ cont { name: "amenity-pub" element { scale: 16 + symbol { + name: "pub" + priority: 16004 + } caption { primary { height: 12 @@ -1985,15 +1989,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "pub" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "pub" + priority: 16004 + } caption { primary { height: 12 @@ -2001,11 +2005,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "pub" - priority: 16000 + priority: 15004 } } } @@ -2016,7 +2016,7 @@ cont { symbol { apply_for_type: 1 name: "recycling" - priority: 16002 + priority: 16004 } caption { primary { @@ -2025,7 +2025,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } } } @@ -2033,6 +2033,10 @@ cont { name: "amenity-restaurant" element { scale: 16 + symbol { + name: "restaurant" + priority: 16004 + } caption { primary { height: 11 @@ -2040,15 +2044,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "restaurant" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "restaurant" + priority: 16004 + } caption { primary { height: 12 @@ -2056,11 +2060,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "restaurant" - priority: 16000 + priority: 15004 } } } @@ -2068,6 +2068,10 @@ cont { name: "amenity-restaurant-hotel" element { scale: 16 + symbol { + name: "hotel_and_restaurant" + priority: 16004 + } caption { primary { height: 11 @@ -2075,15 +2079,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "restaurant" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "hotel_and_restaurant" + priority: 16004 + } caption { primary { height: 12 @@ -2091,11 +2095,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "restaurant" - priority: 16000 + priority: 15004 } } } @@ -2103,6 +2103,10 @@ cont { name: "amenity-restaurant-vegan" element { scale: 16 + symbol { + name: "restaurant" + priority: 16004 + } caption { primary { height: 11 @@ -2110,19 +2114,19 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "restaurant" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "restaurant" + priority: 16004 + } circle { radius: 2.4 color: 0x42FF29 - priority: 16002 + priority: 16004 } caption { primary { @@ -2131,7 +2135,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } } } @@ -2139,6 +2143,10 @@ cont { name: "amenity-restaurant-vegetarian" element { scale: 16 + symbol { + name: "restaurant" + priority: 16004 + } caption { primary { height: 11 @@ -2146,19 +2154,19 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "restaurant" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "restaurant" + priority: 16004 + } circle { radius: 2.4 color: 0x42FF29 - priority: 16002 + priority: 16004 } caption { primary { @@ -2167,7 +2175,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } } } @@ -2238,6 +2246,10 @@ cont { } element { scale: 17 + symbol { + name: "shelter" + priority: 16000 + } caption { primary { height: 12 @@ -2246,10 +2258,6 @@ cont { } priority: 15000 } - symbol { - name: "shelter" - priority: 16000 - } } } cont { @@ -2263,6 +2271,10 @@ cont { } element { scale: 17 + symbol { + name: "speed_trap" + priority: 16004 + } caption { primary { height: 12 @@ -2270,11 +2282,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "speed_trap" - priority: 16000 + priority: 15004 } } } @@ -2289,6 +2297,10 @@ cont { } element { scale: 17 + symbol { + name: "taxi" + priority: 16004 + } caption { primary { height: 12 @@ -2296,11 +2308,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "taxi" - priority: 16000 + priority: 15004 } } } @@ -2319,7 +2327,7 @@ cont { symbol { apply_for_type: 1 name: "telephone" - priority: 16002 + priority: 16004 } caption { primary { @@ -2328,7 +2336,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } } } @@ -2336,6 +2344,10 @@ cont { name: "amenity-theatre" element { scale: 16 + symbol { + name: "theatre" + priority: 16004 + } caption { primary { height: 12 @@ -2343,15 +2355,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "theatre" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "theatre" + priority: 16004 + } caption { primary { height: 12 @@ -2359,11 +2371,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "theatre" - priority: 16000 + priority: 15004 } } } @@ -2378,6 +2386,10 @@ cont { } element { scale: 17 + symbol { + name: "toilets" + priority: 16004 + } caption { primary { height: 12 @@ -2385,11 +2397,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "toilets" - priority: 16000 + priority: 15004 } } } @@ -2466,21 +2474,21 @@ cont { scale: 15 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } } @@ -2490,21 +2498,21 @@ cont { scale: 15 area { color: 0x707070 - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0x707070 - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0x707070 - priority: 1392 + priority: 1393 } } } @@ -2514,21 +2522,21 @@ cont { scale: 15 area { color: 0xF08800 - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xF08800 - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xF08800 - priority: 1392 + priority: 1393 } } } @@ -2538,21 +2546,21 @@ cont { scale: 15 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } } @@ -2562,21 +2570,21 @@ cont { scale: 15 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } } @@ -2586,21 +2594,21 @@ cont { scale: 15 area { color: 0xFFC444 - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xFFC444 - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xFFC444 - priority: 1392 + priority: 1393 } } } @@ -2610,21 +2618,21 @@ cont { scale: 15 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } } @@ -2634,21 +2642,21 @@ cont { scale: 15 area { color: 0xFFFB80 - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xFFFB80 - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xFFFB80 - priority: 1392 + priority: 1393 } } } @@ -2658,21 +2666,21 @@ cont { scale: 15 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } } @@ -2682,21 +2690,21 @@ cont { scale: 15 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xC0BCAC - priority: 1392 + priority: 1393 } } } @@ -2706,21 +2714,21 @@ cont { scale: 15 area { color: 0xFFFB80 - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xFFFB80 - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xFFFB80 - priority: 1392 + priority: 1393 } } } @@ -2730,21 +2738,21 @@ cont { scale: 15 area { color: 0xFFC444 - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xFFC444 - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xFFC444 - priority: 1392 + priority: 1393 } } } @@ -2754,21 +2762,21 @@ cont { scale: 15 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } element { scale: 16 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } element { scale: 17 area { color: 0xFFFFFF - priority: 1392 + priority: 1393 } } } @@ -2827,7 +2835,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1845 + priority: 1846 } } element { @@ -2884,7 +2892,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1938 + priority: 1939 } } } @@ -2905,7 +2913,7 @@ cont { lines { width: 0.4 color: 0xB0B0B0 - priority: 1811 + priority: 1812 } lines { width: 1 @@ -2915,7 +2923,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1816 + priority: 1817 } } element { @@ -2933,7 +2941,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1933 + priority: 1934 } } } @@ -3075,7 +3083,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11872 + priority: 11873 } } element { @@ -3088,7 +3096,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11955 + priority: 11956 } } } @@ -3120,7 +3128,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1107 + priority: 1109 } } element { @@ -3133,7 +3141,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1107 + priority: 1109 } } element { @@ -3146,12 +3154,12 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1119 + priority: 1121 } lines { width: 1 color: 0xEEEEDD - priority: 1117 + priority: 1119 } } element { @@ -3159,7 +3167,7 @@ cont { lines { width: 2.73 color: 0xFFFF00 - priority: 1119 + priority: 1121 } lines { width: 1.95 @@ -3169,7 +3177,7 @@ cont { dd: 4.69 } cap: BUTTCAP - priority: 1122 + priority: 1124 } } element { @@ -3177,7 +3185,7 @@ cont { lines { width: 3.12 color: 0xFFFF00 - priority: 1119 + priority: 1121 } lines { width: 2.34 @@ -3187,7 +3195,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1122 + priority: 1124 } } element { @@ -3195,7 +3203,7 @@ cont { lines { width: 3.12 color: 0xFFFF00 - priority: 1119 + priority: 1121 } lines { width: 2.34 @@ -3205,7 +3213,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1122 + priority: 1124 } } element { @@ -3213,7 +3221,7 @@ cont { lines { width: 3.12 color: 0xFFFF00 - priority: 1119 + priority: 1121 } lines { width: 2.34 @@ -3223,7 +3231,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1122 + priority: 1124 } } element { @@ -3231,7 +3239,7 @@ cont { lines { width: 3.12 color: 0xFFFF00 - priority: 1119 + priority: 1121 } lines { width: 2.34 @@ -3241,7 +3249,7 @@ cont { dd: 3.12 } cap: BUTTCAP - priority: 1122 + priority: 1124 } } element { @@ -3249,7 +3257,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11403 + priority: 11404 } lines { width: 2 @@ -3259,7 +3267,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11405 + priority: 11407 } } element { @@ -3267,7 +3275,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11430 + priority: 11431 } lines { width: 2 @@ -3277,7 +3285,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11432 + priority: 11434 } } element { @@ -3285,7 +3293,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11479 + priority: 11480 } lines { width: 2 @@ -3295,7 +3303,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11481 + priority: 11482 } } element { @@ -3303,7 +3311,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11706 + priority: 11707 } lines { width: 2 @@ -3321,7 +3329,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11889 + priority: 11890 } lines { width: 2 @@ -3365,7 +3373,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } } element { @@ -3378,7 +3386,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } } element { @@ -3391,12 +3399,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3409,12 +3417,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3427,12 +3435,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3445,12 +3453,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3463,12 +3471,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3481,12 +3489,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3499,12 +3507,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3517,12 +3525,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3535,12 +3543,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3553,12 +3561,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3571,12 +3579,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } element { @@ -3589,12 +3597,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1117 + priority: 1119 } lines { width: 1 color: 0xEEEEDD - priority: 1114 + priority: 1117 } } } @@ -3610,7 +3618,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } } element { @@ -3623,12 +3631,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } lines { width: 1 color: 0xEEEEDD - priority: 1110 + priority: 1112 } } element { @@ -3641,12 +3649,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } lines { width: 1 color: 0xEEEEDD - priority: 1110 + priority: 1112 } } element { @@ -3659,12 +3667,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } lines { width: 1 color: 0xEEEEDD - priority: 1110 + priority: 1112 } } element { @@ -3677,12 +3685,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } lines { width: 1 color: 0xEEEEDD - priority: 1110 + priority: 1112 } } element { @@ -3695,12 +3703,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } lines { width: 1.2 color: 0xEEEEDD - priority: 1110 + priority: 1112 } } element { @@ -3713,12 +3721,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 11396 + priority: 11397 } lines { width: 2 color: 0xEEEEDD - priority: 11393 + priority: 11395 } } } @@ -3734,12 +3742,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } lines { width: 1 color: 0xEEEEDD - priority: 1110 + priority: 1112 } } element { @@ -3752,12 +3760,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } lines { width: 1 color: 0xEEEEDD - priority: 1110 + priority: 1112 } } element { @@ -3770,12 +3778,12 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1112 + priority: 1114 } lines { width: 1 color: 0xEEEEDD - priority: 1110 + priority: 1112 } } element { @@ -3788,7 +3796,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1039 + priority: 1041 } lines { width: 0.12 @@ -3800,7 +3808,7 @@ cont { dd: 0.12 } cap: BUTTCAP - priority: 1041 + priority: 1043 } } element { @@ -3813,7 +3821,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1048 + priority: 1051 } lines { width: 0.25 @@ -3825,7 +3833,7 @@ cont { dd: 0.25 } cap: BUTTCAP - priority: 1051 + priority: 1053 } } element { @@ -3838,7 +3846,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 1048 + priority: 1051 } lines { width: 0.5 @@ -3850,7 +3858,7 @@ cont { dd: 0.5 } cap: BUTTCAP - priority: 1051 + priority: 1053 } } element { @@ -3863,7 +3871,7 @@ cont { dd: 0.6 } cap: BUTTCAP - priority: 11396 + priority: 11397 } lines { width: 1 @@ -3875,7 +3883,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 11151 + priority: 11153 } } element { @@ -3883,7 +3891,7 @@ cont { lines { width: 10 color: 0xFFFF00 - priority: 1149 + priority: 1151 } lines { width: 2 @@ -3895,7 +3903,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1151 + priority: 1153 } } element { @@ -3910,7 +3918,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11413 + priority: 11414 } } element { @@ -3925,7 +3933,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11437 + priority: 11439 } } element { @@ -3940,7 +3948,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11491 + priority: 11492 } } element { @@ -4001,7 +4009,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11476 + priority: 11478 } } element { @@ -4014,7 +4022,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11699 + priority: 11700 } } element { @@ -4056,7 +4064,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11474 + priority: 11475 } } element { @@ -4069,7 +4077,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11696 + priority: 11697 } } element { @@ -4106,7 +4114,7 @@ cont { lines { width: 1 color: 0xF9574B - priority: 11694 + priority: 11695 } } element { @@ -4155,7 +4163,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11877 + priority: 11878 } } element { @@ -4186,7 +4194,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11689 + priority: 11690 } } element { @@ -4245,7 +4253,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11899 + priority: 11900 } } element { @@ -4260,7 +4268,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11977 + priority: 11978 } } } @@ -4271,7 +4279,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11418 + priority: 11419 } lines { width: 2 @@ -4281,7 +4289,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11422 + priority: 11424 } } element { @@ -4289,7 +4297,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11442 + priority: 11443 } lines { width: 2 @@ -4299,7 +4307,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11447 + priority: 11448 } } element { @@ -4307,7 +4315,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11496 + priority: 11497 } lines { width: 2 @@ -4317,7 +4325,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11501 + priority: 11502 } } element { @@ -4325,7 +4333,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11735 + priority: 11736 } lines { width: 2 @@ -4335,7 +4343,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11740 + priority: 11741 } } element { @@ -4343,7 +4351,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11911 + priority: 11912 } lines { width: 2 @@ -4353,7 +4361,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11916 + priority: 11917 } } element { @@ -4387,7 +4395,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11486 + priority: 11487 } } element { @@ -4400,7 +4408,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11723 + priority: 11724 } } element { @@ -4444,7 +4452,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11718 + priority: 11719 } } element { @@ -4485,7 +4493,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11415 + priority: 11417 } lines { width: 2 @@ -4495,7 +4503,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11420 + priority: 11421 } } element { @@ -4503,7 +4511,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11440 + priority: 11441 } lines { width: 2 @@ -4513,7 +4521,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11444 + priority: 11446 } } element { @@ -4521,7 +4529,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11493 + priority: 11495 } lines { width: 2 @@ -4531,7 +4539,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11498 + priority: 11500 } } element { @@ -4539,7 +4547,7 @@ cont { lines { width: 6 color: 0xFFFF00 - priority: 11733 + priority: 11734 } lines { width: 2 @@ -4549,7 +4557,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 11738 + priority: 11739 } } element { @@ -4603,7 +4611,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11410 + priority: 11412 } } element { @@ -4618,7 +4626,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11435 + priority: 11436 } } element { @@ -4633,7 +4641,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11488 + priority: 11490 } } element { @@ -4648,7 +4656,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11728 + priority: 11729 } } element { @@ -4689,7 +4697,7 @@ cont { lines { width: 0.31 color: 0xFFFF00 - priority: 1036 + priority: 1039 } } element { @@ -4697,7 +4705,7 @@ cont { lines { width: 0.62 color: 0xFFFF00 - priority: 1039 + priority: 1041 } lines { width: 0.12 @@ -4709,7 +4717,7 @@ cont { dd: 0.12 } cap: BUTTCAP - priority: 1041 + priority: 1043 } } element { @@ -4717,7 +4725,7 @@ cont { lines { width: 1.25 color: 0xFFFF00 - priority: 1048 + priority: 1051 } lines { width: 0.25 @@ -4729,7 +4737,7 @@ cont { dd: 0.25 } cap: BUTTCAP - priority: 1051 + priority: 1053 } } element { @@ -4737,7 +4745,7 @@ cont { lines { width: 1 color: 0xFFFF00 - priority: 1048 + priority: 1051 } lines { width: 0.5 @@ -4749,7 +4757,7 @@ cont { dd: 0.5 } cap: BUTTCAP - priority: 1051 + priority: 1053 } } element { @@ -4757,7 +4765,7 @@ cont { lines { width: 5 color: 0xFFFF00 - priority: 1149 + priority: 1151 } lines { width: 1 @@ -4769,7 +4777,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 1151 + priority: 1153 } } element { @@ -4777,7 +4785,7 @@ cont { lines { width: 10 color: 0xFFFF00 - priority: 1149 + priority: 1151 } lines { width: 2 @@ -4789,7 +4797,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1151 + priority: 1153 } } element { @@ -4804,7 +4812,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11413 + priority: 11414 } } element { @@ -4819,7 +4827,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11437 + priority: 11439 } } element { @@ -4834,7 +4842,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11491 + priority: 11492 } } element { @@ -4895,7 +4903,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11716 + priority: 11717 } } element { @@ -4908,7 +4916,7 @@ cont { dd: 20 } cap: BUTTCAP - priority: 11894 + priority: 11895 } } element { @@ -4939,7 +4947,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 11154 + priority: 11156 } } element { @@ -4954,7 +4962,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 11154 + priority: 11156 } } element { @@ -4969,7 +4977,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11425 + priority: 11426 } } element { @@ -4984,7 +4992,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11449 + priority: 11451 } } element { @@ -4999,7 +5007,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 11503 + priority: 11504 } } element { @@ -5173,7 +5181,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1794 + priority: 1795 } lines { width: 0.4 @@ -5183,7 +5191,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1799 + priority: 1800 } } element { @@ -5221,7 +5229,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1794 + priority: 1795 } lines { width: 0.4 @@ -5231,7 +5239,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1799 + priority: 1800 } } element { @@ -5316,7 +5324,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1173 + priority: 1175 } } element { @@ -5329,7 +5337,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1261 + priority: 1263 } } element { @@ -5337,7 +5345,7 @@ cont { lines { width: 3.2 color: 0xD3CB98 - priority: 1349 + priority: 1351 } } element { @@ -5353,7 +5361,7 @@ cont { lines { width: 6.4 color: 0xD3CB98 - priority: 1577 + priority: 1578 } } element { @@ -5385,7 +5393,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1173 + priority: 1175 } } element { @@ -5398,7 +5406,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1261 + priority: 1263 } } element { @@ -5406,7 +5414,7 @@ cont { lines { width: 3.2 color: 0xD3CB98 - priority: 1349 + priority: 1351 } } element { @@ -5422,13 +5430,13 @@ cont { lines { width: 14.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 6.4 color: 0xD3CB98 - priority: 1577 + priority: 1578 } lines { width: 16.4 @@ -5450,7 +5458,7 @@ cont { lines { width: 14.8 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -5478,7 +5486,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1173 + priority: 1175 } } element { @@ -5491,7 +5499,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1261 + priority: 1263 } } element { @@ -5499,7 +5507,7 @@ cont { lines { width: 3.2 color: 0xD3CB98 - priority: 1349 + priority: 1351 } } element { @@ -5515,7 +5523,7 @@ cont { lines { width: 6.4 color: 0xD3CB98 - priority: 1577 + priority: 1578 } } element { @@ -5547,7 +5555,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1173 + priority: 1175 } } element { @@ -5560,7 +5568,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1261 + priority: 1263 } } element { @@ -5568,7 +5576,7 @@ cont { lines { width: 3.2 color: 0xD3CB98 - priority: 1349 + priority: 1351 } } element { @@ -5584,7 +5592,7 @@ cont { lines { width: 6.4 color: 0xD3CB98 - priority: 1577 + priority: 1578 } } element { @@ -5616,7 +5624,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1173 + priority: 1175 } } element { @@ -5629,7 +5637,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1261 + priority: 1263 } } element { @@ -5637,7 +5645,7 @@ cont { lines { width: 3.2 color: 0xD3CB98 - priority: 1349 + priority: 1351 } } element { @@ -5653,13 +5661,13 @@ cont { lines { width: 14.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 6.4 color: 0xD3CB98 - priority: 1577 + priority: 1578 } lines { width: 16.4 @@ -5685,7 +5693,7 @@ cont { lines { width: 14.8 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -5711,7 +5719,7 @@ cont { scale: 16 symbol { name: "bus-mini" - priority: 16014 + priority: 16017 } caption { primary { @@ -5720,14 +5728,14 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15014 + priority: 15017 } } element { scale: 17 symbol { name: "bus" - priority: 16014 + priority: 16017 } caption { primary { @@ -5736,7 +5744,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15014 + priority: 15017 } } } @@ -5820,7 +5828,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -5833,7 +5841,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -5841,7 +5849,7 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1022 + priority: 1024 } } element { @@ -5849,7 +5857,7 @@ cont { lines { width: 2 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -5857,7 +5865,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -5865,7 +5873,7 @@ cont { lines { width: 3 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -5873,7 +5881,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -5889,7 +5897,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -5902,7 +5910,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -5910,7 +5918,7 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1022 + priority: 1024 } } element { @@ -5918,7 +5926,7 @@ cont { lines { width: 2 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -5926,12 +5934,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -5946,7 +5954,7 @@ cont { lines { width: 3 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -5954,12 +5962,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } lines { width: 11 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -5982,7 +5990,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -5995,7 +6003,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -6003,7 +6011,7 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1022 + priority: 1024 } } element { @@ -6011,7 +6019,7 @@ cont { lines { width: 2 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -6019,7 +6027,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -6027,7 +6035,7 @@ cont { lines { width: 3 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -6035,7 +6043,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -6051,7 +6059,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -6064,7 +6072,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -6072,7 +6080,7 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1022 + priority: 1024 } } element { @@ -6080,7 +6088,7 @@ cont { lines { width: 2 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -6088,7 +6096,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -6096,7 +6104,7 @@ cont { lines { width: 3 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -6104,7 +6112,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -6120,7 +6128,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -6133,7 +6141,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -6141,7 +6149,7 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1022 + priority: 1024 } } element { @@ -6149,7 +6157,7 @@ cont { lines { width: 2 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -6157,12 +6165,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -6181,7 +6189,7 @@ cont { lines { width: 3 color: 0x90BC90 - priority: 1022 + priority: 1024 } path_text { primary { @@ -6189,12 +6197,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } lines { width: 11 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -6216,7 +6224,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6224,7 +6232,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6232,7 +6240,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6240,7 +6248,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6248,7 +6256,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6259,7 +6267,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6267,7 +6275,7 @@ cont { lines { width: 1.2 color: 0x0000FF - priority: 1019 + priority: 1021 } path_text { primary { @@ -6275,7 +6283,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6283,7 +6291,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6291,7 +6299,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6301,7 +6309,7 @@ cont { scale: 15 area { color: 0xD0CCBC - priority: 1020 + priority: 1022 } } element { @@ -6312,11 +6320,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } area { color: 0xD0CCBC - priority: 1020 + priority: 1022 } } element { @@ -6327,11 +6335,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } area { color: 0xC0BCAC - priority: 1020 + priority: 1022 } } } @@ -6342,7 +6350,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6350,7 +6358,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6358,12 +6366,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -6378,7 +6386,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6386,12 +6394,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 11 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -6409,7 +6417,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6422,7 +6430,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -6430,7 +6438,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6443,7 +6451,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -6451,7 +6459,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6462,7 +6470,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6475,7 +6483,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -6483,7 +6491,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6496,7 +6504,7 @@ cont { dd: 1.2 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -6504,7 +6512,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6515,7 +6523,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6528,7 +6536,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -6536,7 +6544,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6549,7 +6557,7 @@ cont { dd: 1.2 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -6557,7 +6565,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6568,7 +6576,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6576,7 +6584,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6584,7 +6592,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6592,7 +6600,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6600,7 +6608,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6611,7 +6619,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6624,7 +6632,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -6632,7 +6640,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6645,7 +6653,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -6653,7 +6661,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6664,7 +6672,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6672,7 +6680,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6680,7 +6688,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6688,7 +6696,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6696,7 +6704,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6707,7 +6715,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6715,7 +6723,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6723,7 +6731,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6731,7 +6739,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6739,7 +6747,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6750,7 +6758,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6758,7 +6766,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6766,7 +6774,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6774,7 +6782,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6782,7 +6790,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -6793,7 +6801,7 @@ cont { lines { width: 1 color: 0xD0CCBC - priority: 1019 + priority: 1021 } } element { @@ -6801,7 +6809,7 @@ cont { lines { width: 2 color: 0xD0CCBC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6809,12 +6817,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -6833,7 +6841,7 @@ cont { lines { width: 3 color: 0xC0BCAC - priority: 1019 + priority: 1021 } path_text { primary { @@ -6841,12 +6849,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 11 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -6868,13 +6876,13 @@ cont { lines { width: 2.99 color: 0x202020 - priority: 166 + priority: 168 cap: BUTTCAP } lines { width: 2.75 color: 0xCDE5EA - priority: 1166 + priority: 1168 } } element { @@ -6882,13 +6890,13 @@ cont { lines { width: 4.5 color: 0x101010 - priority: 251 + priority: 253 cap: BUTTCAP } lines { width: 3.5 color: 0xCDE5EA - priority: 1251 + priority: 1253 } } element { @@ -6896,13 +6904,13 @@ cont { lines { width: 8.4 color: 0x707070 - priority: 344 + priority: 346 cap: BUTTCAP } lines { width: 7 color: 0xCDE5EA - priority: 1344 + priority: 1346 } } element { @@ -6910,13 +6918,13 @@ cont { lines { width: 10.4 color: 0x707070 - priority: 572 + priority: 573 cap: BUTTCAP } lines { width: 9 color: 0xCDE5EA - priority: 1572 + priority: 1573 } } element { @@ -6924,13 +6932,13 @@ cont { lines { width: 13.2 color: 0x707070 - priority: 601 + priority: 602 cap: BUTTCAP } lines { width: 10 color: 0xCDE5EA - priority: 1601 + priority: 1602 } } } @@ -6941,7 +6949,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1019 + priority: 1021 } } element { @@ -6949,13 +6957,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1019 + priority: 1021 } } element { @@ -6963,13 +6971,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -6977,7 +6985,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -6985,13 +6993,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -6999,7 +7007,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -7007,13 +7015,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -7021,7 +7029,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -7032,7 +7040,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1019 + priority: 1021 } } element { @@ -7040,13 +7048,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1019 + priority: 1021 } } element { @@ -7054,13 +7062,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -7068,7 +7076,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -7076,13 +7084,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -7090,12 +7098,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -7110,13 +7118,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -7124,12 +7132,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 16 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -7147,7 +7155,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1019 + priority: 1021 } } element { @@ -7155,13 +7163,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1019 + priority: 1021 } } element { @@ -7169,13 +7177,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -7183,7 +7191,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -7191,13 +7199,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -7205,12 +7213,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -7229,13 +7237,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1019 + priority: 1021 } path_text { primary { @@ -7243,12 +7251,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 16 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -7271,7 +7279,7 @@ cont { width: 1 color: 0xEFBB6E cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7280,7 +7288,7 @@ cont { width: 2 color: 0xEF9721 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7289,7 +7297,7 @@ cont { width: 3 color: 0xF08800 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7298,7 +7306,7 @@ cont { width: 4 color: 0xF08800 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7306,13 +7314,13 @@ cont { lines { width: 6 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 4 color: 0xF08800 - priority: 1036 + priority: 1039 } } element { @@ -7320,13 +7328,13 @@ cont { lines { width: 8 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 6 color: 0xF08800 - priority: 1036 + priority: 1039 } } element { @@ -7334,13 +7342,13 @@ cont { lines { width: 10 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 8 color: 0xF08800 - priority: 1036 + priority: 1039 } path_text { primary { @@ -7348,7 +7356,7 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } } element { @@ -7359,18 +7367,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 16 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1503 + priority: 1504 } } element { @@ -7381,18 +7389,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 20 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1503 + priority: 1504 } } element { @@ -7403,18 +7411,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 20 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1503 + priority: 1504 } } element { @@ -7425,18 +7433,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 21 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 17 color: 0xF08800 - priority: 1503 + priority: 1504 } } } @@ -7448,7 +7456,7 @@ cont { width: 1 color: 0xEFBB6E cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7457,7 +7465,7 @@ cont { width: 2 color: 0xEF9721 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7466,7 +7474,7 @@ cont { width: 3 color: 0xF08800 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7475,7 +7483,7 @@ cont { width: 4 color: 0xF08800 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7483,13 +7491,13 @@ cont { lines { width: 6 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 4 color: 0xF08800 - priority: 1036 + priority: 1039 } } element { @@ -7497,13 +7505,13 @@ cont { lines { width: 8 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 6 color: 0xF08800 - priority: 1036 + priority: 1039 } } element { @@ -7511,13 +7519,13 @@ cont { lines { width: 10 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 8 color: 0xF08800 - priority: 1036 + priority: 1039 } path_text { primary { @@ -7525,7 +7533,7 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } } element { @@ -7536,18 +7544,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 16 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1503 + priority: 1504 } } element { @@ -7558,18 +7566,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 20 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1503 + priority: 1504 } } element { @@ -7580,24 +7588,24 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 20 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1503 + priority: 1504 } lines { width: 26 @@ -7614,24 +7622,24 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 25 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 21 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 17 color: 0xF08800 - priority: 1503 + priority: 1504 } lines { width: 27 @@ -7649,7 +7657,7 @@ cont { width: 1 color: 0xEFBB6E cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7658,7 +7666,7 @@ cont { width: 2 color: 0xEF9721 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7667,7 +7675,7 @@ cont { width: 3 color: 0xF08800 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7676,7 +7684,7 @@ cont { width: 4 color: 0xF08800 cap: BUTTCAP - priority: 1036 + priority: 1039 } } element { @@ -7684,13 +7692,13 @@ cont { lines { width: 6 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 4 color: 0xF08800 - priority: 1036 + priority: 1039 } } element { @@ -7698,13 +7706,13 @@ cont { lines { width: 8 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 6 color: 0xF08800 - priority: 1036 + priority: 1039 } } element { @@ -7712,13 +7720,13 @@ cont { lines { width: 10 color: 0xB87C04 - priority: 36 + priority: 39 cap: BUTTCAP } lines { width: 8 color: 0xF08800 - priority: 1036 + priority: 1039 } path_text { primary { @@ -7726,7 +7734,7 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } } element { @@ -7737,18 +7745,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 16 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1503 + priority: 1504 } } element { @@ -7759,18 +7767,18 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 20 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1503 + priority: 1504 } } element { @@ -7781,24 +7789,24 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 20 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 16 color: 0xF08800 - priority: 1503 + priority: 1504 } lines { width: 26 @@ -7819,24 +7827,24 @@ cont { color: 0x202020 stroke_color: 0xF08800 } - priority: 16036 + priority: 16039 } lines { width: 25 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 21 color: 0xB87C04 - priority: 503 + priority: 504 cap: BUTTCAP } lines { width: 17 color: 0xF08800 - priority: 1503 + priority: 1504 } lines { width: 27 @@ -7915,7 +7923,7 @@ cont { lines { width: 5.5 color: 0xF08800 - priority: 1036 + priority: 1039 } path_text { primary { @@ -7923,7 +7931,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } } element { @@ -7934,12 +7942,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 9 color: 0xF08800 - priority: 1484 + priority: 1485 } } element { @@ -7950,12 +7958,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 12 color: 0xF08800 - priority: 1484 + priority: 1485 } } element { @@ -7966,12 +7974,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 12 color: 0xF08800 - priority: 1484 + priority: 1485 } } } @@ -7982,7 +7990,7 @@ cont { lines { width: 5.5 color: 0xF08800 - priority: 1036 + priority: 1039 } path_text { primary { @@ -7990,7 +7998,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } } element { @@ -8001,12 +8009,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 9 color: 0xF08800 - priority: 1484 + priority: 1485 } } element { @@ -8017,18 +8025,18 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1484 + priority: 1485 } lines { width: 22 @@ -8045,18 +8053,18 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1484 + priority: 1485 } lines { width: 22 @@ -8073,7 +8081,7 @@ cont { lines { width: 5.5 color: 0xF08800 - priority: 1036 + priority: 1039 } path_text { primary { @@ -8081,7 +8089,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } } element { @@ -8092,12 +8100,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 9 color: 0xF08800 - priority: 1484 + priority: 1485 } } element { @@ -8108,18 +8116,18 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1484 + priority: 1485 } lines { width: 22 @@ -8140,18 +8148,18 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16036 + priority: 16039 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 12 color: 0xF08800 - priority: 1484 + priority: 1485 } lines { width: 22 @@ -8172,7 +8180,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8180,7 +8188,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8188,7 +8196,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8196,7 +8204,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8204,7 +8212,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8215,7 +8223,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8223,7 +8231,7 @@ cont { lines { width: 1.2 color: 0x0000FF - priority: 1019 + priority: 1021 } path_text { primary { @@ -8231,7 +8239,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8239,7 +8247,7 @@ cont { lines { width: 0.8 color: 0x0000FF - priority: 1019 + priority: 1021 } path_text { primary { @@ -8247,7 +8255,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8258,7 +8266,7 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1019 + priority: 1021 } } element { @@ -8266,7 +8274,7 @@ cont { lines { width: 2 color: 0x90BC90 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8274,7 +8282,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8282,7 +8290,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8290,7 +8298,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8301,7 +8309,7 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1019 + priority: 1021 } } element { @@ -8309,7 +8317,7 @@ cont { lines { width: 2 color: 0x90BC90 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8317,12 +8325,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -8337,7 +8345,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8345,12 +8353,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 11 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -8368,7 +8376,7 @@ cont { lines { width: 1 color: 0x90BC90 - priority: 1019 + priority: 1021 } } element { @@ -8376,7 +8384,7 @@ cont { lines { width: 2 color: 0x90BC90 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8384,12 +8392,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -8408,7 +8416,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8416,12 +8424,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 11 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -8443,7 +8451,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8451,7 +8459,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8459,12 +8467,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -8479,7 +8487,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8487,12 +8495,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 11 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -8510,7 +8518,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8523,7 +8531,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -8531,7 +8539,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8544,7 +8552,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -8552,7 +8560,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8563,7 +8571,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8576,7 +8584,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -8584,7 +8592,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8597,7 +8605,7 @@ cont { dd: 1.2 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -8605,7 +8613,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8616,7 +8624,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8629,7 +8637,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -8637,7 +8645,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8650,7 +8658,7 @@ cont { dd: 1.2 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -8658,7 +8666,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8669,7 +8677,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8677,7 +8685,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8685,7 +8693,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8693,7 +8701,7 @@ cont { lines { width: 0.8 color: 0xFF0000 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8701,7 +8709,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8712,7 +8720,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8720,7 +8728,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8728,7 +8736,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8736,7 +8744,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8744,7 +8752,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8755,7 +8763,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8768,7 +8776,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -8776,7 +8784,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8789,7 +8797,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1019 + priority: 1021 } path_text { primary { @@ -8797,7 +8805,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8808,7 +8816,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8816,7 +8824,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8824,7 +8832,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8832,7 +8840,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8840,7 +8848,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8851,7 +8859,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8859,7 +8867,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8867,7 +8875,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8875,7 +8883,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8883,7 +8891,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8894,7 +8902,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8902,7 +8910,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8910,7 +8918,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -8918,7 +8926,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8926,7 +8934,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -8937,7 +8945,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } } element { @@ -8945,7 +8953,7 @@ cont { lines { width: 2 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8953,12 +8961,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -8977,7 +8985,7 @@ cont { lines { width: 3 color: 0xC0C0C0 - priority: 1019 + priority: 1021 } path_text { primary { @@ -8985,12 +8993,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 11 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9012,7 +9020,7 @@ cont { lines { width: 1 color: 0xD0CCAC - priority: 1019 + priority: 1021 } } element { @@ -9020,13 +9028,13 @@ cont { lines { width: 5 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 3 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } } element { @@ -9034,13 +9042,13 @@ cont { lines { width: 6 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 4 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } path_text { primary { @@ -9048,7 +9056,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } element { @@ -9056,13 +9064,13 @@ cont { lines { width: 9 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 7 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } path_text { primary { @@ -9070,7 +9078,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } } } @@ -9080,14 +9088,14 @@ cont { scale: 14 area { color: 0xD0CCAC - priority: 1020 + priority: 1022 } } element { scale: 15 area { color: 0xE8E8E8 - priority: 1020 + priority: 1022 } } element { @@ -9098,11 +9106,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } area { color: 0xE8E8E8 - priority: 1020 + priority: 1022 } } element { @@ -9113,11 +9121,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } area { color: 0xE8E8E8 - priority: 1020 + priority: 1022 } } } @@ -9128,7 +9136,7 @@ cont { lines { width: 1 color: 0xD0CCAC - priority: 1019 + priority: 1021 } } element { @@ -9136,13 +9144,13 @@ cont { lines { width: 5 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 3 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } } element { @@ -9150,13 +9158,13 @@ cont { lines { width: 6 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 4 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } path_text { primary { @@ -9164,12 +9172,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9184,13 +9192,13 @@ cont { lines { width: 9 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 7 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } path_text { primary { @@ -9198,12 +9206,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 15 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9221,7 +9229,7 @@ cont { lines { width: 1 color: 0xD0CCAC - priority: 1019 + priority: 1021 } } element { @@ -9229,13 +9237,13 @@ cont { lines { width: 5 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 3 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } } element { @@ -9243,13 +9251,13 @@ cont { lines { width: 6 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 4 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } path_text { primary { @@ -9257,12 +9265,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9281,13 +9289,13 @@ cont { lines { width: 9 color: 0xC0BC9C - priority: 19 + priority: 21 cap: BUTTCAP } lines { width: 7 color: 0xE8E8E8 - priority: 1019 + priority: 1021 } path_text { primary { @@ -9295,12 +9303,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16019 + priority: 16021 } lines { width: 15 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9323,7 +9331,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9332,7 +9340,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9341,7 +9349,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9350,7 +9358,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9359,7 +9367,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9367,13 +9375,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9381,7 +9389,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9389,13 +9397,13 @@ cont { lines { width: 7 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9403,7 +9411,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9411,13 +9419,13 @@ cont { lines { width: 9 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9425,7 +9433,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9433,13 +9441,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9447,7 +9455,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9455,13 +9463,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9469,7 +9477,7 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9477,13 +9485,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9491,7 +9499,7 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } } @@ -9503,7 +9511,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9512,7 +9520,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9521,7 +9529,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9530,7 +9538,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9539,7 +9547,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9547,13 +9555,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9561,7 +9569,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9569,13 +9577,13 @@ cont { lines { width: 7 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9583,7 +9591,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9591,13 +9599,13 @@ cont { lines { width: 9 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9605,7 +9613,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9613,13 +9621,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9627,7 +9635,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9635,13 +9643,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9649,12 +9657,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } lines { width: 22 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9669,13 +9677,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9683,12 +9691,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9707,7 +9715,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9716,7 +9724,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9725,7 +9733,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9734,7 +9742,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9743,7 +9751,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1034 + priority: 1036 } } element { @@ -9751,13 +9759,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9765,7 +9773,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9773,13 +9781,13 @@ cont { lines { width: 7 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9787,7 +9795,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9795,13 +9803,13 @@ cont { lines { width: 9 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9809,7 +9817,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9817,13 +9825,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9831,7 +9839,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } } element { @@ -9839,13 +9847,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9853,12 +9861,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } lines { width: 22 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9877,13 +9885,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 34 + priority: 36 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9891,12 +9899,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16034 + priority: 16036 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -9918,7 +9926,7 @@ cont { lines { width: 1.62 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -9926,7 +9934,7 @@ cont { lines { width: 1.69 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -9934,7 +9942,7 @@ cont { lines { width: 2.75 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -9942,7 +9950,7 @@ cont { lines { width: 4.5 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9950,7 +9958,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } } element { @@ -9958,7 +9966,7 @@ cont { lines { width: 9 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9966,7 +9974,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } } element { @@ -9974,7 +9982,7 @@ cont { lines { width: 12 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9982,7 +9990,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } } element { @@ -9990,7 +9998,7 @@ cont { lines { width: 12 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -9998,7 +10006,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } } } @@ -10009,7 +10017,7 @@ cont { lines { width: 1.62 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -10017,7 +10025,7 @@ cont { lines { width: 1.69 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -10025,7 +10033,7 @@ cont { lines { width: 2.75 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -10033,7 +10041,7 @@ cont { lines { width: 4.5 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -10041,7 +10049,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } } element { @@ -10049,7 +10057,7 @@ cont { lines { width: 9 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -10057,7 +10065,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } } element { @@ -10065,7 +10073,7 @@ cont { lines { width: 12 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -10073,12 +10081,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10093,7 +10101,7 @@ cont { lines { width: 12 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -10101,12 +10109,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10124,7 +10132,7 @@ cont { lines { width: 1.62 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -10132,7 +10140,7 @@ cont { lines { width: 1.69 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -10140,7 +10148,7 @@ cont { lines { width: 2.75 color: 0xFFC444 - priority: 1034 + priority: 1036 } } element { @@ -10148,7 +10156,7 @@ cont { lines { width: 4.5 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -10156,7 +10164,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } } element { @@ -10164,7 +10172,7 @@ cont { lines { width: 9 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -10172,7 +10180,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } } element { @@ -10180,7 +10188,7 @@ cont { lines { width: 12 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -10188,12 +10196,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10212,7 +10220,7 @@ cont { lines { width: 12 color: 0xFFC444 - priority: 1034 + priority: 1036 } path_text { primary { @@ -10220,12 +10228,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16034 + priority: 16036 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10247,7 +10255,7 @@ cont { lines { width: 0.38 color: 0xE8E4D4 - priority: 1156 + priority: 1158 } } element { @@ -10255,7 +10263,7 @@ cont { lines { width: 0.75 color: 0xE8E4D4 - priority: 1168 + priority: 1170 } } element { @@ -10263,7 +10271,7 @@ cont { lines { width: 3 color: 0xE8E4D4 - priority: 1254 + priority: 1256 } } element { @@ -10271,7 +10279,7 @@ cont { lines { width: 3.4 color: 0xFFFFFF - priority: 1161 + priority: 1163 } lines { width: 3.4 @@ -10281,7 +10289,7 @@ cont { dd: 0.4 } cap: BUTTCAP - priority: 1163 + priority: 1165 } } element { @@ -10289,7 +10297,7 @@ cont { lines { width: 12 color: 0xE8E4D4 - priority: 1574 + priority: 1575 } lines { width: 6.8 @@ -10299,12 +10307,12 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1454 + priority: 1456 } lines { width: 6 color: 0xE8E4D4 - priority: 1579 + priority: 1580 } } element { @@ -10312,7 +10320,7 @@ cont { lines { width: 12 color: 0xE8E4D4 - priority: 1459 + priority: 1460 } lines { width: 13.6 @@ -10322,12 +10330,12 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1462 + priority: 1463 } lines { width: 12 color: 0xE8E4D4 - priority: 1623 + priority: 1624 } } } @@ -10338,7 +10346,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -10346,13 +10354,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -10360,13 +10368,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10374,7 +10382,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -10382,13 +10390,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10396,7 +10404,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -10404,13 +10412,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10418,7 +10426,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } } @@ -10428,14 +10436,14 @@ cont { scale: 13 area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { scale: 14 area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { @@ -10446,11 +10454,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { @@ -10461,11 +10469,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { @@ -10476,11 +10484,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } } @@ -10491,7 +10499,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -10499,13 +10507,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -10513,13 +10521,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10527,7 +10535,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -10535,13 +10543,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10549,12 +10557,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10569,13 +10577,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10583,12 +10591,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 16 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10606,7 +10614,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -10614,13 +10622,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -10628,13 +10636,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10642,7 +10650,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -10650,13 +10658,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10664,7 +10672,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -10672,13 +10680,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10686,7 +10694,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } } @@ -10697,7 +10705,7 @@ cont { lines { width: 1 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -10705,13 +10713,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -10719,13 +10727,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10733,7 +10741,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -10741,13 +10749,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10755,12 +10763,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10779,13 +10787,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -10793,12 +10801,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 16 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10932,7 +10940,7 @@ cont { lines { width: 17 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -10960,7 +10968,7 @@ cont { lines { width: 18 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11023,7 +11031,7 @@ cont { lines { width: 17 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11055,7 +11063,7 @@ cont { lines { width: 18 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11077,7 +11085,7 @@ cont { lines { width: 1 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11085,7 +11093,7 @@ cont { lines { width: 2 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11093,13 +11101,13 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 3 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11107,13 +11115,13 @@ cont { lines { width: 6 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 4 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11121,7 +11129,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11129,13 +11137,13 @@ cont { lines { width: 7 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 5 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11143,7 +11151,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11151,13 +11159,13 @@ cont { lines { width: 9 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 7 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11165,7 +11173,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11173,13 +11181,13 @@ cont { lines { width: 15 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 11 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11187,7 +11195,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11195,13 +11203,13 @@ cont { lines { width: 18 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 14 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11209,7 +11217,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } } @@ -11220,7 +11228,7 @@ cont { lines { width: 1 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11228,7 +11236,7 @@ cont { lines { width: 2 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11236,13 +11244,13 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 3 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11250,13 +11258,13 @@ cont { lines { width: 6 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 4 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11264,7 +11272,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11272,13 +11280,13 @@ cont { lines { width: 7 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 5 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11286,7 +11294,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11294,13 +11302,13 @@ cont { lines { width: 9 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 7 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11308,7 +11316,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11316,13 +11324,13 @@ cont { lines { width: 15 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 11 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11330,12 +11338,12 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } lines { width: 19 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11350,13 +11358,13 @@ cont { lines { width: 18 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 14 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11364,12 +11372,12 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } lines { width: 22 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11387,7 +11395,7 @@ cont { lines { width: 1 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11395,7 +11403,7 @@ cont { lines { width: 2 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11403,13 +11411,13 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 3 color: 0xFFFB80 - priority: 1031 + priority: 1034 } } element { @@ -11417,13 +11425,13 @@ cont { lines { width: 6 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 4 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11431,7 +11439,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11439,13 +11447,13 @@ cont { lines { width: 7 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 5 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11453,7 +11461,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11461,13 +11469,13 @@ cont { lines { width: 9 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 7 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11475,7 +11483,7 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } } element { @@ -11483,13 +11491,13 @@ cont { lines { width: 15 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 11 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11497,12 +11505,12 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } lines { width: 19 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11521,13 +11529,13 @@ cont { lines { width: 18 color: 0xC8C860 - priority: 31 + priority: 34 cap: BUTTCAP } lines { width: 14 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11535,12 +11543,12 @@ cont { color: 0x404040 stroke_color: 0xFFFB80 } - priority: 16031 + priority: 16034 } lines { width: 22 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11562,7 +11570,7 @@ cont { lines { width: 4.5 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11570,7 +11578,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } } element { @@ -11578,7 +11586,7 @@ cont { lines { width: 9 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11586,7 +11594,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } } element { @@ -11594,7 +11602,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11602,7 +11610,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } } element { @@ -11610,7 +11618,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11618,7 +11626,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } } } @@ -11629,7 +11637,7 @@ cont { lines { width: 4.5 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11637,7 +11645,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } } element { @@ -11645,7 +11653,7 @@ cont { lines { width: 9 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11653,7 +11661,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } } element { @@ -11661,7 +11669,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11669,12 +11677,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11689,7 +11697,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11697,12 +11705,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11720,7 +11728,7 @@ cont { lines { width: 4.5 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11728,7 +11736,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } } element { @@ -11736,7 +11744,7 @@ cont { lines { width: 9 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11744,7 +11752,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } } element { @@ -11752,7 +11760,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11760,12 +11768,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11784,7 +11792,7 @@ cont { lines { width: 12 color: 0xFFFB80 - priority: 1031 + priority: 1034 } path_text { primary { @@ -11792,12 +11800,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16031 + priority: 16034 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11819,7 +11827,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1026 + priority: 1029 } } element { @@ -11827,7 +11835,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -11835,7 +11843,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -11843,7 +11851,7 @@ cont { lines { width: 7 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -11851,7 +11859,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } } @@ -11861,7 +11869,7 @@ cont { scale: 15 area { color: 0xFDFDFD - priority: 1027 + priority: 1030 } } element { @@ -11872,11 +11880,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { @@ -11887,11 +11895,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } } @@ -11902,7 +11910,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1026 + priority: 1029 } } element { @@ -11910,7 +11918,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -11918,12 +11926,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 13 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11938,7 +11946,7 @@ cont { lines { width: 7 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -11946,12 +11954,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 15 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -11969,7 +11977,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1026 + priority: 1029 } } element { @@ -11977,7 +11985,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -11985,7 +11993,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -11993,13 +12001,13 @@ cont { lines { width: 8 color: 0x707070 - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 7 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12007,7 +12015,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } } @@ -12017,7 +12025,7 @@ cont { scale: 15 area { color: 0xFDFDFD - priority: 1027 + priority: 1030 } } element { @@ -12028,11 +12036,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { @@ -12043,11 +12051,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } } @@ -12058,7 +12066,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1026 + priority: 1029 } } element { @@ -12066,7 +12074,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12074,12 +12082,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 13 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12094,13 +12102,13 @@ cont { lines { width: 8 color: 0x707070 - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 7 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12108,12 +12116,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 15 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12131,7 +12139,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1026 + priority: 1029 } } element { @@ -12139,7 +12147,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12147,12 +12155,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 13 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12171,13 +12179,13 @@ cont { lines { width: 8 color: 0x707070 - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 7 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12185,12 +12193,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 15 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12212,7 +12220,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1026 + priority: 1029 } } element { @@ -12220,7 +12228,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12228,7 +12236,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -12236,7 +12244,7 @@ cont { lines { width: 7 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12244,7 +12252,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } } @@ -12255,7 +12263,7 @@ cont { lines { width: 3 color: 0xFDFDFD - priority: 1026 + priority: 1029 } } element { @@ -12263,7 +12271,7 @@ cont { lines { width: 5 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12271,12 +12279,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 13 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12295,7 +12303,7 @@ cont { lines { width: 7 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -12303,12 +12311,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 15 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12335,7 +12343,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1024 + priority: 1026 } } element { @@ -12348,7 +12356,7 @@ cont { dd: 0.4 } cap: BUTTCAP - priority: 1024 + priority: 1026 } } element { @@ -12359,7 +12367,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16024 + priority: 16026 } lines { width: 4 @@ -12377,7 +12385,7 @@ cont { lines { width: 6 color: 0xA0A090 - priority: 1024 + priority: 1026 } path_text { primary { @@ -12385,7 +12393,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16024 + priority: 16026 } lines { width: 4 @@ -12395,7 +12403,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1738 + priority: 1739 } } } @@ -12411,7 +12419,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1024 + priority: 1026 } } element { @@ -12424,7 +12432,7 @@ cont { dd: 0.4 } cap: BUTTCAP - priority: 1024 + priority: 1026 } } element { @@ -12435,12 +12443,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16024 + priority: 16026 } lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12465,7 +12473,7 @@ cont { lines { width: 6 color: 0xA0A090 - priority: 1024 + priority: 1026 } path_text { primary { @@ -12473,12 +12481,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16024 + priority: 16026 } lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12489,7 +12497,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1738 + priority: 1739 } lines { width: 14 @@ -12511,7 +12519,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1024 + priority: 1026 } } element { @@ -12524,7 +12532,7 @@ cont { dd: 0.4 } cap: BUTTCAP - priority: 1024 + priority: 1026 } } element { @@ -12535,12 +12543,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16024 + priority: 16026 } lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12569,7 +12577,7 @@ cont { lines { width: 6 color: 0xA0A090 - priority: 1024 + priority: 1026 } path_text { primary { @@ -12577,12 +12585,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16024 + priority: 16026 } lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12593,7 +12601,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1738 + priority: 1739 } lines { width: 14 @@ -12614,13 +12622,13 @@ cont { lines { width: 2 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 1 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -12628,13 +12636,13 @@ cont { lines { width: 4 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 2 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -12642,13 +12650,13 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 3 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12656,7 +12664,7 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } } element { @@ -12664,13 +12672,13 @@ cont { lines { width: 6 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 4 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12678,7 +12686,7 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } } element { @@ -12686,13 +12694,13 @@ cont { lines { width: 10 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 6 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12700,7 +12708,7 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } } element { @@ -12708,13 +12716,13 @@ cont { lines { width: 16 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12722,7 +12730,7 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } } } @@ -12733,13 +12741,13 @@ cont { lines { width: 2 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 1 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -12747,13 +12755,13 @@ cont { lines { width: 4 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 2 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -12761,13 +12769,13 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 3 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12775,7 +12783,7 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } } element { @@ -12783,13 +12791,13 @@ cont { lines { width: 6 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 4 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12797,7 +12805,7 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } } element { @@ -12805,13 +12813,13 @@ cont { lines { width: 10 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 6 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12819,12 +12827,12 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12839,13 +12847,13 @@ cont { lines { width: 16 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12853,12 +12861,12 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12876,13 +12884,13 @@ cont { lines { width: 2 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 1 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -12890,13 +12898,13 @@ cont { lines { width: 4 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 2 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -12904,13 +12912,13 @@ cont { lines { width: 5 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 3 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12918,7 +12926,7 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } } element { @@ -12926,13 +12934,13 @@ cont { lines { width: 6 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 4 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12940,7 +12948,7 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } } element { @@ -12948,13 +12956,13 @@ cont { lines { width: 10 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 6 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -12962,12 +12970,12 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -12986,13 +12994,13 @@ cont { lines { width: 16 color: 0xC8C860 - priority: 29 + priority: 31 cap: BUTTCAP } lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13000,12 +13008,12 @@ cont { color: 0x404040 stroke_color: 0xFFFF90 } - priority: 16029 + priority: 16031 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -13027,7 +13035,7 @@ cont { lines { width: 1.44 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13035,7 +13043,7 @@ cont { lines { width: 2.75 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13043,7 +13051,7 @@ cont { lines { width: 4.5 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13051,7 +13059,7 @@ cont { lines { width: 9 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13059,7 +13067,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } } element { @@ -13067,7 +13075,7 @@ cont { lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13075,7 +13083,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } } element { @@ -13083,7 +13091,7 @@ cont { lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13091,7 +13099,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } } } @@ -13102,7 +13110,7 @@ cont { lines { width: 1.44 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13110,7 +13118,7 @@ cont { lines { width: 2.75 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13118,7 +13126,7 @@ cont { lines { width: 4.5 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13126,7 +13134,7 @@ cont { lines { width: 9 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13134,7 +13142,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } } element { @@ -13142,7 +13150,7 @@ cont { lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13150,12 +13158,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -13170,7 +13178,7 @@ cont { lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13178,12 +13186,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -13201,7 +13209,7 @@ cont { lines { width: 1.44 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13209,7 +13217,7 @@ cont { lines { width: 2.75 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13217,7 +13225,7 @@ cont { lines { width: 4.5 color: 0xFFFF90 - priority: 1029 + priority: 1031 } } element { @@ -13225,7 +13233,7 @@ cont { lines { width: 9 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13233,7 +13241,7 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } } element { @@ -13241,7 +13249,7 @@ cont { lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13249,12 +13257,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -13273,7 +13281,7 @@ cont { lines { width: 12 color: 0xFFFF90 - priority: 1029 + priority: 1031 } path_text { primary { @@ -13281,12 +13289,12 @@ cont { color: 0x202020 stroke_color: 0xFFFFFF } - priority: 16029 + priority: 16031 } lines { width: 20 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -13313,7 +13321,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13326,7 +13334,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13334,7 +13342,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -13342,7 +13350,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13350,7 +13358,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -13358,7 +13366,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13366,7 +13374,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -13376,21 +13384,21 @@ cont { scale: 13 area { color: 0xD79331 - priority: 1023 + priority: 1025 } } element { scale: 14 area { color: 0xD79331 - priority: 1023 + priority: 1025 } } element { scale: 15 area { color: 0xC0A87C - priority: 1023 + priority: 1025 } } element { @@ -13401,11 +13409,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } area { color: 0xC0A87C - priority: 1023 + priority: 1025 } } element { @@ -13416,11 +13424,11 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } area { color: 0xC0A87C - priority: 1023 + priority: 1025 } } } @@ -13436,7 +13444,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13449,7 +13457,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13457,7 +13465,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -13465,7 +13473,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13473,12 +13481,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -13493,7 +13501,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13501,12 +13509,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -13524,7 +13532,7 @@ cont { lines { width: 1 color: 0xD79331 - priority: 1022 + priority: 1024 } } element { @@ -13537,7 +13545,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13550,7 +13558,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13558,7 +13566,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -13566,7 +13574,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13574,7 +13582,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -13582,7 +13590,7 @@ cont { lines { width: 4 color: 0xD79331 - priority: 1022 + priority: 1024 } path_text { primary { @@ -13590,7 +13598,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -13606,7 +13614,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13619,7 +13627,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13632,7 +13640,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13640,7 +13648,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -13648,7 +13656,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13656,7 +13664,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -13664,7 +13672,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13672,7 +13680,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -13688,7 +13696,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13701,7 +13709,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13714,7 +13722,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13722,7 +13730,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -13730,7 +13738,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13738,7 +13746,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -13746,7 +13754,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13754,7 +13762,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -13770,7 +13778,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13783,7 +13791,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13796,7 +13804,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13804,7 +13812,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -13812,7 +13820,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13820,7 +13828,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -13828,7 +13836,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13836,7 +13844,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -13852,7 +13860,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13865,7 +13873,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13878,7 +13886,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13886,7 +13894,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -13894,7 +13902,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13902,7 +13910,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -13910,7 +13918,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13918,7 +13926,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -13934,7 +13942,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13947,7 +13955,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13960,7 +13968,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -13968,7 +13976,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -13976,7 +13984,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -13984,7 +13992,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -13992,7 +14000,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14000,7 +14008,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14018,7 +14026,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14031,7 +14039,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14046,7 +14054,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14054,7 +14062,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14062,7 +14070,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14070,7 +14078,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14078,7 +14086,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14086,7 +14094,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14104,7 +14112,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14117,7 +14125,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14132,7 +14140,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14140,7 +14148,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14148,7 +14156,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14156,7 +14164,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14164,7 +14172,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14172,7 +14180,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14190,7 +14198,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14203,7 +14211,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14218,7 +14226,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14226,7 +14234,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14234,7 +14242,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14242,7 +14250,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14250,7 +14258,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14258,7 +14266,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14276,7 +14284,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14289,7 +14297,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14304,7 +14312,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14312,7 +14320,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14320,7 +14328,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14328,7 +14336,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14336,7 +14344,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14344,7 +14352,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14360,7 +14368,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14373,7 +14381,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14386,7 +14394,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14394,7 +14402,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14402,7 +14410,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14410,7 +14418,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14418,7 +14426,7 @@ cont { lines { width: 5.6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14426,7 +14434,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14442,7 +14450,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14455,7 +14463,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14468,7 +14476,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14476,7 +14484,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14484,7 +14492,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14492,7 +14500,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14500,7 +14508,7 @@ cont { lines { width: 5.6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14508,7 +14516,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14524,7 +14532,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14537,7 +14545,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14550,7 +14558,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14558,7 +14566,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14566,7 +14574,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14574,7 +14582,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14582,7 +14590,7 @@ cont { lines { width: 5.6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14590,7 +14598,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14606,7 +14614,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14619,7 +14627,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14632,7 +14640,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14640,7 +14648,7 @@ cont { lines { width: 2.8 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14648,7 +14656,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14656,7 +14664,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14664,7 +14672,7 @@ cont { lines { width: 5.6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14672,7 +14680,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14688,7 +14696,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14701,7 +14709,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14709,7 +14717,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14717,7 +14725,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14725,7 +14733,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14733,7 +14741,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14741,7 +14749,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14757,7 +14765,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14770,7 +14778,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14778,7 +14786,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14786,7 +14794,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14794,7 +14802,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14802,7 +14810,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14810,7 +14818,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14826,7 +14834,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14839,7 +14847,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14847,7 +14855,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14855,7 +14863,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14863,7 +14871,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } element { @@ -14871,7 +14879,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14879,7 +14887,7 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } } } @@ -14895,7 +14903,7 @@ cont { dd: 2.25 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14908,7 +14916,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1022 + priority: 1024 } } element { @@ -14916,7 +14924,7 @@ cont { lines { width: 2 color: 0xC0A87C - priority: 1022 + priority: 1024 } } element { @@ -14924,7 +14932,7 @@ cont { lines { width: 4 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14932,12 +14940,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -14956,7 +14964,7 @@ cont { lines { width: 6 color: 0xC0A87C - priority: 1022 + priority: 1024 } path_text { primary { @@ -14964,12 +14972,12 @@ cont { color: 0x606060 stroke_color: 0xFFFFFF } - priority: 16022 + priority: 16024 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -14992,7 +15000,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15001,7 +15009,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15010,7 +15018,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15019,7 +15027,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15028,7 +15036,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15036,13 +15044,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15050,7 +15058,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15058,13 +15066,13 @@ cont { lines { width: 7 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15072,7 +15080,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15080,13 +15088,13 @@ cont { lines { width: 9 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15094,7 +15102,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15102,13 +15110,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15116,7 +15124,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15124,13 +15132,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15138,7 +15146,7 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15146,13 +15154,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15160,7 +15168,7 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } } @@ -15172,7 +15180,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15181,7 +15189,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15190,7 +15198,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15199,7 +15207,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15208,7 +15216,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15216,13 +15224,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15230,7 +15238,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15238,13 +15246,13 @@ cont { lines { width: 7 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15252,7 +15260,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15260,13 +15268,13 @@ cont { lines { width: 9 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15274,7 +15282,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15282,13 +15290,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15296,7 +15304,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15304,13 +15312,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15318,12 +15326,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } lines { width: 22 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -15338,13 +15346,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15352,12 +15360,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -15376,7 +15384,7 @@ cont { width: 1 color: 0xEED4A6 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15385,7 +15393,7 @@ cont { width: 2 color: 0xF7D396 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15394,7 +15402,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15403,7 +15411,7 @@ cont { width: 2 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15412,7 +15420,7 @@ cont { width: 3 color: 0xFFC444 cap: BUTTCAP - priority: 1039 + priority: 1041 } } element { @@ -15420,13 +15428,13 @@ cont { lines { width: 5 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 3 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15434,7 +15442,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15442,13 +15450,13 @@ cont { lines { width: 7 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 5 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15456,7 +15464,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15464,13 +15472,13 @@ cont { lines { width: 9 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 7 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15478,7 +15486,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15486,13 +15494,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15500,7 +15508,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15508,13 +15516,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15522,12 +15530,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } lines { width: 22 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -15546,13 +15554,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15560,12 +15568,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -15587,13 +15595,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15601,7 +15609,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15609,13 +15617,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15623,7 +15631,7 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15631,13 +15639,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15645,7 +15653,7 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } } @@ -15656,13 +15664,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15670,7 +15678,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15678,13 +15686,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15692,12 +15700,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } lines { width: 22 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -15712,13 +15720,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15726,12 +15734,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -15749,13 +15757,13 @@ cont { lines { width: 12 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 8 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15763,7 +15771,7 @@ cont { color: 0x303030 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } } element { @@ -15771,13 +15779,13 @@ cont { lines { width: 18 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 14 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15785,12 +15793,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } lines { width: 22 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -15809,13 +15817,13 @@ cont { lines { width: 20 color: 0xD8A050 - priority: 39 + priority: 41 cap: BUTTCAP } lines { width: 16 color: 0xFFC444 - priority: 1039 + priority: 1041 } path_text { primary { @@ -15823,12 +15831,12 @@ cont { color: 0x404040 stroke_color: 0xFFC444 } - priority: 16039 + priority: 16041 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -15851,7 +15859,7 @@ cont { width: 1 color: 0xFFFFFF cap: BUTTCAP - priority: 1026 + priority: 1029 } } element { @@ -15859,13 +15867,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -15873,13 +15881,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -15887,7 +15895,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -15895,13 +15903,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -15909,7 +15917,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -15917,13 +15925,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -15931,7 +15939,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } } @@ -15941,14 +15949,14 @@ cont { scale: 13 area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { scale: 14 area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { @@ -15959,11 +15967,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { @@ -15974,11 +15982,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } element { @@ -15989,11 +15997,11 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } area { color: 0xFFFFFF - priority: 1027 + priority: 1030 } } } @@ -16005,7 +16013,7 @@ cont { width: 1 color: 0xFFFFFF cap: BUTTCAP - priority: 1026 + priority: 1029 } } element { @@ -16013,13 +16021,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -16027,13 +16035,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -16041,7 +16049,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -16049,13 +16057,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -16063,12 +16071,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -16083,13 +16091,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -16097,12 +16105,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 16 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -16121,7 +16129,7 @@ cont { width: 1 color: 0xFFFFFF cap: BUTTCAP - priority: 1026 + priority: 1029 } } element { @@ -16129,13 +16137,13 @@ cont { lines { width: 5 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 3 color: 0xFFFFFF - priority: 1026 + priority: 1029 } } element { @@ -16143,13 +16151,13 @@ cont { lines { width: 6 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 4 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -16157,7 +16165,7 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } } element { @@ -16165,13 +16173,13 @@ cont { lines { width: 10 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 6 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -16179,12 +16187,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 14 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -16203,13 +16211,13 @@ cont { lines { width: 12 color: 0xC8C8AF - priority: 26 + priority: 29 cap: BUTTCAP } lines { width: 8 color: 0xFFFFFF - priority: 1026 + priority: 1029 } path_text { primary { @@ -16217,12 +16225,12 @@ cont { color: 0x505050 stroke_color: 0xFFFFFF } - priority: 16026 + priority: 16029 } lines { width: 16 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -16241,6 +16249,10 @@ cont { name: "historic-archaeological_site" element { scale: 16 + symbol { + name: "museum" + priority: 16004 + } caption { primary { height: 12 @@ -16248,15 +16260,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "museum" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "museum" + priority: 16004 + } caption { primary { height: 12 @@ -16264,11 +16276,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "museum" - priority: 16000 + priority: 15004 } } } @@ -16276,6 +16284,10 @@ cont { name: "historic-battlefield" element { scale: 16 + symbol { + name: "cannon" + priority: 16004 + } caption { primary { height: 12 @@ -16283,15 +16295,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "cannon" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "cannon" + priority: 16004 + } caption { primary { height: 12 @@ -16299,11 +16311,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "cannon" - priority: 16000 + priority: 15004 } } } @@ -16318,7 +16326,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } symbol { name: "castle" @@ -16334,7 +16342,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } symbol { name: "castle" @@ -16346,6 +16354,10 @@ cont { name: "historic-memorial" element { scale: 16 + symbol { + name: "memorial" + priority: 16004 + } caption { primary { height: 12 @@ -16353,15 +16365,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "memorial" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "memorial" + priority: 16004 + } caption { primary { height: 12 @@ -16369,11 +16381,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "memorial" - priority: 16000 + priority: 15004 } } } @@ -16381,6 +16389,10 @@ cont { name: "historic-monument" element { scale: 16 + symbol { + name: "memorial" + priority: 16004 + } caption { primary { height: 12 @@ -16388,15 +16400,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "memorial" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "memorial" + priority: 16004 + } caption { primary { height: 12 @@ -16404,11 +16416,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "memorial" - priority: 16000 + priority: 15004 } } } @@ -16416,6 +16424,10 @@ cont { name: "historic-museum" element { scale: 16 + symbol { + name: "museum" + priority: 16004 + } caption { primary { height: 12 @@ -16423,15 +16435,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "museum" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "museum" + priority: 16004 + } caption { primary { height: 12 @@ -16439,11 +16451,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "museum" - priority: 16000 + priority: 15004 } } } @@ -16451,6 +16459,10 @@ cont { name: "historic-ruins" element { scale: 16 + symbol { + name: "ruins" + priority: 16004 + } caption { primary { height: 12 @@ -16458,15 +16470,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "ruins" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "ruins" + priority: 16004 + } caption { primary { height: 12 @@ -16474,11 +16486,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "ruins" - priority: 16000 + priority: 15004 } } } @@ -19847,7 +19855,7 @@ cont { lines { width: 4 color: 0x707070 - priority: 1772 + priority: 1773 } } element { @@ -19855,7 +19863,7 @@ cont { lines { width: 6.4 color: 0x707070 - priority: 1855 + priority: 1856 } } } @@ -19882,7 +19890,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1158 + priority: 1160 } } element { @@ -19895,7 +19903,7 @@ cont { dd: 3 } cap: BUTTCAP - priority: 1171 + priority: 1173 } } element { @@ -19908,7 +19916,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1259 + priority: 1260 } } element { @@ -19932,7 +19940,7 @@ cont { lines { width: 1 color: 0xB0AC8C - priority: 1273 + priority: 1275 } } element { @@ -19948,7 +19956,7 @@ cont { lines { width: 3 color: 0xB0AC8C - priority: 1273 + priority: 1275 } } } @@ -19969,12 +19977,12 @@ cont { lines { width: 0.1 color: 0xD0D0D0 - priority: 1466 + priority: 1468 } lines { width: 0.6 color: 0xE4E4E4 - priority: 1469 + priority: 1470 } lines { width: 0.8 @@ -19987,17 +19995,17 @@ cont { lines { width: 0.2 color: 0xD0D0D0 - priority: 1613 + priority: 1614 } lines { width: 1.2 color: 0xE4E4E4 - priority: 1618 + priority: 1619 } lines { width: 1.6 color: 0xD0D0D0 - priority: 1616 + priority: 1617 } } element { @@ -20010,7 +20018,7 @@ cont { lines { width: 2.4 color: 0xE4E4E4 - priority: 1777 + priority: 1778 } lines { width: 3.2 @@ -20044,7 +20052,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1801 + priority: 1802 } lines { width: 0.8 @@ -20058,7 +20066,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1806 + priority: 1807 } } element { @@ -20096,7 +20104,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1801 + priority: 1802 } lines { width: 0.8 @@ -20110,7 +20118,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1806 + priority: 1807 } } element { @@ -20592,7 +20600,7 @@ cont { lines { width: 0.75 color: 0xADD8E6 - priority: 1009 + priority: 1012 } } element { @@ -20600,7 +20608,7 @@ cont { lines { width: 0.8 color: 0xADD8E6 - priority: 1012 + priority: 1014 } } element { @@ -20608,7 +20616,7 @@ cont { lines { width: 1.6 color: 0xADD8E6 - priority: 1012 + priority: 1014 } } element { @@ -20616,7 +20624,7 @@ cont { lines { width: 3.2 color: 0xADD8E6 - priority: 1012 + priority: 1014 } } element { @@ -20624,7 +20632,7 @@ cont { lines { width: 6.4 color: 0xADD8E6 - priority: 1012 + priority: 1014 } } } @@ -22001,7 +22009,7 @@ cont { dd: 40 } cap: BUTTCAP - priority: 1581 + priority: 1582 } } element { @@ -22019,7 +22027,7 @@ cont { dd: 40 } cap: BUTTCAP - priority: 1581 + priority: 1582 } } element { @@ -22037,7 +22045,7 @@ cont { dd: 40 } cap: BUTTCAP - priority: 1581 + priority: 1582 } } } @@ -22162,7 +22170,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1586 + priority: 1587 } } element { @@ -23697,7 +23705,7 @@ cont { height: 12 color: 0x909090 } - priority: 15014 + priority: 15017 } } element { @@ -23711,7 +23719,7 @@ cont { height: 14 color: 0x909090 } - priority: 15014 + priority: 15017 } } element { @@ -23725,7 +23733,7 @@ cont { height: 18 color: 0x909090 } - priority: 15014 + priority: 15017 } } element { @@ -23739,7 +23747,7 @@ cont { height: 18 color: 0x909090 } - priority: 15014 + priority: 15017 } } element { @@ -23753,7 +23761,7 @@ cont { height: 18 color: 0x909090 } - priority: 15014 + priority: 15017 } } element { @@ -23767,7 +23775,7 @@ cont { height: 20 color: 0x909090 } - priority: 15014 + priority: 15017 } } } @@ -24168,7 +24176,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1779 + priority: 1780 } lines { width: 0.8 @@ -24178,7 +24186,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1784 + priority: 1785 } } element { @@ -24186,7 +24194,7 @@ cont { lines { width: 1.6 color: 0x80FFFFFF - priority: 1779 + priority: 1780 } lines { width: 0.8 @@ -24196,7 +24204,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1784 + priority: 1785 } } } @@ -24226,7 +24234,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1784 + priority: 1785 } } element { @@ -24253,7 +24261,7 @@ cont { dd: 8 } cap: BUTTCAP - priority: 1784 + priority: 1785 } } } @@ -24288,7 +24296,7 @@ cont { dd: 4.4 } cap: BUTTCAP - priority: 1789 + priority: 1790 } } element { @@ -24306,7 +24314,7 @@ cont { dd: 4 } cap: BUTTCAP - priority: 1867 + priority: 1868 } lines { width: 0.8 @@ -24427,7 +24435,7 @@ cont { lines { width: 0.25 color: 0xb3B2B2B2 - priority: 1210 + priority: 1212 } } element { @@ -24435,7 +24443,7 @@ cont { lines { width: 0.55 color: 0xb3B2B2B2 - priority: 1227 + priority: 1229 } } element { @@ -24443,7 +24451,7 @@ cont { lines { width: 1.6 color: 0x99B2B2B2 - priority: 1178 + priority: 1180 } lines { width: 1 @@ -24453,12 +24461,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1317 + priority: 1319 } lines { width: 1 color: 0x99FFFFFF - priority: 1283 + priority: 1285 } } element { @@ -24466,7 +24474,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1288 + priority: 1290 } lines { width: 2 @@ -24476,12 +24484,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1393 + priority: 1395 } lines { width: 2 color: 0x99FFFFFF - priority: 1366 + priority: 1368 } } element { @@ -24489,7 +24497,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1513 + priority: 1514 } lines { width: 2.4 @@ -24504,7 +24512,7 @@ cont { lines { width: 2.4 color: 0x99FFFFFF - priority: 1611 + priority: 1612 } } element { @@ -24512,7 +24520,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1542 + priority: 1543 } lines { width: 2 @@ -24522,12 +24530,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1706 + priority: 1707 } lines { width: 2 color: 0x99FFFFFF - priority: 1669 + priority: 1670 } } } @@ -24538,7 +24546,7 @@ cont { lines { width: 0.25 color: 0xb3B2B2B2 - priority: 1210 + priority: 1212 } } element { @@ -24546,7 +24554,7 @@ cont { lines { width: 0.55 color: 0xb3B2B2B2 - priority: 1227 + priority: 1229 } } element { @@ -24554,7 +24562,7 @@ cont { lines { width: 1.6 color: 0x99B2B2B2 - priority: 1178 + priority: 1180 } lines { width: 1 @@ -24564,12 +24572,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1317 + priority: 1319 } lines { width: 1 color: 0x99FFFFFF - priority: 1283 + priority: 1285 } } element { @@ -24577,7 +24585,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1288 + priority: 1290 } lines { width: 2 @@ -24587,12 +24595,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1393 + priority: 1395 } lines { width: 2 color: 0x99FFFFFF - priority: 1366 + priority: 1368 } } element { @@ -24600,12 +24608,12 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1513 + priority: 1514 } lines { width: 10.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -24621,7 +24629,7 @@ cont { lines { width: 2.4 color: 0x99FFFFFF - priority: 1611 + priority: 1612 } lines { width: 12.4 @@ -24635,12 +24643,12 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1542 + priority: 1543 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -24651,12 +24659,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1706 + priority: 1707 } lines { width: 2 color: 0x99FFFFFF - priority: 1669 + priority: 1670 } lines { width: 12 @@ -24673,7 +24681,7 @@ cont { lines { width: 0.25 color: 0xb3B2B2B2 - priority: 1210 + priority: 1212 } } element { @@ -24681,7 +24689,7 @@ cont { lines { width: 0.55 color: 0xb3B2B2B2 - priority: 1227 + priority: 1229 } } element { @@ -24689,7 +24697,7 @@ cont { lines { width: 1.6 color: 0x99B2B2B2 - priority: 1178 + priority: 1180 } lines { width: 1 @@ -24699,12 +24707,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1317 + priority: 1319 } lines { width: 1 color: 0x99FFFFFF - priority: 1283 + priority: 1285 } } element { @@ -24712,7 +24720,7 @@ cont { lines { width: 3.2 color: 0x99B2B2B2 - priority: 1288 + priority: 1290 } lines { width: 2 @@ -24722,12 +24730,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1393 + priority: 1395 } lines { width: 2 color: 0x99FFFFFF - priority: 1366 + priority: 1368 } } element { @@ -24735,13 +24743,13 @@ cont { lines { width: 10.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x99B2B2B2 - priority: 1513 + priority: 1514 } lines { width: 2.4 @@ -24756,7 +24764,7 @@ cont { lines { width: 2.4 color: 0x99FFFFFF - priority: 1611 + priority: 1612 } lines { width: 12.4 @@ -24774,13 +24782,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x99B2B2B2 - priority: 1542 + priority: 1543 } lines { width: 2 @@ -24790,12 +24798,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1706 + priority: 1707 } lines { width: 2 color: 0x99FFFFFF - priority: 1669 + priority: 1670 } lines { width: 12 @@ -24833,7 +24841,7 @@ cont { lines { width: 0.5 color: 0x80808080 - priority: 1207 + priority: 1209 } } element { @@ -24841,7 +24849,7 @@ cont { lines { width: 0.85 color: 0x80808080 - priority: 1224 + priority: 1226 } } element { @@ -24849,7 +24857,7 @@ cont { lines { width: 1.6 color: 0x4d808080 - priority: 1176 + priority: 1178 } lines { width: 1 @@ -24859,12 +24867,12 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1315 + priority: 1317 } lines { width: 1 color: 0x4dF2F2F2 - priority: 1281 + priority: 1282 } } element { @@ -24872,7 +24880,7 @@ cont { lines { width: 3.2 color: 0x4d808080 - priority: 1286 + priority: 1287 } lines { width: 2 @@ -24882,12 +24890,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1391 + priority: 1392 } lines { width: 2 color: 0x4dF2F2F2 - priority: 1364 + priority: 1365 } } element { @@ -24895,7 +24903,7 @@ cont { lines { width: 3.2 color: 0x4d808080 - priority: 1508 + priority: 1509 } lines { width: 2.4 @@ -24905,12 +24913,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1638 + priority: 1639 } lines { width: 2.4 color: 0x4dF2F2F2 - priority: 1606 + priority: 1607 } } element { @@ -24918,7 +24926,7 @@ cont { lines { width: 3.2 color: 0x4d808080 - priority: 1540 + priority: 1541 } lines { width: 2 @@ -24928,7 +24936,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1701 + priority: 1702 } lines { width: 2 @@ -24944,7 +24952,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1222 + priority: 1224 } } element { @@ -24952,7 +24960,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1239 + priority: 1241 } } element { @@ -24960,12 +24968,12 @@ cont { lines { width: 2.4 color: 0x590909 - priority: 1195 + priority: 1197 } lines { width: 0.4 color: 0x590909 - priority: 1330 + priority: 1331 } lines { width: 1.7 @@ -24975,7 +24983,7 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1300 + priority: 1302 } } element { @@ -24983,12 +24991,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1303 + priority: 1304 } lines { width: 0.5 color: 0x4C0F0F - priority: 1405 + priority: 1407 } lines { width: 2 @@ -24998,7 +25006,7 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1378 + priority: 1380 } } element { @@ -25006,12 +25014,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1520 + priority: 1521 } lines { width: 0.6 color: 0x4C0F0F - priority: 1652 + priority: 1653 } lines { width: 2 @@ -25021,7 +25029,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1625 + priority: 1626 } } element { @@ -25029,12 +25037,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1559 + priority: 1560 } lines { width: 0.64 color: 0x4C0F0F - priority: 1728 + priority: 1729 } lines { width: 2 @@ -25044,7 +25052,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1684 + priority: 1685 } } } @@ -25055,7 +25063,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1222 + priority: 1224 } } element { @@ -25063,7 +25071,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1239 + priority: 1241 } } element { @@ -25071,12 +25079,12 @@ cont { lines { width: 2.4 color: 0x590909 - priority: 1195 + priority: 1197 } lines { width: 0.4 color: 0x590909 - priority: 1330 + priority: 1331 } lines { width: 1.7 @@ -25086,7 +25094,7 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1300 + priority: 1302 } } element { @@ -25094,12 +25102,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1303 + priority: 1304 } lines { width: 0.5 color: 0x4C0F0F - priority: 1405 + priority: 1407 } lines { width: 2 @@ -25109,7 +25117,7 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1378 + priority: 1380 } } element { @@ -25117,18 +25125,18 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1520 + priority: 1521 } lines { width: 8.6 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 0.6 color: 0x4C0F0F - priority: 1652 + priority: 1653 } lines { width: 2 @@ -25138,7 +25146,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1625 + priority: 1626 } lines { width: 10.6 @@ -25152,18 +25160,18 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1559 + priority: 1560 } lines { width: 8.64 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 0.64 color: 0x4C0F0F - priority: 1728 + priority: 1729 } lines { width: 2 @@ -25173,7 +25181,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1684 + priority: 1685 } lines { width: 10.64 @@ -25190,7 +25198,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1222 + priority: 1224 } } element { @@ -25198,7 +25206,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1239 + priority: 1241 } } element { @@ -25206,12 +25214,12 @@ cont { lines { width: 2.4 color: 0x590909 - priority: 1195 + priority: 1197 } lines { width: 0.4 color: 0x590909 - priority: 1330 + priority: 1331 } lines { width: 1.7 @@ -25221,7 +25229,7 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1300 + priority: 1302 } } element { @@ -25229,12 +25237,12 @@ cont { lines { width: 3.2 color: 0x4C0F0F - priority: 1303 + priority: 1304 } lines { width: 0.5 color: 0x4C0F0F - priority: 1405 + priority: 1407 } lines { width: 2 @@ -25244,7 +25252,7 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1378 + priority: 1380 } } element { @@ -25252,18 +25260,18 @@ cont { lines { width: 8.6 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x4C0F0F - priority: 1520 + priority: 1521 } lines { width: 0.6 color: 0x4C0F0F - priority: 1652 + priority: 1653 } lines { width: 2 @@ -25273,7 +25281,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1625 + priority: 1626 } lines { width: 10.6 @@ -25291,18 +25299,18 @@ cont { lines { width: 8.64 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x4C0F0F - priority: 1559 + priority: 1560 } lines { width: 0.64 color: 0x4C0F0F - priority: 1728 + priority: 1729 } lines { width: 2 @@ -25312,7 +25320,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1684 + priority: 1685 } lines { width: 10.64 @@ -25332,14 +25340,14 @@ cont { scale: 14 symbol { name: "railway-station-mini" - priority: 16146 + priority: 16148 } } element { scale: 15 symbol { name: "railway-station-mini" - priority: 16146 + priority: 16148 } caption { primary { @@ -25348,14 +25356,14 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15146 + priority: 15148 } } element { scale: 16 symbol { name: "railway-station-mini" - priority: 16146 + priority: 16148 } caption { primary { @@ -25364,7 +25372,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15146 + priority: 15148 } } element { @@ -25439,7 +25447,7 @@ cont { lines { width: 1.7 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } } element { @@ -25462,7 +25470,7 @@ cont { lines { width: 2 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } } element { @@ -25485,7 +25493,7 @@ cont { lines { width: 2 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } } element { @@ -25493,7 +25501,7 @@ cont { lines { width: 3.2 color: 0x0F4C0F - priority: 1557 + priority: 1558 } lines { width: 2 @@ -25503,12 +25511,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1718 + priority: 1719 } lines { width: 2 color: 0xB7E6E6 - priority: 1679 + priority: 1680 } } } @@ -25550,7 +25558,7 @@ cont { lines { width: 1.7 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } } element { @@ -25573,7 +25581,7 @@ cont { lines { width: 2 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } } element { @@ -25586,7 +25594,7 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -25602,7 +25610,7 @@ cont { lines { width: 2 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } lines { width: 12 @@ -25616,12 +25624,12 @@ cont { lines { width: 3.2 color: 0x0F4C0F - priority: 1557 + priority: 1558 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -25632,12 +25640,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1718 + priority: 1719 } lines { width: 2 color: 0xB7E6E6 - priority: 1679 + priority: 1680 } lines { width: 12 @@ -25685,7 +25693,7 @@ cont { lines { width: 1.7 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } } element { @@ -25708,7 +25716,7 @@ cont { lines { width: 2 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } } element { @@ -25716,7 +25724,7 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -25737,7 +25745,7 @@ cont { lines { width: 2 color: 0xB7E6E6 - priority: 1701 + priority: 1702 } lines { width: 12 @@ -25755,13 +25763,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x0F4C0F - priority: 1557 + priority: 1558 } lines { width: 2 @@ -25771,12 +25779,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1718 + priority: 1719 } lines { width: 2 color: 0xB7E6E6 - priority: 1679 + priority: 1680 } lines { width: 12 @@ -25797,7 +25805,7 @@ cont { lines { width: 1 color: 0xD08080 - priority: 1224 + priority: 1226 } } element { @@ -25818,17 +25826,17 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1535 + priority: 1536 } lines { width: 2 color: 0x590959 - priority: 1530 + priority: 1531 } lines { width: 1.7 color: 0xD08080 - priority: 1533 + priority: 1534 } } element { @@ -25836,7 +25844,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -25846,12 +25854,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } } element { @@ -25859,7 +25867,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -25869,12 +25877,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } } element { @@ -25882,7 +25890,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -25892,12 +25900,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } } } @@ -25908,7 +25916,7 @@ cont { lines { width: 1 color: 0xD08080 - priority: 1224 + priority: 1226 } } element { @@ -25929,17 +25937,17 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1535 + priority: 1536 } lines { width: 2 color: 0x590959 - priority: 1530 + priority: 1531 } lines { width: 1.7 color: 0xD08080 - priority: 1533 + priority: 1534 } } element { @@ -25947,7 +25955,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -25957,12 +25965,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } } element { @@ -25970,12 +25978,12 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -25986,12 +25994,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } lines { width: 12 @@ -26005,12 +26013,12 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -26021,12 +26029,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } lines { width: 12 @@ -26043,7 +26051,7 @@ cont { lines { width: 1 color: 0xD08080 - priority: 1224 + priority: 1226 } } element { @@ -26064,17 +26072,17 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1535 + priority: 1536 } lines { width: 2 color: 0x590959 - priority: 1530 + priority: 1531 } lines { width: 1.7 color: 0xD08080 - priority: 1533 + priority: 1534 } } element { @@ -26082,7 +26090,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -26092,12 +26100,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } } element { @@ -26105,13 +26113,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -26121,12 +26129,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } lines { width: 12 @@ -26144,13 +26152,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -26160,12 +26168,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xD08080 - priority: 1537 + priority: 1539 } lines { width: 12 @@ -26186,7 +26194,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1215 + priority: 1217 } } element { @@ -26194,7 +26202,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1234 + priority: 1236 } } element { @@ -26202,7 +26210,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1183 + priority: 1185 } lines { width: 1.7 @@ -26212,12 +26220,12 @@ cont { dd: 5.5 } cap: BUTTCAP - priority: 1322 + priority: 1324 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1290 + priority: 1292 } } element { @@ -26225,7 +26233,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1295 + priority: 1297 } lines { width: 2 @@ -26235,12 +26243,12 @@ cont { dd: 11 } cap: BUTTCAP - priority: 1398 + priority: 1400 } lines { width: 2 color: 0xE6E6E6 - priority: 1371 + priority: 1373 } } element { @@ -26248,7 +26256,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1518 + priority: 1519 } lines { width: 2 @@ -26258,12 +26266,12 @@ cont { dd: 14 } cap: BUTTCAP - priority: 1647 + priority: 1648 } lines { width: 2 color: 0xE6E6E6 - priority: 1618 + priority: 1619 } } element { @@ -26271,7 +26279,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1552 + priority: 1553 } lines { width: 2 @@ -26281,12 +26289,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1713 + priority: 1714 } lines { width: 2 color: 0xE6E6E6 - priority: 1674 + priority: 1675 } } } @@ -26297,7 +26305,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1215 + priority: 1217 } } element { @@ -26305,7 +26313,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1234 + priority: 1236 } } element { @@ -26313,7 +26321,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1183 + priority: 1185 } lines { width: 1.7 @@ -26323,12 +26331,12 @@ cont { dd: 5.5 } cap: BUTTCAP - priority: 1322 + priority: 1324 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1290 + priority: 1292 } } element { @@ -26336,7 +26344,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1295 + priority: 1297 } lines { width: 2 @@ -26346,12 +26354,12 @@ cont { dd: 11 } cap: BUTTCAP - priority: 1398 + priority: 1400 } lines { width: 2 color: 0xE6E6E6 - priority: 1371 + priority: 1373 } } element { @@ -26359,12 +26367,12 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1518 + priority: 1519 } lines { width: 11.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -26375,12 +26383,12 @@ cont { dd: 14 } cap: BUTTCAP - priority: 1647 + priority: 1648 } lines { width: 2 color: 0xE6E6E6 - priority: 1618 + priority: 1619 } lines { width: 13.2 @@ -26394,12 +26402,12 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1552 + priority: 1553 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -26410,12 +26418,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1713 + priority: 1714 } lines { width: 2 color: 0xE6E6E6 - priority: 1674 + priority: 1675 } lines { width: 12 @@ -26432,7 +26440,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1215 + priority: 1217 } } element { @@ -26440,7 +26448,7 @@ cont { lines { width: 1 color: 0xA0A0A0 - priority: 1234 + priority: 1236 } } element { @@ -26448,7 +26456,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1183 + priority: 1185 } lines { width: 1.7 @@ -26458,12 +26466,12 @@ cont { dd: 5.5 } cap: BUTTCAP - priority: 1322 + priority: 1324 } lines { width: 1.7 color: 0xE6E6E6 - priority: 1290 + priority: 1292 } } element { @@ -26471,7 +26479,7 @@ cont { lines { width: 3.2 color: 0x333333 - priority: 1295 + priority: 1297 } lines { width: 2 @@ -26481,12 +26489,12 @@ cont { dd: 11 } cap: BUTTCAP - priority: 1398 + priority: 1400 } lines { width: 2 color: 0xE6E6E6 - priority: 1371 + priority: 1373 } } element { @@ -26494,13 +26502,13 @@ cont { lines { width: 11.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x333333 - priority: 1518 + priority: 1519 } lines { width: 2 @@ -26510,12 +26518,12 @@ cont { dd: 14 } cap: BUTTCAP - priority: 1647 + priority: 1648 } lines { width: 2 color: 0xE6E6E6 - priority: 1618 + priority: 1619 } lines { width: 13.2 @@ -26533,13 +26541,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x333333 - priority: 1552 + priority: 1553 } lines { width: 2 @@ -26549,12 +26557,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1713 + priority: 1714 } lines { width: 2 color: 0xE6E6E6 - priority: 1674 + priority: 1675 } lines { width: 12 @@ -26575,7 +26583,7 @@ cont { lines { width: 4 color: 0xBBBBBB - priority: 1569 + priority: 1570 } area { color: 0xBBBBBB @@ -26602,7 +26610,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1217 + priority: 1219 } } element { @@ -26610,7 +26618,7 @@ cont { lines { width: 1.35 color: 0xB0B0B0 - priority: 1237 + priority: 1239 } } element { @@ -26618,7 +26626,7 @@ cont { lines { width: 2.4 color: 0x909090 - priority: 1185 + priority: 1187 } lines { width: 1.7 @@ -26628,7 +26636,7 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1325 + priority: 1326 } lines { width: 1.7 @@ -26641,7 +26649,7 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1298 + priority: 1300 } lines { width: 2 @@ -26651,12 +26659,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1400 + priority: 1402 } lines { width: 2 color: 0xE6E6E6 - priority: 1374 + priority: 1375 } } element { @@ -26674,7 +26682,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1650 + priority: 1651 } lines { width: 2 @@ -26687,7 +26695,7 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1555 + priority: 1556 } lines { width: 2 @@ -26697,12 +26705,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1716 + priority: 1717 } lines { width: 2 color: 0xE6E6E6 - priority: 1677 + priority: 1678 } } } @@ -26713,7 +26721,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1217 + priority: 1219 } } element { @@ -26721,7 +26729,7 @@ cont { lines { width: 1.35 color: 0xB0B0B0 - priority: 1237 + priority: 1239 } } element { @@ -26729,7 +26737,7 @@ cont { lines { width: 2.4 color: 0x909090 - priority: 1185 + priority: 1187 } lines { width: 1.7 @@ -26739,7 +26747,7 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1325 + priority: 1326 } lines { width: 1.7 @@ -26752,7 +26760,7 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1298 + priority: 1300 } lines { width: 2 @@ -26762,12 +26770,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1400 + priority: 1402 } lines { width: 2 color: 0xE6E6E6 - priority: 1374 + priority: 1375 } } element { @@ -26780,7 +26788,7 @@ cont { lines { width: 11.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -26791,7 +26799,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1650 + priority: 1651 } lines { width: 2 @@ -26810,12 +26818,12 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1555 + priority: 1556 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -26826,12 +26834,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1716 + priority: 1717 } lines { width: 2 color: 0xE6E6E6 - priority: 1677 + priority: 1678 } lines { width: 12 @@ -26848,7 +26856,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1217 + priority: 1219 } } element { @@ -26856,7 +26864,7 @@ cont { lines { width: 1.35 color: 0xB0B0B0 - priority: 1237 + priority: 1239 } } element { @@ -26864,7 +26872,7 @@ cont { lines { width: 2.4 color: 0x909090 - priority: 1185 + priority: 1187 } lines { width: 1.7 @@ -26874,7 +26882,7 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1325 + priority: 1326 } lines { width: 1.7 @@ -26887,7 +26895,7 @@ cont { lines { width: 3.2 color: 0x909090 - priority: 1298 + priority: 1300 } lines { width: 2 @@ -26897,12 +26905,12 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1400 + priority: 1402 } lines { width: 2 color: 0xE6E6E6 - priority: 1374 + priority: 1375 } } element { @@ -26910,7 +26918,7 @@ cont { lines { width: 11.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -26926,7 +26934,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1650 + priority: 1651 } lines { width: 2 @@ -26949,13 +26957,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x909090 - priority: 1555 + priority: 1556 } lines { width: 2 @@ -26965,12 +26973,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1716 + priority: 1717 } lines { width: 2 color: 0xE6E6E6 - priority: 1677 + priority: 1678 } lines { width: 12 @@ -26991,7 +26999,7 @@ cont { lines { width: 1.56 color: 0xB0B0B0 - priority: 1044 + priority: 1046 } } element { @@ -26999,7 +27007,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1139 + priority: 1141 } } element { @@ -27007,7 +27015,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1139 + priority: 1141 } } element { @@ -27015,7 +27023,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1212 + priority: 1214 } } element { @@ -27023,7 +27031,7 @@ cont { lines { width: 1.85 color: 0xB0B0B0 - priority: 1232 + priority: 1234 } } element { @@ -27039,12 +27047,12 @@ cont { lines { width: 1.8 color: 0xE6E6E6 - priority: 1288 + priority: 1290 } lines { width: 3 color: 0x888888 - priority: 1180 + priority: 1182 } lines { width: 1.8 @@ -27054,7 +27062,7 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1320 + priority: 1321 } } element { @@ -27070,12 +27078,12 @@ cont { lines { width: 2.4 color: 0xE6E6E6 - priority: 1369 + priority: 1370 } lines { width: 4 color: 0x666666 - priority: 1293 + priority: 1295 } lines { width: 2.4 @@ -27085,7 +27093,7 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1371 + priority: 1373 } } element { @@ -27101,12 +27109,12 @@ cont { lines { width: 2.4 color: 0xE6E6E6 - priority: 1616 + priority: 1617 } lines { width: 4 color: 0x666666 - priority: 1515 + priority: 1517 } lines { width: 2.4 @@ -27116,7 +27124,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1645 + priority: 1646 } } element { @@ -27132,12 +27140,12 @@ cont { lines { width: 3.2 color: 0xE6E6E6 - priority: 1672 + priority: 1673 } lines { width: 4.4 color: 0x666666 - priority: 1550 + priority: 1551 } lines { width: 3.2 @@ -27147,7 +27155,7 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1711 + priority: 1712 } } } @@ -27158,7 +27166,7 @@ cont { lines { width: 1.56 color: 0xB0B0B0 - priority: 1044 + priority: 1046 } } element { @@ -27166,7 +27174,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1139 + priority: 1141 } } element { @@ -27174,7 +27182,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1139 + priority: 1141 } } element { @@ -27182,7 +27190,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1212 + priority: 1214 } } element { @@ -27190,7 +27198,7 @@ cont { lines { width: 1.85 color: 0xB0B0B0 - priority: 1232 + priority: 1234 } } element { @@ -27206,12 +27214,12 @@ cont { lines { width: 1.8 color: 0xE6E6E6 - priority: 1288 + priority: 1290 } lines { width: 3 color: 0x888888 - priority: 1180 + priority: 1182 } lines { width: 1.8 @@ -27221,7 +27229,7 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1320 + priority: 1321 } } element { @@ -27237,12 +27245,12 @@ cont { lines { width: 2.4 color: 0xE6E6E6 - priority: 1369 + priority: 1370 } lines { width: 4 color: 0x666666 - priority: 1293 + priority: 1295 } lines { width: 2.4 @@ -27252,7 +27260,7 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1371 + priority: 1373 } } element { @@ -27268,12 +27276,12 @@ cont { lines { width: 2.4 color: 0xE6E6E6 - priority: 1616 + priority: 1617 } lines { width: 4 color: 0x666666 - priority: 1515 + priority: 1517 } lines { width: 2.4 @@ -27283,12 +27291,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1645 + priority: 1646 } lines { width: 10.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -27311,12 +27319,12 @@ cont { lines { width: 3.2 color: 0xE6E6E6 - priority: 1672 + priority: 1673 } lines { width: 4.4 color: 0x666666 - priority: 1550 + priority: 1551 } lines { width: 3.2 @@ -27326,12 +27334,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1711 + priority: 1712 } lines { width: 11.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -27349,7 +27357,7 @@ cont { lines { width: 1.56 color: 0xB0B0B0 - priority: 1044 + priority: 1046 } } element { @@ -27357,7 +27365,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1139 + priority: 1141 } } element { @@ -27365,7 +27373,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1139 + priority: 1141 } } element { @@ -27373,7 +27381,7 @@ cont { lines { width: 1 color: 0xC0C0C0 - priority: 1212 + priority: 1214 } } element { @@ -27381,7 +27389,7 @@ cont { lines { width: 1.85 color: 0xB0B0B0 - priority: 1232 + priority: 1234 } } element { @@ -27397,12 +27405,12 @@ cont { lines { width: 1.8 color: 0xE6E6E6 - priority: 1288 + priority: 1290 } lines { width: 3 color: 0x888888 - priority: 1180 + priority: 1182 } lines { width: 1.8 @@ -27412,7 +27420,7 @@ cont { dd: 4.5 } cap: BUTTCAP - priority: 1320 + priority: 1321 } } element { @@ -27428,12 +27436,12 @@ cont { lines { width: 2.4 color: 0xE6E6E6 - priority: 1369 + priority: 1370 } lines { width: 4 color: 0x666666 - priority: 1293 + priority: 1295 } lines { width: 2.4 @@ -27443,7 +27451,7 @@ cont { dd: 9 } cap: BUTTCAP - priority: 1371 + priority: 1373 } } element { @@ -27459,12 +27467,12 @@ cont { lines { width: 2.4 color: 0xE6E6E6 - priority: 1616 + priority: 1617 } lines { width: 4 color: 0x666666 - priority: 1515 + priority: 1517 } lines { width: 12.4 @@ -27484,12 +27492,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1645 + priority: 1646 } lines { width: 10.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } } @@ -27506,12 +27514,12 @@ cont { lines { width: 3.2 color: 0xE6E6E6 - priority: 1672 + priority: 1673 } lines { width: 4.4 color: 0x666666 - priority: 1550 + priority: 1551 } lines { width: 13.2 @@ -27531,12 +27539,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1711 + priority: 1712 } lines { width: 11.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } } @@ -27553,7 +27561,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1511 + priority: 1512 } lines { width: 2.4 @@ -27567,12 +27575,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1640 + priority: 1641 } lines { width: 2.4 color: 0xb3FFFFFF - priority: 1608 + priority: 1609 } } element { @@ -27585,7 +27593,7 @@ cont { dd: 2.4 } cap: BUTTCAP - priority: 1547 + priority: 1548 } lines { width: 2 @@ -27604,7 +27612,7 @@ cont { lines { width: 2 color: 0xb3FFFFFF - priority: 1667 + priority: 1668 } } } @@ -27615,7 +27623,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1244 + priority: 1246 } } element { @@ -27623,7 +27631,7 @@ cont { lines { width: 1.6 color: 0x909090 - priority: 1202 + priority: 1204 } lines { width: 1 @@ -27633,12 +27641,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1337 + priority: 1339 } lines { width: 1 color: 0xE6E6E6 - priority: 1308 + priority: 1309 } } element { @@ -27646,7 +27654,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1312 + priority: 1314 } lines { width: 1.4 @@ -27656,12 +27664,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1413 + priority: 1414 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1386 + priority: 1387 } } element { @@ -27669,7 +27677,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1528 + priority: 1529 } lines { width: 1.2 @@ -27684,7 +27692,7 @@ cont { lines { width: 1.2 color: 0xE6E6E6 - priority: 1633 + priority: 1634 } } element { @@ -27692,7 +27700,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1567 + priority: 1568 } lines { width: 1.36 @@ -27702,12 +27710,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1738 + priority: 1739 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1691 + priority: 1692 } } } @@ -27718,7 +27726,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1244 + priority: 1246 } } element { @@ -27726,7 +27734,7 @@ cont { lines { width: 1.6 color: 0x909090 - priority: 1202 + priority: 1204 } lines { width: 1 @@ -27736,12 +27744,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1337 + priority: 1339 } lines { width: 1 color: 0xE6E6E6 - priority: 1308 + priority: 1309 } } element { @@ -27749,7 +27757,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1312 + priority: 1314 } lines { width: 1.4 @@ -27759,12 +27767,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1413 + priority: 1414 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1386 + priority: 1387 } } element { @@ -27772,12 +27780,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1528 + priority: 1529 } lines { width: 9.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -27793,7 +27801,7 @@ cont { lines { width: 1.2 color: 0xE6E6E6 - priority: 1633 + priority: 1634 } lines { width: 11.2 @@ -27807,12 +27815,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1567 + priority: 1568 } lines { width: 10.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -27823,12 +27831,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1738 + priority: 1739 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1691 + priority: 1692 } lines { width: 12.4 @@ -27845,7 +27853,7 @@ cont { lines { width: 1 color: 0xB0B0B0 - priority: 1244 + priority: 1246 } } element { @@ -27853,7 +27861,7 @@ cont { lines { width: 1.6 color: 0x909090 - priority: 1202 + priority: 1204 } lines { width: 1 @@ -27863,12 +27871,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1337 + priority: 1339 } lines { width: 1 color: 0xE6E6E6 - priority: 1308 + priority: 1309 } } element { @@ -27876,7 +27884,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1312 + priority: 1314 } lines { width: 1.4 @@ -27886,12 +27894,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1413 + priority: 1414 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1386 + priority: 1387 } } element { @@ -27899,13 +27907,13 @@ cont { lines { width: 9.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 2.4 color: 0x333333 - priority: 1528 + priority: 1529 } lines { width: 1.2 @@ -27920,7 +27928,7 @@ cont { lines { width: 1.2 color: 0xE6E6E6 - priority: 1633 + priority: 1634 } lines { width: 11.2 @@ -27938,13 +27946,13 @@ cont { lines { width: 10.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 2.4 color: 0x333333 - priority: 1567 + priority: 1568 } lines { width: 1.36 @@ -27954,12 +27962,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1738 + priority: 1739 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1691 + priority: 1692 } lines { width: 12.4 @@ -27980,7 +27988,7 @@ cont { lines { width: 1.6 color: 0xB0B0B0 - priority: 1198 + priority: 1200 } lines { width: 1 @@ -27990,12 +27998,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1332 + priority: 1334 } lines { width: 1 color: 0x909090 - priority: 1303 + priority: 1304 } } element { @@ -28003,7 +28011,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1308 + priority: 1309 } lines { width: 1.4 @@ -28013,12 +28021,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1408 + priority: 1409 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1381 + priority: 1382 } } element { @@ -28026,7 +28034,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1523 + priority: 1524 } lines { width: 1.2 @@ -28036,12 +28044,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1655 + priority: 1656 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1628 + priority: 1629 } } element { @@ -28049,7 +28057,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1562 + priority: 1563 } lines { width: 1.36 @@ -28059,7 +28067,7 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1733 + priority: 1734 } lines { width: 1.36 @@ -28075,7 +28083,7 @@ cont { lines { width: 1.6 color: 0xB0B0B0 - priority: 1198 + priority: 1200 } lines { width: 1 @@ -28085,12 +28093,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1332 + priority: 1334 } lines { width: 1 color: 0x909090 - priority: 1303 + priority: 1304 } } element { @@ -28098,7 +28106,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1308 + priority: 1309 } lines { width: 1.4 @@ -28108,12 +28116,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1408 + priority: 1409 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1381 + priority: 1382 } } element { @@ -28121,12 +28129,12 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1523 + priority: 1524 } lines { width: 9.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -28137,12 +28145,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1655 + priority: 1656 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1628 + priority: 1629 } lines { width: 11.2 @@ -28156,12 +28164,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1562 + priority: 1563 } lines { width: 9.36 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -28172,7 +28180,7 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1733 + priority: 1734 } lines { width: 1.36 @@ -28194,7 +28202,7 @@ cont { lines { width: 1.6 color: 0xB0B0B0 - priority: 1198 + priority: 1200 } lines { width: 1 @@ -28204,12 +28212,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1332 + priority: 1334 } lines { width: 1 color: 0x909090 - priority: 1303 + priority: 1304 } } element { @@ -28217,7 +28225,7 @@ cont { lines { width: 2.4 color: 0x606060 - priority: 1308 + priority: 1309 } lines { width: 1.4 @@ -28227,12 +28235,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1408 + priority: 1409 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1381 + priority: 1382 } } element { @@ -28240,13 +28248,13 @@ cont { lines { width: 9.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 2.4 color: 0x606060 - priority: 1523 + priority: 1524 } lines { width: 1.2 @@ -28256,12 +28264,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1655 + priority: 1656 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1628 + priority: 1629 } lines { width: 11.2 @@ -28279,13 +28287,13 @@ cont { lines { width: 9.36 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 2.4 color: 0x333333 - priority: 1562 + priority: 1563 } lines { width: 1.36 @@ -28295,7 +28303,7 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1733 + priority: 1734 } lines { width: 1.36 @@ -28320,14 +28328,14 @@ cont { scale: 14 symbol { name: "railway-station-mini" - priority: 16146 + priority: 16148 } } element { scale: 15 symbol { name: "railway-station-mini" - priority: 16146 + priority: 16148 } caption { primary { @@ -28336,14 +28344,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 14 } - priority: 15146 + priority: 15148 } } element { scale: 16 symbol { name: "railway-station" - priority: 16146 + priority: 16148 } caption { primary { @@ -28352,14 +28360,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 14 } - priority: 15146 + priority: 15148 } } element { scale: 17 symbol { name: "railway-station" - priority: 16146 + priority: 16148 } caption { primary { @@ -28368,7 +28376,7 @@ cont { stroke_color: 0xF8FCFF offset_y: 14 } - priority: 15146 + priority: 15148 } } } @@ -28378,7 +28386,7 @@ cont { scale: 13 symbol { name: "subway-station-s" - priority: 16146 + priority: 16148 } caption { primary { @@ -28387,14 +28395,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 14 } - priority: 15146 + priority: 15148 } } element { scale: 14 symbol { name: "subway-station-s" - priority: 16146 + priority: 16148 } caption { primary { @@ -28403,14 +28411,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 14 } - priority: 15146 + priority: 15148 } } element { scale: 15 symbol { name: "subway-station-m" - priority: 16146 + priority: 16148 } caption { primary { @@ -28419,14 +28427,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 14 } - priority: 15146 + priority: 15148 } } element { scale: 16 symbol { name: "subway-station-l" - priority: 16146 + priority: 16148 } caption { primary { @@ -28435,14 +28443,14 @@ cont { stroke_color: 0xF8FCFF offset_y: 14 } - priority: 15146 + priority: 15148 } } element { scale: 17 symbol { name: "subway-station-l" - priority: 16146 + priority: 16148 } caption { primary { @@ -28451,7 +28459,7 @@ cont { stroke_color: 0xF8FCFF offset_y: 14 } - priority: 15146 + priority: 15148 } } } @@ -28467,7 +28475,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } } element { @@ -28480,7 +28488,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } } element { @@ -28493,7 +28501,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } } } @@ -28509,7 +28517,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } } element { @@ -28522,12 +28530,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -28547,12 +28555,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -28575,7 +28583,7 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } } element { @@ -28588,12 +28596,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -28617,12 +28625,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1723 + priority: 1724 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -28666,17 +28674,17 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1535 + priority: 1536 } lines { width: 2 color: 0x590959 - priority: 1530 + priority: 1531 } lines { width: 1.7 color: 0xE6B7E6 - priority: 1533 + priority: 1534 } } element { @@ -28684,7 +28692,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -28694,12 +28702,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } } element { @@ -28707,7 +28715,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -28717,12 +28725,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } } element { @@ -28730,7 +28738,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -28740,12 +28748,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } } } @@ -28761,17 +28769,17 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1535 + priority: 1536 } lines { width: 2 color: 0x590959 - priority: 1530 + priority: 1531 } lines { width: 1.7 color: 0xE6B7E6 - priority: 1533 + priority: 1534 } } element { @@ -28779,7 +28787,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -28789,12 +28797,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } } element { @@ -28802,12 +28810,12 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -28818,12 +28826,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } lines { width: 12 @@ -28837,12 +28845,12 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -28853,12 +28861,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } lines { width: 12 @@ -28880,17 +28888,17 @@ cont { dd: 5.4 } cap: BUTTCAP - priority: 1535 + priority: 1536 } lines { width: 2 color: 0x590959 - priority: 1530 + priority: 1531 } lines { width: 1.7 color: 0xE6B7E6 - priority: 1533 + priority: 1534 } } element { @@ -28898,7 +28906,7 @@ cont { lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -28908,12 +28916,12 @@ cont { dd: 10.8 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } } element { @@ -28921,13 +28929,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -28937,12 +28945,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } lines { width: 12 @@ -28960,13 +28968,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 3.2 color: 0x4C0F4C - priority: 1533 + priority: 1534 } lines { width: 2 @@ -28976,12 +28984,12 @@ cont { dd: 14.4 } cap: BUTTCAP - priority: 1545 + priority: 1546 } lines { width: 2 color: 0xE6B7E6 - priority: 1537 + priority: 1539 } lines { width: 12 @@ -29053,7 +29061,7 @@ cont { lines { width: 0.5 color: 0x404040 - priority: 1229 + priority: 1231 } } element { @@ -29061,7 +29069,7 @@ cont { lines { width: 0.85 color: 0x404040 - priority: 1242 + priority: 1243 } } element { @@ -29069,7 +29077,7 @@ cont { lines { width: 1.6 color: 0x404040 - priority: 1200 + priority: 1202 } lines { width: 1 @@ -29079,12 +29087,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1334 + priority: 1336 } lines { width: 1 color: 0xE6E6E6 - priority: 1305 + priority: 1307 } } element { @@ -29102,12 +29110,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1410 + priority: 1412 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1383 + priority: 1385 } } element { @@ -29115,7 +29123,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1525 + priority: 1526 } lines { width: 1.2 @@ -29125,12 +29133,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1657 + priority: 1658 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1630 + priority: 1631 } } element { @@ -29138,7 +29146,7 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1564 + priority: 1565 } lines { width: 1.36 @@ -29148,12 +29156,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1735 + priority: 1736 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1689 + priority: 1690 } } } @@ -29164,7 +29172,7 @@ cont { lines { width: 0.5 color: 0x404040 - priority: 1229 + priority: 1231 } } element { @@ -29172,7 +29180,7 @@ cont { lines { width: 0.85 color: 0x404040 - priority: 1242 + priority: 1243 } } element { @@ -29180,7 +29188,7 @@ cont { lines { width: 1.6 color: 0x404040 - priority: 1200 + priority: 1202 } lines { width: 1 @@ -29190,12 +29198,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1334 + priority: 1336 } lines { width: 1 color: 0xE6E6E6 - priority: 1305 + priority: 1307 } } element { @@ -29213,12 +29221,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1410 + priority: 1412 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1383 + priority: 1385 } } element { @@ -29226,12 +29234,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1525 + priority: 1526 } lines { width: 9.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -29242,12 +29250,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1657 + priority: 1658 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1630 + priority: 1631 } lines { width: 11.2 @@ -29261,12 +29269,12 @@ cont { lines { width: 2.4 color: 0x333333 - priority: 1564 + priority: 1565 } lines { width: 9.36 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -29277,12 +29285,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1735 + priority: 1736 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1689 + priority: 1690 } lines { width: 11.36 @@ -29299,7 +29307,7 @@ cont { lines { width: 0.5 color: 0x404040 - priority: 1229 + priority: 1231 } } element { @@ -29307,7 +29315,7 @@ cont { lines { width: 0.85 color: 0x404040 - priority: 1242 + priority: 1243 } } element { @@ -29315,7 +29323,7 @@ cont { lines { width: 1.6 color: 0x404040 - priority: 1200 + priority: 1202 } lines { width: 1 @@ -29325,12 +29333,12 @@ cont { dd: 6 } cap: BUTTCAP - priority: 1334 + priority: 1336 } lines { width: 1 color: 0xE6E6E6 - priority: 1305 + priority: 1307 } } element { @@ -29348,12 +29356,12 @@ cont { dd: 12 } cap: BUTTCAP - priority: 1410 + priority: 1412 } lines { width: 1.4 color: 0xE6E6E6 - priority: 1383 + priority: 1385 } } element { @@ -29361,13 +29369,13 @@ cont { lines { width: 9.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 2.4 color: 0x333333 - priority: 1525 + priority: 1526 } lines { width: 1.2 @@ -29377,12 +29385,12 @@ cont { dd: 16 } cap: BUTTCAP - priority: 1657 + priority: 1658 } lines { width: 1.2 color: 0xE6E6E6 - priority: 1630 + priority: 1631 } lines { width: 11.2 @@ -29400,13 +29408,13 @@ cont { lines { width: 9.36 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 2.4 color: 0x333333 - priority: 1564 + priority: 1565 } lines { width: 1.36 @@ -29416,12 +29424,12 @@ cont { dd: 16.8 } cap: BUTTCAP - priority: 1735 + priority: 1736 } lines { width: 1.36 color: 0xE6E6E6 - priority: 1689 + priority: 1690 } lines { width: 11.36 @@ -29447,7 +29455,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 1141 + priority: 1143 } } element { @@ -29460,7 +29468,7 @@ cont { dd: 1 } cap: BUTTCAP - priority: 1141 + priority: 1143 } } element { @@ -29473,7 +29481,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1046 + priority: 1048 } } element { @@ -29486,7 +29494,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1144 + priority: 1146 } } element { @@ -29499,7 +29507,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1144 + priority: 1146 } } element { @@ -29512,7 +29520,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1376 + priority: 1378 } } element { @@ -29525,7 +29533,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1408 + priority: 1409 } } element { @@ -29538,7 +29546,7 @@ cont { dd: 2 } cap: BUTTCAP - priority: 1471 + priority: 1473 } } element { @@ -29551,7 +29559,7 @@ cont { dd: 5 } cap: BUTTCAP - priority: 1638 + priority: 1639 } } element { @@ -29585,6 +29593,10 @@ cont { name: "shop-bakery" element { scale: 16 + symbol { + name: "bakery" + priority: 16004 + } caption { primary { height: 12 @@ -29592,15 +29604,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bakery" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "bakery" + priority: 16004 + } caption { primary { height: 12 @@ -29608,11 +29620,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "bakery" - priority: 16000 + priority: 15004 } } } @@ -29620,6 +29628,10 @@ cont { name: "shop-car_repair" element { scale: 16 + symbol { + name: "car_repair" + priority: 16004 + } caption { primary { height: 12 @@ -29627,15 +29639,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "car_repair" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "car_repair" + priority: 16004 + } caption { primary { height: 12 @@ -29643,11 +29655,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "car_repair" - priority: 16000 + priority: 15004 } } } @@ -29655,6 +29663,10 @@ cont { name: "shop-clothes" element { scale: 16 + symbol { + name: "clothes" + priority: 16004 + } caption { primary { height: 12 @@ -29662,15 +29674,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "clothes" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "clothes" + priority: 16004 + } caption { primary { height: 12 @@ -29678,11 +29690,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "clothes" - priority: 16000 + priority: 15004 } } } @@ -29690,6 +29698,10 @@ cont { name: "shop-convenience" element { scale: 16 + symbol { + name: "supermarket" + priority: 16004 + } caption { primary { height: 12 @@ -29697,15 +29709,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "supermarket" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "supermarket" + priority: 16004 + } caption { primary { height: 12 @@ -29713,11 +29725,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "supermarket" - priority: 16000 + priority: 15004 } } } @@ -29725,6 +29733,10 @@ cont { name: "shop-hairdresser" element { scale: 16 + symbol { + name: "hairdresser" + priority: 16004 + } caption { primary { height: 12 @@ -29732,15 +29744,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hairdresser" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "hairdresser" + priority: 16004 + } caption { primary { height: 12 @@ -29748,11 +29760,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hairdresser" - priority: 16000 + priority: 15004 } } } @@ -29767,7 +29775,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } symbol { name: "kiosk" @@ -29783,7 +29791,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } symbol { name: "kiosk" @@ -29795,6 +29803,10 @@ cont { name: "shop-supermarket" element { scale: 16 + symbol { + name: "supermarket" + priority: 16004 + } caption { primary { height: 12 @@ -29802,15 +29814,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "supermarket" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "supermarket" + priority: 16004 + } caption { primary { height: 12 @@ -29818,11 +29830,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "supermarket" - priority: 16000 + priority: 15004 } } } @@ -30176,11 +30184,11 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } area { color: 0xCFECB7 - priority: -15998 + priority: -15996 } symbol { name: "campsite" @@ -30245,6 +30253,10 @@ cont { name: "tourism-guest_house" element { scale: 16 + symbol { + name: "hostel" + priority: 16004 + } caption { primary { height: 12 @@ -30252,15 +30264,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hostel" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "hostel" + priority: 16004 + } caption { primary { height: 12 @@ -30268,11 +30280,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hostel" - priority: 16000 + priority: 15004 } } } @@ -30280,6 +30288,10 @@ cont { name: "tourism-hostel" element { scale: 16 + symbol { + name: "hostel" + priority: 16004 + } caption { primary { height: 12 @@ -30287,15 +30299,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hostel" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "hostel" + priority: 16004 + } caption { primary { height: 12 @@ -30303,11 +30315,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "hostel" - priority: 16000 + priority: 15004 } } } @@ -30322,7 +30330,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } symbol { name: "hotel" @@ -30338,7 +30346,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } symbol { name: "hotel" @@ -30387,7 +30395,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } symbol { name: "hotel" @@ -30403,7 +30411,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } symbol { name: "hotel" @@ -30415,6 +30423,10 @@ cont { name: "tourism-museum" element { scale: 16 + symbol { + name: "museum" + priority: 16004 + } caption { primary { height: 12 @@ -30422,15 +30434,15 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "museum" - priority: 16000 + priority: 15004 } } element { scale: 17 + symbol { + name: "museum" + priority: 16004 + } caption { primary { height: 12 @@ -30438,11 +30450,7 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 - } - symbol { - name: "museum" - priority: 16000 + priority: 15004 } } } @@ -30485,6 +30493,10 @@ cont { } element { scale: 17 + symbol { + name: "picnic" + priority: 16004 + } caption { primary { height: 12 @@ -30492,15 +30504,11 @@ cont { stroke_color: 0xFFFFFF offset_y: 14 } - priority: 15002 + priority: 15004 } area { color: 0xCFECB7 - priority: -15998 - } - symbol { - name: "picnic" - priority: 16000 + priority: -15996 } } } @@ -30588,7 +30596,7 @@ cont { lines { width: 2.5 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -30596,7 +30604,7 @@ cont { lines { width: 3 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -30604,14 +30612,14 @@ cont { lines { width: 4 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } element { @@ -30619,14 +30627,14 @@ cont { lines { width: 4 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } element { @@ -30634,14 +30642,14 @@ cont { lines { width: 4.8 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } element { @@ -30649,20 +30657,20 @@ cont { lines { width: 8 color: 0xB0B0B0 - priority: 14 + priority: 17 cap: BUTTCAP } lines { width: 6.4 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } } @@ -30673,7 +30681,7 @@ cont { lines { width: 2.5 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -30681,7 +30689,7 @@ cont { lines { width: 3 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -30689,14 +30697,14 @@ cont { lines { width: 4 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } element { @@ -30704,14 +30712,14 @@ cont { lines { width: 4 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } element { @@ -30719,19 +30727,19 @@ cont { lines { width: 4.8 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } lines { width: 12.8 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -30750,25 +30758,25 @@ cont { lines { width: 8 color: 0xB0B0B0 - priority: 14 + priority: 17 cap: BUTTCAP } lines { width: 6.4 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } lines { width: 14.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -30790,7 +30798,7 @@ cont { lines { width: 0.38 color: 0x202020 - priority: 1119 + priority: 1121 } } element { @@ -30798,7 +30806,7 @@ cont { lines { width: 1.5 color: 0x202020 - priority: 1127 + priority: 1129 } } element { @@ -30806,7 +30814,7 @@ cont { lines { width: 3 color: 0x202020 - priority: 1132 + priority: 1134 } } element { @@ -30814,7 +30822,7 @@ cont { lines { width: 4 color: 0x202020 - priority: 1136 + priority: 1139 } } } @@ -30825,7 +30833,7 @@ cont { lines { width: 0.3 color: 0xCDE5EA - priority: 1058 + priority: 1060 } } element { @@ -30833,7 +30841,7 @@ cont { lines { width: 0.4 color: 0xCDE5EA - priority: 1066 + priority: 1068 } } element { @@ -30841,7 +30849,7 @@ cont { lines { width: 0.3 color: 0xCDE5EA - priority: 1088 + priority: 1090 } } element { @@ -30849,7 +30857,7 @@ cont { lines { width: 0.6 color: 0xCDE5EA - priority: 1095 + priority: 1097 } } element { @@ -30864,7 +30872,7 @@ cont { lines { width: 0.6 color: 0xCDE5EA - priority: 1100 + priority: 1102 } } element { @@ -30879,7 +30887,7 @@ cont { lines { width: 0.8 color: 0xCDE5EA - priority: 1105 + priority: 1107 } } } @@ -30890,7 +30898,7 @@ cont { lines { width: 0.3 color: 0xCDE5EA - priority: 1058 + priority: 1060 } } element { @@ -30898,7 +30906,7 @@ cont { lines { width: 0.4 color: 0xCDE5EA - priority: 1066 + priority: 1068 } } element { @@ -30906,7 +30914,7 @@ cont { lines { width: 0.3 color: 0xCDE5EA - priority: 1088 + priority: 1090 } } element { @@ -30914,7 +30922,7 @@ cont { lines { width: 0.6 color: 0xCDE5EA - priority: 1095 + priority: 1097 } } element { @@ -30929,13 +30937,13 @@ cont { lines { width: 8.6 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 0.6 color: 0xCDE5EA - priority: 1100 + priority: 1102 } lines { width: 10.6 @@ -30960,13 +30968,13 @@ cont { lines { width: 8.8 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 0.8 color: 0xCDE5EA - priority: 1105 + priority: 1107 } lines { width: 10.8 @@ -31074,7 +31082,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1056 + priority: 1058 } } element { @@ -31082,7 +31090,7 @@ cont { lines { width: 1.5 color: 0xCDE5EA - priority: 1063 + priority: 1065 } } element { @@ -31098,13 +31106,13 @@ cont { lines { width: 3.5 color: 0xB0B0B0 - priority: 92 + priority: 95 cap: BUTTCAP } lines { width: 2.8 color: 0xCDE5EA - priority: 1092 + priority: 1095 } } element { @@ -31119,13 +31127,13 @@ cont { lines { width: 5.2 color: 0xB0B0B0 - priority: 97 + priority: 100 cap: BUTTCAP } lines { width: 4 color: 0xCDE5EA - priority: 1097 + priority: 1100 } } element { @@ -31140,13 +31148,13 @@ cont { lines { width: 8 color: 0xB0B0B0 - priority: 102 + priority: 104 cap: BUTTCAP } lines { width: 6.4 color: 0xCDE5EA - priority: 1102 + priority: 1104 } } } @@ -31157,7 +31165,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1056 + priority: 1058 } } element { @@ -31165,7 +31173,7 @@ cont { lines { width: 1.5 color: 0xCDE5EA - priority: 1063 + priority: 1065 } } element { @@ -31181,13 +31189,13 @@ cont { lines { width: 3.5 color: 0xB0B0B0 - priority: 92 + priority: 95 cap: BUTTCAP } lines { width: 2.8 color: 0xCDE5EA - priority: 1092 + priority: 1095 } } element { @@ -31202,19 +31210,19 @@ cont { lines { width: 12 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 5.2 color: 0xB0B0B0 - priority: 97 + priority: 100 cap: BUTTCAP } lines { width: 4 color: 0xCDE5EA - priority: 1097 + priority: 1100 } lines { width: 14 @@ -31239,19 +31247,19 @@ cont { lines { width: 14.4 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 8 color: 0xB0B0B0 - priority: 102 + priority: 104 cap: BUTTCAP } lines { width: 6.4 color: 0xCDE5EA - priority: 1102 + priority: 1104 } lines { width: 16.4 @@ -31272,13 +31280,13 @@ cont { lines { width: 6 color: 0x202020 - priority: 68 + priority: 70 cap: BUTTCAP } lines { width: 5 color: 0xF8F8F8 - priority: 1068 + priority: 1070 } } element { @@ -31286,13 +31294,13 @@ cont { lines { width: 10 color: 0x202020 - priority: 73 + priority: 75 cap: BUTTCAP } lines { width: 9 color: 0xF8F8F8 - priority: 1073 + priority: 1075 } } element { @@ -31300,13 +31308,13 @@ cont { lines { width: 12 color: 0x202020 - priority: 75 + priority: 78 cap: BUTTCAP } lines { width: 10 color: 0xF8F8F8 - priority: 1075 + priority: 1078 } } element { @@ -31314,13 +31322,13 @@ cont { lines { width: 16 color: 0x202020 - priority: 78 + priority: 80 cap: BUTTCAP } lines { width: 12 color: 0xF8F8F8 - priority: 1078 + priority: 1080 } } } @@ -31331,7 +31339,7 @@ cont { lines { width: 0.5 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -31339,7 +31347,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -31347,7 +31355,7 @@ cont { lines { width: 2.5 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -31355,7 +31363,7 @@ cont { lines { width: 3 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -31365,7 +31373,7 @@ cont { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } lines { width: 4 @@ -31378,14 +31386,14 @@ cont { lines { width: 5 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } element { @@ -31393,14 +31401,14 @@ cont { lines { width: 8 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } element { @@ -31408,14 +31416,14 @@ cont { lines { width: 16 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } } @@ -31426,7 +31434,7 @@ cont { lines { width: 0.5 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -31434,7 +31442,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -31442,7 +31450,7 @@ cont { lines { width: 2.5 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -31450,7 +31458,7 @@ cont { lines { width: 3 color: 0xCDE5EA - priority: 1014 + priority: 1017 } } element { @@ -31460,7 +31468,7 @@ cont { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } lines { width: 4 @@ -31473,14 +31481,14 @@ cont { lines { width: 5 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } } element { @@ -31488,19 +31496,19 @@ cont { lines { width: 8 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } lines { width: 16 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -31519,19 +31527,19 @@ cont { lines { width: 16 color: 0xCDE5EA - priority: 1014 + priority: 1017 } path_text { primary { height: 12 color: 0x507CEA } - priority: 16014 + priority: 16017 } lines { width: 24 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { @@ -31552,84 +31560,84 @@ cont { scale: 6 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 7 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 8 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 9 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 10 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 11 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 12 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 13 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 14 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 15 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 16 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } element { scale: 17 area { color: 0xCDE5EA - priority: -15986 + priority: -15983 } } } @@ -31640,7 +31648,7 @@ cont { lines { width: 0.75 color: 0xCDE5EA - priority: 1053 + priority: 1056 } } element { @@ -31648,7 +31656,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1061 + priority: 1063 } } element { @@ -31656,7 +31664,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1085 + priority: 1087 } } element { @@ -31664,7 +31672,7 @@ cont { lines { width: 2 color: 0xCDE5EA - priority: 1090 + priority: 1092 } } element { @@ -31679,7 +31687,7 @@ cont { lines { width: 2 color: 0xCDE5EA - priority: 1092 + priority: 1095 } } element { @@ -31694,7 +31702,7 @@ cont { lines { width: 2.2 color: 0xCDE5EA - priority: 1097 + priority: 1100 } } } @@ -31705,7 +31713,7 @@ cont { lines { width: 0.75 color: 0xCDE5EA - priority: 1053 + priority: 1056 } } element { @@ -31713,7 +31721,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1061 + priority: 1063 } } element { @@ -31726,7 +31734,7 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1080 + priority: 1082 } } element { @@ -31739,7 +31747,7 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1088 + priority: 1090 } } element { @@ -31752,19 +31760,19 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1090 + priority: 1092 } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16090 + priority: 16092 } lines { width: 2 color: 0xCDE5EA - priority: 1092 + priority: 1095 } } element { @@ -31777,19 +31785,19 @@ cont { dd: 1.6 } cap: BUTTCAP - priority: 1095 + priority: 1097 } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16095 + priority: 16097 } lines { width: 2.2 color: 0xCDE5EA - priority: 1097 + priority: 1100 } } } @@ -31800,7 +31808,7 @@ cont { lines { width: 0.75 color: 0xCDE5EA - priority: 1053 + priority: 1056 } } element { @@ -31808,7 +31816,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1061 + priority: 1063 } } element { @@ -31821,7 +31829,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1085 + priority: 1087 } } element { @@ -31834,7 +31842,7 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1090 + priority: 1092 } } element { @@ -31859,7 +31867,7 @@ cont { lines { width: 2 color: 0xCDE5EA - priority: 1092 + priority: 1095 } } element { @@ -31872,19 +31880,19 @@ cont { dd: 0.8 } cap: BUTTCAP - priority: 1092 + priority: 1095 } path_text { primary { height: 12 color: 0xFFFFFF } - priority: 16092 + priority: 16095 } lines { width: 2.2 color: 0xCDE5EA - priority: 1097 + priority: 1100 } } } @@ -31895,7 +31903,7 @@ cont { lines { width: 0.75 color: 0xCDE5EA - priority: 1053 + priority: 1056 } } element { @@ -31903,7 +31911,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1061 + priority: 1063 } } element { @@ -31911,7 +31919,7 @@ cont { lines { width: 1 color: 0xCDE5EA - priority: 1085 + priority: 1087 } } element { @@ -31919,7 +31927,7 @@ cont { lines { width: 2 color: 0xCDE5EA - priority: 1090 + priority: 1092 } } element { @@ -31934,13 +31942,13 @@ cont { lines { width: 10 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 2 color: 0xCDE5EA - priority: 1092 + priority: 1095 } lines { width: 12 @@ -31965,13 +31973,13 @@ cont { lines { width: 10.2 color: 0xFFFFFF - priority: 4 + priority: 7 cap: BUTTCAP } lines { width: 2.2 color: 0xCDE5EA - priority: 1097 + priority: 1100 } lines { width: 12.2 @@ -31992,7 +32000,7 @@ cont { lines { width: 0.25 color: 0x000044 - priority: 1117 + priority: 1119 } } element { @@ -32000,7 +32008,7 @@ cont { lines { width: 1 color: 0x000044 - priority: 1124 + priority: 1126 } } element { @@ -32008,7 +32016,7 @@ cont { lines { width: 2 color: 0x000044 - priority: 1129 + priority: 1131 } } element { @@ -32016,7 +32024,7 @@ cont { lines { width: 3 color: 0x000044 - priority: 1134 + priority: 1136 } } } diff --git a/data/normal.mapcss b/data/normal.mapcss index f89a0a86ef..2a0c5eba0c 100644 --- a/data/normal.mapcss +++ b/data/normal.mapcss @@ -922,12 +922,8 @@ line|z12[railway=light_rail] } area|z15-[amenity=parking][!access], area|z15-[amenity=parking][access?], -area|z12-14[landuse=commercial], -area|z12-[natural=heath], -area|z15-[landuse=commercial]::d1p2, -node|z15-[amenity=parking][!access], -node|z15-[amenity=parking][access?], -node|z15-[landuse=commercial]::d1p2 +area|z12-[landuse=commercial], +area|z12-[natural=heath] { fill-color: #f8f8d8; } @@ -2270,10 +2266,8 @@ line|z14[man_made=cutline] dashes: 3,4; linecap: butt; } -area|z14-16[amenity=shelter], -area|z17-[amenity=shelter]::d1p2, -node|z14-16[amenity=shelter], -node|z17-[amenity=shelter]::d1p2 +area|z14-[amenity=shelter], +node|z14-[amenity=shelter] { icon-image: shelter.svg; } @@ -3862,10 +3856,8 @@ node|z15[railway=tram_stop] text-offset: 14; text-halo-color: white; } -area|z15[amenity=fuel], -area|z16-[amenity=fuel]::d1p2, -node|z15[amenity=fuel], -node|z16-[amenity=fuel]::d1p2 +area|z15-[amenity=fuel], +node|z15-[amenity=fuel] { icon-image: petrolstation.svg; } @@ -3963,8 +3955,8 @@ line|z16[highway=path][sac_scale=demanding_mountain_hiking] dashes: 0.16,2.4; linecap: butt; } -area|z16-[amenity=bureau_de_change]::d1p2, -node|z16-[amenity=bureau_de_change]::d1p2 +area|z16-[amenity=bureau_de_change], +node|z16-[amenity=bureau_de_change] { icon-image: bureau_de_change.svg; } @@ -4036,8 +4028,8 @@ line|z16[highway=track][tracktype=grade1] color: #d79331; width: 3; } -area|z16-[amenity=restaurant]::d1p2, -node|z16-[amenity=restaurant]::d1p2 +area|z16-[amenity=restaurant], +node|z16-[amenity=restaurant] { icon-image: restaurant.svg; } @@ -4239,14 +4231,14 @@ line|z16[railway=light_rail]::d1p3 linecap: butt; } area|z17-[military=bunker], -area|z16-[historic=battlefield]::d1p2, +area|z16-[historic=battlefield], node|z17-[military=bunker], -node|z16-[historic=battlefield]::d1p2 +node|z16-[historic=battlefield] { icon-image: cannon.svg; } -area|z16-[amenity=hunting_stand]::d1p2, -node|z16-[amenity=hunting_stand]::d1p2 +area|z16-[amenity=hunting_stand], +node|z16-[amenity=hunting_stand] { icon-image: hunting_closed_high.svg; } @@ -4282,10 +4274,10 @@ line|z16[railway=spur]::d1p3 dashes: 8,16; linecap: butt; } -area|z16[building]::d0p5, -area|z16[building=address]::d1p3, -node|z16[building]::d0p5, -node|z16[building=address]::d1p3 +area|z16[building]::int_name, +area|z16[building=address]::int_name, +node|z16[building]::int_name, +node|z16[building=address]::int_name { text: int_name; font-size: 11; @@ -4319,8 +4311,8 @@ line|z16-[highway=motorway] text-color: #202020; text-halo-color: #f08800; } -area|z16-[amenity=fast_food]::d1p2, -node|z16-[amenity=fast_food]::d1p2 +area|z16-[amenity=fast_food], +node|z16-[amenity=fast_food] { icon-image: fastfood.svg; } @@ -4332,8 +4324,8 @@ line|z16[highway=secondary] casing-width: 2; casing-color: #c8c860; } -area|z16-[shop=car_repair]::d1p2, -node|z16-[shop=car_repair]::d1p2 +area|z16-[shop=car_repair], +node|z16-[shop=car_repair] { icon-image: car_repair.svg; } @@ -4478,8 +4470,8 @@ node|z16[aerialway=station]::d1p2 symbol-fill-color: #3050d8; symbol-size: 4; } -area|z16-[amenity=bicycle_rental]::d1p2, -node|z16-[amenity=bicycle_rental]::d1p2 +area|z16-[amenity=bicycle_rental], +node|z16-[amenity=bicycle_rental] { icon-image: bicycle_rental.svg; } @@ -4498,8 +4490,8 @@ line|z16[power=minor_line] z-index: 862; opacity: 0.5; } -area|z16-[amenity=theatre]::d1p2, -node|z16-[amenity=theatre]::d1p2 +area|z16-[amenity=theatre], +node|z16-[amenity=theatre] { icon-image: theatre.svg; } @@ -4511,11 +4503,6 @@ line|z16[highway=footway][sac_scale=demanding_mountain_hiking] dashes: 0.16,2.4; linecap: butt; } -area|z16[landuse=reservoir]::d1p3, -node|z16[landuse=reservoir]::d1p3 -{ - z-index: 123; -} line|z16[highway=secondary] { font-size: 14; @@ -4525,8 +4512,8 @@ line|z16[highway=secondary] text-color: #404040; text-halo-color: #fffb80; } -area|z16-[amenity=embassy]::d1p2, -node|z16-[amenity=embassy]::d1p2 +area|z16-[amenity=embassy], +node|z16-[amenity=embassy] { icon-image: embassy.svg; } @@ -4536,10 +4523,10 @@ line|z16[railway=rail]::d1p3 z-index: 543; width: 4; } -area|z16-[tourism=guest_house]::d1p2, -area|z16-[tourism=hostel]::d1p2, -node|z16-[tourism=guest_house]::d1p2, -node|z16-[tourism=hostel]::d1p2 +area|z16-[tourism=guest_house], +area|z16-[tourism=hostel], +node|z16-[tourism=guest_house], +node|z16-[tourism=hostel] { icon-image: hostel.svg; } @@ -4620,8 +4607,8 @@ line|z16[highway=tertiary] width: 6; casing-color: #c8c860; } -area|z16-[amenity=restaurant][hotel]::d2p2, -node|z16-[amenity=restaurant][hotel]::d2p2 +area|z16-[amenity=restaurant][hotel], +node|z16-[amenity=restaurant][hotel] { icon-image: hotel_and_restaurant.svg; } @@ -4679,10 +4666,8 @@ line|z16[railway=narrow_gauge]::d1p2 width: 2; z-index: 632; } -area|z16[amenity=toilets], -area|z17-[amenity=toilets]::d1p2, -node|z16[amenity=toilets], -node|z17-[amenity=toilets]::d1p2 +area|z16-[amenity=toilets], +node|z16-[amenity=toilets], { icon-image: toilets.svg; } @@ -4859,8 +4844,8 @@ line|z16[boundary=administrative][type=nation]::d2p2 z-index: 944; dashes: 12,12; } -area|z16-[amenity=fire_station]::d1p2, -node|z16-[amenity=fire_station]::d1p2 +area|z16-[amenity=fire_station], +node|z16-[amenity=fire_station] { icon-image: firebrigade.svg; } @@ -4872,15 +4857,15 @@ line|z16[railway=construction]::d1p3 dashes: 4,4,4,12; linecap: butt; } -area|z16-[shop=bakery]::d1p2, -node|z16-[shop=bakery]::d1p2 +area|z16-[shop=bakery], +node|z16-[shop=bakery] { icon-image: bakery.svg; } area|z16[amenity=taxi], -area|z17-[amenity=taxi]::d1p2, +area|z17-[amenity=taxi], node|z16[amenity=taxi], -node|z17-[amenity=taxi]::d1p2 +node|z17-[amenity=taxi] { icon-image: taxi.svg; } @@ -4892,9 +4877,10 @@ line|z16[railway=preserved]::d1p3 dashes: 12,12; linecap: butt; } -node|z16-[building] +node|z16-[building]::icon { icon-image: building.svg; + z-index: -10; } line|z16[railway=narrow_gauge] { @@ -4910,10 +4896,8 @@ line|z16[power=minor_line]::d1p3 dashes: 8,4; linecap: butt; } -area|z16[amenity=fountain]::d1p2, -area|z17-[amenity=fountain]::d1p3, -node|z16[amenity=fountain]::d1p2, -node|z17-[amenity=fountain]::d1p3 +area|z16-[amenity=fountain], +node|z16-[amenity=fountain] { icon-image: fountain.svg; } @@ -4949,8 +4933,8 @@ line|z16[railway=siding] width: 2.4; z-index: 549; } -area|z16-[amenity=car_rental]::d1p2, -node|z16-[amenity=car_rental]::d1p2 +area|z16-[amenity=car_rental], +node|z16-[amenity=car_rental] { icon-image: car_rental.svg; } @@ -5010,21 +4994,21 @@ line|z16[railway=funicular]::d1p3 width: 0.6; z-index: 651; } -area|z16-[amenity=marketplace]::d1p2, -area|z16-[shop=convenience]::d1p2, -area|z16-[shop=supermarket]::d1p2, -node|z16-[amenity=marketplace]::d1p2, -node|z16-[shop=convenience]::d1p2, -node|z16-[shop=supermarket]::d1p2 +area|z16-[amenity=marketplace], +area|z16-[shop=convenience], +area|z16-[shop=supermarket], +node|z16-[amenity=marketplace], +node|z16-[shop=convenience], +node|z16-[shop=supermarket] { icon-image: supermarket.svg; } area|z16[amenity=pharmacy], -area|z16-[amenity=doctors]::d1p2, -area|z17-[amenity=pharmacy]::d1p2, +area|z16-[amenity=doctors], +area|z17-[amenity=pharmacy], node|z16[amenity=pharmacy], -node|z16-[amenity=doctors]::d1p2, -node|z17-[amenity=pharmacy]::d1p2 +node|z16-[amenity=doctors], +node|z17-[amenity=pharmacy] { icon-image: pharmacy.svg; } @@ -5065,8 +5049,8 @@ line|z16[man_made=cutline]::d1p2 width: 1; z-index: 276; } -area|z16-[amenity=place_of_worship]::d1p2, -node|z16-[amenity=place_of_worship]::d1p2 +area|z16-[amenity=place_of_worship], +node|z16-[amenity=place_of_worship] { icon-image: religion.svg; } @@ -5102,8 +5086,8 @@ line|z16[waterway=river] color: #cde5ea; width: 8; } -area|z16-[shop=hairdresser]::d1p2, -node|z16-[shop=hairdresser]::d1p2 +area|z16-[shop=hairdresser], +node|z16-[shop=hairdresser] { icon-image: hairdresser.svg; } @@ -5117,15 +5101,15 @@ node|z16-[barrier=lift_gate] { icon-image: barrier.svg; } -area|z16-[amenity=bar]::d1p2, -area|z16-[amenity=nightclub]::d1p2, -node|z16-[amenity=bar]::d1p2, -node|z16-[amenity=nightclub]::d1p2 +area|z16-[amenity=bar], +area|z16-[amenity=nightclub], +node|z16-[amenity=bar], +node|z16-[amenity=nightclub] { icon-image: bar.svg; } -area|z16-[historic=ruins]::d1p2, -node|z16-[historic=ruins]::d1p2 +area|z16-[historic=ruins], +node|z16-[historic=ruins] { icon-image: ruins.svg; } @@ -5144,17 +5128,15 @@ line|z16[boundary=administrative][border_type=state] z-index: 941; dashes: 12,4,4,4; } -area|z16[amenity=speed_trap], -area|z17-[amenity=speed_trap]::d1p2, -node|z16[amenity=speed_trap], -node|z17-[amenity=speed_trap]::d1p2 +area|z16-[amenity=speed_trap], +node|z16-[amenity=speed_trap] { icon-image: speed_trap.svg; } -area|z16-[historic=memorial]::d1p2, -area|z16-[historic=monument]::d1p2, -node|z16-[historic=memorial]::d1p2, -node|z16-[historic=monument]::d1p2 +area|z16-[historic=memorial], +area|z16-[historic=monument], +node|z16-[historic=memorial], +node|z16-[historic=monument] { icon-image: memorial.svg; } @@ -5307,8 +5289,8 @@ line|z16[barrier=hedge]::d1p2 dashes: 0.0,2.0; linecap: butt; } -area|z16-[amenity=police]::d1p2, -node|z16-[amenity=police]::d1p2 +area|z16-[amenity=police], +node|z16-[amenity=police] { icon-image: police.svg; } @@ -5341,10 +5323,8 @@ line|z16[highway=raceway] width: 12; z-index: 587; } -area|z16[amenity=hospital], -area|z17-[amenity=hospital]::d1p2, -node|z16[amenity=hospital], -node|z17-[amenity=hospital]::d1p2 +area|z16-[amenity=hospital], +node|z16-[amenity=hospital] { icon-image: hospital.svg; } @@ -5394,8 +5374,8 @@ line|z16[man_made=pipeline] z-index: 874; opacity: 0.5; } -area|z16-[amenity=car_sharing]::d1p2, -node|z16-[amenity=car_sharing]::d1p2 +area|z16-[amenity=car_sharing], +node|z16-[amenity=car_sharing] { icon-image: car_sharing.svg; } @@ -5431,17 +5411,17 @@ line|z16[railway=preserved] color: #909090; width: 3.2; } -area|z16-[amenity=cinema]::d1p2, -node|z16-[amenity=cinema]::d1p2 +area|z16-[amenity=cinema], +node|z16-[amenity=cinema] { icon-image: cinema.svg; } -area|z16-[historic=archaeological_site]::d1p2, -area|z16-[historic=museum]::d1p2, -area|z16-[tourism=museum]::d1p2, -node|z16-[historic=archaeological_site]::d1p2, -node|z16-[historic=museum]::d1p2, -node|z16-[tourism=museum]::d1p2 +area|z16-[historic=archaeological_site], +area|z16-[historic=museum], +area|z16-[tourism=museum], +node|z16-[historic=archaeological_site], +node|z16-[historic=museum], +node|z16-[tourism=museum] { icon-image: museum.svg; } @@ -5512,8 +5492,8 @@ line|z16[highway=track] color: #c0a87c; width: 4; } -area|z16-[amenity=post_office]::d1p2, -node|z16-[amenity=post_office]::d1p2 +area|z16-[amenity=post_office], +node|z16-[amenity=post_office] { icon-image: postoffice.svg; } @@ -5543,15 +5523,13 @@ line|z16[railway=yard]::raildash dashes: 8,16; linecap: butt; } -area|z16[amenity=library], -area|z17-[amenity=library]::d1p2, -node|z16[amenity=library], -node|z17-[amenity=library]::d1p2 +area|z16-[amenity=library], +node|z16-[amenity=library], { icon-image: library.svg; } -area|z16-[shop=clothes]::d1p2, -node|z16-[shop=clothes]::d1p2 +area|z16-[shop=clothes], +node|z16-[shop=clothes] { icon-image: clothes.svg; } @@ -6088,15 +6066,15 @@ line|z17-[highway=raceway] color: #e8e4d4; width: 12; } -area|z17-[tourism=picnic_site]::d1p3, -node|z17-[tourism=picnic_site]::d1p3 +area|z17-[tourism=picnic_site], +node|z17-[tourism=picnic_site] { icon-image: picnic.svg; } -area|z17-[amenity=parking][!access]::d1p2, -area|z17-[amenity=parking][access?]::d1p2, -node|z17-[amenity=parking][!access]::d1p2, -node|z17-[amenity=parking][access?]::d1p2 +area|z17-[amenity=parking][!access], +area|z17-[amenity=parking][access?], +node|z17-[amenity=parking][!access], +node|z17-[amenity=parking][access?] { icon-image: parking.svg; } @@ -6949,10 +6927,10 @@ 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 +area|z16[amenity=parking][!access], +area|z16[amenity=parking][access?], +node|z16[amenity=parking][!access], +node|z16[amenity=parking][access?] { icon-image: parking-mini.svg; } @@ -6968,8 +6946,8 @@ node|z17-[tourism=information] } -area|z17-[amenity=post_box]::d1p2, -node|z17-[amenity=post_box]::d1p2 +area|z17-[amenity=post_box], +node|z17-[amenity=post_box] { icon-image: postbox.svg; } @@ -6979,8 +6957,8 @@ node|z16-[amenity=bank] icon-image: bank.svg; z-index: 5; } -area|z16-[amenity=pub]::d1p2, -node|z16-[amenity=pub]::d1p2 +area|z16-[amenity=pub], +node|z16-[amenity=pub] { icon-image: pub.svg; }