diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index a403b7549a..476ce643fe 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 8c243050ec..435149aa58 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -64,6 +64,86 @@ cont { priority: 15000 } } + element { + scale: 15 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } + element { + scale: 16 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } + element { + scale: 17 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } + element { + scale: 18 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } } cont { name: "aeroway-airport" @@ -131,6 +211,86 @@ cont { priority: 15000 } } + element { + scale: 15 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } + element { + scale: 16 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } + element { + scale: 17 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } + element { + scale: 18 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "airport-l" + priority: 16000 + } + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15000 + } + } } cont { name: "amenity-bank" @@ -139,7 +299,7 @@ cont { symbol { name: "bank-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -147,7 +307,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -155,7 +315,7 @@ cont { symbol { name: "bank-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -163,7 +323,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -171,7 +331,7 @@ cont { symbol { name: "bank-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -179,7 +339,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -190,7 +350,7 @@ cont { symbol { name: "bar-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -198,7 +358,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -206,7 +366,7 @@ cont { symbol { name: "bar-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -214,7 +374,58 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 + } + } +} +cont { + name: "amenity-bicycle_rental" + element { + scale: 17 + symbol { + name: "bicycle-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 18 + symbol { + name: "bicycle-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "bicycle-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } } @@ -225,7 +436,7 @@ cont { symbol { name: "cafe-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -233,7 +444,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -241,7 +452,7 @@ cont { symbol { name: "cafe-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -249,7 +460,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -260,7 +471,7 @@ cont { symbol { name: "cinema-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -268,7 +479,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -276,7 +487,7 @@ cont { symbol { name: "cinema-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -284,7 +495,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -292,7 +503,7 @@ cont { symbol { name: "cinema-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -300,7 +511,125 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 + } + } +} +cont { + name: "amenity-college" + element { + scale: 16 + symbol { + name: "college-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 17 + symbol { + name: "college-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 18 + symbol { + name: "college-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "college-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } +} +cont { + name: "amenity-embassy" + element { + scale: 17 + symbol { + name: "embassy-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 18 + symbol { + name: "embassy-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "embassy-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } } @@ -311,7 +640,7 @@ cont { symbol { name: "fastfood-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -319,7 +648,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -327,7 +656,7 @@ cont { symbol { name: "fastfood-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -335,7 +664,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -346,7 +675,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16909 + priority: 16882 } } element { @@ -354,7 +683,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -362,7 +691,7 @@ cont { color: 5592405 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { @@ -370,7 +699,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -378,7 +707,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15882 } } element { @@ -386,7 +715,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -394,7 +723,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15882 } } element { @@ -402,7 +731,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -410,7 +739,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15882 } } } @@ -420,28 +749,28 @@ cont { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } } } @@ -450,43 +779,272 @@ cont { element { scale: 14 area { - color: 16755370 - priority: 1182 + color: 16764108 + priority: 1177 } } element { scale: 15 area { - color: 16755370 - priority: 1182 + color: 16764108 + priority: 1177 + } + symbol { + name: "hospital-s" + apply_for_type: 1 + priority: 16176 } } element { scale: 16 area { - color: 16755370 - priority: 1182 + color: 16764108 + priority: 1853 + } + symbol { + name: "hospital-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } element { scale: 17 area { - color: 16755370 - priority: 1182 + color: 16764108 + priority: 1853 + } + symbol { + name: "hospital-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } element { scale: 18 area { - color: 16755370 - priority: 1182 + color: 16764108 + priority: 1853 + } + symbol { + name: "hospital-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } element { scale: 19 area { - color: 16755370 - priority: 1182 + color: 16764108 + priority: 1853 + } + symbol { + name: "hospital-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } +} +cont { + name: "amenity-library" + element { + scale: 17 + symbol { + name: "library-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 18 + symbol { + name: "library-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "library-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } +} +cont { + name: "amenity-pharmacy" + element { + scale: 18 + symbol { + name: "pharmacy-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "pharmacy-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } +} +cont { + name: "amenity-police" + element { + scale: 17 + symbol { + name: "police-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 18 + symbol { + name: "police-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "police-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } +} +cont { + name: "amenity-pub" + element { + scale: 18 + symbol { + name: "beer-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "beer-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } } @@ -497,7 +1055,7 @@ cont { symbol { name: "restaurant-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -505,7 +1063,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -513,7 +1071,7 @@ cont { symbol { name: "restaurant-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -521,7 +1079,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -532,7 +1090,7 @@ cont { symbol { name: "restaurant-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -540,7 +1098,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -548,7 +1106,7 @@ cont { symbol { name: "restaurant-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -556,7 +1114,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -567,7 +1125,7 @@ cont { symbol { name: "restaurant-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -575,7 +1133,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -583,7 +1141,7 @@ cont { symbol { name: "restaurant-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -591,7 +1149,74 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 + } + } +} +cont { + name: "amenity-school" + element { + scale: 16 + symbol { + name: "school-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 17 + symbol { + name: "school-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 18 + symbol { + name: "school-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "school-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } } @@ -602,7 +1227,7 @@ cont { symbol { name: "theatre-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -610,7 +1235,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -638,48 +1263,156 @@ cont { } } } +cont { + name: "amenity-toilets" + element { + scale: 17 + symbol { + name: "toilets-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 18 + symbol { + name: "toilets-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } + element { + scale: 19 + symbol { + name: "toilets-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 + } + } +} cont { name: "amenity-university" element { scale: 14 area { color: 2162019498 - priority: 1182 + priority: 1177 } } element { scale: 15 area { color: 2162019498 - priority: 1182 + priority: 1177 + } + symbol { + name: "college-s" + apply_for_type: 1 + priority: 16176 } } element { scale: 16 area { color: 2162019498 - priority: 1182 + priority: 1853 + } + symbol { + name: "college-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } element { scale: 17 area { color: 2162019498 - priority: 1182 + priority: 1853 + } + symbol { + name: "college-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } element { scale: 18 area { color: 2162019498 - priority: 1182 + priority: 1853 + } + symbol { + name: "college-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } element { scale: 19 area { color: 2162019498 - priority: 1182 + priority: 1853 + } + symbol { + name: "college-m" + apply_for_type: 1 + priority: 16852 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15852 } } } @@ -689,70 +1422,70 @@ cont { scale: 15 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 16 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 17 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 18 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 19 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } } @@ -762,70 +1495,70 @@ cont { scale: 15 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 16 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 17 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 18 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 19 area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } } @@ -840,7 +1573,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -854,7 +1587,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -868,7 +1601,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -882,7 +1615,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -899,7 +1632,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -913,7 +1646,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -927,7 +1660,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -941,7 +1674,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -958,7 +1691,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -972,7 +1705,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -986,7 +1719,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1000,7 +1733,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1017,7 +1750,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1031,7 +1764,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1045,7 +1778,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1059,7 +1792,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1076,7 +1809,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1090,7 +1823,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1104,7 +1837,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1118,7 +1851,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -1131,7 +1864,7 @@ cont { lines { width: 0.2 color: 1719105382 - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1141,7 +1874,7 @@ cont { lines { width: 0.2 color: 863467366 - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1151,7 +1884,7 @@ cont { lines { width: 0.4 color: 7829350 - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1318,7 +2051,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1335,7 +2068,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1303 + priority: 1294 join: ROUNDJOIN cap: ROUNDCAP } @@ -1349,7 +2082,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1303 + priority: 1294 join: ROUNDJOIN cap: ROUNDCAP } @@ -1363,7 +2096,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1303 + priority: 1294 join: ROUNDJOIN cap: ROUNDCAP } @@ -1377,7 +2110,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1391,7 +2124,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1405,7 +2138,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1419,7 +2152,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1433,7 +2166,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1447,7 +2180,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1461,7 +2194,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1475,7 +2208,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1489,7 +2222,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1503,7 +2236,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1517,7 +2250,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1531,7 +2264,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1548,7 +2281,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1303 + priority: 1294 join: ROUNDJOIN cap: ROUNDCAP } @@ -1562,7 +2295,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1303 + priority: 1294 join: ROUNDJOIN cap: ROUNDCAP } @@ -1576,7 +2309,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1303 + priority: 1294 join: ROUNDJOIN cap: ROUNDCAP } @@ -1590,7 +2323,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1604,7 +2337,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1618,7 +2351,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1632,7 +2365,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1646,7 +2379,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1660,7 +2393,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1674,7 +2407,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1688,7 +2421,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1702,7 +2435,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1716,7 +2449,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1730,7 +2463,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1744,7 +2477,7 @@ cont { dd: 1.5 dd: 1.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -1752,72 +2485,82 @@ cont { } cont { name: "building" - element { - scale: 14 - area { - color: 2580335803 - priority: 1213 - } - } element { scale: 15 area { color: 1724697787 - priority: 1213 + priority: 1206 } } element { scale: 16 area { color: 869059771 - priority: 1213 + priority: 1148 + } + caption { + primary { + height: 8 + color: 7829367 + } + priority: 15147 } } element { scale: 17 area { color: 13421755 - priority: 1273 + priority: 1265 } caption { primary { height: 9 color: 7829367 } - priority: 15272 + priority: 15264 } } element { scale: 18 area { color: 13421755 - priority: 1697 + priority: 1677 } caption { primary { height: 10 color: 7829367 } - priority: 15696 + priority: 15676 } } element { scale: 19 area { color: 13421755 - priority: 1697 + priority: 1677 } caption { primary { height: 10 color: 7829367 } - priority: 15696 + priority: 15676 } } } cont { name: "building-address" + element { + scale: 16 + caption { + primary { + height: 8 + color: 7829367 + } + priority: 15147 + } + } element { scale: 17 caption { @@ -1825,7 +2568,7 @@ cont { height: 9 color: 7829367 } - priority: 15272 + priority: 15264 } } element { @@ -1835,7 +2578,7 @@ cont { height: 10 color: 7829367 } - priority: 15696 + priority: 15676 } } element { @@ -1845,7 +2588,7 @@ cont { height: 10 color: 7829367 } - priority: 15696 + priority: 15676 } } } @@ -1855,14 +2598,14 @@ cont { scale: 17 symbol { name: "bus-m" - priority: 16878 + priority: 16852 } } element { scale: 18 symbol { name: "bus-l" - priority: 16909 + priority: 16882 } caption { primary { @@ -1871,14 +2614,14 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { name: "bus-l" - priority: 16909 + priority: 16882 } caption { primary { @@ -1887,17 +2630,45 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } cont { name: "highway-construction" + element { + scale: 13 + lines { + width: 1.4 + color: 2159786922 + dashdot { + dd: 4.0 + dd: 4.0 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 2159786922 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 2.0 - color: 2159786922 + color: 1723579306 dashdot { dd: 5.0 dd: 5.0 @@ -1924,7 +2695,7 @@ cont { element { scale: 17 lines { - width: 3.0 + width: 2.0 color: 12303274 dashdot { dd: 6.0 @@ -1938,7 +2709,7 @@ cont { element { scale: 18 lines { - width: 6.0 + width: 4.0 color: 12303274 dashdot { dd: 6.0 @@ -1952,7 +2723,7 @@ cont { element { scale: 19 lines { - width: 6.0 + width: 5.0 color: 12303274 dashdot { dd: 6.0 @@ -1966,22 +2737,12 @@ cont { } cont { name: "highway-cycleway" - element { - scale: 14 - lines { - width: 0.6 - color: 872384682 - priority: 1696 - join: ROUNDJOIN - cap: ROUNDCAP - } - } element { scale: 15 lines { width: 0.6 color: 872384682 - priority: 1696 + priority: 1676 join: ROUNDJOIN cap: ROUNDCAP } @@ -1991,7 +2752,7 @@ cont { lines { width: 1.0 color: 16746666 - priority: 1696 + priority: 1676 join: ROUNDJOIN cap: ROUNDCAP } @@ -1999,9 +2760,9 @@ cont { element { scale: 17 lines { - width: 1.5 + width: 1.2 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2011,7 +2772,7 @@ cont { lines { width: 2.0 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2019,9 +2780,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 3.0 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2029,22 +2790,12 @@ cont { } cont { name: "highway-cycleway-bridge" - element { - scale: 14 - lines { - width: 0.6 - color: 872384682 - priority: 1696 - join: ROUNDJOIN - cap: ROUNDCAP - } - } element { scale: 15 lines { width: 0.6 color: 872384682 - priority: 1696 + priority: 1676 join: ROUNDJOIN cap: ROUNDCAP } @@ -2054,7 +2805,7 @@ cont { lines { width: 1.0 color: 16746666 - priority: 1696 + priority: 1676 join: ROUNDJOIN cap: ROUNDCAP } @@ -2062,9 +2813,9 @@ cont { element { scale: 17 lines { - width: 1.5 + width: 1.2 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2074,7 +2825,7 @@ cont { lines { width: 2.0 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2082,9 +2833,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 3.0 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2092,22 +2843,12 @@ cont { } cont { name: "highway-cycleway-permissive" - element { - scale: 14 - lines { - width: 0.6 - color: 872384682 - priority: 1696 - join: ROUNDJOIN - cap: ROUNDCAP - } - } element { scale: 15 lines { width: 0.6 color: 872384682 - priority: 1696 + priority: 1676 join: ROUNDJOIN cap: ROUNDCAP } @@ -2117,7 +2858,7 @@ cont { lines { width: 1.0 color: 16746666 - priority: 1696 + priority: 1676 join: ROUNDJOIN cap: ROUNDCAP } @@ -2125,9 +2866,9 @@ cont { element { scale: 17 lines { - width: 1.5 + width: 1.2 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2137,7 +2878,7 @@ cont { lines { width: 2.0 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2145,9 +2886,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 3.0 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2155,22 +2896,12 @@ cont { } cont { name: "highway-cycleway-tunnel" - element { - scale: 14 - lines { - width: 0.6 - color: 872384682 - priority: 1696 - join: ROUNDJOIN - cap: ROUNDCAP - } - } element { scale: 15 lines { width: 0.6 color: 872384682 - priority: 1696 + priority: 1676 join: ROUNDJOIN cap: ROUNDCAP } @@ -2180,7 +2911,7 @@ cont { lines { width: 1.0 color: 16746666 - priority: 1696 + priority: 1676 join: ROUNDJOIN cap: ROUNDCAP } @@ -2188,9 +2919,9 @@ cont { element { scale: 17 lines { - width: 1.5 + width: 1.2 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2200,7 +2931,7 @@ cont { lines { width: 2.0 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2208,9 +2939,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 3.0 color: 16746666 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -2219,15 +2950,29 @@ cont { cont { name: "highway-footway" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2236,12 +2981,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2252,10 +2997,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2263,13 +3008,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2277,13 +3022,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2292,15 +3037,29 @@ cont { cont { name: "highway-footway-alpine_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2309,12 +3068,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2325,10 +3084,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2336,13 +3095,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2350,13 +3109,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2365,53 +3124,67 @@ cont { cont { name: "highway-footway-area" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1393 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1393 + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { @@ -2420,88 +3193,102 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1393 + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1393 + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1393 + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } } cont { name: "highway-footway-bridge" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2510,26 +3297,26 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -2540,24 +3327,24 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -2565,27 +3352,27 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 5.0 + width: 4.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 7.0 + width: 6.6 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -2593,27 +3380,27 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 5.0 + width: 6.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 7.0 + width: 8.2 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -2622,15 +3409,29 @@ cont { cont { name: "highway-footway-demanding_alpine_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2639,12 +3440,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2655,10 +3456,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2666,13 +3467,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2680,13 +3481,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2695,15 +3496,29 @@ cont { cont { name: "highway-footway-demanding_mountain_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2712,12 +3527,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2728,10 +3543,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2739,13 +3554,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2753,13 +3568,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2768,15 +3583,29 @@ cont { cont { name: "highway-footway-difficult_alpine_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2785,12 +3614,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2801,10 +3630,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2812,13 +3641,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2826,13 +3655,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2841,15 +3670,29 @@ cont { cont { name: "highway-footway-hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2858,12 +3701,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2874,10 +3717,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2885,13 +3728,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2899,13 +3742,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2914,15 +3757,29 @@ cont { cont { name: "highway-footway-mountain_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2931,12 +3788,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2947,10 +3804,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2958,13 +3815,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2972,13 +3829,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -2987,15 +3844,29 @@ cont { cont { name: "highway-footway-no-access" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3004,12 +3875,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3020,10 +3891,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3031,13 +3902,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3045,13 +3916,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3060,15 +3931,29 @@ cont { cont { name: "highway-footway-permissive" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3077,12 +3962,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3093,10 +3978,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3104,13 +3989,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3118,13 +4003,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3133,15 +4018,29 @@ cont { cont { name: "highway-footway-tunnel" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3150,12 +4049,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3165,7 +4064,7 @@ cont { lines { width: 3.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } @@ -3176,7 +4075,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -3184,10 +4083,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3195,31 +4094,31 @@ cont { element { scale: 18 lines { - width: 5.0 + width: 4.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 5.6 color: 8947848 dashdot { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3227,31 +4126,31 @@ cont { element { scale: 19 lines { - width: 5.0 + width: 6.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 7.2 color: 8947848 dashdot { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -3264,16 +4163,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { @@ -3281,50 +4181,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { scale: 14 lines { - width: 0.6 + width: 1.4 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { @@ -3332,24 +4233,24 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 17 lines { - width: 6.5 + width: 7.6 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -3358,41 +4259,41 @@ cont { height: 10 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16484 + priority: 16470 } } } @@ -3403,16 +4304,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { @@ -3420,50 +4322,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { scale: 14 lines { - width: 0.6 + width: 1.4 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { @@ -3471,24 +4374,24 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 17 lines { - width: 6.5 + width: 7.6 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -3497,41 +4400,41 @@ cont { height: 10 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16484 + priority: 16470 } } } @@ -3542,16 +4445,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { @@ -3559,50 +4463,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { scale: 14 lines { - width: 0.6 + width: 1.4 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { @@ -3614,42 +4519,42 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1483 + priority: 1469 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 17 lines { - width: 8.5 + width: 9.6 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1483 + priority: 1469 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.5 + width: 7.6 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -3658,63 +4563,63 @@ cont { height: 10 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 18 lines { - width: 11.0 + width: 13.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1483 + priority: 1469 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 19 lines { - width: 11.0 + width: 23.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1483 + priority: 1469 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16484 + priority: 16470 } } } @@ -3725,7 +4630,7 @@ cont { lines { width: 0.3 color: 2583647488 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3735,7 +4640,7 @@ cont { lines { width: 0.6 color: 2164217088 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3745,7 +4650,7 @@ cont { lines { width: 0.8 color: 1308579072 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3754,26 +4659,44 @@ cont { scale: 10 lines { width: 1.2 - color: 1308579072 - priority: 1636 + color: 872375842 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 11 lines { width: 1.8 - color: 872371456 - priority: 1636 + color: 1308583475 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 12 + lines { + width: 2.5 + color: 452949828 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3783,69 +4706,87 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 12 - lines { - width: 2.5 - color: 452941056 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { scale: 13 lines { width: 2.8 - color: 16737843 - priority: 1636 + color: 452949828 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 14 lines { - width: 3.6 - color: 16742212 - priority: 1636 + width: 3.8 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 15 lines { - width: 4.0 - color: 16742212 - priority: 1636 + width: 4.8 + color: 16746564 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 16 + lines { + width: 6.8 + color: 16746564 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 17 + lines { + width: 10.6 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3855,79 +4796,43 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 16 - lines { - width: 7.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 - } - } - element { - scale: 17 - lines { - width: 9.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { scale: 18 lines { width: 16.0 - color: 16742212 - priority: 1636 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 19 lines { - width: 16.0 - color: 16742212 - priority: 1636 + width: 26.0 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } } @@ -3938,7 +4843,7 @@ cont { lines { width: 0.3 color: 2583647488 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3948,7 +4853,7 @@ cont { lines { width: 0.6 color: 2164217088 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3958,7 +4863,7 @@ cont { lines { width: 0.8 color: 1308579072 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3967,26 +4872,44 @@ cont { scale: 10 lines { width: 1.2 - color: 1308579072 - priority: 1636 + color: 872375842 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 11 lines { width: 1.8 - color: 872371456 - priority: 1636 + color: 1308583475 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 12 + lines { + width: 2.5 + color: 452949828 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -3996,111 +4919,157 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 12 - lines { - width: 2.5 - color: 452941056 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { scale: 13 lines { width: 2.8 - color: 16737843 - priority: 1636 + color: 452949828 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.6 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 14 lines { - width: 3.6 - color: 16742212 - priority: 1636 + width: 3.8 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 8.2 + width: 8.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 10.2 + width: 10.6 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 15 lines { - width: 4.0 - color: 16742212 - priority: 1636 + width: 4.8 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 9.0 + width: 10.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 11.0 + width: 12.6 color: 8947848 - priority: 1059 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 16 + lines { + width: 6.8 + color: 16746564 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 14.6 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 16.6 + color: 8947848 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 17 + lines { + width: 10.6 + color: 16746564 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 22.2 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 24.2 + color: 8947848 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -4110,135 +5079,71 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 16 - lines { - width: 7.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 15.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 17.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 - } - } - element { - scale: 17 - lines { - width: 9.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 19.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 21.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { scale: 18 lines { width: 16.0 - color: 16742212 - priority: 1636 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 33.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 35.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 19 lines { - width: 16.0 - color: 16742212 - priority: 1636 + width: 26.0 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 33.0 + width: 53.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 35.0 + width: 55.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } } @@ -4249,7 +5154,7 @@ cont { lines { width: 0.3 color: 2583647488 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -4259,7 +5164,7 @@ cont { lines { width: 0.6 color: 2164217088 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -4269,7 +5174,7 @@ cont { lines { width: 0.8 color: 1308579072 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -4278,36 +5183,36 @@ cont { scale: 10 lines { width: 1.2 - color: 1308579072 - priority: 1636 + color: 872375842 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 11 lines { width: 1.8 - color: 872371456 - priority: 1636 + color: 1308583475 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { @@ -4319,24 +5224,24 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.5 color: 16733440 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { @@ -4348,72 +5253,130 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.8 - color: 16737843 - priority: 1636 + color: 452945459 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 14 lines { - width: 5.6 + width: 5.8 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 3.6 + width: 3.8 color: 16742212 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 15 lines { - width: 6.0 + width: 6.8 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 4.0 + width: 4.8 color: 16742212 - priority: 1636 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 16 + lines { + width: 8.8 + color: 8947848 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 1616 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 6.8 + color: 16742212 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 17 + lines { + width: 12.6 + color: 8947848 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 1616 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 10.6 + color: 16742212 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -4423,65 +5386,7 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 16 - lines { - width: 9.0 - color: 8947848 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1635 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 7.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 - } - } - element { - scale: 17 - lines { - width: 11.0 - color: 8947848 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1635 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 9.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { @@ -4493,53 +5398,53 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { width: 16.0 color: 16742212 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 19 lines { - width: 18.0 + width: 28.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 16.0 + width: 26.0 color: 16742212 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } } @@ -4549,33 +5454,33 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { @@ -4583,43 +5488,79 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1363 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 16 + lines { + width: 3.4 + color: 16777215 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 17 + lines { + width: 5.0 + color: 16777215 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -4629,43 +5570,7 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16363 - } - } - element { - scale: 16 - lines { - width: 3.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 - } - } - element { - scale: 17 - lines { - width: 4.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 + priority: 16352 } } element { @@ -4673,35 +5578,35 @@ cont { lines { width: 8.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 8.0 + width: 13.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } @@ -4711,33 +5616,33 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { @@ -4745,57 +5650,121 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 5.0 + width: 5.8 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 6.8 color: 8947848 - priority: 1059 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 16 + lines { + width: 3.4 + color: 16777215 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 7.8 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 8.8 + color: 8947848 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 17 + lines { + width: 5.0 + color: 16777215 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 11.0 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 12.0 + color: 8947848 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -4805,71 +5774,7 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16363 - } - } - element { - scale: 16 - lines { - width: 3.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 8.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 9.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 - } - } - element { - scale: 17 - lines { - width: 4.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 10.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 + priority: 16352 } } element { @@ -4877,63 +5782,63 @@ cont { lines { width: 8.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 17.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 18.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 8.0 + width: 13.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 17.0 + width: 27.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 18.0 + width: 28.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } @@ -4943,33 +5848,33 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { @@ -4977,43 +5882,79 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1363 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 16 + lines { + width: 3.4 + color: 16777215 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 17 + lines { + width: 5.0 + color: 16777215 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -5023,43 +5964,7 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16363 - } - } - element { - scale: 16 - lines { - width: 3.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 - } - } - element { - scale: 17 - lines { - width: 4.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 + priority: 16352 } } element { @@ -5067,50 +5972,64 @@ cont { lines { width: 8.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 8.0 + width: 13.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } cont { name: "highway-path" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5119,12 +6038,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5135,10 +6054,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5146,13 +6065,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5160,13 +6079,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5175,15 +6094,29 @@ cont { cont { name: "highway-path-alpine_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5192,12 +6125,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5208,10 +6141,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5219,13 +6152,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5233,13 +6166,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5248,15 +6181,29 @@ cont { cont { name: "highway-path-bicycle" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5265,12 +6212,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5281,10 +6228,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5292,13 +6239,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5306,13 +6253,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5321,15 +6268,29 @@ cont { cont { name: "highway-path-bicycle-bridge" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5338,12 +6299,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5354,10 +6315,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5365,13 +6326,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5379,13 +6340,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5394,15 +6355,29 @@ cont { cont { name: "highway-path-bicycle-tunnel" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5411,12 +6386,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5426,7 +6401,7 @@ cont { lines { width: 3.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } @@ -5437,7 +6412,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -5445,10 +6420,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5456,31 +6431,31 @@ cont { element { scale: 18 lines { - width: 5.0 + width: 4.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 5.6 color: 8947848 dashdot { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5488,31 +6463,31 @@ cont { element { scale: 19 lines { - width: 5.0 + width: 6.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 7.2 color: 8947848 dashdot { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5521,15 +6496,29 @@ cont { cont { name: "highway-path-bridge" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5538,12 +6527,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5554,10 +6543,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5565,13 +6554,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5579,13 +6568,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5594,15 +6583,29 @@ cont { cont { name: "highway-path-demanding_alpine_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5611,12 +6614,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5627,10 +6630,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5638,13 +6641,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5652,13 +6655,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5667,15 +6670,29 @@ cont { cont { name: "highway-path-demanding_mountain_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5684,12 +6701,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5700,10 +6717,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5711,13 +6728,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5725,13 +6742,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5740,15 +6757,29 @@ cont { cont { name: "highway-path-difficult_alpine_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5757,12 +6788,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5773,10 +6804,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5784,13 +6815,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5798,13 +6829,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5813,15 +6844,29 @@ cont { cont { name: "highway-path-hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5830,12 +6875,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5846,10 +6891,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5857,13 +6902,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5871,13 +6916,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5886,15 +6931,29 @@ cont { cont { name: "highway-path-horse" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5903,12 +6962,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5919,10 +6978,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5930,13 +6989,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5944,13 +7003,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5959,15 +7018,29 @@ cont { cont { name: "highway-path-mountain_hiking" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5976,12 +7049,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -5992,10 +7065,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6003,13 +7076,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6017,13 +7090,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6032,15 +7105,29 @@ cont { cont { name: "highway-path-no-access" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6049,12 +7136,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6065,10 +7152,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6076,13 +7163,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6090,13 +7177,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6105,15 +7192,29 @@ cont { cont { name: "highway-path-permissive" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6122,12 +7223,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6138,10 +7239,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6149,13 +7250,13 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6163,13 +7264,13 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6178,15 +7279,29 @@ cont { cont { name: "highway-path-tunnel" element { - scale: 15 + scale: 14 lines { - width: 0.5 - color: 1728053247 + width: 0.1 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 15 + lines { + width: 0.8 + color: 872415231 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6195,12 +7310,12 @@ cont { scale: 16 lines { width: 1.0 - color: 872415231 + color: 16777215 dashdot { dd: 1.0 dd: 1.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6210,7 +7325,7 @@ cont { lines { width: 3.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } @@ -6221,7 +7336,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -6229,10 +7344,10 @@ cont { width: 1.2 color: 16777215 dashdot { - dd: 2.0 + dd: 3.0 dd: 2.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6240,31 +7355,31 @@ cont { element { scale: 18 lines { - width: 5.0 + width: 4.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 5.6 color: 8947848 dashdot { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 2.0 + width: 1.8 color: 16777215 dashdot { + dd: 6.0 dd: 3.0 - dd: 1.5 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6272,31 +7387,31 @@ cont { element { scale: 19 lines { - width: 5.0 + width: 6.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 7.2 color: 8947848 dashdot { dd: 2.0 dd: 2.0 } - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 2.0 + width: 2.6 color: 16777215 dashdot { - dd: 3.0 - dd: 1.5 + dd: 8.0 + dd: 4.0 } - priority: 1424 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -6308,95 +7423,108 @@ cont { scale: 12 path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16454 + priority: 16441 } } element { scale: 13 + lines { + width: 0.7 + color: 1308622847 + dashdot { + dd: 2.0 + dd: 1.0 + } + priority: 1441 + join: ROUNDJOIN + cap: ROUNDCAP + } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16454 + priority: 16441 } } element { scale: 14 lines { - width: 0.6 - color: 16777215 - dashdot { - dd: 1.0 - dd: 2.0 - } - priority: 1454 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 2236962 - } - priority: 16454 - } - } - element { - scale: 15 - lines { - width: 1.5 + width: 0.9 color: 872415231 dashdot { dd: 2.0 dd: 1.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16454 + priority: 16441 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 872415231 + dashdot { + dd: 2.0 + dd: 1.0 + } + priority: 1441 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + } + priority: 16441 } } element { scale: 16 lines { - width: 1.5 + width: 2.2 color: 16777215 dashdot { dd: 3.0 - dd: 1.2 + dd: 1.5 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 17 lines { - width: 3.0 + width: 3.2 color: 16777215 dashdot { - dd: 4.0 - dd: 1.5 + dd: 6.0 + dd: 3.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -6405,49 +7533,49 @@ cont { height: 10 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 18 lines { - width: 5.0 + width: 4.6 color: 16777215 dashdot { + dd: 10.0 dd: 5.0 - dd: 2.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 19 lines { - width: 5.0 + width: 7.0 color: 16777215 dashdot { - dd: 5.0 - dd: 2.0 + dd: 16.0 + dd: 8.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16454 + priority: 16441 } } } @@ -6457,166 +7585,179 @@ cont { scale: 12 path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16454 + priority: 16441 } } element { scale: 13 + lines { + width: 0.7 + color: 1308622847 + dashdot { + dd: 2.0 + dd: 1.0 + } + priority: 1441 + join: ROUNDJOIN + cap: ROUNDCAP + } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16454 + priority: 16441 } } element { scale: 14 lines { - width: 0.6 - color: 16777215 - dashdot { - dd: 1.0 - dd: 2.0 - } - priority: 1454 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 2236962 - } - priority: 16454 - } - } - element { - scale: 15 - lines { - width: 1.5 + width: 0.9 color: 872415231 dashdot { dd: 2.0 dd: 1.0 } - priority: 1393 + priority: 1441 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + } + priority: 16441 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 872415231 + dashdot { + dd: 2.0 + dd: 1.0 + } + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 16 lines { - width: 1.5 + width: 2.2 color: 16777215 dashdot { dd: 3.0 - dd: 1.2 + dd: 1.5 } - priority: 1393 + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 17 lines { - width: 3.0 + width: 3.2 color: 16777215 dashdot { - dd: 4.0 - dd: 1.5 + dd: 6.0 + dd: 3.0 } - priority: 1393 + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 18 lines { - width: 5.0 + width: 4.6 color: 16777215 dashdot { + dd: 10.0 dd: 5.0 - dd: 2.0 } - priority: 1393 + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } element { scale: 19 lines { - width: 5.0 + width: 7.0 color: 16777215 dashdot { - dd: 5.0 - dd: 2.0 + dd: 16.0 + dd: 8.0 } - priority: 1393 + priority: 1382 join: ROUNDJOIN cap: ROUNDCAP } area { color: 3019898879 - priority: 1394 + priority: 1383 } caption { primary { height: 11 color: 5592405 } - priority: 15393 + priority: 15382 } } } @@ -6626,123 +7767,136 @@ cont { scale: 12 path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16454 + priority: 16441 } } element { scale: 13 + lines { + width: 0.7 + color: 1308622847 + dashdot { + dd: 2.0 + dd: 1.0 + } + priority: 1441 + join: ROUNDJOIN + cap: ROUNDCAP + } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16454 + priority: 16441 } } element { scale: 14 lines { - width: 0.6 - color: 16777215 - dashdot { - dd: 1.0 - dd: 2.0 - } - priority: 1454 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 2236962 - } - priority: 16454 - } - } - element { - scale: 15 - lines { - width: 1.5 + width: 0.9 color: 872415231 dashdot { dd: 2.0 dd: 1.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16454 + priority: 16441 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 872415231 + dashdot { + dd: 2.0 + dd: 1.0 + } + priority: 1441 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + } + priority: 16441 } } element { scale: 16 lines { - width: 1.5 + width: 2.2 color: 16777215 dashdot { dd: 3.0 - dd: 1.2 + dd: 1.5 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 4.0 + width: 5.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 7.4 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 17 lines { - width: 3.0 + width: 3.2 color: 16777215 dashdot { - dd: 4.0 - dd: 1.5 + dd: 6.0 + dd: 3.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 7.0 + width: 7.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 9.4 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -6751,77 +7905,77 @@ cont { height: 10 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 18 lines { - width: 5.0 + width: 4.6 color: 16777215 dashdot { + dd: 10.0 dd: 5.0 - dd: 2.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 11.0 + width: 10.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 13.0 + width: 12.2 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 19 lines { - width: 5.0 + width: 7.0 color: 16777215 dashdot { - dd: 5.0 - dd: 2.0 + dd: 16.0 + dd: 8.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 11.0 + width: 15.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 13.0 + width: 17.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16454 + priority: 16441 } } } @@ -6831,117 +7985,130 @@ cont { scale: 12 path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16454 + priority: 16441 } } element { scale: 13 + lines { + width: 0.7 + color: 1308622847 + dashdot { + dd: 2.0 + dd: 1.0 + } + priority: 1441 + join: ROUNDJOIN + cap: ROUNDCAP + } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16454 + priority: 16441 } } element { scale: 14 lines { - width: 0.6 - color: 16777215 - dashdot { - dd: 1.0 - dd: 2.0 - } - priority: 1454 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 2236962 - } - priority: 16454 - } - } - element { - scale: 15 - lines { - width: 1.5 + width: 0.9 color: 872415231 dashdot { dd: 2.0 dd: 1.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16454 + priority: 16441 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 872415231 + dashdot { + dd: 2.0 + dd: 1.0 + } + priority: 1441 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + } + priority: 16441 } } element { scale: 16 lines { - width: 3.5 + width: 4.2 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1453 + priority: 1440 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 1.5 + width: 2.2 color: 16777215 dashdot { dd: 3.0 - dd: 1.2 + dd: 1.5 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 17 lines { - width: 5.0 + width: 5.2 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1453 + priority: 1440 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 3.0 + width: 3.2 color: 16777215 dashdot { - dd: 4.0 - dd: 1.5 + dd: 6.0 + dd: 3.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -6950,71 +8117,71 @@ cont { height: 10 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 18 lines { - width: 7.0 + width: 6.6 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1453 + priority: 1440 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 5.0 + width: 4.6 color: 16777215 dashdot { + dd: 10.0 dd: 5.0 - dd: 2.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16454 + priority: 16441 } } element { scale: 19 lines { - width: 7.0 + width: 9.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1453 + priority: 1440 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 5.0 + width: 7.0 color: 16777215 dashdot { - dd: 5.0 - dd: 2.0 + dd: 16.0 + dd: 8.0 } - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16454 + priority: 16441 } } } @@ -7025,7 +8192,7 @@ cont { lines { width: 0.1 color: 2583660612 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } @@ -7035,114 +8202,114 @@ cont { lines { width: 0.9 color: 872384580 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 11 lines { - width: 1.2 - color: 872384580 - priority: 1606 + width: 1.1 + color: 16750933 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 12 lines { width: 1.8 - color: 452954180 - priority: 1606 + color: 452958549 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 13 lines { - width: 2.0 - color: 16750933 - priority: 1606 + width: 2.1 + color: 16755302 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 14 lines { - width: 2.4 + width: 2.8 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 15 lines { - width: 3.0 + width: 3.8 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 6.4 + width: 8.0 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { @@ -7150,99 +8317,99 @@ cont { lines { width: 6.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 17 lines { - width: 8.0 + width: 9.2 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 16.4 + width: 18.8 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 11 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 18 lines { - width: 12.0 + width: 13.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 24.4 + width: 26.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 14 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 19 lines { - width: 12.0 + width: 23.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 24.4 + width: 46.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 18 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } } @@ -7253,7 +8420,7 @@ cont { lines { width: 0.1 color: 2583660612 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } @@ -7263,142 +8430,142 @@ cont { lines { width: 0.9 color: 872384580 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 11 lines { - width: 1.2 - color: 872384580 - priority: 1606 + width: 1.1 + color: 16750933 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 12 lines { width: 1.8 - color: 452954180 - priority: 1606 + color: 452958549 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 13 lines { - width: 2.0 - color: 16750933 - priority: 1606 + width: 2.1 + color: 16755302 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 14 lines { - width: 2.4 + width: 2.8 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 5.8 + width: 6.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 7.8 + width: 8.6 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 15 lines { - width: 3.0 + width: 3.8 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 7.0 + width: 8.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 10.6 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.4 + width: 8.0 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { @@ -7406,155 +8573,155 @@ cont { lines { width: 6.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 17 lines { - width: 8.0 + width: 9.2 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 17.0 + width: 19.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 19.0 + width: 21.4 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 16.4 + width: 18.8 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 11 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 18 lines { - width: 12.0 + width: 13.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } - lines { - width: 25.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } lines { width: 27.0 - color: 8947848 - priority: 1059 + color: 15658717 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 24.4 + width: 29.0 + color: 8947848 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 26.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 14 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 19 lines { - width: 12.0 + width: 23.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 25.0 + width: 47.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 27.0 + width: 49.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 24.4 + width: 46.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 18 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } } @@ -7565,7 +8732,7 @@ cont { lines { width: 0.1 color: 2583660612 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } @@ -7575,136 +8742,136 @@ cont { lines { width: 0.9 color: 872384580 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 11 lines { - width: 1.2 - color: 872384580 - priority: 1606 + width: 1.1 + color: 16750933 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 12 lines { width: 1.8 - color: 452954180 - priority: 1606 + color: 452958549 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 13 lines { - width: 2.0 - color: 16750933 - priority: 1606 + width: 2.1 + color: 16755302 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 14 lines { - width: 4.4 + width: 4.8 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1605 + priority: 1587 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 2.4 + width: 2.8 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 15 lines { - width: 5.0 + width: 5.8 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1605 + priority: 1587 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 3.0 + width: 3.8 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 6.4 + width: 8.0 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { @@ -7716,139 +8883,139 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1605 + priority: 1587 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 17 lines { - width: 10.0 + width: 11.2 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1605 + priority: 1587 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 8.0 + width: 9.2 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 16.4 + width: 18.8 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 11 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 18 lines { - width: 14.0 + width: 15.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1605 + priority: 1587 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 12.0 + width: 13.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 24.4 + width: 26.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 14 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } element { scale: 19 lines { - width: 14.0 + width: 25.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1605 + priority: 1587 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 12.0 + width: 23.0 color: 16755302 - priority: 1606 + priority: 1588 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 24.4 + width: 46.4 color: 14540236 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 18 color: 2236962 stroke_color: 14540236 } - priority: 16606 + priority: 16588 } } } @@ -7858,152 +9025,152 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 13 path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.0 + width: 1.4 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 16 lines { - width: 2.5 + width: 3.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 17 lines { - width: 4.0 + width: 4.6 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 11 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 18 lines { - width: 6.0 + width: 7.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 14 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 6.0 + width: 11.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 18 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } @@ -8013,222 +9180,222 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 13 path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.0 + width: 1.4 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 4.0 + width: 4.8 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 5.0 + width: 5.8 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 16 lines { - width: 2.5 + width: 3.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 6.0 + width: 7.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 7.0 + width: 8.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 17 lines { - width: 4.0 + width: 4.6 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 9.0 + width: 10.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 10.0 + width: 11.2 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 11 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 18 lines { - width: 6.0 + width: 7.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 13.0 + width: 16.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 14.0 + width: 17.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 14 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 6.0 + width: 11.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 13.0 + width: 24.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 14.0 + width: 25.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 18 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } @@ -8238,152 +9405,152 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 13 path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.0 + width: 1.4 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 16 lines { - width: 2.5 + width: 3.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 17 lines { - width: 4.0 + width: 4.6 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 11 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 18 lines { - width: 6.0 + width: 7.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 14 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 6.0 + width: 11.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 18 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } @@ -8394,7 +9561,7 @@ cont { lines { width: 0.1 color: 3439329279 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -8404,16 +9571,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { @@ -8421,50 +9589,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { scale: 14 lines { - width: 1.1 + width: 1.4 color: 872415231 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { @@ -8472,24 +9641,24 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 17 lines { - width: 6.5 + width: 7.2 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -8498,41 +9667,41 @@ cont { height: 10 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16515 + priority: 16500 } } } @@ -8543,7 +9712,7 @@ cont { lines { width: 0.1 color: 3439329279 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -8553,16 +9722,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { @@ -8570,50 +9740,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { scale: 14 lines { - width: 1.1 + width: 1.4 color: 872415231 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { @@ -8621,24 +9792,24 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 17 lines { - width: 6.5 + width: 7.2 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -8647,41 +9818,41 @@ cont { height: 10 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16515 + priority: 16500 } } } @@ -8692,7 +9863,7 @@ cont { lines { width: 0.1 color: 3439329279 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -8702,16 +9873,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { @@ -8719,50 +9891,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { scale: 14 lines { - width: 1.1 + width: 1.4 color: 872415231 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { @@ -8770,52 +9943,52 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 17 lines { - width: 6.5 + width: 7.2 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 14.0 + width: 15.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 16.0 + width: 17.4 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -8824,69 +9997,69 @@ cont { height: 10 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 19.0 + width: 23.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 21.0 + width: 25.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 19.0 + width: 43.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 21.0 + width: 45.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16515 + priority: 16500 } } } @@ -8897,7 +10070,7 @@ cont { lines { width: 0.1 color: 3439329279 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -8907,16 +10080,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { @@ -8924,50 +10098,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { scale: 14 lines { - width: 1.1 + width: 1.4 color: 872415231 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { @@ -8979,42 +10154,42 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1514 + priority: 1499 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 17 lines { - width: 8.5 + width: 9.2 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1514 + priority: 1499 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.5 + width: 7.2 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -9023,63 +10198,63 @@ cont { height: 10 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 18 lines { - width: 11.0 + width: 13.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1514 + priority: 1499 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 19 lines { - width: 11.0 + width: 23.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1514 + priority: 1499 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16515 + priority: 16500 } } } @@ -9090,17 +10265,17 @@ cont { lines { width: 0.2 color: 2583691263 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9108,17 +10283,17 @@ cont { lines { width: 0.7 color: 872415231 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9126,16 +10301,17 @@ cont { lines { width: 1.8 color: 1308622847 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9143,41 +10319,61 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { scale: 14 lines { - width: 2.4 + width: 2.8 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { scale: 15 lines { - width: 3.0 + width: 3.8 color: 16777215 - priority: 1575 + priority: 1558 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + stroke_color: 14540236 + } + priority: 16558 + } + } + element { + scale: 16 + lines { + width: 5.4 + color: 16777215 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } @@ -9186,75 +10382,58 @@ cont { height: 9 color: 2236962 } - priority: 16575 - } - } - element { - scale: 16 - lines { - width: 6.0 - color: 16777215 - priority: 1575 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 2236962 - } - priority: 16575 + priority: 16558 } } element { scale: 17 lines { - width: 8.0 + width: 8.6 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 11 color: 2236962 } - priority: 16575 + priority: 16558 } } element { scale: 18 lines { - width: 12.0 + width: 13.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16575 + priority: 16558 } } element { scale: 19 lines { - width: 12.0 + width: 18.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 17 color: 2236962 } - priority: 16575 + priority: 16558 } } } @@ -9265,17 +10444,17 @@ cont { lines { width: 0.2 color: 2583691263 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9283,17 +10462,17 @@ cont { lines { width: 0.7 color: 872415231 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9301,16 +10480,17 @@ cont { lines { width: 1.8 color: 1308622847 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9318,55 +10498,89 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { scale: 14 lines { - width: 2.4 + width: 2.8 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { scale: 15 lines { - width: 3.0 + width: 3.8 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 7.0 + width: 8.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 10.6 color: 8947848 - priority: 1059 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 7 + color: 2236962 + stroke_color: 14540236 + } + priority: 16558 + } + } + element { + scale: 16 + lines { + width: 5.4 + color: 16777215 + priority: 1558 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 11.8 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 13.8 + color: 8947848 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -9375,131 +10589,100 @@ cont { height: 9 color: 2236962 } - priority: 16575 - } - } - element { - scale: 16 - lines { - width: 6.0 - color: 16777215 - priority: 1575 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 13.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 15.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 2236962 - } - priority: 16575 + priority: 16558 } } element { scale: 17 lines { - width: 8.0 + width: 8.6 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 17.0 + width: 18.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 19.0 + width: 20.2 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 11 color: 2236962 } - priority: 16575 + priority: 16558 } } element { scale: 18 lines { - width: 12.0 + width: 13.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 25.0 + width: 27.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 27.0 + width: 29.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16575 + priority: 16558 } } element { scale: 19 lines { - width: 12.0 + width: 18.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 25.0 + width: 37.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 27.0 + width: 39.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 17 color: 2236962 } - priority: 16575 + priority: 16558 } } } @@ -9510,17 +10693,17 @@ cont { lines { width: 0.2 color: 2583691263 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9528,17 +10711,17 @@ cont { lines { width: 0.7 color: 872415231 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 6 color: 2236962 stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9546,16 +10729,17 @@ cont { lines { width: 1.8 color: 1308622847 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { @@ -9563,41 +10747,72 @@ cont { lines { width: 2.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { scale: 14 lines { - width: 2.4 + width: 2.8 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16575 + priority: 16558 } } element { scale: 15 lines { - width: 3.0 + width: 3.8 color: 16777215 - priority: 1575 + priority: 1558 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + stroke_color: 14540236 + } + priority: 16558 + } + } + element { + scale: 16 + lines { + width: 7.4 + color: 8947848 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 1557 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 5.4 + color: 16777215 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } @@ -9606,119 +10821,91 @@ cont { height: 9 color: 2236962 } - priority: 16575 - } - } - element { - scale: 16 - lines { - width: 8.0 - color: 8947848 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1574 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 6.0 - color: 16777215 - priority: 1575 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 10 - color: 2236962 - } - priority: 16575 + priority: 16558 } } element { scale: 17 lines { - width: 10.0 + width: 10.6 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1574 + priority: 1557 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 8.0 + width: 8.6 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 11 color: 2236962 } - priority: 16575 + priority: 16558 } } element { scale: 18 lines { - width: 14.0 + width: 15.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1574 + priority: 1557 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 12.0 + width: 13.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16575 + priority: 16558 } } element { scale: 19 lines { - width: 14.0 + width: 20.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1574 + priority: 1557 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 12.0 + width: 18.0 color: 16777215 - priority: 1575 + priority: 1558 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 17 color: 2236962 } - priority: 16575 + priority: 16558 } } } @@ -9727,9 +10914,9 @@ cont { element { scale: 14 lines { - width: 1.0 + width: 1.4 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9737,9 +10924,9 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9747,9 +10934,9 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 2.7 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9757,9 +10944,9 @@ cont { element { scale: 17 lines { - width: 4.0 + width: 4.3 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9767,9 +10954,9 @@ cont { element { scale: 18 lines { - width: 6.0 + width: 7.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9777,9 +10964,9 @@ cont { element { scale: 19 lines { - width: 6.0 + width: 9.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9790,9 +10977,9 @@ cont { element { scale: 14 lines { - width: 1.0 + width: 1.4 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9800,9 +10987,9 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9810,23 +10997,23 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 2.7 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 5.0 + width: 6.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 7.4 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -9834,23 +11021,23 @@ cont { element { scale: 17 lines { - width: 4.0 + width: 4.3 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 9.0 + width: 9.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 10.0 + width: 10.6 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -9858,23 +11045,23 @@ cont { element { scale: 18 lines { - width: 6.0 + width: 7.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 13.0 + width: 16.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 14.0 + width: 17.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -9882,23 +11069,23 @@ cont { element { scale: 19 lines { - width: 6.0 + width: 9.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 13.0 + width: 19.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 14.0 + width: 20.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -9909,9 +11096,9 @@ cont { element { scale: 14 lines { - width: 1.0 + width: 1.4 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9919,9 +11106,9 @@ cont { element { scale: 15 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9929,9 +11116,9 @@ cont { element { scale: 16 lines { - width: 2.0 + width: 2.7 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9939,9 +11126,9 @@ cont { element { scale: 17 lines { - width: 4.0 + width: 4.3 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9949,9 +11136,9 @@ cont { element { scale: 18 lines { - width: 6.0 + width: 7.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9959,9 +11146,9 @@ cont { element { scale: 19 lines { - width: 6.0 + width: 9.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -9969,12 +11156,22 @@ cont { } cont { name: "highway-service" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -9982,9 +11179,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -9992,9 +11189,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10002,9 +11199,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10012,9 +11209,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10022,12 +11219,22 @@ cont { } cont { name: "highway-service-area" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -10035,9 +11242,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10045,9 +11252,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10055,9 +11262,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10065,9 +11272,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10075,12 +11282,22 @@ cont { } cont { name: "highway-service-bridge" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -10088,9 +11305,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10098,9 +11315,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10108,9 +11325,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10118,9 +11335,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10128,12 +11345,22 @@ cont { } cont { name: "highway-service-driveway" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -10141,9 +11368,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10151,9 +11378,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10161,9 +11388,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10171,9 +11398,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10181,12 +11408,22 @@ cont { } cont { name: "highway-service-driveway-area" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -10194,9 +11431,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10204,9 +11441,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10214,9 +11451,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10224,9 +11461,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10234,12 +11471,22 @@ cont { } cont { name: "highway-service-driveway-bridge" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -10247,9 +11494,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10257,9 +11504,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10267,9 +11514,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10277,9 +11524,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10287,12 +11534,22 @@ cont { } cont { name: "highway-service-driveway-tunnel" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -10300,9 +11557,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10310,9 +11567,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10320,9 +11577,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10330,9 +11587,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10340,12 +11597,22 @@ cont { } cont { name: "highway-service-parking_aisle" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -10353,9 +11620,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10363,9 +11630,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10373,9 +11640,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10383,9 +11650,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10393,12 +11660,22 @@ cont { } cont { name: "highway-service-tunnel" + element { + scale: 14 + lines { + width: 0.2 + color: 2583691263 + priority: 1411 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { width: 0.6 - color: 452984831 - priority: 1424 + color: 1308622847 + priority: 1411 join: ROUNDJOIN cap: ROUNDCAP } @@ -10406,9 +11683,9 @@ cont { element { scale: 16 lines { - width: 1.0 + width: 1.4 color: 872415231 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10416,9 +11693,9 @@ cont { element { scale: 17 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10426,9 +11703,9 @@ cont { element { scale: 18 lines { - width: 2.0 + width: 4.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10436,9 +11713,9 @@ cont { element { scale: 19 lines { - width: 2.0 + width: 6.0 color: 16777215 - priority: 1454 + priority: 1441 join: ROUNDJOIN cap: ROUNDCAP } @@ -10463,7 +11740,7 @@ cont { element { scale: 17 lines { - width: 5.0 + width: 4.0 color: 16777215 dashdot { dd: 1.0 @@ -10477,7 +11754,7 @@ cont { element { scale: 18 lines { - width: 6.0 + width: 5.0 color: 16777215 dashdot { dd: 1.0 @@ -10494,8 +11771,8 @@ cont { width: 6.0 color: 16777215 dashdot { - dd: 1.0 - dd: 1.0 + dd: 1.5 + dd: 1.5 } priority: 1000 join: ROUNDJOIN @@ -10522,7 +11799,7 @@ cont { element { scale: 17 lines { - width: 5.0 + width: 4.0 color: 16777215 dashdot { dd: 1.0 @@ -10536,7 +11813,7 @@ cont { element { scale: 18 lines { - width: 6.0 + width: 5.0 color: 16777215 dashdot { dd: 1.0 @@ -10553,8 +11830,8 @@ cont { width: 6.0 color: 16777215 dashdot { - dd: 1.0 - dd: 1.0 + dd: 1.5 + dd: 1.5 } priority: 1000 join: ROUNDJOIN @@ -10581,7 +11858,7 @@ cont { element { scale: 17 lines { - width: 5.0 + width: 4.0 color: 16777215 dashdot { dd: 1.0 @@ -10595,7 +11872,7 @@ cont { element { scale: 18 lines { - width: 6.0 + width: 5.0 color: 16777215 dashdot { dd: 1.0 @@ -10612,8 +11889,8 @@ cont { width: 6.0 color: 16777215 dashdot { - dd: 1.0 - dd: 1.0 + dd: 1.5 + dd: 1.5 } priority: 1000 join: ROUNDJOIN @@ -10628,7 +11905,7 @@ cont { lines { width: 0.1 color: 3439329279 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -10638,16 +11915,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { @@ -10655,50 +11933,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { scale: 14 lines { - width: 1.1 + width: 1.4 color: 872415231 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { @@ -10706,24 +11985,24 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 17 lines { - width: 6.5 + width: 7.2 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -10732,41 +12011,41 @@ cont { height: 10 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16515 + priority: 16500 } } } @@ -10777,7 +12056,7 @@ cont { lines { width: 0.1 color: 3439329279 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -10787,16 +12066,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { @@ -10804,50 +12084,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { scale: 14 lines { - width: 1.1 + width: 1.4 color: 872415231 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { @@ -10855,52 +12136,52 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 17 lines { - width: 6.5 + width: 7.2 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 14.0 + width: 15.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 16.0 + width: 17.4 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -10909,69 +12190,69 @@ cont { height: 10 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 19.0 + width: 23.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 21.0 + width: 25.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 19.0 + width: 43.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 21.0 + width: 45.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16515 + priority: 16500 } } } @@ -10982,7 +12263,7 @@ cont { lines { width: 0.1 color: 3439329279 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -10992,16 +12273,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { @@ -11009,50 +12291,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16515 + priority: 16500 } } element { scale: 14 lines { - width: 1.1 + width: 1.4 color: 872415231 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 8 + height: 7 color: 2236962 } - priority: 16515 + priority: 16500 } } element { @@ -11064,42 +12347,42 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1514 + priority: 1499 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 17 lines { - width: 8.5 + width: 9.2 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1514 + priority: 1499 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.5 + width: 7.2 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } @@ -11108,63 +12391,63 @@ cont { height: 10 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 18 lines { - width: 11.0 + width: 13.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1514 + priority: 1499 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16515 + priority: 16500 } } element { scale: 19 lines { - width: 11.0 + width: 23.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1514 + priority: 1499 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1515 + priority: 1500 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16515 + priority: 16500 } } } @@ -11173,9 +12456,9 @@ cont { element { scale: 15 lines { - width: 0.5 + width: 1.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11183,9 +12466,9 @@ cont { element { scale: 16 lines { - width: 1.5 + width: 2.2 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11193,9 +12476,9 @@ cont { element { scale: 17 lines { - width: 3.0 + width: 3.1 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11203,9 +12486,9 @@ cont { element { scale: 18 lines { - width: 4.5 + width: 5.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11213,9 +12496,9 @@ cont { element { scale: 19 lines { - width: 4.5 + width: 10.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11226,9 +12509,9 @@ cont { element { scale: 15 lines { - width: 0.5 + width: 1.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11236,23 +12519,23 @@ cont { element { scale: 16 lines { - width: 1.5 + width: 2.2 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 4.0 + width: 5.4 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 5.0 + width: 6.4 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -11260,23 +12543,23 @@ cont { element { scale: 17 lines { - width: 3.0 + width: 3.1 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 7.0 + width: 7.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 8.0 + width: 8.2 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -11284,23 +12567,23 @@ cont { element { scale: 18 lines { - width: 4.5 + width: 5.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 10.0 + width: 12.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 11.0 + width: 13.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -11308,23 +12591,23 @@ cont { element { scale: 19 lines { - width: 4.5 + width: 10.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 10.0 + width: 22.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 11.0 + width: 23.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -11335,9 +12618,9 @@ cont { element { scale: 15 lines { - width: 0.5 + width: 1.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11345,9 +12628,9 @@ cont { element { scale: 16 lines { - width: 1.5 + width: 2.2 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11355,9 +12638,9 @@ cont { element { scale: 17 lines { - width: 3.0 + width: 3.1 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11365,9 +12648,9 @@ cont { element { scale: 18 lines { - width: 4.5 + width: 5.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11375,9 +12658,9 @@ cont { element { scale: 19 lines { - width: 4.5 + width: 10.5 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -11390,7 +12673,7 @@ cont { lines { width: 0.3 color: 2583647488 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11400,7 +12683,7 @@ cont { lines { width: 0.6 color: 2164217088 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11410,7 +12693,7 @@ cont { lines { width: 0.8 color: 1308579072 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11419,26 +12702,44 @@ cont { scale: 10 lines { width: 1.2 - color: 1308579072 - priority: 1636 + color: 872375842 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 11 lines { width: 1.8 - color: 872371456 - priority: 1636 + color: 1308583475 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 12 + lines { + width: 2.5 + color: 452949828 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11448,69 +12749,87 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 12 - lines { - width: 2.5 - color: 452941056 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { scale: 13 lines { width: 2.8 - color: 16737843 - priority: 1636 + color: 452949828 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 14 lines { - width: 3.6 - color: 16742212 - priority: 1636 + width: 3.8 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 15 lines { - width: 4.0 - color: 16742212 - priority: 1636 + width: 4.8 + color: 16746564 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 16 + lines { + width: 6.8 + color: 16746564 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 17 + lines { + width: 10.6 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11520,79 +12839,43 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 16 - lines { - width: 7.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 - } - } - element { - scale: 17 - lines { - width: 9.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { scale: 18 lines { width: 16.0 - color: 16742212 - priority: 1636 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 19 lines { - width: 16.0 - color: 16742212 - priority: 1636 + width: 26.0 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } } @@ -11603,7 +12886,7 @@ cont { lines { width: 0.3 color: 2583647488 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11613,7 +12896,7 @@ cont { lines { width: 0.6 color: 2164217088 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11623,7 +12906,7 @@ cont { lines { width: 0.8 color: 1308579072 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11632,26 +12915,44 @@ cont { scale: 10 lines { width: 1.2 - color: 1308579072 - priority: 1636 + color: 872375842 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 11 lines { width: 1.8 - color: 872371456 - priority: 1636 + color: 1308583475 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 7 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 12 + lines { + width: 2.5 + color: 452949828 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11661,111 +12962,157 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 12 - lines { - width: 2.5 - color: 452941056 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { scale: 13 lines { width: 2.8 - color: 16737843 - priority: 1636 + color: 452949828 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.6 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 14 lines { - width: 3.6 - color: 16742212 - priority: 1636 + width: 3.8 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 8.2 + width: 8.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 10.2 + width: 10.6 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 15 lines { - width: 4.0 - color: 16742212 - priority: 1636 + width: 4.8 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 9.0 + width: 10.6 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 11.0 + width: 12.6 color: 8947848 - priority: 1059 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 16 + lines { + width: 6.8 + color: 16746564 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 14.6 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 16.6 + color: 8947848 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 17 + lines { + width: 10.6 + color: 16746564 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 22.2 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 24.2 + color: 8947848 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -11775,135 +13122,71 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 16 - lines { - width: 7.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 15.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 17.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 - } - } - element { - scale: 17 - lines { - width: 9.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 19.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 21.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { scale: 18 lines { width: 16.0 - color: 16742212 - priority: 1636 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 33.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 35.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 19 lines { - width: 16.0 - color: 16742212 - priority: 1636 + width: 26.0 + color: 16746564 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 33.0 + width: 53.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 35.0 + width: 55.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } } @@ -11914,7 +13197,7 @@ cont { lines { width: 0.3 color: 2583647488 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11924,7 +13207,7 @@ cont { lines { width: 0.6 color: 2164217088 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11934,7 +13217,7 @@ cont { lines { width: 0.8 color: 1308579072 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -11943,36 +13226,36 @@ cont { scale: 10 lines { width: 1.2 - color: 1308579072 - priority: 1636 + color: 872375842 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 11 lines { width: 1.8 - color: 872371456 - priority: 1636 + color: 1308583475 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { @@ -11984,24 +13267,24 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.5 color: 16733440 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { @@ -12013,72 +13296,130 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.8 - color: 16737843 - priority: 1636 + color: 452945459 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 14 lines { - width: 5.6 + width: 5.8 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 3.6 + width: 3.8 color: 16742212 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 15 lines { - width: 6.0 + width: 6.8 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 4.0 + width: 4.8 color: 16742212 - priority: 1636 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 16 + lines { + width: 8.8 + color: 8947848 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 1616 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 6.8 + color: 16742212 + priority: 1617 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16617 + } + } + element { + scale: 17 + lines { + width: 12.6 + color: 8947848 + dashdot { + dd: 5.0 + dd: 5.0 + } + priority: 1616 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 10.6 + color: 16742212 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } @@ -12088,65 +13429,7 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16636 - } - } - element { - scale: 16 - lines { - width: 9.0 - color: 8947848 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1635 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 7.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 - } - } - element { - scale: 17 - lines { - width: 11.0 - color: 8947848 - dashdot { - dd: 5.0 - dd: 5.0 - } - priority: 1635 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 9.0 - color: 16742212 - priority: 1636 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16636 + priority: 16617 } } element { @@ -12158,53 +13441,53 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { width: 16.0 color: 16742212 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } element { scale: 19 lines { - width: 18.0 + width: 28.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1635 + priority: 1616 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 16.0 + width: 26.0 color: 16742212 - priority: 1636 + priority: 1617 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16636 + priority: 16617 } } } @@ -12214,33 +13497,33 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { @@ -12248,43 +13531,79 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1363 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 16 + lines { + width: 3.4 + color: 16777215 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 17 + lines { + width: 5.0 + color: 16777215 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -12294,43 +13613,7 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16363 - } - } - element { - scale: 16 - lines { - width: 3.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 - } - } - element { - scale: 17 - lines { - width: 4.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 + priority: 16352 } } element { @@ -12338,35 +13621,35 @@ cont { lines { width: 8.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 8.0 + width: 13.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } @@ -12376,33 +13659,33 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { @@ -12410,57 +13693,121 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 5.0 + width: 5.8 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.0 + width: 6.8 color: 8947848 - priority: 1059 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 16 + lines { + width: 3.4 + color: 16777215 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 7.8 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 8.8 + color: 8947848 + priority: 1057 + join: ROUNDJOIN + cap: BUTTCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 17 + lines { + width: 5.0 + color: 16777215 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + lines { + width: 11.0 + color: 15658717 + priority: 1087 + join: ROUNDJOIN + cap: BUTTCAP + } + lines { + width: 12.0 + color: 8947848 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -12470,71 +13817,7 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16363 - } - } - element { - scale: 16 - lines { - width: 3.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 8.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 9.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 - } - } - element { - scale: 17 - lines { - width: 4.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - lines { - width: 10.0 - color: 15658717 - priority: 1089 - join: ROUNDJOIN - cap: BUTTCAP - } - lines { - width: 11.0 - color: 8947848 - priority: 1059 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 + priority: 16352 } } element { @@ -12542,63 +13825,63 @@ cont { lines { width: 8.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 17.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 18.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 8.0 + width: 13.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 17.0 + width: 27.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 18.0 + width: 28.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } @@ -12608,33 +13891,33 @@ cont { scale: 10 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 11 path_text { primary { - height: 9 + height: 7 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 12 path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { @@ -12642,43 +13925,79 @@ cont { lines { width: 0.8 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 9 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 14 lines { - width: 1.5 + width: 1.9 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 12 + height: 10 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 15 lines { - width: 2.0 + width: 2.4 color: 16777215 - priority: 1363 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 10 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 16 + lines { + width: 3.4 + color: 16777215 + priority: 1352 + join: ROUNDJOIN + cap: ROUNDCAP + } + path_text { + primary { + height: 11 + color: 2236962 + stroke_color: 14540236 + } + priority: 16352 + } + } + element { + scale: 17 + lines { + width: 5.0 + color: 16777215 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } @@ -12688,43 +14007,7 @@ cont { color: 2236962 stroke_color: 14540236 } - priority: 16363 - } - } - element { - scale: 16 - lines { - width: 3.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 - } - } - element { - scale: 17 - lines { - width: 4.5 - color: 16777215 - priority: 1363 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 14 - color: 2236962 - stroke_color: 14540236 - } - priority: 16363 + priority: 16352 } } element { @@ -12732,35 +14015,35 @@ cont { lines { width: 8.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 17 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } element { scale: 19 lines { - width: 8.0 + width: 13.0 color: 16777215 - priority: 1363 + priority: 1352 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 14 + height: 20 color: 2236962 stroke_color: 14540236 } - priority: 16363 + priority: 16352 } } } @@ -12771,16 +14054,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { @@ -12788,50 +14072,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { scale: 14 lines { - width: 0.6 + width: 1.4 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { @@ -12839,24 +14124,24 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 17 lines { - width: 6.5 + width: 7.6 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -12865,41 +14150,41 @@ cont { height: 10 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16484 + priority: 16470 } } } @@ -12910,16 +14195,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { @@ -12927,50 +14213,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { scale: 14 lines { - width: 0.6 + width: 1.4 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { @@ -12978,24 +14265,24 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 17 lines { - width: 6.5 + width: 7.6 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -13004,41 +14291,41 @@ cont { height: 10 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16484 + priority: 16470 } } } @@ -13049,16 +14336,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { @@ -13066,50 +14354,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { scale: 14 lines { - width: 0.6 + width: 1.4 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { @@ -13117,52 +14406,52 @@ cont { lines { width: 4.5 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 17 lines { - width: 6.5 + width: 7.6 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 14.0 + width: 16.2 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 16.0 + width: 18.2 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } @@ -13171,69 +14460,69 @@ cont { height: 10 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 18 lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 19.0 + width: 23.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 21.0 + width: 25.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 19 lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 19.0 + width: 43.0 color: 15658717 - priority: 1089 + priority: 1087 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 21.0 + width: 45.0 color: 8947848 - priority: 1059 + priority: 1057 join: ROUNDJOIN cap: BUTTCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16484 + priority: 16470 } } } @@ -13244,16 +14533,17 @@ cont { lines { width: 0.3 color: 2583691263 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { @@ -13261,50 +14551,51 @@ cont { lines { width: 0.7 color: 1308622847 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 + stroke_color: 14540236 } - priority: 16484 + priority: 16470 } } element { scale: 14 lines { - width: 0.6 + width: 1.4 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 15 lines { - width: 1.5 + width: 3.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 7 color: 2236962 } - priority: 16484 + priority: 16470 } } element { @@ -13316,42 +14607,42 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1483 + priority: 1469 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 8 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 17 lines { - width: 8.5 + width: 9.6 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1483 + priority: 1469 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 6.5 + width: 7.6 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } @@ -13360,63 +14651,63 @@ cont { height: 10 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 18 lines { - width: 11.0 + width: 13.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1483 + priority: 1469 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 11.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 12 color: 2236962 } - priority: 16484 + priority: 16470 } } element { scale: 19 lines { - width: 11.0 + width: 23.0 color: 8947848 dashdot { dd: 5.0 dd: 5.0 } - priority: 1483 + priority: 1469 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 9.0 + width: 21.0 color: 16777215 - priority: 1484 + priority: 1470 join: ROUNDJOIN cap: ROUNDCAP } path_text { primary { - height: 10 + height: 15 color: 2236962 } - priority: 16484 + priority: 16470 } } } @@ -13431,7 +14722,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -13445,7 +14736,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -13459,7 +14750,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -13473,7 +14764,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -13486,7 +14777,7 @@ cont { symbol { name: "monument-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -13494,7 +14785,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -13502,7 +14793,7 @@ cont { symbol { name: "monument-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -13510,7 +14801,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -13518,7 +14809,7 @@ cont { symbol { name: "monument-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -13526,7 +14817,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -13534,7 +14825,7 @@ cont { symbol { name: "monument-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -13542,7 +14833,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -13553,7 +14844,7 @@ cont { lines { width: 0 color: 0 - priority: 1696 + priority: 1676 pathsym { name: "arrow-s" step: 144.0 @@ -13566,7 +14857,7 @@ cont { lines { width: 0 color: 0 - priority: 1696 + priority: 1676 pathsym { name: "arrow-s" step: 184.0 @@ -13579,7 +14870,7 @@ cont { lines { width: 0 color: 0 - priority: 1696 + priority: 1676 pathsym { name: "arrow-m" step: 184.0 @@ -13592,7 +14883,7 @@ cont { lines { width: 0 color: 0 - priority: 1696 + priority: 1676 pathsym { name: "arrow-m" step: 184.0 @@ -13607,56 +14898,56 @@ cont { scale: 12 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 13 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 14 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 15 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } } } @@ -13666,56 +14957,56 @@ cont { scale: 12 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 13 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 14 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 15 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 16 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 17 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 18 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 19 area { color: 2158672742 - priority: 1182 + priority: 1177 } } } @@ -13725,56 +15016,56 @@ cont { scale: 12 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 13 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 14 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 15 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 16 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 17 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 18 area { color: 2158672742 - priority: 1182 + priority: 1177 } } element { scale: 19 area { color: 2158672742 - priority: 1182 + priority: 1177 } } } @@ -13784,70 +15075,70 @@ cont { scale: 10 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 11 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 12 area { color: 3014310758 - priority: 1152 + priority: 1089 } } element { scale: 13 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 14 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 15 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 16 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 17 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 18 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 19 area { color: 1303034726 - priority: 1031 + priority: 1030 } } } @@ -13857,70 +15148,70 @@ cont { scale: 10 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 11 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 12 area { color: 3014310758 - priority: 1152 + priority: 1089 } } element { scale: 13 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 14 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 15 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 16 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 17 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 18 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 19 area { color: 1303034726 - priority: 1031 + priority: 1030 } } } @@ -13930,70 +15221,70 @@ cont { scale: 10 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 11 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 12 area { color: 3014310758 - priority: 1152 + priority: 1089 } } element { scale: 13 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 14 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 15 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 16 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 17 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 18 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 19 area { color: 1303034726 - priority: 1031 + priority: 1030 } } } @@ -14003,70 +15294,70 @@ cont { scale: 10 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 11 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 12 area { color: 3014310758 - priority: 1152 + priority: 1089 } } element { scale: 13 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 14 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 15 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 16 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 17 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 18 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 19 area { color: 1303034726 - priority: 1031 + priority: 1030 } } } @@ -14076,42 +15367,42 @@ cont { scale: 14 area { color: 2376776550 - priority: 1091 + priority: 1089 } } element { scale: 15 area { color: 2376776550 - priority: 1091 + priority: 1089 } } element { scale: 16 area { color: 2376776550 - priority: 1091 + priority: 1089 } } element { scale: 17 area { color: 2376776550 - priority: 1091 + priority: 1089 } } element { scale: 18 area { color: 2376776550 - priority: 1091 + priority: 1089 } } element { scale: 19 area { color: 2376776550 - priority: 1091 + priority: 1089 } } } @@ -14121,35 +15412,35 @@ cont { scale: 15 area { color: 14540253 - priority: 1182 + priority: 1177 } } element { scale: 16 area { color: 14540253 - priority: 1182 + priority: 1177 } } element { scale: 17 area { color: 14540253 - priority: 1182 + priority: 1177 } } element { scale: 18 area { color: 14540253 - priority: 1182 + priority: 1177 } } element { scale: 19 area { color: 14540253 - priority: 1182 + priority: 1177 } } } @@ -14159,56 +15450,56 @@ cont { scale: 12 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 13 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 14 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 15 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } } } @@ -14217,54 +15508,54 @@ cont { element { scale: 10 area { - color: 3433741158 - priority: 1061 + color: 3014310758 + priority: 1059 } } element { scale: 11 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 12 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 13 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 14 area { color: 1722465126 - priority: 1061 + priority: 1059 } caption { primary { height: 10 color: 3372834 } - priority: 15060 + priority: 15058 } } element { scale: 15 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-s" - priority: 16060 + priority: 16058 } caption { primary { @@ -14272,18 +15563,18 @@ cont { color: 3372834 offset_y: 8 } - priority: 15060 + priority: 15058 } } element { scale: 16 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14291,18 +15582,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 17 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14310,18 +15601,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 18 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14329,18 +15620,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 19 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14348,7 +15639,7 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } } @@ -14357,54 +15648,54 @@ cont { element { scale: 10 area { - color: 3433741158 - priority: 1061 + color: 3014310758 + priority: 1059 } } element { scale: 11 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 12 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 13 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 14 area { color: 1722465126 - priority: 1061 + priority: 1059 } caption { primary { height: 10 color: 3372834 } - priority: 15060 + priority: 15058 } } element { scale: 15 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-s" - priority: 16060 + priority: 16058 } caption { primary { @@ -14412,18 +15703,18 @@ cont { color: 3372834 offset_y: 8 } - priority: 15060 + priority: 15058 } } element { scale: 16 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14431,18 +15722,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 17 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14450,18 +15741,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 18 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14469,18 +15760,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 19 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14488,7 +15779,7 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } } @@ -14497,54 +15788,54 @@ cont { element { scale: 10 area { - color: 3433741158 - priority: 1061 + color: 3014310758 + priority: 1059 } } element { scale: 11 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 12 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 13 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 14 area { color: 1722465126 - priority: 1061 + priority: 1059 } caption { primary { height: 10 color: 3372834 } - priority: 15060 + priority: 15058 } } element { scale: 15 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-s" - priority: 16060 + priority: 16058 } caption { primary { @@ -14552,18 +15843,18 @@ cont { color: 3372834 offset_y: 8 } - priority: 15060 + priority: 15058 } } element { scale: 16 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14571,18 +15862,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 17 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14590,18 +15881,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 18 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14609,18 +15900,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 19 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14628,7 +15919,7 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } } @@ -14637,54 +15928,54 @@ cont { element { scale: 10 area { - color: 3433741158 - priority: 1061 + color: 3014310758 + priority: 1059 } } element { scale: 11 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 12 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 13 area { color: 1722465126 - priority: 1061 + priority: 1059 } } element { scale: 14 area { color: 1722465126 - priority: 1061 + priority: 1059 } caption { primary { height: 10 color: 3372834 } - priority: 15060 + priority: 15058 } } element { scale: 15 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-s" - priority: 16060 + priority: 16058 } caption { primary { @@ -14692,18 +15983,18 @@ cont { color: 3372834 offset_y: 8 } - priority: 15060 + priority: 15058 } } element { scale: 16 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14711,18 +16002,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 17 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14730,18 +16021,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 18 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14749,18 +16040,18 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } element { scale: 19 area { color: 1722465126 - priority: 1061 + priority: 1059 } symbol { name: "park-m" - priority: 16060 + priority: 16058 } caption { primary { @@ -14768,7 +16059,7 @@ cont { color: 3372834 offset_y: 10 } - priority: 15060 + priority: 15058 } } } @@ -14778,49 +16069,49 @@ cont { scale: 13 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 14 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 15 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } } } @@ -14830,112 +16121,112 @@ cont { scale: 10 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 11 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 12 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 13 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 14 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 8 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 15 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 8 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 12 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 12 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 12 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 12 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } } @@ -14945,140 +16236,140 @@ cont { scale: 0 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 1 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 2 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 3 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 4 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 5 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 6 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 7 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 8 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 9 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 10 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 11 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 12 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 13 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 14 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 15 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 16 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 17 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 18 area { color: 8965341 - priority: 971 + priority: 972 } } element { scale: 19 area { color: 8965341 - priority: 971 + priority: 972 } } } @@ -15231,140 +16522,140 @@ cont { scale: 0 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 1 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 2 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 3 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 4 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 5 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 6 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 7 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 8 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 9 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 10 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 11 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 12 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 13 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 14 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 15 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } } } @@ -15374,140 +16665,140 @@ cont { scale: 0 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 1 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 2 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 3 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 4 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 5 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 6 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 7 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 8 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 9 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 10 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 11 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 12 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 13 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 14 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 15 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 16 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 17 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 18 area { color: 14540236 - priority: 941 + priority: 943 } } element { scale: 19 area { color: 14540236 - priority: 941 + priority: 943 } } } @@ -15517,140 +16808,140 @@ cont { scale: 0 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 1 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 2 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 3 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 4 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 5 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 6 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 7 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 8 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 9 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 10 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 11 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 12 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 13 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 14 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 15 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } } } @@ -15660,182 +16951,182 @@ cont { scale: 0 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 1 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 2 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 3 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 4 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 5 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 6 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 7 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 8 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 9 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 10 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 11 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 12 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 13 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 14 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 8 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 15 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 8 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 12 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 12 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 12 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } caption { primary { height: 12 - color: 3381691 + color: 2263210 } - priority: 15242 + priority: 15235 } } } @@ -15845,70 +17136,70 @@ cont { scale: 10 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 11 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 12 area { color: 3014310758 - priority: 1152 + priority: 1089 } } element { scale: 13 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 14 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 15 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 16 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 17 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 18 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 19 area { color: 1303034726 - priority: 1031 + priority: 1030 } } } @@ -15918,70 +17209,70 @@ cont { scale: 10 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 11 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 12 area { color: 3014310758 - priority: 1152 + priority: 1089 } } element { scale: 13 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 14 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 15 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 16 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 17 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 18 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 19 area { color: 1303034726 - priority: 1031 + priority: 1030 } } } @@ -15991,70 +17282,70 @@ cont { scale: 10 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 11 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 12 area { color: 3014310758 - priority: 1152 + priority: 1089 } } element { scale: 13 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 14 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 15 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 16 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 17 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 18 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 19 area { color: 1303034726 - priority: 1031 + priority: 1030 } } } @@ -16064,70 +17355,70 @@ cont { scale: 10 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 11 area { color: 3014310758 - priority: 1031 + priority: 1030 } } element { scale: 12 area { color: 3014310758 - priority: 1152 + priority: 1089 } } element { scale: 13 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 14 area { color: 2376776550 - priority: 1031 + priority: 1030 } } element { scale: 15 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 16 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 17 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 18 area { color: 1303034726 - priority: 1031 + priority: 1030 } } element { scale: 19 area { color: 1303034726 - priority: 1031 + priority: 1030 } } } @@ -16138,7 +17429,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -16147,7 +17438,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -16155,7 +17446,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16164,7 +17455,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16172,7 +17463,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16181,7 +17472,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -16192,7 +17483,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16203,7 +17494,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16214,7 +17505,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16225,7 +17516,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -16236,7 +17527,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -16245,7 +17536,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -16253,7 +17544,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16262,7 +17553,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16270,7 +17561,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16279,7 +17570,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -16290,7 +17581,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16301,7 +17592,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16312,7 +17603,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16323,7 +17614,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -16334,7 +17625,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -16343,7 +17634,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -16351,7 +17642,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16360,7 +17651,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16368,7 +17659,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16377,7 +17668,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -16388,7 +17679,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16399,7 +17690,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16410,7 +17701,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16421,7 +17712,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -16432,7 +17723,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -16441,7 +17732,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -16449,7 +17740,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16458,7 +17749,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16466,7 +17757,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16475,7 +17766,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -16486,7 +17777,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16497,7 +17788,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16508,7 +17799,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16519,7 +17810,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -16530,7 +17821,7 @@ cont { symbol { name: "star-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16538,7 +17829,7 @@ cont { color: 5592405 offset_y: 2 } - priority: 15818 + priority: 15794 } } element { @@ -16546,7 +17837,7 @@ cont { symbol { name: "star-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16554,7 +17845,7 @@ cont { color: 5592405 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16562,7 +17853,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16571,7 +17862,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -16579,7 +17870,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -16588,7 +17879,7 @@ cont { stroke_color: 14540236 offset_y: 5 } - priority: 15696 + priority: 15676 } } element { @@ -16596,7 +17887,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16848 + priority: 16823 } caption { primary { @@ -16605,7 +17896,7 @@ cont { stroke_color: 14540236 offset_y: 5 } - priority: 15848 + priority: 15823 } } element { @@ -16613,7 +17904,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16848 + priority: 16823 } caption { primary { @@ -16622,7 +17913,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15848 + priority: 15823 } } element { @@ -16630,7 +17921,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16848 + priority: 16823 } caption { primary { @@ -16639,7 +17930,7 @@ cont { stroke_color: 4292730316 offset_y: 3 } - priority: 15848 + priority: 15823 } } element { @@ -16647,7 +17938,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16848 + priority: 16823 } caption { primary { @@ -16656,7 +17947,7 @@ cont { stroke_color: 4292730316 offset_y: 4 } - priority: 15848 + priority: 15823 } } element { @@ -16664,7 +17955,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16848 + priority: 16823 } caption { primary { @@ -16673,7 +17964,7 @@ cont { stroke_color: 4292730316 offset_y: 4 } - priority: 15848 + priority: 15823 } } element { @@ -16681,7 +17972,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16848 + priority: 16823 } caption { primary { @@ -16690,7 +17981,7 @@ cont { stroke_color: 4292730316 offset_y: 4 } - priority: 15848 + priority: 15823 } } } @@ -16701,14 +17992,14 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { height: 9 color: 5592405 } - priority: 15818 + priority: 15794 } } element { @@ -16716,7 +18007,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16725,7 +18016,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16733,7 +18024,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -16742,7 +18033,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -16750,7 +18041,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16759,7 +18050,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16767,7 +18058,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16776,7 +18067,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -16787,7 +18078,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16798,7 +18089,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16809,7 +18100,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16820,7 +18111,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -16831,14 +18122,14 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { height: 9 color: 5592405 } - priority: 15818 + priority: 15794 } } element { @@ -16846,7 +18137,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16855,7 +18146,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16863,7 +18154,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -16872,7 +18163,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -16880,7 +18171,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16889,7 +18180,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16897,7 +18188,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16906,7 +18197,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -16917,7 +18208,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16928,7 +18219,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16939,7 +18230,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -16950,7 +18241,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -16961,7 +18252,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -16970,7 +18261,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -16978,7 +18269,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -16987,7 +18278,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -16995,7 +18286,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17004,7 +18295,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -17015,7 +18306,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17026,7 +18317,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17037,7 +18328,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17048,7 +18339,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -17059,7 +18350,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -17068,7 +18359,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -17076,7 +18367,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17085,7 +18376,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -17093,7 +18384,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17102,7 +18393,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -17113,7 +18404,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17124,7 +18415,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17135,7 +18426,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17146,7 +18437,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -17157,7 +18448,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -17166,7 +18457,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -17174,7 +18465,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17183,7 +18474,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -17191,7 +18482,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17200,7 +18491,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -17211,7 +18502,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17222,7 +18513,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17233,7 +18524,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17244,7 +18535,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -17255,7 +18546,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -17264,7 +18555,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -17272,7 +18563,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17281,7 +18572,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -17289,7 +18580,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17298,7 +18589,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -17309,7 +18600,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17320,7 +18611,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17331,7 +18622,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17342,7 +18633,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -17353,7 +18644,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16696 + priority: 16676 } caption { primary { @@ -17362,7 +18653,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15696 + priority: 15676 } } element { @@ -17370,7 +18661,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17379,7 +18670,7 @@ cont { stroke_color: 14540236 offset_y: 3 } - priority: 15818 + priority: 15794 } } element { @@ -17387,7 +18678,7 @@ cont { symbol { name: "dot-s" apply_for_type: 1 - priority: 16818 + priority: 16794 } caption { primary { @@ -17396,7 +18687,7 @@ cont { stroke_color: 14540236 offset_y: 4 } - priority: 15818 + priority: 15794 } } element { @@ -17407,7 +18698,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17418,7 +18709,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17429,7 +18720,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } element { @@ -17440,7 +18731,7 @@ cont { color: 5592405 stroke_color: 4292730316 } - priority: 15818 + priority: 15794 } } } @@ -17453,7 +18744,7 @@ cont { height: 12 color: 5592405 } - priority: 15727 + priority: 15705 } } element { @@ -17463,7 +18754,7 @@ cont { height: 14 color: 5592405 } - priority: 15727 + priority: 15705 } } } @@ -17476,7 +18767,7 @@ cont { height: 10 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17486,7 +18777,7 @@ cont { height: 14 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17496,7 +18787,7 @@ cont { height: 16 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17506,7 +18797,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17516,7 +18807,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17526,7 +18817,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17536,7 +18827,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17546,7 +18837,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17556,7 +18847,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17566,7 +18857,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17576,7 +18867,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17586,7 +18877,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17596,7 +18887,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17606,7 +18897,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17616,7 +18907,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17626,7 +18917,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } element { @@ -17636,7 +18927,7 @@ cont { height: 18 color: 5592405 } - priority: 15696 + priority: 15676 } } } @@ -17870,9 +19161,9 @@ cont { caption { primary { height: 15 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17880,9 +19171,9 @@ cont { caption { primary { height: 15 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17890,9 +19181,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17900,9 +19191,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17910,9 +19201,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17920,9 +19211,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17930,9 +19221,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17940,9 +19231,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17950,9 +19241,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17960,9 +19251,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17970,9 +19261,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17980,9 +19271,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -17990,9 +19281,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -18000,9 +19291,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -18010,9 +19301,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -18020,9 +19311,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -18030,9 +19321,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -18040,9 +19331,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { @@ -18050,9 +19341,9 @@ cont { caption { primary { height: 18 - color: 3381691 + color: 2263210 } - priority: 15757 + priority: 15735 } } } @@ -18085,160 +19376,160 @@ cont { scale: 4 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 5 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 6 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 7 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 8 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 9 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 10 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 11 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 12 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 13 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 14 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 15 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 16 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 17 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 18 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } element { scale: 19 caption { primary { - height: 14 - color: 3381691 + height: 13 + color: 2263210 } - priority: 15757 + priority: 15735 } } } @@ -18261,7 +19552,7 @@ cont { height: 12 color: 8947848 } - priority: 14970 + priority: 14971 } } element { @@ -18271,7 +19562,7 @@ cont { height: 13 color: 8947848 } - priority: 14970 + priority: 14971 } } element { @@ -18281,7 +19572,7 @@ cont { height: 12 color: 8947848 } - priority: 14970 + priority: 14971 } } } @@ -18304,7 +19595,7 @@ cont { height: 12 color: 8947848 } - priority: 14970 + priority: 14971 } } element { @@ -18314,7 +19605,7 @@ cont { height: 13 color: 8947848 } - priority: 14970 + priority: 14971 } } element { @@ -18324,12 +19615,22 @@ cont { height: 12 color: 8947848 } - priority: 14970 + priority: 14971 } } } cont { name: "place-suburb" + element { + scale: 10 + caption { + primary { + height: 10 + color: 7829367 + } + priority: 15000 + } + } element { scale: 11 caption { @@ -18381,7 +19682,7 @@ cont { color: 7829367 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18392,7 +19693,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18403,7 +19704,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18414,7 +19715,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18425,7 +19726,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18436,7 +19737,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18447,7 +19748,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18458,7 +19759,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18469,7 +19770,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18480,7 +19781,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } element { @@ -18491,7 +19792,7 @@ cont { color: 5592405 stroke_color: 14540236 } - priority: 15787 + priority: 15764 } } } @@ -18538,7 +19839,7 @@ cont { lines { width: 1.0 color: 12303274 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18548,7 +19849,7 @@ cont { lines { width: 1.0 color: 12303274 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18558,7 +19859,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18568,7 +19869,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18578,7 +19879,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18588,7 +19889,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18598,7 +19899,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18608,7 +19909,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18618,7 +19919,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18631,7 +19932,7 @@ cont { lines { width: 1.0 color: 12303274 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18641,7 +19942,7 @@ cont { lines { width: 1.0 color: 12303274 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18651,7 +19952,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18661,7 +19962,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18671,7 +19972,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18681,7 +19982,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18691,7 +19992,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18701,7 +20002,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18711,7 +20012,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18724,7 +20025,7 @@ cont { lines { width: 1.0 color: 12303274 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18734,7 +20035,7 @@ cont { lines { width: 1.0 color: 12303274 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18744,7 +20045,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18754,7 +20055,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18764,7 +20065,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18774,7 +20075,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18784,7 +20085,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18794,7 +20095,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18804,7 +20105,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18817,7 +20118,7 @@ cont { lines { width: 1.0 color: 12303274 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18827,7 +20128,7 @@ cont { lines { width: 1.0 color: 12303274 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18837,7 +20138,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18847,7 +20148,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18857,7 +20158,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18867,7 +20168,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18877,7 +20178,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18887,7 +20188,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18897,7 +20198,7 @@ cont { lines { width: 1.0 color: 865704328 - priority: 1545 + priority: 1529 join: ROUNDJOIN cap: ROUNDCAP } @@ -18910,7 +20211,7 @@ cont { symbol { name: "subway-xs" apply_for_type: 1 - priority: 16909 + priority: 16882 } } element { @@ -18918,7 +20219,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -18927,7 +20228,7 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { @@ -18935,7 +20236,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -18944,7 +20245,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { @@ -18952,7 +20253,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -18961,7 +20262,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { @@ -18969,7 +20270,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -18978,7 +20279,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { @@ -18986,7 +20287,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -18995,7 +20296,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { @@ -19003,7 +20304,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19012,7 +20313,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19021,17 +20322,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19040,15 +20350,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19057,15 +20367,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19074,15 +20384,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19091,15 +20401,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19108,15 +20418,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19125,7 +20435,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19134,17 +20444,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19153,15 +20472,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19170,15 +20489,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19187,15 +20506,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19204,15 +20523,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19221,15 +20540,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19238,7 +20557,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19247,17 +20566,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19266,15 +20594,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19283,15 +20611,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19300,15 +20628,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19317,15 +20645,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19334,15 +20662,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19351,7 +20679,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19360,17 +20688,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19379,15 +20716,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19396,15 +20733,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19413,15 +20750,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19430,15 +20767,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19447,15 +20784,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19464,7 +20801,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19473,17 +20810,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19492,15 +20838,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19509,15 +20855,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19526,15 +20872,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19543,15 +20889,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19560,15 +20906,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19577,7 +20923,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19586,17 +20932,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19605,15 +20960,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19622,15 +20977,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19639,15 +20994,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19656,15 +21011,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19673,15 +21028,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19690,7 +21045,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19699,17 +21054,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19718,15 +21082,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19735,15 +21099,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19752,15 +21116,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19769,15 +21133,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19786,15 +21150,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19803,7 +21167,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19812,17 +21176,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19831,15 +21204,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19848,15 +21221,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19865,15 +21238,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19882,15 +21255,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19899,15 +21272,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19916,7 +21289,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -19925,17 +21298,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19944,15 +21326,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19961,15 +21343,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19978,15 +21360,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -19995,15 +21377,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20012,15 +21394,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20029,7 +21411,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -20038,17 +21420,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20057,15 +21448,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20074,15 +21465,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20091,15 +21482,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20108,15 +21499,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20125,15 +21516,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20142,7 +21533,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -20151,17 +21542,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20170,15 +21570,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20187,15 +21587,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20204,15 +21604,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20221,15 +21621,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20238,15 +21638,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20255,7 +21655,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -20264,17 +21664,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20283,15 +21692,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20300,15 +21709,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20317,15 +21726,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20334,15 +21743,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20351,15 +21760,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20368,7 +21777,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -20377,17 +21786,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20396,15 +21814,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20413,15 +21831,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20430,15 +21848,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20447,15 +21865,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20464,15 +21882,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20481,7 +21899,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -20490,17 +21908,26 @@ cont { element { scale: 13 symbol { - name: "subway-xs" + name: "subway-entrance" apply_for_type: 1 - priority: 16909 + priority: 16882 + } + caption { + primary { + height: 9 + color: 3355443 + stroke_color: 14540236 + offset_y: 6 + } + priority: 15882 } } element { scale: 14 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20509,15 +21936,15 @@ cont { stroke_color: 14540236 offset_y: 6 } - priority: 15909 + priority: 15882 } } element { scale: 15 symbol { - name: "subway-m" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20526,15 +21953,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 16 symbol { - name: "subway-l" + name: "mtro" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20543,15 +21970,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 17 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20560,15 +21987,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20577,15 +22004,15 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { - name: "subway-l" + name: "none" apply_for_type: 1 - priority: 16909 + priority: 16882 } caption { primary { @@ -20594,7 +22021,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -20603,43 +22030,52 @@ cont { element { scale: 17 symbol { - name: "subway-s" + name: "mtro" apply_for_type: 1 - priority: 16757 + priority: 16911 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 14540236 + offset_y: 8 + } + priority: 15911 } } element { scale: 18 symbol { - name: "subway-s" + name: "mtro-l" apply_for_type: 1 - priority: 16909 + priority: 16911 } caption { primary { - height: 10 - color: 5592405 + height: 14 + color: 3355443 stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15911 } } element { scale: 19 symbol { - name: "subway-s" + name: "mtro-l" apply_for_type: 1 - priority: 16909 + priority: 16911 } caption { primary { - height: 10 - color: 5592405 + height: 14 + color: 3355443 stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15911 } } } @@ -20650,7 +22086,7 @@ cont { lines { width: 0.5 color: 1716868437 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20660,7 +22096,7 @@ cont { lines { width: 0.5 color: 861230421 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20670,7 +22106,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20680,7 +22116,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20690,7 +22126,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20703,7 +22139,7 @@ cont { lines { width: 0.5 color: 1716868437 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20713,7 +22149,7 @@ cont { lines { width: 0.5 color: 861230421 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20723,7 +22159,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20733,7 +22169,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20743,7 +22179,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20756,7 +22192,7 @@ cont { lines { width: 0.5 color: 1716868437 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20766,7 +22202,7 @@ cont { lines { width: 0.5 color: 861230421 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20776,7 +22212,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20786,7 +22222,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20796,7 +22232,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1666 + priority: 1647 join: ROUNDJOIN cap: ROUNDCAP } @@ -20808,21 +22244,21 @@ cont { scale: 15 symbol { name: "tram-s" - priority: 16878 + priority: 16852 } } element { scale: 16 symbol { name: "tram-s" - priority: 16878 + priority: 16852 } } element { scale: 17 symbol { name: "tram-m" - priority: 16909 + priority: 16882 } caption { primary { @@ -20831,14 +22267,14 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 18 symbol { name: "tram-l" - priority: 16909 + priority: 16882 } caption { primary { @@ -20847,14 +22283,14 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } element { scale: 19 symbol { name: "tram-l" - priority: 16909 + priority: 16882 } caption { primary { @@ -20863,7 +22299,7 @@ cont { stroke_color: 14540236 offset_y: 8 } - priority: 15909 + priority: 15882 } } } @@ -20878,7 +22314,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -20892,7 +22328,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -20906,7 +22342,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -20920,7 +22356,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -20934,7 +22370,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -20948,7 +22384,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -20962,7 +22398,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -20976,7 +22412,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -20990,7 +22426,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21004,7 +22440,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21021,7 +22457,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21035,7 +22471,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21049,7 +22485,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21063,7 +22499,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21077,7 +22513,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21091,7 +22527,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21105,7 +22541,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21119,7 +22555,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21133,7 +22569,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21147,7 +22583,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21164,7 +22600,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21178,7 +22614,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21192,7 +22628,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21206,7 +22642,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21220,7 +22656,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21234,7 +22670,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21248,7 +22684,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21262,7 +22698,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21276,7 +22712,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21290,7 +22726,7 @@ cont { dd: 3.0 dd: 2.0 } - priority: 1333 + priority: 1323 join: ROUNDJOIN cap: ROUNDCAP } @@ -21303,7 +22739,7 @@ cont { symbol { name: "grocery-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21311,7 +22747,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21319,7 +22755,7 @@ cont { symbol { name: "grocery-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21327,7 +22763,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21335,7 +22771,7 @@ cont { symbol { name: "grocery-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21343,7 +22779,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -21354,7 +22790,7 @@ cont { symbol { name: "museum-s" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21362,7 +22798,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21370,7 +22806,7 @@ cont { symbol { name: "museum-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21378,7 +22814,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21386,7 +22822,7 @@ cont { symbol { name: "museum-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21394,7 +22830,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21402,7 +22838,7 @@ cont { symbol { name: "museum-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21410,7 +22846,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21418,7 +22854,7 @@ cont { symbol { name: "museum-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21426,7 +22862,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -21437,7 +22873,7 @@ cont { symbol { name: "zoo-s" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21445,7 +22881,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21453,7 +22889,7 @@ cont { symbol { name: "zoo-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21461,7 +22897,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21469,7 +22905,7 @@ cont { symbol { name: "zoo-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21477,7 +22913,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21485,7 +22921,7 @@ cont { symbol { name: "zoo-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21493,7 +22929,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } element { @@ -21501,7 +22937,7 @@ cont { symbol { name: "zoo-m" apply_for_type: 1 - priority: 16878 + priority: 16852 } caption { primary { @@ -21509,7 +22945,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15878 + priority: 15852 } } } @@ -21519,140 +22955,140 @@ cont { scale: 0 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 1 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 2 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 3 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 4 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 5 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 6 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 7 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 8 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 9 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 10 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 11 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 12 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 13 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 14 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 15 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 16 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 17 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 18 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 19 area { color: 8965341 - priority: 1243 + priority: 1236 } } } @@ -21662,210 +23098,210 @@ cont { scale: 0 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 1 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 2 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 3 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 4 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 5 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 6 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 7 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 8 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 9 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 10 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 11 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 12 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 13 lines { width: 0.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 14 lines { width: 0.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 15 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 16 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 17 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 18 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 19 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } } @@ -21875,210 +23311,210 @@ cont { scale: 0 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 1 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 2 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 3 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 4 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 5 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 6 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 7 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 8 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 9 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 10 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 11 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 12 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 13 lines { width: 0.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 14 lines { width: 0.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 15 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 16 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 17 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 18 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 19 lines { width: 1.5 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } } @@ -22088,210 +23524,210 @@ cont { scale: 0 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 1 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 2 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 3 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 4 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 5 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 6 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 7 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 8 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 9 area { color: 8965341 - priority: 1243 + priority: 1236 } } element { scale: 10 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 11 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 12 lines { width: 0.5 - color: 1297464285 - priority: 1121 + color: 1300810973 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 13 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 14 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 15 lines { width: 2.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 16 lines { width: 2.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 17 lines { width: 2.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 18 lines { width: 2.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } element { scale: 19 lines { width: 2.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } area { color: 8965341 - priority: 1122 + priority: 1118 } } } @@ -22301,8 +23737,8 @@ cont { scale: 13 lines { width: 0.5 - color: 2153102301 - priority: 1121 + color: 2156448989 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22311,8 +23747,8 @@ cont { scale: 14 lines { width: 0.5 - color: 2153102301 - priority: 1121 + color: 2156448989 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22321,8 +23757,8 @@ cont { scale: 15 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22331,8 +23767,8 @@ cont { scale: 16 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22341,8 +23777,8 @@ cont { scale: 17 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22351,8 +23787,8 @@ cont { scale: 18 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22361,8 +23797,8 @@ cont { scale: 19 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22374,8 +23810,8 @@ cont { scale: 13 lines { width: 0.5 - color: 2153102301 - priority: 1121 + color: 2156448989 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22384,8 +23820,8 @@ cont { scale: 14 lines { width: 0.5 - color: 2153102301 - priority: 1121 + color: 2156448989 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22394,8 +23830,8 @@ cont { scale: 15 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22404,8 +23840,8 @@ cont { scale: 16 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22414,8 +23850,8 @@ cont { scale: 17 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22424,8 +23860,8 @@ cont { scale: 18 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22434,8 +23870,8 @@ cont { scale: 19 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22447,8 +23883,8 @@ cont { scale: 13 lines { width: 0.5 - color: 2153102301 - priority: 1121 + color: 2156448989 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22457,8 +23893,8 @@ cont { scale: 14 lines { width: 0.5 - color: 2153102301 - priority: 1121 + color: 2156448989 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22467,8 +23903,8 @@ cont { scale: 15 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22477,8 +23913,8 @@ cont { scale: 16 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22487,8 +23923,8 @@ cont { scale: 17 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22497,8 +23933,8 @@ cont { scale: 18 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22507,8 +23943,8 @@ cont { scale: 19 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22520,8 +23956,8 @@ cont { scale: 13 lines { width: 0.5 - color: 2153102301 - priority: 1121 + color: 2156448989 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22530,8 +23966,8 @@ cont { scale: 14 lines { width: 0.5 - color: 2153102301 - priority: 1121 + color: 2156448989 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22540,8 +23976,8 @@ cont { scale: 15 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22550,8 +23986,8 @@ cont { scale: 16 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22560,8 +23996,8 @@ cont { scale: 17 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22570,8 +24006,8 @@ cont { scale: 18 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } @@ -22580,8 +24016,8 @@ cont { scale: 19 lines { width: 1.0 - color: 5618653 - priority: 1121 + color: 8965341 + priority: 1117 join: ROUNDJOIN cap: ROUNDCAP } diff --git a/data/resources-6plus_clear/basic.skn b/data/resources-6plus_clear/basic.skn index 812199b286..dd80c931ed 100644 --- a/data/resources-6plus_clear/basic.skn +++ b/data/resources-6plus_clear/basic.skn @@ -1,269 +1,395 @@ - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 0056b37669..667c727495 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index 1d871093c1..a959ae88f6 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -1,93 +1,135 @@ - + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/basic.skn b/data/resources-hdpi_clear/basic.skn index 03dae6e699..8602b83c93 100644 --- a/data/resources-hdpi_clear/basic.skn +++ b/data/resources-hdpi_clear/basic.skn @@ -1,269 +1,395 @@ - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index a4a4449722..a0c0c13711 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 6b8013d66a..472fcffbfc 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -1,93 +1,135 @@ - + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi_clear/basic.skn b/data/resources-ldpi_clear/basic.skn index 7346307601..e7c402e4d3 100644 --- a/data/resources-ldpi_clear/basic.skn +++ b/data/resources-ldpi_clear/basic.skn @@ -1,269 +1,446 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi_clear/symbols.png b/data/resources-ldpi_clear/symbols.png index 038490dbf6..0f8745f495 100644 Binary files a/data/resources-ldpi_clear/symbols.png and b/data/resources-ldpi_clear/symbols.png differ diff --git a/data/resources-ldpi_clear/symbols.sdf b/data/resources-ldpi_clear/symbols.sdf index 81c1857539..3b859e5eca 100644 --- a/data/resources-ldpi_clear/symbols.sdf +++ b/data/resources-ldpi_clear/symbols.sdf @@ -1,93 +1,152 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/basic.skn b/data/resources-mdpi_clear/basic.skn index 63864b1be4..cc00493d4f 100644 --- a/data/resources-mdpi_clear/basic.skn +++ b/data/resources-mdpi_clear/basic.skn @@ -1,278 +1,464 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 5f6c69f9d5..a5519e57fb 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index b07c699af3..70c60c3a97 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -1,96 +1,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/basic.skn b/data/resources-xhdpi_clear/basic.skn index f0e3e5206f..e5634e07ad 100644 --- a/data/resources-xhdpi_clear/basic.skn +++ b/data/resources-xhdpi_clear/basic.skn @@ -1,278 +1,464 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index 2ddff7aeb7..88757db0c4 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index 435df46621..5ba4a4452d 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -1,96 +1,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/basic.skn b/data/resources-xxhdpi_clear/basic.skn index eaa005c1a8..9dfc95a577 100644 --- a/data/resources-xxhdpi_clear/basic.skn +++ b/data/resources-xxhdpi_clear/basic.skn @@ -1,293 +1,494 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index 8ef783e503..c09a6706d2 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index b88981fa32..3d45db0275 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -1,101 +1,168 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss index 73ceb203d1..8bfebba0b4 100644 --- a/data/styles/clear/include/POI.mapcss +++ b/data/styles/clear/include/POI.mapcss @@ -15,6 +15,8 @@ node|z15-[tourism=zoo] { node|z15[tourism=museum] { icon-image: museum-s.svg; } node|z15[tourism=gallery] { icon-image: gallery-s.svg; } /* <-- <-- не показывается, непонятно почему, позже разобраться */ node|z15[tourism=zoo] { icon-image: zoo-s.svg; } +node|z15[amenity=university] { icon-image: college-s.svg; } +node|z15[amenity=hospital] { icon-image: hospital-s.svg; } /* ZOOM 16 */ @@ -23,7 +25,11 @@ node|z16[tourism=museum], node|z16[historic=monument], node|z16[tourism=gallery], node|z16[amenity=theatre], -node|z16[tourism=zoo] { +node|z16[tourism=zoo], +node|z16[amenity=school], +node|z16[amenity=college], +node|z16[amenity=university], +node|z16[amenity=hospital] { text-offset: 8; font-size: 10; text: name; @@ -37,6 +43,10 @@ node|z16[historic=monument] { icon-image: monument-m.svg; } node|z16[tourism=gallery] { icon-image: gallery-m.svg; } node|z16[amenity=theatre] { icon-image: theatre-m.svg; } node|z16[tourism=zoo] { icon-image: zoo-m.svg; } +node|z16[amenity=school] { icon-image: school-m.svg; } +node|z16[amenity=university] { icon-image: college-m.svg; } +node|z16[amenity=college] { icon-image: college-m.svg; } +node|z16[amenity=hospital] { icon-image: hospital-m.svg; } /* ZOOM 17+ */ @@ -47,7 +57,17 @@ node|z17-[historic=monument], node|z17-[tourism=zoo], node|z17-[amenity=cinema], node|z17-[amenity=bank], -node|z17-[shop=supermarket] +node|z17-[shop=supermarket], +node|z17-[amenity=school], +node|z17-[amenity=college], +node|z17-[amenity=university], +node|z17-[amenity=library], +node|z17-[amenity=police], +node|z17-[amenity=mail], +node|z17-[amenity=embassy], +node|z17-[amenity=toilets], +node|z17-[amenity=hospital], +node|z17-[amenity=bicycle_rental] { text-offset: 8; font-size: 10; @@ -65,13 +85,26 @@ node|z17-[tourism=zoo] { icon-image: zoo-m.svg; } node|z17-[amenity=cinema] { icon-image: cinema-m.svg; } node|z17-[amenity=bank] { icon-image: bank-m.svg; } node|z17-[shop=supermarket] { icon-image: grocery-m.svg; } +node|z17-[amenity=school] { icon-image: school-m.svg; } +node|z17-[amenity=college] { icon-image: college-m.svg; } +node|z17-[amenity=university] { icon-image: college-m.svg; } +node|z17-[amenity=library] { icon-image: library-m.svg; } +node|z17-[amenity=police] { icon-image: police-m.svg; } +node|z17-[amenity=mail] { icon-image: mail-m.svg; } +node|z17-[amenity=toilets] { icon-image: toilets-m.svg; } +node|z17-[amenity=embassy] { icon-image: embassy-m.svg; } +node|z17-[amenity=hospital] { icon-image: hospital-m.svg; } +node|z17-[amenity=bicycle_rental] { icon-image: bicycle-m.svg; } + /* ZOOM 18+ */ node|z18-[amenity=cafe], node|z18-[amenity=fast_food], node|z18-[amenity=restaurant], -node|z18-[amenity=bar] { +node|z18-[amenity=bar], +node|z18-[amenity=pub], +node|z18-[amenity=pharmacy] { text-offset: 8; font-size: 10; text: name; @@ -83,3 +116,5 @@ node|z18-[amenity=cafe] { icon-image: cafe-m.svg; } node|z18-[amenity=fast_food] { icon-image: fastfood-m.svg; } node|z18-[amenity=restaurant] { icon-image: restaurant-m.svg; } node|z18-[amenity=bar] { icon-image: bar-m.svg; } +node|z18-[amenity=pub] { icon-image: beer-m.svg; } +node|z18-[amenity=pharmacy] { icon-image: pharmacy-m.svg; } diff --git a/data/styles/clear/include/buildings.mapcss b/data/styles/clear/include/buildings.mapcss index cc7695acfa..26cbae7929 100644 --- a/data/styles/clear/include/buildings.mapcss +++ b/data/styles/clear/include/buildings.mapcss @@ -1,9 +1,9 @@ -area|z14[building] +/*area|z14[building] { fill-color: @building; fill-opacity: 0.4; z-index: 200; -} +}*/ area|z15[building] { fill-color: @building; diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss index ec2c848f81..2d2ee261af 100644 --- a/data/styles/clear/include/labels.mapcss +++ b/data/styles/clear/include/labels.mapcss @@ -380,7 +380,7 @@ line|z10-[highway=motorway], line|z10-[highway=trunk], line|z10-[highway=motorway_link], line|z10-[highway=trunk_link] { - font-size: 9; + font-size: 7; text: name; text-color: @primary_road_label; text-halo-radius: 1; @@ -389,7 +389,7 @@ line|z10-[highway=trunk_link] { line|z10-[highway=primary], line|z10-[highway=primary_link] { - font-size: 9; + font-size: 6; text: name; text-color: @primary_road_label; text-halo-radius: 0.5; @@ -397,7 +397,7 @@ line|z10-[highway=primary_link] { } line|z10-[highway=secondary] { - font-size: 8; + font-size: 6; text: name; text-color: @primary_road_label; text-halo-radius: 0.5; @@ -407,7 +407,7 @@ line|z12-[highway=motorway], line|z12-[highway=trunk], line|z12-[highway=motorway_link], line|z12-[highway=trunk_link] { - font-size: 12; + font-size: 9; text: name; text-color: @primary_road_label; text-halo-radius: 1; @@ -416,7 +416,7 @@ line|z12-[highway=trunk_link] { line|z12-[highway=primary], line|z12-[highway=primary_link] { - font-size: 10; + font-size: 8; text: name; text-color: @primary_road_label; text-halo-radius: 0.5; @@ -424,10 +424,10 @@ line|z12-[highway=primary_link] { } line|z12-[highway=secondary] { - font-size: 9; + font-size: 7; text: name; text-color: @primary_road_label; - text-halo-radius: 0; + text-halo-radius: 1; text-halo-color: @city_halo; } @@ -436,7 +436,46 @@ line|z12-[highway=tertiary], line|z12-[highway=unclassified], line|z12-[highway=living_street], line|z12-[highway=pedestrian] { - font-size: 8; + font-size: 7; + text: name; + text-color: @primary_road_label; + text-halo-radius: 1; + text-halo-color: @city_halo; +} +line|z14-[highway=motorway], +line|z14-[highway=trunk], +line|z14-[highway=motorway_link], +line|z14-[highway=trunk_link] { + font-size: 10; + text: name; + text-color: @primary_road_label; + text-halo-radius: 1; + text-halo-color: @city_halo; +} + +line|z14-[highway=primary], +line|z14-[highway=primary_link] { + font-size: 8.8; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0.5; + text-halo-color: @city_halo; +} + +line|z14-[highway=secondary] { + font-size: 7.6; + text: name; + text-color: @primary_road_label; + text-halo-radius: 1; + text-halo-color: @city_halo; +} + +line|z14-[highway=residential], +line|z14-[highway=tertiary], +line|z14-[highway=unclassified], +line|z14-[highway=living_street], +line|z14-[highway=pedestrian] { + font-size: 7.6; text: name; text-color: @primary_road_label; text-halo-radius: 0; @@ -446,7 +485,7 @@ line|z16-[highway=motorway], line|z16-[highway=trunk], line|z16-[highway=motorway_link], line|z16-[highway=trunk_link] { - font-size: 14; + font-size: 11.4; text: name; text-color: @primary_road_label; text-halo-radius: 1; @@ -455,7 +494,7 @@ line|z16-[highway=trunk_link] { line|z16-[highway=primary], line|z16-[highway=primary_link] { - font-size: 12; + font-size: 9.4; text: name; text-color: @primary_road_label; text-halo-radius: 0.5; @@ -463,7 +502,7 @@ line|z16-[highway=primary_link] { } line|z16-[highway=secondary] { - font-size: 10; + font-size: 9; text: name; text-color: @primary_road_label; text-halo-radius: 0; @@ -472,18 +511,144 @@ line|z16-[highway=secondary] { line|z16-[highway=residential], line|z16-[highway=tertiary], -line|z12-[highway=unclassified], -line|z12-[highway=living_street], -line|z12-[highway=pedestrian] { - font-size: 10; +line|z16-[highway=unclassified], +line|z16-[highway=living_street], +line|z16-[highway=pedestrian] { + font-size: 8; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0; + text-halo-color: @city_halo; +} +line|z17-[highway=motorway], +line|z17-[highway=trunk], +line|z17-[highway=motorway_link], +line|z17-[highway=trunk_link] { + font-size: 12; + text: name; + text-color: @primary_road_label; + text-halo-radius: 1; + text-halo-color: @city_halo; +} + +line|z17-[highway=primary], +line|z17-[highway=primary_link] { + font-size: 11.8; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0.5; + text-halo-color: @city_halo; +} + +line|z17-[highway=secondary] { + font-size: 11; text: name; text-color: @primary_road_label; text-halo-radius: 0; text-halo-color: @city_halo; } +line|z17-[highway=residential], +line|z17-[highway=tertiary], +line|z17-[highway=unclassified], +line|z17-[highway=living_street], +line|z17-[highway=pedestrian] { + font-size: 10; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0; + text-halo-color: @city_halo; +} +line|z18-[highway=motorway], +line|z18-[highway=trunk], +line|z18-[highway=motorway_link], +line|z18-[highway=trunk_link] { + font-size: 17; + text: name; + text-color: @primary_road_label; + text-halo-radius: 1; + text-halo-color: @city_halo; +} + +line|z18-[highway=primary], +line|z18-[highway=primary_link] { + font-size:14; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0.5; + text-halo-color: @city_halo; +} + +line|z18-[highway=secondary] { + font-size: 12; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0; + text-halo-color: @city_halo; +} + +line|z18-[highway=residential], +line|z18-[highway=tertiary], +line|z18-[highway=unclassified], +line|z18-[highway=living_street], +line|z18-[highway=pedestrian] { + font-size: 12; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0; + text-halo-color: @city_halo; +} +line|z19-[highway=motorway], +line|z19-[highway=trunk], +line|z19-[highway=motorway_link], +line|z19-[highway=trunk_link] { + font-size: 20; + text: name; + text-color: @primary_road_label; + text-halo-radius: 1; + text-halo-color: @city_halo; +} + +line|z19-[highway=primary], +line|z19-[highway=primary_link] { + font-size:18; + text: name; + text-color: @primary_road_label; + text-halo-radius: 1; + text-halo-color: @city_halo; +} + +line|z19-[highway=secondary] { + font-size: 17; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0; + text-halo-color: @city_halo; +} + +line|z19-[highway=residential], +line|z19-[highway=tertiary], +line|z19-[highway=unclassified], +line|z19-[highway=living_street], +line|z19-[highway=pedestrian] { + font-size: 15; + text: name; + text-color: @primary_road_label; + text-halo-radius: 0; + text-halo-color: @city_halo; +} + + /* DISTRICTS */ + +node|z10[place=suburb] +{ + text: name; + font-size: 10; + text-color: @district_label; +} + node|z11[place=suburb] { text: name; @@ -516,7 +681,6 @@ node|z8-9[place=region], /* BUILDINGS LABELS */ -/* area|z16[building], node|z16[building], area|z16[addr:housenumber][addr:street], @@ -528,7 +692,6 @@ node|z16[addr:housenumber][addr:street] text-position: center; z-index: 100; } -*/ area|z17[building], node|z17[building], @@ -614,7 +777,7 @@ node|z5-[place=ocean]{ } node|z4-[place=sea]{ text: name; - font-size: 14; + font-size: 13; text-color: @water_label; z-index: 3000; } diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss index c1dc80de13..4cc97cbffb 100644 --- a/data/styles/clear/include/natural.mapcss +++ b/data/styles/clear/include/natural.mapcss @@ -22,7 +22,21 @@ area|z0-[natural=glacier] /* WATER */ -area[natural=coastline] +area|z0-10[natural=coastline] +{ + fill-color: @water; + opacity: 1; + z-index: -10; +} + +area|z11-19[natural=coastline] +{ + fill-color: @water; + opacity: 1; + z-index: -10; +} + +area|z10-19[natural=coastline] { fill-color: @water; z-index: -10; @@ -128,8 +142,8 @@ area|z15-[landuse=forest] } area|z10[leisure=park] { - fill-color: @park; - fill-opacity: 0.2; + fill-color: @forest; + fill-opacity: 0.3; z-index: 25; } @@ -154,7 +168,7 @@ area|z15-[leisure=park] { area|z14-[landuse=grass] { - fill-color: @forest; + fill-color: @park; fill-opacity: 0.45; z-index: 30; } diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss index a417c53f44..6f28d849bf 100644 --- a/data/styles/clear/include/roads.mapcss +++ b/data/styles/clear/include/roads.mapcss @@ -93,9 +93,9 @@ line|z9[highway=primary] line|z10[highway=trunk], line|z10[highway=motorway] { - color: @trunk; + color: @trunk_hard; width: 1.2; - opacity: 0.7; + opacity: 0.8; } line|z10[highway=primary] @@ -118,16 +118,16 @@ line|z10[highway=secondary] line|z11[highway=trunk], line|z11[highway=motorway] { - color: @trunk; + color: @trunk_medium; width: 1.8; - opacity: 0.8; + opacity: 0.7; } line|z11[highway=primary] { - color: @primary; - width: 1.2; - opacity: 0.8; + color: @primary_medium; + width: 1.1; + opacity: 1; } line|z11[highway=secondary] @@ -151,7 +151,7 @@ line|z11[highway=tertiary] line|z12[highway=trunk], line|z12[highway=motorway] { - color: @trunk; + color: @trunk_light; width: 2.5; opacity: 0.9; } @@ -168,7 +168,7 @@ line|z12[highway=trunk][tunnel?] { line|z12[highway=primary] { - color: @primary; + color: @primary_medium; width: 1.8; opacity: 0.9; } @@ -196,8 +196,8 @@ line|z13[highway=trunk], line|z13[highway=motorway] { width: 2.8; - opacity: 1; - color: @trunk_medium; + opacity: 0.9; + color: @trunk_light; } line|z13[highway=motorway][tunnel?], @@ -218,8 +218,8 @@ line|z13[highway=trunk_link] line|z13[highway=primary] { - color: @primary_medium; - width: 2; + color: @primary_ligth; + width: 2.1; opacity: 1; } @@ -247,21 +247,39 @@ line|z13[highway=living_street] opacity: 0.7; } +line|z13[highway=pedestrian] +{ + color: @pedestrian; + width: 0.7; + dashes: 2,1; + opacity: 0.7; +} + + +line|z13[highway=construction] +{ + color: @construction; + opacity: 0.5; + width: 1.4; + dashes: 4,4; +} + + /* ZOOM 14 */ line|z14[highway=trunk], line|z14[highway=motorway] { - width: 3.6; + width: 3.8; opacity: 1; - color: @trunk_light; + color: @primary; } line|z14[highway=motorway_link], line|z14[highway=trunk_link] { color: @trunk_link; - width: 1.5; + width: 1.9; } line|z14[highway=motorway][tunnel?], @@ -276,14 +294,14 @@ line|z14[highway=trunk][tunnel?] { line|z14[highway=primary] { color: @primary_ligth; - width: 2.4; + width: 2.8; opacity: 1; } line|z14[highway=primary_link] { color: @primary_link; - width: 1; + width: 1.4; } line|z14[highway=primary][tunnel?] { @@ -297,21 +315,21 @@ line|z14[highway=primary][tunnel?] { line|z14[highway=secondary] { color: @secondary; - width: 2.4; + width: 2.8; opacity: 1; } line|z14[highway=secondary_link] { color: @secondary_link; - width: 1; + width: 1.4; } line|z14[highway=residential], line|z14[highway=tertiary], { color: @residential; - width: 1.1; + width: 1.4; opacity: 0.8; } @@ -319,25 +337,53 @@ line|z14[highway=unclassified], line|z14[highway=living_street] { color: @unclassified; - width: 0.6; + width: 1.4; opacity: 1; } +line|z14[highway=service] +{ + color: @unclassified; + width: 0.2; + opacity: 0.4; + z-index: 600; +} + line|z14[highway=pedestrian] { - color: @pedestrian; - width: 0.6; - dashes: 1,2; - opacity: 1; - + color: @pedestrian; + width: 0.9; + dashes: 2,0.5; + opacity: 0.8; } +line|z14[highway=footway], +line|z14[highway=path] +{ + color: @footway; + width: 0.1; + dashes: 0.1,0.1; + opacity: 1; + z-index: 600; +} +/* line|z14[highway=cycleway] { - color: @cycleway; - width: 0.6; - opacity: 0.8; - z-index: 1000; + color: @cycleway; + width: 0.1; + opacity: 0.5; + z-index: 1000; + dashes: 1,1; + opacity: 0.8; +} +*/ + +line|z14[highway=construction] +{ + color: @construction; + opacity: 0.5; + width: 1.6; + dashes: 5,5; } /* ZOOM 15 */ @@ -345,9 +391,9 @@ line|z14[highway=cycleway] line|z15[highway=trunk], line|z15[highway=motorway] { - width: 4; + width: 4.8; opacity: 1; - color: @trunk_light; + color: @primary; z-index: 900; } @@ -355,7 +401,7 @@ line|z15[highway=motorway_link], line|z15[highway=trunk_link] { color: @trunk_link; - width: 2; + width: 2.4; } line|z15[highway=motorway][tunnel?], @@ -370,7 +416,7 @@ line|z15[highway=trunk][tunnel?] { line|z15[highway=primary] { color: @primary_ligth; - width: 3; + width: 3.8; opacity: 1; z-index: 850; } @@ -378,7 +424,7 @@ line|z15[highway=primary] line|z15[highway=primary_link] { color: @primary_link; - width: 1.5; + width: 1.9; z-index: 500; } @@ -393,7 +439,7 @@ line|z15[highway=primary][tunnel?] { line|z15[highway=secondary] { color: @secondary; - width: 3; + width: 3.8; opacity: 1; z-index: 800; } @@ -401,7 +447,7 @@ line|z15[highway=secondary] line|z15[highway=secondary_link] { color: @secondary_link; - width: 1.5; + width: 1.9; } @@ -409,21 +455,21 @@ line|z15[highway=residential], line|z15[highway=tertiary], { color: @residential; - width: 1.5; + width: 3; opacity: 1; z-index: 750; } line|z15[highway=tertiary_link] { color: @tertiary_link; - width: 0.5; + width: 1.5; } line|z15[highway=unclassified], line|z15[highway=living_street] { color: @unclassified; - width: 1.5; + width: 3; opacity: 1; z-index: 700; } @@ -432,14 +478,14 @@ line|z15[highway=service] { color: @unclassified; width: 0.6; - opacity: 0.9; + opacity: 0.7; z-index: 600; } line|z15[highway=pedestrian] { color: @pedestrian; - width: 1.5; + width: 1.6; dashes: 2,0.5; opacity: 0.8; } @@ -448,9 +494,9 @@ line|z15[highway=footway], line|z15[highway=path] { color: @footway; - width: 0.5; + width: 0.8; dashes: 0.5,0.5; - opacity: 0.6; + opacity: 0.8; z-index: 600; } @@ -467,7 +513,7 @@ line|z15[highway=cycleway] line|z15[highway=construction] { color: @construction; - opacity: 0.5; + opacity: 0.6; width: 2; dashes: 5,5; } @@ -478,8 +524,8 @@ line|z15[highway=construction] line|z16[highway=trunk], line|z16[highway=motorway] { - color: @trunk_light; - width: 7; + color: @primary; + width: 6.8; opacity: 1; } @@ -487,7 +533,7 @@ line|z16[highway=motorway_link], line|z16[highway=trunk_link] { color: @trunk_link; - width: 3.5; + width: 3.4; } line|z16[highway=motorway][tunnel?], @@ -509,7 +555,7 @@ line|z16[highway=primary] line|z16[highway=primary_link] { color: @primary_link; - width: 2.5; + width: 3; } line|z16[highway=primary][tunnel?] { @@ -523,13 +569,13 @@ line|z16[highway=primary][tunnel?] { line|z16[highway=secondary] { color: @secondary; - width: 6; + width: 5.4; } line|z16[highway=secondary_link] { color: @secondary_link; - width: 2; + width: 2.7; } line|z16[highway=secondary][tunnel?] { @@ -550,7 +596,7 @@ line|z16[highway=tertiary], line|z16[highway=tertiary_link] { color: @tertiary_link; - width: 1.5; + width: 2.2; } line|z16[highway=tertiary][tunnel?], @@ -572,15 +618,15 @@ line|z16[highway=living_street] line|z16[highway=service] { color: @unclassified; - width: 1; + width: 1.4; opacity: 0.8; } line|z16[highway=pedestrian] { color: @pedestrian; - width: 1.5; - dashes: 3,1.2; + width: 2.2; + dashes: 3,1.5; } @@ -600,7 +646,7 @@ line|z16[highway=path] color: @footway; width: 1; dashes: 1,1; - opacity: 0.8; + opacity: 1; } line|z16[highway=steps] @@ -632,8 +678,8 @@ line|z16[highway=cycleway] line|z17[highway=trunk], line|z17[highway=motorway] { - color: @trunk_light; - width: 9; + color: @primary; + width: 10.6; opacity: 1; } @@ -641,7 +687,7 @@ line|z17[highway=trunk_link], line|z17[highway=motorway_link] { color: @trunk_link; - width: 4.5; + width: 5; } line|z17[highway=trunk][tunnel?], @@ -656,14 +702,14 @@ line|z17[highway=motorway][tunnel?] { line|z17[highway=primary] { color: @primary_ligth; - width: 8; + width: 9.2; opacity: 1; } line|z17[highway=primary_link] { color: @primary_link; - width: 4; + width: 4.6; opacity: 1; } @@ -678,14 +724,14 @@ line|z17[highway=primary][tunnel?] { line|z17[highway=secondary] { color: @secondary; - width: 8; + width: 8.6; opacity: 1; } line|z17[highway=secondary_link] { color: @secondary_link; - width: 4; + width: 4.3; } line|z17[highway=secondary][tunnel?] { @@ -700,14 +746,14 @@ line|z17[highway=residential], line|z17[highway=tertiary], { color: @residential; - width: 6.5; + width: 7.2; opacity: 1; } line|z17[highway=tertiary_link], { color: @tertiary_link; - width: 3; + width: 3.1; } line|z17[highway=tertiary][tunnel?], @@ -723,14 +769,14 @@ line|z17[highway=unclassified], line|z17[highway=living_street] { color: @unclassified; - width: 6.5; + width: 7.6; } line|z17[highway=pedestrian] { color: @pedestrian; - width: 3; - dashes: 4,1.5; + width: 3.2; + dashes: 6,3; } line|z17[highway=unclassified][tunnel?], @@ -748,7 +794,7 @@ line|z17[highway=path] { color: @footway; width: 1.2; - dashes: 2,2; + dashes: 3,2; opacity: 1; z-index: 600; } @@ -773,39 +819,39 @@ line|z17[highway=path][tunnel?]::tunnelCasing { line|z17[highway=service] { color: @unclassified; - width: 2; + width: 2.4; } line|z17[highway=steps] { color: @steps; - width: 5; - dashes: 0.5,0.5; + width: 4; + dashes: 1,1; } line|z17[highway=construction] { color: @construction; opacity: 1; - width: 3; + width: 2; dashes: 6,6; } line|z17[highway=cycleway] { color: @cycleway; - width: 1.5; + width: 1.2; opacity: 1; z-index: 700; } -/* ZOOM 18+ */ +/* ZOOM 18 */ line|z18-[highway=trunk], line|z18-[highway=motorway] { - color: @trunk_light; + color: @primary; width: 16; opacity: 1; } @@ -829,14 +875,14 @@ line|z18-[highway=motorway][tunnel?] { line|z18-[highway=primary] { color: @primary_ligth; - width: 12; + width: 13; opacity: 1; } line|z18-[highway=primary_link] { color: @primary_link; - width: 6; + width: 7.5; opacity: 1; } @@ -851,14 +897,14 @@ line|z18-[highway=primary][tunnel?] { line|z18-[highway=secondary] { color: @secondary; - width: 12; + width: 13; opacity: 1; } line|z18-[highway=secondary_link] { color: @secondary_link; - width: 6; + width: 7.5; } line|z18-[highway=secondary][tunnel?] { @@ -873,14 +919,14 @@ line|z18-[highway=residential], line|z18-[highway=tertiary], { color: @residential; - width: 9; + width: 11; opacity: 1; } line|z18-[highway=tertiary_link], { color: @tertiary_link; - width: 4.5; + width: 5.5; } line|z18-[highway=tertiary][tunnel?], @@ -896,14 +942,14 @@ line|z18-[highway=unclassified], line|z18-[highway=living_street] { color: @unclassified; - width: 9; + width: 11; } line|z18-[highway=pedestrian] { color: @pedestrian; - width: 5; - dashes: 5,2; + width: 4.6; + dashes: 10,5; } line|z18-[highway=unclassified][tunnel?], @@ -916,26 +962,26 @@ line|z18-[highway=pedestrian][tunnel?] { casing-dashes: 5,5; } -line|z18-[highway=footway], -line|z18-[highway=path] +line|z18[highway=footway], +line|z18[highway=path] { color: @footway; - width: 2; - dashes: 3,1.5; + width: 1.8; + dashes: 6,3; opacity: 1; z-index: 600; } -line|z18-[highway=footway][tunnel?]::tunnelBackground, -line|z18-[highway=path][tunnel?]::tunnelBackground { +line|z18[highway=footway][tunnel?]::tunnelBackground, +line|z18[highway=path][tunnel?]::tunnelBackground { z-index: 30; casing-width: eval(prop("width")+0.5); casing-linecap: butt; casing-color: @bridge_background; } -line|z18-[highway=footway][tunnel?]::tunnelCasing, -line|z18-[highway=path][tunnel?]::tunnelCasing { +line|z18[highway=footway][tunnel?]::tunnelCasing, +line|z18[highway=path][tunnel?]::tunnelCasing { z-index: 25; casing-width: eval(prop("width")+1); casing-linecap: butt; @@ -946,21 +992,21 @@ line|z18-[highway=path][tunnel?]::tunnelCasing { line|z18-[highway=service] { color: @unclassified; - width: 2; + width: 4; } line|z18-[highway=steps] { color: @steps; - width: 6; - dashes: 0.5,0.5; + width: 5; + dashes: 1,1; } line|z18-[highway=construction] { color: @construction; opacity: 1; - width: 6; + width: 4; dashes: 6,6; } @@ -971,7 +1017,178 @@ line|z18-[highway=cycleway] opacity: 1; z-index: 700; } +/* ZOOM 19 */ +line|z19-[highway=trunk], +line|z19-[highway=motorway] +{ + color: @primary; + width: 26; + opacity: 1; +} + +line|z19-[highway=trunk_link], +line|z19-[highway=motorway_link] +{ + color: @trunk_link; + width: 13; +} + +line|z19-[highway=trunk][tunnel?], +line|z19-[highway=motorway][tunnel?] { + color: @trunk_tunnel_light; + casing-width: 1; + casing-linecap: butt; + casing-color: @trunk_tunnel_casing; + casing-dashes: 5,5; +} + +line|z19-[highway=primary] +{ + color: @primary_ligth; + width: 23; + opacity: 1; +} + +line|z19-[highway=primary_link] +{ + color: @primary_link; + width: 11.5; + opacity: 1; +} + +line|z19-[highway=primary][tunnel?] { + color: @primary_tunnel_ligth; + casing-width: 1; + casing-linecap: butt; + casing-color: @primary_tunnel_casing; + casing-dashes: 5,5; +} + +line|z19-[highway=secondary] +{ + color: @secondary; + width: 18; + opacity: 1; +} + +line|z19-[highway=secondary_link] +{ + color: @secondary_link; + width: 9; +} + +line|z19-[highway=secondary][tunnel?] { + color: @secondary_tunnel; + casing-width: 1; + casing-linecap: butt; + casing-color: @secondary_tunnel_casing; + casing-dashes: 5,5; +} + +line|z19-[highway=residential], +line|z19-[highway=tertiary], +{ + color: @residential; + width: 21; + opacity: 1; +} + +line|z19-[highway=tertiary_link], +{ + color: @tertiary_link; + width: 10.5; +} + +line|z19-[highway=tertiary][tunnel?], +line|z19-[highway=residential][tunnel?] { + color: @tertiary_tunnel; + casing-width: 1; + casing-linecap: butt; + casing-color: @tertiary_tunnel_casing; + casing-dashes: 5,5; +} + +line|z19-[highway=unclassified], +line|z19-[highway=living_street] +{ + color: @unclassified; + width: 21; +} + +line|z19-[highway=pedestrian] +{ + color: @pedestrian; + width: 7; + dashes: 16,8; +} + +line|z19-[highway=unclassified][tunnel?], +line|z19-[highway=living_street][tunnel?], +line|z19-[highway=pedestrian][tunnel?] { + color: @unclassified_tunnel; + casing-width: 1; + casing-linecap: butt; + casing-color: @unclassified_tunnel_casing; + casing-dashes: 5,5; +} + +line|z19-[highway=footway], +line|z19-[highway=path] +{ + color: @footway; + width: 2.6; + dashes: 8,4; + opacity: 1; + z-index: 600; +} + +line|z19-[highway=footway][tunnel?]::tunnelBackground, +line|z19-[highway=path][tunnel?]::tunnelBackground { + z-index: 30; + casing-width: eval(prop("width")+0.5); + casing-linecap: butt; + casing-color: @bridge_background; +} + +line|z19-[highway=footway][tunnel?]::tunnelCasing, +line|z19-[highway=path][tunnel?]::tunnelCasing { + z-index: 25; + casing-width: eval(prop("width")+1); + casing-linecap: butt; + casing-color: @bridge_casing; + casing-dashes: 2,2; +} + + +line|z19-[highway=service] +{ + color: @unclassified; + width: 6; +} + +line|z19-[highway=steps] +{ + color: @steps; + width: 6; + dashes: 1.5,1.5; +} + +line|z19-[highway=construction] +{ + color: @construction; + opacity: 1; + width: 5; + dashes: 6,6; +} + +line|z19-[highway=cycleway] +{ + color: @cycleway; + width: 3; + opacity: 1; + z-index: 700; +} /* BRIDGES */ /* CASING FOR PRIMARY ROADS */ diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss index 197685e12b..9a7e3b3567 100644 --- a/data/styles/clear/include/transport.mapcss +++ b/data/styles/clear/include/transport.mapcss @@ -138,12 +138,19 @@ node|z17-[railway=station] { /* SUBWAY STATIONS */ node|z13[railway=station][transport=subway] { - icon-image: subway-xs.svg; + icon-image: subway-entrance.svg; z-index: 5000; + text-offset: 6; + z-index: 5000; + font-size: 9; + text: name; + text-color: @subway_label; + text-halo-radius: 1; + text-halo-color: @city_halo; } node|z14[railway=station][transport=subway] { - icon-image: subway-s.svg; + icon-image: mtro.svg; text-offset: 6; z-index: 5000; font-size: 10; @@ -154,7 +161,7 @@ node|z14[railway=station][transport=subway] { } node|z15[railway=station][transport=subway] { - icon-image: subway-m.svg; + icon-image: mtro.svg; text-offset: 8; z-index: 5000; font-size: 10; @@ -165,7 +172,7 @@ node|z15[railway=station][transport=subway] { } node|z16[railway=station][transport=subway] { - icon-image: subway-l.svg; + icon-image: mtro.svg; text-offset: 8; font-size: 11; z-index: 5000; @@ -176,8 +183,7 @@ node|z16[railway=station][transport=subway] { } node|z17-[railway=station][transport=subway] { - icon-image: subway-l.svg; - text-offset: 8; + icon-image: none.svg; font-size: 14; z-index: 5000; text: name; @@ -186,22 +192,33 @@ node|z17-[railway=station][transport=subway] { text-halo-color: @city_halo; } +/* +node|z16[railway=subway_entrance] { + icon-image: subway-entrance.svg; + z-index: 5000; +} +*/ + node|z17[railway=subway_entrance] { - icon-image: subway-s.svg; - z-index: 3000; + icon-image: mtro.svg; + text-offset: 8; + font-size: 12; + z-index: 6000; + text: name; + text-color: @subway_label; + text-halo-radius: 1; + text-halo-color: @city_halo; } - node|z18-[railway=subway_entrance] { - icon-image: subway-s.svg; - z-index: 3000; - text-offset: 8; - font-size: 10; - z-index: 5000; - text: name; - text-color: @city_label; - text-halo-radius: 1; - text-halo-color: @city_halo; + icon-image: mtro-l.svg; + text-offset: 8; + font-size: 14; + z-index: 6000; + text: name; + text-color: @subway_label; + text-halo-radius: 1; + text-halo-color: @city_halo; } /* TRAM STOPS */ @@ -332,3 +349,17 @@ node|z13-14[aeroway=aerodrome] text-halo-radius: 1; text-halo-color: @city_halo; } + +area|z15-[aeroway=airport], +area|z15-[aeroway=aerodrome], +node|z15-[aeroway=airport], +node|z15-[aeroway=aerodrome] +{ + icon-image: airport-l.svg; + text-offset: 8; + font-size: 14; + text: name; + text-color: @city_label; + text-halo-radius: 1; + text-halo-color: @city_halo; +} diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index 61714163be..0a7601bb87 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -1,7 +1,7 @@ /* BASE */ @white: #ffffff; @background: #DDDDCC; /* #EDEAE1; /* @background: #f1eee8; */ -@backgroundone: #E1E1D1; +@backgroundone: #DEDECD; /* BOUNDARIES */ @border_country: #73736D; @@ -12,9 +12,9 @@ /* ROADS */ /* ROADS */ @trunk: #FF5102; +@trunk_hard: #F7632C; @trunk_medium: #F86B39; @trunk_light: #F87C4A; -@motorway: #FF5102; @primary: #FF864E; @primary_medium: #FC9757; @primary_ligth: #FCA462; @@ -61,10 +61,12 @@ /* NATURAL */ @glacier: #FFFFFF; -@water: #83C6D2; /* #82a6bd,#91C8E2 7CBAD6 */ -@river: #56B4D7; +@water: #83C6D2; +@water1: #83c5d1; +@water2: #83d8e5; +@river: #83C6D2; @forest: #A4B265; -@park: #A4B265; +@park: #A4B265; /* #BCCC74*/ /* BUILDINGS */ @building: #CCCCBE; @@ -72,7 +74,7 @@ /* LANDUSE */ @pedestrian_area: #FFFFFF; @unversity: #DDCCAA; -@hospital: #FFAAAA; +@hospital: #FFcccc; @industrial: #D1D1D1; /* BARRIERS */ @@ -95,7 +97,7 @@ @secondary_road_label: #333333; /* NATURAL LABELS */ -@water_label: #3B9AB8; +@water_label: #238daf; @park_label: #3A7921; diff --git a/data/styles/clear/style-clear/ldpi/api-result (1).png b/data/styles/clear/style-clear/ldpi/api-result (1).png new file mode 100644 index 0000000000..3e51253981 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/api-result (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/compass-image (1).png b/data/styles/clear/style-clear/ldpi/compass-image (1).png new file mode 100644 index 0000000000..82ce5b84d3 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/compass-image (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/current-position (1).png b/data/styles/clear/style-clear/ldpi/current-position (1).png new file mode 100644 index 0000000000..5138508aac Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/current-position (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/current-position-compas (1).png b/data/styles/clear/style-clear/ldpi/current-position-compas (1).png new file mode 100644 index 0000000000..742339c6a5 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/current-position-compas (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/current-routing-compas (1).png b/data/styles/clear/style-clear/ldpi/current-routing-compas (1).png new file mode 100644 index 0000000000..a2c850f6ff Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/current-routing-compas (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/placemark-blue (1).png b/data/styles/clear/style-clear/ldpi/placemark-blue (1).png new file mode 100644 index 0000000000..76dddf53cb Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/placemark-blue (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/placemark-brown (1).png b/data/styles/clear/style-clear/ldpi/placemark-brown (1).png new file mode 100644 index 0000000000..428d29f778 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/placemark-brown (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/placemark-green (1).png b/data/styles/clear/style-clear/ldpi/placemark-green (1).png new file mode 100644 index 0000000000..1d21f7faa1 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/placemark-green (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/placemark-orange (1).png b/data/styles/clear/style-clear/ldpi/placemark-orange (1).png new file mode 100644 index 0000000000..7263fc8c31 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/placemark-orange (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/placemark-pink (1).png b/data/styles/clear/style-clear/ldpi/placemark-pink (1).png new file mode 100644 index 0000000000..7888043c77 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/placemark-pink (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/placemark-purple (1).png b/data/styles/clear/style-clear/ldpi/placemark-purple (1).png new file mode 100644 index 0000000000..771176a0a2 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/placemark-purple (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/placemark-red (1).png b/data/styles/clear/style-clear/ldpi/placemark-red (1).png new file mode 100644 index 0000000000..4d0ffc492d Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/placemark-red (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/placemark-yellow (1).png b/data/styles/clear/style-clear/ldpi/placemark-yellow (1).png new file mode 100644 index 0000000000..f2277787e2 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/placemark-yellow (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/route_from (1).png b/data/styles/clear/style-clear/ldpi/route_from (1).png new file mode 100644 index 0000000000..e305504f3b Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/route_from (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/route_to (1).png b/data/styles/clear/style-clear/ldpi/route_to (1).png new file mode 100644 index 0000000000..4c87d967b2 Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/route_to (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/search-result (1).png b/data/styles/clear/style-clear/ldpi/search-result (1).png new file mode 100644 index 0000000000..97234273fc Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/search-result (1).png differ diff --git a/data/styles/clear/style-clear/ldpi/search-result-active (1).png b/data/styles/clear/style-clear/ldpi/search-result-active (1).png new file mode 100644 index 0000000000..8d53f21bcf Binary files /dev/null and b/data/styles/clear/style-clear/ldpi/search-result-active (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/api-result (1).png b/data/styles/clear/style-clear/mdpi/api-result (1).png new file mode 100644 index 0000000000..088abf16de Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/api-result (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/compass-image (1).png b/data/styles/clear/style-clear/mdpi/compass-image (1).png new file mode 100644 index 0000000000..24fe4ba8f7 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/compass-image (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/current-position (1).png b/data/styles/clear/style-clear/mdpi/current-position (1).png new file mode 100644 index 0000000000..9c5482003d Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/current-position (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/current-position-compas (1).png b/data/styles/clear/style-clear/mdpi/current-position-compas (1).png new file mode 100644 index 0000000000..fc6f0c3111 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/current-position-compas (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/current-routing-compas (1).png b/data/styles/clear/style-clear/mdpi/current-routing-compas (1).png new file mode 100644 index 0000000000..ee583b3e97 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/current-routing-compas (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/placemark-blue (1).png b/data/styles/clear/style-clear/mdpi/placemark-blue (1).png new file mode 100644 index 0000000000..f6035b5e68 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/placemark-blue (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/placemark-brown (1).png b/data/styles/clear/style-clear/mdpi/placemark-brown (1).png new file mode 100644 index 0000000000..f31f9e0f1e Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/placemark-brown (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/placemark-green (1).png b/data/styles/clear/style-clear/mdpi/placemark-green (1).png new file mode 100644 index 0000000000..18bf41ae0a Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/placemark-green (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/placemark-orange (1).png b/data/styles/clear/style-clear/mdpi/placemark-orange (1).png new file mode 100644 index 0000000000..1dd7243d47 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/placemark-orange (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/placemark-pink (1).png b/data/styles/clear/style-clear/mdpi/placemark-pink (1).png new file mode 100644 index 0000000000..0252e99a87 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/placemark-pink (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/placemark-purple (1).png b/data/styles/clear/style-clear/mdpi/placemark-purple (1).png new file mode 100644 index 0000000000..3d02194015 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/placemark-purple (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/placemark-red (1).png b/data/styles/clear/style-clear/mdpi/placemark-red (1).png new file mode 100644 index 0000000000..7c1fff6861 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/placemark-red (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/placemark-yellow (1).png b/data/styles/clear/style-clear/mdpi/placemark-yellow (1).png new file mode 100644 index 0000000000..bb0710e5a3 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/placemark-yellow (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/route_from (1).png b/data/styles/clear/style-clear/mdpi/route_from (1).png new file mode 100644 index 0000000000..c3d31ff777 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route_from (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/route_to (1).png b/data/styles/clear/style-clear/mdpi/route_to (1).png new file mode 100644 index 0000000000..47d548989f Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route_to (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/search-result (1).png b/data/styles/clear/style-clear/mdpi/search-result (1).png new file mode 100644 index 0000000000..3abda4fbbb Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/search-result (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/search-result-active (1).png b/data/styles/clear/style-clear/mdpi/search-result-active (1).png new file mode 100644 index 0000000000..0981ef9448 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/search-result-active (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/watch-my-direction (1).png b/data/styles/clear/style-clear/mdpi/watch-my-direction (1).png new file mode 100644 index 0000000000..ec48e5278b Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/watch-my-direction (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/watch-my-position (1).png b/data/styles/clear/style-clear/mdpi/watch-my-position (1).png new file mode 100644 index 0000000000..7a060d578c Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/watch-my-position (1).png differ diff --git a/data/styles/clear/style-clear/mdpi/watch-search-result (1).png b/data/styles/clear/style-clear/mdpi/watch-search-result (1).png new file mode 100644 index 0000000000..7e7636ec4d Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/watch-search-result (1).png differ diff --git a/data/styles/clear/style-clear/symbols/airport-l.svg b/data/styles/clear/style-clear/symbols/airport-l.svg index cf96890fe0..c2da1ef64b 100644 --- a/data/styles/clear/style-clear/symbols/airport-l.svg +++ b/data/styles/clear/style-clear/symbols/airport-l.svg @@ -4,11 +4,11 @@ airport-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/airport-m.svg b/data/styles/clear/style-clear/symbols/airport-m.svg index e8a1f64da5..c2bef00263 100644 --- a/data/styles/clear/style-clear/symbols/airport-m.svg +++ b/data/styles/clear/style-clear/symbols/airport-m.svg @@ -4,11 +4,11 @@ airport-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/airport-s.svg b/data/styles/clear/style-clear/symbols/airport-s.svg index 243553d15a..20197ec3d5 100644 --- a/data/styles/clear/style-clear/symbols/airport-s.svg +++ b/data/styles/clear/style-clear/symbols/airport-s.svg @@ -4,11 +4,11 @@ airport-s Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/arrow-m.svg b/data/styles/clear/style-clear/symbols/arrow-m.svg index 07a240e471..5538972385 100644 --- a/data/styles/clear/style-clear/symbols/arrow-m.svg +++ b/data/styles/clear/style-clear/symbols/arrow-m.svg @@ -4,8 +4,8 @@ arrow-m Created with Sketch. - - + + diff --git a/data/styles/clear/style-clear/symbols/arrow-s.svg b/data/styles/clear/style-clear/symbols/arrow-s.svg index dce8e803d1..5c8a9c4ae8 100644 --- a/data/styles/clear/style-clear/symbols/arrow-s.svg +++ b/data/styles/clear/style-clear/symbols/arrow-s.svg @@ -4,8 +4,8 @@ arrow-s Created with Sketch. - - + + diff --git a/data/styles/clear/style-clear/symbols/arrow.svg b/data/styles/clear/style-clear/symbols/arrow.svg deleted file mode 100644 index 52424545eb..0000000000 --- a/data/styles/clear/style-clear/symbols/arrow.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - arrow - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bank-l.svg b/data/styles/clear/style-clear/symbols/bank-l.svg index d15b8dbf5c..920adb97aa 100644 --- a/data/styles/clear/style-clear/symbols/bank-l.svg +++ b/data/styles/clear/style-clear/symbols/bank-l.svg @@ -4,9 +4,9 @@ bank-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/bank-m.svg b/data/styles/clear/style-clear/symbols/bank-m.svg index 055681169c..33e033a2ea 100644 --- a/data/styles/clear/style-clear/symbols/bank-m.svg +++ b/data/styles/clear/style-clear/symbols/bank-m.svg @@ -4,9 +4,9 @@ bank-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/bank-s.svg b/data/styles/clear/style-clear/symbols/bank-s.svg index 51d528e004..4c8007b6b9 100644 --- a/data/styles/clear/style-clear/symbols/bank-s.svg +++ b/data/styles/clear/style-clear/symbols/bank-s.svg @@ -4,9 +4,9 @@ bank-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/bar-l.svg b/data/styles/clear/style-clear/symbols/bar-l.svg index 5cfb13470e..ff13e2d2f9 100644 --- a/data/styles/clear/style-clear/symbols/bar-l.svg +++ b/data/styles/clear/style-clear/symbols/bar-l.svg @@ -4,9 +4,9 @@ bar-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/bar-m.svg b/data/styles/clear/style-clear/symbols/bar-m.svg index 8c120ba93f..5eda2e697d 100644 --- a/data/styles/clear/style-clear/symbols/bar-m.svg +++ b/data/styles/clear/style-clear/symbols/bar-m.svg @@ -4,9 +4,9 @@ bar-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/bar-s.svg b/data/styles/clear/style-clear/symbols/bar-s.svg index 7f87216d47..80f682d3eb 100644 --- a/data/styles/clear/style-clear/symbols/bar-s.svg +++ b/data/styles/clear/style-clear/symbols/bar-s.svg @@ -4,9 +4,9 @@ bar-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/beer-l.svg b/data/styles/clear/style-clear/symbols/beer-l.svg new file mode 100644 index 0000000000..08e3e7ac44 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/beer-l.svg @@ -0,0 +1,16 @@ + + + + beer-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/beer-s.svg b/data/styles/clear/style-clear/symbols/beer-s.svg new file mode 100644 index 0000000000..d8d334bb8a --- /dev/null +++ b/data/styles/clear/style-clear/symbols/beer-s.svg @@ -0,0 +1,16 @@ + + + + beer-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bicycle-l.svg b/data/styles/clear/style-clear/symbols/bicycle-l.svg new file mode 100644 index 0000000000..09fe3103bc --- /dev/null +++ b/data/styles/clear/style-clear/symbols/bicycle-l.svg @@ -0,0 +1,16 @@ + + + + bicycle-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bicycle-m.svg b/data/styles/clear/style-clear/symbols/bicycle-m.svg new file mode 100644 index 0000000000..f000d5c6f9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/bicycle-m.svg @@ -0,0 +1,19 @@ + + + + bicycle-m + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bicycle-s.svg b/data/styles/clear/style-clear/symbols/bicycle-s.svg new file mode 100644 index 0000000000..e71af58bb9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/bicycle-s.svg @@ -0,0 +1,16 @@ + + + + bicycle-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bus-l.svg b/data/styles/clear/style-clear/symbols/bus-l.svg index 4bd8715c14..5c52ac5489 100644 --- a/data/styles/clear/style-clear/symbols/bus-l.svg +++ b/data/styles/clear/style-clear/symbols/bus-l.svg @@ -4,11 +4,11 @@ bus-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/bus-m.svg b/data/styles/clear/style-clear/symbols/bus-m.svg index f5f6a06573..ad57e16723 100644 --- a/data/styles/clear/style-clear/symbols/bus-m.svg +++ b/data/styles/clear/style-clear/symbols/bus-m.svg @@ -4,11 +4,11 @@ bus-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/bus-s.svg b/data/styles/clear/style-clear/symbols/bus-s.svg index 106d27fe56..a0aefbe3ac 100644 --- a/data/styles/clear/style-clear/symbols/bus-s.svg +++ b/data/styles/clear/style-clear/symbols/bus-s.svg @@ -4,11 +4,11 @@ bus-s Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/cafe-l.svg b/data/styles/clear/style-clear/symbols/cafe-l.svg index 08c2bb99eb..b0e757ca02 100644 --- a/data/styles/clear/style-clear/symbols/cafe-l.svg +++ b/data/styles/clear/style-clear/symbols/cafe-l.svg @@ -4,9 +4,9 @@ cafe-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/cafe-m.svg b/data/styles/clear/style-clear/symbols/cafe-m.svg index ec4ad91324..58b08ff30c 100644 --- a/data/styles/clear/style-clear/symbols/cafe-m.svg +++ b/data/styles/clear/style-clear/symbols/cafe-m.svg @@ -4,9 +4,9 @@ cafe-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/cafe-s.svg b/data/styles/clear/style-clear/symbols/cafe-s.svg index 882c78dc0f..9eca55618e 100644 --- a/data/styles/clear/style-clear/symbols/cafe-s.svg +++ b/data/styles/clear/style-clear/symbols/cafe-s.svg @@ -4,9 +4,9 @@ cafe-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/cinema-l.svg b/data/styles/clear/style-clear/symbols/cinema-l.svg index d6e608ec88..d1aecb8ff2 100644 --- a/data/styles/clear/style-clear/symbols/cinema-l.svg +++ b/data/styles/clear/style-clear/symbols/cinema-l.svg @@ -4,13 +4,13 @@ cinema-l Created with Sketch. - - - + + + + - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/cinema-m.svg b/data/styles/clear/style-clear/symbols/cinema-m.svg index 6fe54c7ce4..90a9a486a7 100644 --- a/data/styles/clear/style-clear/symbols/cinema-m.svg +++ b/data/styles/clear/style-clear/symbols/cinema-m.svg @@ -4,9 +4,9 @@ cinema-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/cinema-s.svg b/data/styles/clear/style-clear/symbols/cinema-s.svg index c65d4f7d51..663434ed21 100644 --- a/data/styles/clear/style-clear/symbols/cinema-s.svg +++ b/data/styles/clear/style-clear/symbols/cinema-s.svg @@ -4,9 +4,9 @@ cinema-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/college-l.svg b/data/styles/clear/style-clear/symbols/college-l.svg new file mode 100644 index 0000000000..397f0aa90f --- /dev/null +++ b/data/styles/clear/style-clear/symbols/college-l.svg @@ -0,0 +1,16 @@ + + + + college-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/college-m.svg b/data/styles/clear/style-clear/symbols/college-m.svg new file mode 100644 index 0000000000..eff1d3ee43 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/college-m.svg @@ -0,0 +1,16 @@ + + + + college-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/college-s.svg b/data/styles/clear/style-clear/symbols/college-s.svg new file mode 100644 index 0000000000..c21920ad71 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/college-s.svg @@ -0,0 +1,16 @@ + + + + college-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/dot-m.svg b/data/styles/clear/style-clear/symbols/dot-m.svg deleted file mode 100644 index 422aec004c..0000000000 --- a/data/styles/clear/style-clear/symbols/dot-m.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - dot-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/dot-s-light.svg b/data/styles/clear/style-clear/symbols/dot-s-light.svg deleted file mode 100644 index 303809eb20..0000000000 --- a/data/styles/clear/style-clear/symbols/dot-s-light.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - dot-s-light - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/dot-s.svg b/data/styles/clear/style-clear/symbols/dot-s.svg deleted file mode 100644 index 46b3ae1355..0000000000 --- a/data/styles/clear/style-clear/symbols/dot-s.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - dot-s - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/embassy-l.svg b/data/styles/clear/style-clear/symbols/embassy-l.svg new file mode 100644 index 0000000000..03b3517386 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/embassy-l.svg @@ -0,0 +1,16 @@ + + + + embassy-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/embassy-m.svg b/data/styles/clear/style-clear/symbols/embassy-m.svg new file mode 100644 index 0000000000..01041a233e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/embassy-m.svg @@ -0,0 +1,16 @@ + + + + embassy-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/embassy-s.svg b/data/styles/clear/style-clear/symbols/embassy-s.svg new file mode 100644 index 0000000000..ac16606ef3 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/embassy-s.svg @@ -0,0 +1,16 @@ + + + + embassy-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/fastfood-l.svg b/data/styles/clear/style-clear/symbols/fastfood-l.svg index a3bf57b849..de98d90aee 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-l.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-l.svg @@ -4,9 +4,9 @@ fastfood-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/fastfood-m.svg b/data/styles/clear/style-clear/symbols/fastfood-m.svg index 365ed13200..eee9eadb3d 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-m.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-m.svg @@ -4,9 +4,9 @@ fastfood-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/fastfood-s.svg b/data/styles/clear/style-clear/symbols/fastfood-s.svg index 30c5aee6ac..b67c0eb5e4 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-s.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-s.svg @@ -4,9 +4,9 @@ fastfood-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/gallery-l.svg b/data/styles/clear/style-clear/symbols/gallery-l.svg index 222b56c480..c562744278 100644 --- a/data/styles/clear/style-clear/symbols/gallery-l.svg +++ b/data/styles/clear/style-clear/symbols/gallery-l.svg @@ -4,9 +4,9 @@ gallery-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/gallery-m.svg b/data/styles/clear/style-clear/symbols/gallery-m.svg index e1dbfaab3f..7373139afd 100644 --- a/data/styles/clear/style-clear/symbols/gallery-m.svg +++ b/data/styles/clear/style-clear/symbols/gallery-m.svg @@ -4,9 +4,9 @@ gallery-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/gallery-s.svg b/data/styles/clear/style-clear/symbols/gallery-s.svg index 58dcb65334..d616908012 100644 --- a/data/styles/clear/style-clear/symbols/gallery-s.svg +++ b/data/styles/clear/style-clear/symbols/gallery-s.svg @@ -4,9 +4,9 @@ gallery-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/grocery-l.svg b/data/styles/clear/style-clear/symbols/grocery-l.svg index b320296465..9dff43bdc6 100644 --- a/data/styles/clear/style-clear/symbols/grocery-l.svg +++ b/data/styles/clear/style-clear/symbols/grocery-l.svg @@ -4,9 +4,9 @@ grocery-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/grocery-m.svg b/data/styles/clear/style-clear/symbols/grocery-m.svg index 93c3e94ee6..43386fcfe1 100644 --- a/data/styles/clear/style-clear/symbols/grocery-m.svg +++ b/data/styles/clear/style-clear/symbols/grocery-m.svg @@ -4,13 +4,13 @@ grocery-m Created with Sketch. - - - + + + - + diff --git a/data/styles/clear/style-clear/symbols/grocery-s.svg b/data/styles/clear/style-clear/symbols/grocery-s.svg index 7129e9157e..16227f0048 100644 --- a/data/styles/clear/style-clear/symbols/grocery-s.svg +++ b/data/styles/clear/style-clear/symbols/grocery-s.svg @@ -4,9 +4,9 @@ grocery-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/hospital-l.svg b/data/styles/clear/style-clear/symbols/hospital-l.svg new file mode 100644 index 0000000000..637d383329 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hospital-l.svg @@ -0,0 +1,16 @@ + + + + hospital-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/hospital-m.svg b/data/styles/clear/style-clear/symbols/hospital-m.svg new file mode 100644 index 0000000000..85f33aa298 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hospital-m.svg @@ -0,0 +1,16 @@ + + + + hospital-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/hospital-s.svg b/data/styles/clear/style-clear/symbols/hospital-s.svg new file mode 100644 index 0000000000..ff8ae7133a --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hospital-s.svg @@ -0,0 +1,16 @@ + + + + hospital-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/hotel-l.svg b/data/styles/clear/style-clear/symbols/hotel-l.svg index da63f978dd..4f00072779 100644 --- a/data/styles/clear/style-clear/symbols/hotel-l.svg +++ b/data/styles/clear/style-clear/symbols/hotel-l.svg @@ -4,9 +4,9 @@ hotel-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/hotel-m.svg b/data/styles/clear/style-clear/symbols/hotel-m.svg index 056c375f6e..9316f7c47f 100644 --- a/data/styles/clear/style-clear/symbols/hotel-m.svg +++ b/data/styles/clear/style-clear/symbols/hotel-m.svg @@ -4,9 +4,9 @@ hotel-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/hotel-s.svg b/data/styles/clear/style-clear/symbols/hotel-s.svg index 548958ac6a..a5e97a16a1 100644 --- a/data/styles/clear/style-clear/symbols/hotel-s.svg +++ b/data/styles/clear/style-clear/symbols/hotel-s.svg @@ -4,9 +4,9 @@ hotel-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/iphone6.png.png b/data/styles/clear/style-clear/symbols/iphone6.png.png new file mode 100644 index 0000000000..da8f1857b5 Binary files /dev/null and b/data/styles/clear/style-clear/symbols/iphone6.png.png differ diff --git a/data/styles/clear/style-clear/symbols/library-l.svg b/data/styles/clear/style-clear/symbols/library-l.svg new file mode 100644 index 0000000000..bd641ec51d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/library-l.svg @@ -0,0 +1,16 @@ + + + + library-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/library-m.svg b/data/styles/clear/style-clear/symbols/library-m.svg new file mode 100644 index 0000000000..39b2eb28a1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/library-m.svg @@ -0,0 +1,16 @@ + + + + library-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/library-s.svg b/data/styles/clear/style-clear/symbols/library-s.svg new file mode 100644 index 0000000000..d580634e52 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/library-s.svg @@ -0,0 +1,16 @@ + + + + library-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/london-tube-l.svg b/data/styles/clear/style-clear/symbols/london-tube-l.svg new file mode 100644 index 0000000000..803fee66a7 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/london-tube-l.svg @@ -0,0 +1,15 @@ + + + + london-tube-l + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/london-tube-m.svg b/data/styles/clear/style-clear/symbols/london-tube-m.svg new file mode 100644 index 0000000000..5526aeff5e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/london-tube-m.svg @@ -0,0 +1,14 @@ + + + + london-tube-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/london-tube-s.svg b/data/styles/clear/style-clear/symbols/london-tube-s.svg new file mode 100644 index 0000000000..b00bc62197 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/london-tube-s.svg @@ -0,0 +1,13 @@ + + + + london-tube-s + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mail-l.svg b/data/styles/clear/style-clear/symbols/mail-l.svg new file mode 100644 index 0000000000..b84d7efe12 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mail-l.svg @@ -0,0 +1,16 @@ + + + + mail-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mail-m.svg b/data/styles/clear/style-clear/symbols/mail-m.svg new file mode 100644 index 0000000000..d581d71737 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mail-m.svg @@ -0,0 +1,16 @@ + + + + mail-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mail-s.svg b/data/styles/clear/style-clear/symbols/mail-s.svg new file mode 100644 index 0000000000..045c4c961c --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mail-s.svg @@ -0,0 +1,16 @@ + + + + mail-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/monument-l.svg b/data/styles/clear/style-clear/symbols/monument-l.svg index 1f7bb4cb6f..393f1effe8 100644 --- a/data/styles/clear/style-clear/symbols/monument-l.svg +++ b/data/styles/clear/style-clear/symbols/monument-l.svg @@ -4,14 +4,14 @@ monument-l Created with Sketch. - - - + + + - + diff --git a/data/styles/clear/style-clear/symbols/monument-m.svg b/data/styles/clear/style-clear/symbols/monument-m.svg index 0b53891bbc..39faf18721 100644 --- a/data/styles/clear/style-clear/symbols/monument-m.svg +++ b/data/styles/clear/style-clear/symbols/monument-m.svg @@ -4,14 +4,14 @@ monument-m Created with Sketch. - - - + + + - + diff --git a/data/styles/clear/style-clear/symbols/monument-s.svg b/data/styles/clear/style-clear/symbols/monument-s.svg index 04446cf1dd..b5f602e552 100644 --- a/data/styles/clear/style-clear/symbols/monument-s.svg +++ b/data/styles/clear/style-clear/symbols/monument-s.svg @@ -4,14 +4,14 @@ monument-s Created with Sketch. - - - + + + - + diff --git a/data/styles/clear/style-clear/symbols/mosmetro-l.svg b/data/styles/clear/style-clear/symbols/mosmetro-l.svg new file mode 100644 index 0000000000..c617587821 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mosmetro-l.svg @@ -0,0 +1,12 @@ + + + + mosmetro-l + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mosmetro-m.svg b/data/styles/clear/style-clear/symbols/mosmetro-m.svg new file mode 100644 index 0000000000..a043763115 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mosmetro-m.svg @@ -0,0 +1,12 @@ + + + + mosmetro-m + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mosmetro-mono-l.svg b/data/styles/clear/style-clear/symbols/mosmetro-mono-l.svg new file mode 100644 index 0000000000..0a0382d0af --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mosmetro-mono-l.svg @@ -0,0 +1,12 @@ + + + + mosmetro-mono-l + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mosmetro-mono-m.svg b/data/styles/clear/style-clear/symbols/mosmetro-mono-m.svg new file mode 100644 index 0000000000..5e1e9f051a --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mosmetro-mono-m.svg @@ -0,0 +1,12 @@ + + + + mosmetro-mono-m + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mosmetro-mono-s.svg b/data/styles/clear/style-clear/symbols/mosmetro-mono-s.svg new file mode 100644 index 0000000000..86215facbb --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mosmetro-mono-s.svg @@ -0,0 +1,12 @@ + + + + mosmetro-mono-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mosmetro-s.svg b/data/styles/clear/style-clear/symbols/mosmetro-s.svg new file mode 100644 index 0000000000..f58a96f4f1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mosmetro-s.svg @@ -0,0 +1,12 @@ + + + + mosmetro-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mtro-l.svg b/data/styles/clear/style-clear/symbols/mtro-l.svg new file mode 100644 index 0000000000..84829b6567 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mtro-l.svg @@ -0,0 +1,11 @@ + + + + mtro-l + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/mtro.svg b/data/styles/clear/style-clear/symbols/mtro.svg new file mode 100644 index 0000000000..f8b481e7e9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mtro.svg @@ -0,0 +1,11 @@ + + + + mtro + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/museum-l.svg b/data/styles/clear/style-clear/symbols/museum-l.svg index 11d9736f87..f68d68dd76 100644 --- a/data/styles/clear/style-clear/symbols/museum-l.svg +++ b/data/styles/clear/style-clear/symbols/museum-l.svg @@ -4,9 +4,9 @@ museum-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/museum-m.svg b/data/styles/clear/style-clear/symbols/museum-m.svg index 27b035b45e..bc76f0c162 100644 --- a/data/styles/clear/style-clear/symbols/museum-m.svg +++ b/data/styles/clear/style-clear/symbols/museum-m.svg @@ -4,9 +4,9 @@ museum-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/museum-s.svg b/data/styles/clear/style-clear/symbols/museum-s.svg index 60d5070f3b..d11ae1c226 100644 --- a/data/styles/clear/style-clear/symbols/museum-s.svg +++ b/data/styles/clear/style-clear/symbols/museum-s.svg @@ -4,9 +4,9 @@ museum-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/none.svg b/data/styles/clear/style-clear/symbols/none.svg new file mode 100644 index 0000000000..762f675264 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/none.svg @@ -0,0 +1,8 @@ + + + + none + Created with Sketch. + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/park-l.svg b/data/styles/clear/style-clear/symbols/park-l.svg index 7dad37bb6f..6ba29f0f45 100644 --- a/data/styles/clear/style-clear/symbols/park-l.svg +++ b/data/styles/clear/style-clear/symbols/park-l.svg @@ -4,7 +4,7 @@ park-l Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/park-m.svg b/data/styles/clear/style-clear/symbols/park-m.svg index 55bc176d4e..f9b27e7c0d 100644 --- a/data/styles/clear/style-clear/symbols/park-m.svg +++ b/data/styles/clear/style-clear/symbols/park-m.svg @@ -4,7 +4,7 @@ park-m Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/park-s.svg b/data/styles/clear/style-clear/symbols/park-s.svg index d1d1b7569d..33387f5c54 100644 --- a/data/styles/clear/style-clear/symbols/park-s.svg +++ b/data/styles/clear/style-clear/symbols/park-s.svg @@ -4,7 +4,7 @@ park-s Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/pharmacy-l.svg b/data/styles/clear/style-clear/symbols/pharmacy-l.svg new file mode 100644 index 0000000000..3f21ab2e85 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/pharmacy-l.svg @@ -0,0 +1,16 @@ + + + + pharmacy-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/pharmacy-m.svg b/data/styles/clear/style-clear/symbols/pharmacy-m.svg new file mode 100644 index 0000000000..d565f88329 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/pharmacy-m.svg @@ -0,0 +1,16 @@ + + + + pharmacy-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/pharmacy-s.svg b/data/styles/clear/style-clear/symbols/pharmacy-s.svg new file mode 100644 index 0000000000..43b9232c50 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/pharmacy-s.svg @@ -0,0 +1,16 @@ + + + + pharmacy-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/police-l.svg b/data/styles/clear/style-clear/symbols/police-l.svg new file mode 100644 index 0000000000..11be4e101a --- /dev/null +++ b/data/styles/clear/style-clear/symbols/police-l.svg @@ -0,0 +1,16 @@ + + + + police-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/police-m.svg b/data/styles/clear/style-clear/symbols/police-m.svg new file mode 100644 index 0000000000..9be3882eb2 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/police-m.svg @@ -0,0 +1,16 @@ + + + + police-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/police-s.svg b/data/styles/clear/style-clear/symbols/police-s.svg new file mode 100644 index 0000000000..a2ad9d45a0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/police-s.svg @@ -0,0 +1,16 @@ + + + + police-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/restaurant-l.svg b/data/styles/clear/style-clear/symbols/restaurant-l.svg index be37213c0c..96b57cb4ea 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-l.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-l.svg @@ -4,9 +4,9 @@ restaurant-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/restaurant-m.svg b/data/styles/clear/style-clear/symbols/restaurant-m.svg index 66ea920408..2c965ee67c 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-m.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-m.svg @@ -4,9 +4,9 @@ restaurant-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/restaurant-s.svg b/data/styles/clear/style-clear/symbols/restaurant-s.svg index 2b6ff37e7b..a76f878474 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-s.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-s.svg @@ -4,9 +4,9 @@ restaurant-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/school-l.svg b/data/styles/clear/style-clear/symbols/school-l.svg new file mode 100644 index 0000000000..00407e7ebe --- /dev/null +++ b/data/styles/clear/style-clear/symbols/school-l.svg @@ -0,0 +1,16 @@ + + + + school-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/school-m.svg b/data/styles/clear/style-clear/symbols/school-m.svg new file mode 100644 index 0000000000..b112ac1b70 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/school-m.svg @@ -0,0 +1,16 @@ + + + + school-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/school-s.svg b/data/styles/clear/style-clear/symbols/school-s.svg new file mode 100644 index 0000000000..15f3c34f23 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/school-s.svg @@ -0,0 +1,16 @@ + + + + school-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/ship-l.svg b/data/styles/clear/style-clear/symbols/ship-l.svg index f4ab431ec2..96a35c14cf 100644 --- a/data/styles/clear/style-clear/symbols/ship-l.svg +++ b/data/styles/clear/style-clear/symbols/ship-l.svg @@ -4,11 +4,11 @@ ship-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/ship-m.svg b/data/styles/clear/style-clear/symbols/ship-m.svg index 716abf50e5..a6a78ccf52 100644 --- a/data/styles/clear/style-clear/symbols/ship-m.svg +++ b/data/styles/clear/style-clear/symbols/ship-m.svg @@ -4,11 +4,11 @@ ship-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/ship-s.svg b/data/styles/clear/style-clear/symbols/ship-s.svg index c3779aeb20..663163fe02 100644 --- a/data/styles/clear/style-clear/symbols/ship-s.svg +++ b/data/styles/clear/style-clear/symbols/ship-s.svg @@ -4,11 +4,11 @@ ship-s Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/star-l.svg b/data/styles/clear/style-clear/symbols/star-l.svg index a60e1dc47e..3db74a071b 100644 --- a/data/styles/clear/style-clear/symbols/star-l.svg +++ b/data/styles/clear/style-clear/symbols/star-l.svg @@ -1,24 +1,16 @@ - + star-l Created with Sketch. - - - - - - - - - - - - - - - + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/star-m.svg b/data/styles/clear/style-clear/symbols/star-m.svg index 8375e524ea..b07384b5fa 100644 --- a/data/styles/clear/style-clear/symbols/star-m.svg +++ b/data/styles/clear/style-clear/symbols/star-m.svg @@ -1,18 +1,15 @@ - + star-m Created with Sketch. - - - - - - - - - + + + + + + diff --git a/data/styles/clear/style-clear/symbols/star-s.svg b/data/styles/clear/style-clear/symbols/star-s.svg index 34e0bf0856..00e5be40ad 100644 --- a/data/styles/clear/style-clear/symbols/star-s.svg +++ b/data/styles/clear/style-clear/symbols/star-s.svg @@ -1,18 +1,15 @@ - + star-s Created with Sketch. - - - - - - - - - + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-entrance.svg b/data/styles/clear/style-clear/symbols/subway-entrance.svg new file mode 100644 index 0000000000..e16667d663 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/subway-entrance.svg @@ -0,0 +1,15 @@ + + + + subway-entrance + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/subway-l.svg b/data/styles/clear/style-clear/symbols/subway-l.svg index a86df62dac..d28dd4de3e 100644 --- a/data/styles/clear/style-clear/symbols/subway-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-l.svg @@ -4,11 +4,11 @@ subway-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/subway-m.svg b/data/styles/clear/style-clear/symbols/subway-m.svg index 6fe29d5f2b..cc76fab300 100644 --- a/data/styles/clear/style-clear/symbols/subway-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-m.svg @@ -4,11 +4,11 @@ subway-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/subway-s.svg b/data/styles/clear/style-clear/symbols/subway-s.svg index fdd23e104e..24650f31fa 100644 --- a/data/styles/clear/style-clear/symbols/subway-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-s.svg @@ -4,12 +4,12 @@ subway-s Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/subway-xs.svg b/data/styles/clear/style-clear/symbols/subway-xs.svg index 26f74371e3..c30305cc11 100644 --- a/data/styles/clear/style-clear/symbols/subway-xs.svg +++ b/data/styles/clear/style-clear/symbols/subway-xs.svg @@ -4,11 +4,11 @@ subway-xs Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/theatre-l.svg b/data/styles/clear/style-clear/symbols/theatre-l.svg index d26cb9bb23..d31c4ce45c 100644 --- a/data/styles/clear/style-clear/symbols/theatre-l.svg +++ b/data/styles/clear/style-clear/symbols/theatre-l.svg @@ -4,9 +4,9 @@ theatre-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/theatre-m.svg b/data/styles/clear/style-clear/symbols/theatre-m.svg index 3bd7781906..ccd0c25e96 100644 --- a/data/styles/clear/style-clear/symbols/theatre-m.svg +++ b/data/styles/clear/style-clear/symbols/theatre-m.svg @@ -4,9 +4,9 @@ theatre-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/theatre-s.svg b/data/styles/clear/style-clear/symbols/theatre-s.svg index 0a551fc5e8..81124849d0 100644 --- a/data/styles/clear/style-clear/symbols/theatre-s.svg +++ b/data/styles/clear/style-clear/symbols/theatre-s.svg @@ -4,9 +4,9 @@ theatre-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/toilets-l.svg b/data/styles/clear/style-clear/symbols/toilets-l.svg new file mode 100644 index 0000000000..fea407bcad --- /dev/null +++ b/data/styles/clear/style-clear/symbols/toilets-l.svg @@ -0,0 +1,17 @@ + + + + toilets-l + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/toilets-m.svg b/data/styles/clear/style-clear/symbols/toilets-m.svg new file mode 100644 index 0000000000..fbd2807aa0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/toilets-m.svg @@ -0,0 +1,16 @@ + + + + toilets-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/toilets-s.svg b/data/styles/clear/style-clear/symbols/toilets-s.svg new file mode 100644 index 0000000000..d72c0715b5 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/toilets-s.svg @@ -0,0 +1,16 @@ + + + + toilets-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/train-l.svg b/data/styles/clear/style-clear/symbols/train-l.svg index 11e17cb49e..20056dc2b0 100644 --- a/data/styles/clear/style-clear/symbols/train-l.svg +++ b/data/styles/clear/style-clear/symbols/train-l.svg @@ -4,11 +4,11 @@ train-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/train-m.svg b/data/styles/clear/style-clear/symbols/train-m.svg index 73cbd7ea55..c03d907dfa 100644 --- a/data/styles/clear/style-clear/symbols/train-m.svg +++ b/data/styles/clear/style-clear/symbols/train-m.svg @@ -4,11 +4,11 @@ train-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/train-s.svg b/data/styles/clear/style-clear/symbols/train-s.svg index 2b2db4a8fd..3d7646cc49 100644 --- a/data/styles/clear/style-clear/symbols/train-s.svg +++ b/data/styles/clear/style-clear/symbols/train-s.svg @@ -4,12 +4,12 @@ train-s Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/tram-l.svg b/data/styles/clear/style-clear/symbols/tram-l.svg index 8ef3d84b93..6e60516cee 100644 --- a/data/styles/clear/style-clear/symbols/tram-l.svg +++ b/data/styles/clear/style-clear/symbols/tram-l.svg @@ -4,11 +4,11 @@ tram-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/tram-m.svg b/data/styles/clear/style-clear/symbols/tram-m.svg index bcf55d9ac6..553e0c0b7b 100644 --- a/data/styles/clear/style-clear/symbols/tram-m.svg +++ b/data/styles/clear/style-clear/symbols/tram-m.svg @@ -4,11 +4,11 @@ tram-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/tram-s.svg b/data/styles/clear/style-clear/symbols/tram-s.svg index c6dc59a8d2..2b0303be15 100644 --- a/data/styles/clear/style-clear/symbols/tram-s.svg +++ b/data/styles/clear/style-clear/symbols/tram-s.svg @@ -4,12 +4,12 @@ tram-s Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/zoo-l.svg b/data/styles/clear/style-clear/symbols/zoo-l.svg index dd872400bf..9320a0edbe 100644 --- a/data/styles/clear/style-clear/symbols/zoo-l.svg +++ b/data/styles/clear/style-clear/symbols/zoo-l.svg @@ -4,9 +4,9 @@ zoo-l Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/zoo-m.svg b/data/styles/clear/style-clear/symbols/zoo-m.svg index 91a349b669..493227ae82 100644 --- a/data/styles/clear/style-clear/symbols/zoo-m.svg +++ b/data/styles/clear/style-clear/symbols/zoo-m.svg @@ -4,9 +4,9 @@ zoo-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/zoo-s.svg b/data/styles/clear/style-clear/symbols/zoo-s.svg index af1f10300e..5f0b09dbda 100644 --- a/data/styles/clear/style-clear/symbols/zoo-s.svg +++ b/data/styles/clear/style-clear/symbols/zoo-s.svg @@ -4,9 +4,9 @@ zoo-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/watch/api-result (1).png b/data/styles/clear/style-clear/watch/api-result (1).png new file mode 100644 index 0000000000..8f3f27e7a7 Binary files /dev/null and b/data/styles/clear/style-clear/watch/api-result (1).png differ diff --git a/data/styles/clear/style-clear/watch/arrow-direction (1).png b/data/styles/clear/style-clear/watch/arrow-direction (1).png new file mode 100644 index 0000000000..0991a99dad Binary files /dev/null and b/data/styles/clear/style-clear/watch/arrow-direction (1).png differ diff --git a/data/styles/clear/style-clear/watch/compass-image (1).png b/data/styles/clear/style-clear/watch/compass-image (1).png new file mode 100644 index 0000000000..3cb750cdf4 Binary files /dev/null and b/data/styles/clear/style-clear/watch/compass-image (1).png differ diff --git a/data/styles/clear/style-clear/watch/current-position (1).png b/data/styles/clear/style-clear/watch/current-position (1).png new file mode 100644 index 0000000000..d1868a2074 Binary files /dev/null and b/data/styles/clear/style-clear/watch/current-position (1).png differ diff --git a/data/styles/clear/style-clear/watch/current-position-compas (1).png b/data/styles/clear/style-clear/watch/current-position-compas (1).png new file mode 100644 index 0000000000..a5a032db69 Binary files /dev/null and b/data/styles/clear/style-clear/watch/current-position-compas (1).png differ diff --git a/data/styles/clear/style-clear/watch/current-routing-compas (1).png b/data/styles/clear/style-clear/watch/current-routing-compas (1).png new file mode 100644 index 0000000000..6ee3b649cd Binary files /dev/null and b/data/styles/clear/style-clear/watch/current-routing-compas (1).png differ diff --git a/data/styles/clear/style-clear/watch/placemark-blue (1).png b/data/styles/clear/style-clear/watch/placemark-blue (1).png new file mode 100644 index 0000000000..c2b686de90 Binary files /dev/null and b/data/styles/clear/style-clear/watch/placemark-blue (1).png differ diff --git a/data/styles/clear/style-clear/watch/placemark-brown (1).png b/data/styles/clear/style-clear/watch/placemark-brown (1).png new file mode 100644 index 0000000000..f638920852 Binary files /dev/null and b/data/styles/clear/style-clear/watch/placemark-brown (1).png differ diff --git a/data/styles/clear/style-clear/watch/placemark-green (1).png b/data/styles/clear/style-clear/watch/placemark-green (1).png new file mode 100644 index 0000000000..44b8857ff1 Binary files /dev/null and b/data/styles/clear/style-clear/watch/placemark-green (1).png differ diff --git a/data/styles/clear/style-clear/watch/placemark-orange (1).png b/data/styles/clear/style-clear/watch/placemark-orange (1).png new file mode 100644 index 0000000000..326ab640c4 Binary files /dev/null and b/data/styles/clear/style-clear/watch/placemark-orange (1).png differ diff --git a/data/styles/clear/style-clear/watch/placemark-pink (1).png b/data/styles/clear/style-clear/watch/placemark-pink (1).png new file mode 100644 index 0000000000..8553c98345 Binary files /dev/null and b/data/styles/clear/style-clear/watch/placemark-pink (1).png differ diff --git a/data/styles/clear/style-clear/watch/placemark-purple (1).png b/data/styles/clear/style-clear/watch/placemark-purple (1).png new file mode 100644 index 0000000000..878fbef6ac Binary files /dev/null and b/data/styles/clear/style-clear/watch/placemark-purple (1).png differ diff --git a/data/styles/clear/style-clear/watch/placemark-red (1).png b/data/styles/clear/style-clear/watch/placemark-red (1).png new file mode 100644 index 0000000000..33b159be2c Binary files /dev/null and b/data/styles/clear/style-clear/watch/placemark-red (1).png differ diff --git a/data/styles/clear/style-clear/watch/placemark-yellow (1).png b/data/styles/clear/style-clear/watch/placemark-yellow (1).png new file mode 100644 index 0000000000..55a61176ec Binary files /dev/null and b/data/styles/clear/style-clear/watch/placemark-yellow (1).png differ diff --git a/data/styles/clear/style-clear/watch/route_from (1).png b/data/styles/clear/style-clear/watch/route_from (1).png new file mode 100644 index 0000000000..6469d3a2b1 Binary files /dev/null and b/data/styles/clear/style-clear/watch/route_from (1).png differ diff --git a/data/styles/clear/style-clear/watch/route_to (1).png b/data/styles/clear/style-clear/watch/route_to (1).png new file mode 100644 index 0000000000..b7e2d64f66 Binary files /dev/null and b/data/styles/clear/style-clear/watch/route_to (1).png differ diff --git a/data/styles/clear/style-clear/watch/search-result (1).png b/data/styles/clear/style-clear/watch/search-result (1).png new file mode 100644 index 0000000000..ec3f99e18a Binary files /dev/null and b/data/styles/clear/style-clear/watch/search-result (1).png differ diff --git a/data/styles/clear/style-clear/watch/search-result-active (1).png b/data/styles/clear/style-clear/watch/search-result-active (1).png new file mode 100644 index 0000000000..942dfa2c3a Binary files /dev/null and b/data/styles/clear/style-clear/watch/search-result-active (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/api-result (1).png b/data/styles/clear/style-clear/xhdpi/api-result (1).png new file mode 100644 index 0000000000..9e05de31c7 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/api-result (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/compass-image (1).png b/data/styles/clear/style-clear/xhdpi/compass-image (1).png new file mode 100644 index 0000000000..d89b458e23 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/compass-image (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/current-position (1).png b/data/styles/clear/style-clear/xhdpi/current-position (1).png new file mode 100644 index 0000000000..72b70dc261 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/current-position (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/current-position-compas (1).png b/data/styles/clear/style-clear/xhdpi/current-position-compas (1).png new file mode 100644 index 0000000000..60f95a28f0 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/current-position-compas (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/current-routing-compas (1).png b/data/styles/clear/style-clear/xhdpi/current-routing-compas (1).png new file mode 100644 index 0000000000..cb6d23aac4 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/current-routing-compas (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/placemark-blue (1).png b/data/styles/clear/style-clear/xhdpi/placemark-blue (1).png new file mode 100644 index 0000000000..859cd49206 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/placemark-blue (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/placemark-brown (1).png b/data/styles/clear/style-clear/xhdpi/placemark-brown (1).png new file mode 100644 index 0000000000..4d519bc33e Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/placemark-brown (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/placemark-green (1).png b/data/styles/clear/style-clear/xhdpi/placemark-green (1).png new file mode 100644 index 0000000000..f8e37096c5 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/placemark-green (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/placemark-orange (1).png b/data/styles/clear/style-clear/xhdpi/placemark-orange (1).png new file mode 100644 index 0000000000..6c465b92bf Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/placemark-orange (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/placemark-pink (1).png b/data/styles/clear/style-clear/xhdpi/placemark-pink (1).png new file mode 100644 index 0000000000..7960e4aeef Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/placemark-pink (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/placemark-purple (1).png b/data/styles/clear/style-clear/xhdpi/placemark-purple (1).png new file mode 100644 index 0000000000..6ea0ae5620 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/placemark-purple (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/placemark-red (1).png b/data/styles/clear/style-clear/xhdpi/placemark-red (1).png new file mode 100644 index 0000000000..a0b5fa79db Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/placemark-red (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/placemark-yellow (1).png b/data/styles/clear/style-clear/xhdpi/placemark-yellow (1).png new file mode 100644 index 0000000000..8cc93b0523 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/placemark-yellow (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/route_from (1).png b/data/styles/clear/style-clear/xhdpi/route_from (1).png new file mode 100644 index 0000000000..3e2de72ae2 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route_from (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/route_to (1).png b/data/styles/clear/style-clear/xhdpi/route_to (1).png new file mode 100644 index 0000000000..71ac6ff4ec Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route_to (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/search-result (1).png b/data/styles/clear/style-clear/xhdpi/search-result (1).png new file mode 100644 index 0000000000..190fbb6992 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/search-result (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/search-result-active (1).png b/data/styles/clear/style-clear/xhdpi/search-result-active (1).png new file mode 100644 index 0000000000..38cb8a8fb7 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/search-result-active (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/watch-my-direction (1).png b/data/styles/clear/style-clear/xhdpi/watch-my-direction (1).png new file mode 100644 index 0000000000..a24ad35677 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/watch-my-direction (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/watch-my-position (1).png b/data/styles/clear/style-clear/xhdpi/watch-my-position (1).png new file mode 100644 index 0000000000..258fa395e3 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/watch-my-position (1).png differ diff --git a/data/styles/clear/style-clear/xhdpi/watch-search-result (1).png b/data/styles/clear/style-clear/xhdpi/watch-search-result (1).png new file mode 100644 index 0000000000..452e7e6df6 Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/watch-search-result (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/api-result (1).png b/data/styles/clear/style-clear/xxhdpi/api-result (1).png new file mode 100644 index 0000000000..6f33ed8066 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/api-result (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/compass-image (2).png b/data/styles/clear/style-clear/xxhdpi/compass-image (2).png new file mode 100644 index 0000000000..af76e028e9 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/compass-image (2).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/compass-image (3).png b/data/styles/clear/style-clear/xxhdpi/compass-image (3).png new file mode 100644 index 0000000000..af76e028e9 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/compass-image (3).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/current-position (1).png b/data/styles/clear/style-clear/xxhdpi/current-position (1).png new file mode 100644 index 0000000000..c8773cab39 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/current-position (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/current-position-compas (2).png b/data/styles/clear/style-clear/xxhdpi/current-position-compas (2).png new file mode 100644 index 0000000000..1855baa68c Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/current-position-compas (2).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/current-position-compas (3).png b/data/styles/clear/style-clear/xxhdpi/current-position-compas (3).png new file mode 100644 index 0000000000..1855baa68c Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/current-position-compas (3).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/current-routing-compas (1).png b/data/styles/clear/style-clear/xxhdpi/current-routing-compas (1).png new file mode 100644 index 0000000000..c841d09583 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/current-routing-compas (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-blue (1).png b/data/styles/clear/style-clear/xxhdpi/placemark-blue (1).png new file mode 100644 index 0000000000..ea84dc76d6 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-blue (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-brown (2).png b/data/styles/clear/style-clear/xxhdpi/placemark-brown (2).png new file mode 100644 index 0000000000..295ddf108e Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-brown (2).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-brown (3).png b/data/styles/clear/style-clear/xxhdpi/placemark-brown (3).png new file mode 100644 index 0000000000..295ddf108e Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-brown (3).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-green (1).png b/data/styles/clear/style-clear/xxhdpi/placemark-green (1).png new file mode 100644 index 0000000000..9629ac0be1 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-green (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-orange (2).png b/data/styles/clear/style-clear/xxhdpi/placemark-orange (2).png new file mode 100644 index 0000000000..ae08d5ac1a Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-orange (2).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-orange (3).png b/data/styles/clear/style-clear/xxhdpi/placemark-orange (3).png new file mode 100644 index 0000000000..ae08d5ac1a Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-orange (3).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-pink (1).png b/data/styles/clear/style-clear/xxhdpi/placemark-pink (1).png new file mode 100644 index 0000000000..17a0773b07 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-pink (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-purple (1).png b/data/styles/clear/style-clear/xxhdpi/placemark-purple (1).png new file mode 100644 index 0000000000..318a91733b Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-purple (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-red (2).png b/data/styles/clear/style-clear/xxhdpi/placemark-red (2).png new file mode 100644 index 0000000000..0f4253ea6e Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-red (2).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-red (3).png b/data/styles/clear/style-clear/xxhdpi/placemark-red (3).png new file mode 100644 index 0000000000..0f4253ea6e Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-red (3).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/placemark-yellow (1).png b/data/styles/clear/style-clear/xxhdpi/placemark-yellow (1).png new file mode 100644 index 0000000000..699caedd63 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/placemark-yellow (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/route_from (1).png b/data/styles/clear/style-clear/xxhdpi/route_from (1).png new file mode 100644 index 0000000000..3464497403 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route_from (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/route_to (1).png b/data/styles/clear/style-clear/xxhdpi/route_to (1).png new file mode 100644 index 0000000000..449b7be1b7 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route_to (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/search-result (1).png b/data/styles/clear/style-clear/xxhdpi/search-result (1).png new file mode 100644 index 0000000000..7d290ae012 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/search-result (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/search-result-active (1).png b/data/styles/clear/style-clear/xxhdpi/search-result-active (1).png new file mode 100644 index 0000000000..ae0742c19f Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/search-result-active (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/watch-my-direction (1).png b/data/styles/clear/style-clear/xxhdpi/watch-my-direction (1).png new file mode 100644 index 0000000000..d192bc09e2 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/watch-my-direction (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/watch-my-position (1).png b/data/styles/clear/style-clear/xxhdpi/watch-my-position (1).png new file mode 100644 index 0000000000..7e39ede702 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/watch-my-position (1).png differ diff --git a/data/styles/clear/style-clear/xxhdpi/watch-search-result (1).png b/data/styles/clear/style-clear/xxhdpi/watch-search-result (1).png new file mode 100644 index 0000000000..870b95fdfe Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/watch-search-result (1).png differ