diff --git a/data/World.mwm b/data/World.mwm index 286b0a1646..f9266f49a5 100644 Binary files a/data/World.mwm and b/data/World.mwm differ diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm index c48290f6b8..d951b452d6 100644 Binary files a/data/WorldCoasts.mwm and b/data/WorldCoasts.mwm differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 44ed675462..f35985847f 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -5,7 +5,7 @@ cont { lines { width: 0.5 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -23,7 +23,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -31,7 +31,7 @@ cont { lines { width: 0.5 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -49,7 +49,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -58,7 +58,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -66,7 +66,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -84,7 +84,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -93,7 +93,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -101,7 +101,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -119,7 +119,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -128,7 +128,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -136,7 +136,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -154,7 +154,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -163,7 +163,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -195,7 +195,7 @@ cont { lines { width: 0.5 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -213,7 +213,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -221,7 +221,7 @@ cont { lines { width: 0.5 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -239,7 +239,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -248,7 +248,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -256,7 +256,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -274,7 +274,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -283,7 +283,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -291,7 +291,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -309,7 +309,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -318,7 +318,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -326,7 +326,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -344,7 +344,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -353,7 +353,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -385,7 +385,7 @@ cont { lines { width: 0.5 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -403,7 +403,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -411,7 +411,7 @@ cont { lines { width: 0.5 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -429,7 +429,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -438,7 +438,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -446,7 +446,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -464,7 +464,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -473,7 +473,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -481,7 +481,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -499,7 +499,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -508,7 +508,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -516,7 +516,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -534,7 +534,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -543,7 +543,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -575,7 +575,7 @@ cont { lines { width: 0.5 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -593,7 +593,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -601,7 +601,7 @@ cont { lines { width: 0.5 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -619,7 +619,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -628,7 +628,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -636,7 +636,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -654,7 +654,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -663,7 +663,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -671,7 +671,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -689,7 +689,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -698,7 +698,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -706,7 +706,7 @@ cont { lines { width: 1.0 color: 7829367 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -724,7 +724,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -733,7 +733,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -765,7 +765,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -773,7 +773,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -782,7 +782,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -790,7 +790,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -799,7 +799,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -807,7 +807,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -816,7 +816,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -824,7 +824,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -833,7 +833,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -841,7 +841,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -850,7 +850,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15914 + priority: 15928 } } } @@ -874,11 +874,11 @@ cont { scale: 14 area { color: 13484259 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -887,18 +887,18 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15957 + priority: 15971 } } element { scale: 15 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -914,18 +914,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 16 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -941,18 +941,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 17 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -968,18 +968,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 18 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -995,18 +995,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 19 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1022,7 +1022,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -1032,11 +1032,11 @@ cont { scale: 10 area { color: 13942770 - priority: -15043 + priority: -15029 } symbol { name: "airport-s" - priority: 16957 + priority: 16971 } caption { primary { @@ -1045,18 +1045,18 @@ cont { stroke_color: 2164260863 offset_y: 7 } - priority: 15957 + priority: 15971 } } element { scale: 11 area { color: 13942770 - priority: -15043 + priority: -15029 } symbol { name: "airport-m" - priority: 16957 + priority: 16971 } caption { primary { @@ -1072,18 +1072,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 12 area { color: 13746411 - priority: -15043 + priority: -15029 } symbol { name: "airport-m" - priority: 16957 + priority: 16971 } caption { primary { @@ -1099,18 +1099,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 13 area { color: 13615592 - priority: -15043 + priority: -15029 } symbol { name: "airport-m" - priority: 16957 + priority: 16971 } caption { primary { @@ -1126,18 +1126,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 14 area { color: 13484259 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1153,18 +1153,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 15 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1180,18 +1180,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 16 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1207,18 +1207,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 17 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1234,18 +1234,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 18 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1261,18 +1261,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 19 area { color: 13155550 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1288,7 +1288,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -1298,7 +1298,7 @@ cont { scale: 17 symbol { name: "heliport-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -1306,14 +1306,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "heliport-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -1321,14 +1321,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "heliport-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -1336,7 +1336,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -1590,7 +1590,7 @@ cont { scale: 18 symbol { name: "atm-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1598,14 +1598,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "atm-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1613,7 +1613,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -1623,7 +1623,7 @@ cont { scale: 17 symbol { name: "bank-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1631,14 +1631,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "bank-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1646,14 +1646,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "bank-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1661,7 +1661,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -1671,7 +1671,7 @@ cont { scale: 18 symbol { name: "beer-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1679,14 +1679,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "beer-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1694,7 +1694,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -1723,14 +1723,14 @@ cont { symbol { name: "bench" apply_for_type: 1 - priority: 16871 + priority: 16885 } } element { scale: 19 symbol { name: "bench" - priority: 16871 + priority: 16885 } caption { primary { @@ -1738,7 +1738,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -1748,7 +1748,7 @@ cont { scale: 17 symbol { name: "bicycle-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1756,14 +1756,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "bicycle-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1771,14 +1771,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "bicycle-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1786,7 +1786,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -1815,7 +1815,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -1823,14 +1823,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "banknote-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1838,7 +1838,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -1856,7 +1856,7 @@ cont { scale: 16 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -1872,14 +1872,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -1895,14 +1895,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -1918,14 +1918,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "none" - priority: 16928 + priority: 16942 } caption { primary { @@ -1941,7 +1941,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15928 + priority: 15942 } } } @@ -1951,7 +1951,7 @@ cont { scale: 16 symbol { name: "cafe-m" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -1960,14 +1960,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "cafe-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1975,14 +1975,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "cafe-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1990,14 +1990,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "cafe-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2005,7 +2005,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -2087,7 +2087,7 @@ cont { scale: 16 symbol { name: "hospital-m" - priority: 16871 + priority: 16885 } caption { primary { @@ -2095,14 +2095,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 17 symbol { name: "hospital-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2110,14 +2110,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 18 symbol { name: "hospital-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2125,14 +2125,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 19 symbol { name: "hospital-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2140,7 +2140,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -2150,7 +2150,7 @@ cont { scale: 16 symbol { name: "college-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -2158,14 +2158,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "college-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2173,14 +2173,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "college-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2188,14 +2188,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "college-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2203,7 +2203,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -2249,21 +2249,21 @@ cont { scale: 17 symbol { name: "drinking-water-l" - priority: 16871 + priority: 16885 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16871 + priority: 16885 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2271,7 +2271,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -2281,7 +2281,7 @@ cont { scale: 17 symbol { name: "embassy-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2289,14 +2289,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "embassy-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2304,14 +2304,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "embassy-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2319,7 +2319,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -2329,7 +2329,7 @@ cont { scale: 18 symbol { name: "fastfood-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2337,14 +2337,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "fastfood-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2352,7 +2352,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -2363,7 +2363,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } } element { @@ -2371,7 +2371,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } } element { @@ -2379,7 +2379,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -2388,7 +2388,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15928 + priority: 15942 } } element { @@ -2396,7 +2396,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -2405,7 +2405,7 @@ cont { stroke_color: 2164260863 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -2413,7 +2413,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -2422,14 +2422,14 @@ cont { stroke_color: 2164260863 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "none" - priority: 16928 + priority: 16942 } caption { primary { @@ -2438,17 +2438,17 @@ cont { stroke_color: 2164260863 offset_y: 10 } - priority: 15928 + priority: 15942 } } } cont { name: "amenity-fire_station" element { - scale: 19 + scale: 18 symbol { - name: "none" - priority: 16000 + name: "fire_station-l" + priority: 16900 } caption { primary { @@ -2456,7 +2456,22 @@ cont { color: 4473924 offset_y: 10 } - priority: 15000 + priority: 15900 + } + } + element { + scale: 19 + symbol { + name: "none" + priority: 16900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15900 } } } @@ -2466,18 +2481,18 @@ cont { scale: 16 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 9163744 - priority: 1886 + priority: -15100 } symbol { name: "fountain-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2485,18 +2500,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 9163744 - priority: 1886 + priority: -15100 } symbol { name: "fountain-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2504,18 +2519,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 9163744 - priority: 1886 + priority: -15100 } symbol { name: "fountain-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2523,7 +2538,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -2533,7 +2548,7 @@ cont { scale: 17 symbol { name: "fuel-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2541,14 +2556,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "fuel-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2556,14 +2571,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "fuel-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2571,7 +2586,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -2757,11 +2772,11 @@ cont { scale: 16 area { color: 15453902 - priority: -15072 + priority: -15058 } symbol { name: "hospital-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -2769,18 +2784,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 area { color: 15453902 - priority: -15072 + priority: -15058 } symbol { name: "hospital-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -2788,18 +2803,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 area { color: 15453902 - priority: -15072 + priority: -15058 } symbol { name: "hospital-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -2807,18 +2822,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 area { color: 15453902 - priority: -15072 + priority: -15058 } symbol { name: "hospital-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -2826,7 +2841,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -2837,7 +2852,7 @@ cont { symbol { name: "hunting-tower-m" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -2845,7 +2860,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -2853,7 +2868,7 @@ cont { symbol { name: "hunting-tower-m" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -2861,7 +2876,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -2869,7 +2884,7 @@ cont { symbol { name: "hunting-tower-m" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -2877,14 +2892,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "hunting-tower-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2892,14 +2907,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "hunting-tower-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2907,7 +2922,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -2932,7 +2947,7 @@ cont { scale: 18 symbol { name: "kindergarten-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2940,14 +2955,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 19 symbol { name: "kindergarten-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2955,7 +2970,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -2966,7 +2981,7 @@ cont { symbol { name: "library-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -2974,14 +2989,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "library-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2989,7 +3004,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -3017,7 +3032,7 @@ cont { scale: 18 symbol { name: "bar-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3025,14 +3040,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "bar-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3040,7 +3055,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -3057,23 +3072,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3081,18 +3096,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3100,7 +3115,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3117,23 +3132,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3141,18 +3156,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3160,7 +3175,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3177,23 +3192,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3201,18 +3216,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3220,7 +3235,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3237,23 +3252,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3261,18 +3276,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3280,7 +3295,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3297,23 +3312,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3321,18 +3336,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3340,7 +3355,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3357,23 +3372,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3381,18 +3396,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3400,7 +3415,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3417,23 +3432,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "zero-icon" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3441,18 +3456,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3460,7 +3475,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3477,23 +3492,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "zero-icon" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3501,18 +3516,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3520,7 +3535,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3537,23 +3552,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "zero-icon" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3561,18 +3576,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3580,7 +3595,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3597,23 +3612,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3621,18 +3636,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3640,7 +3655,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3657,23 +3672,23 @@ cont { scale: 17 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3681,18 +3696,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 15921870 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3700,7 +3715,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3710,7 +3725,7 @@ cont { scale: 18 symbol { name: "pharmacy-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3718,14 +3733,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "pharmacy-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3733,7 +3748,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -3743,11 +3758,11 @@ cont { scale: 16 area { color: 16316664 - priority: -15086 + priority: -15072 } symbol { name: "place-of-worship-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -3755,18 +3770,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 area { color: 16316664 - priority: -15086 + priority: -15072 } symbol { name: "place-of-worship-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3774,18 +3789,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 area { color: 16316664 - priority: -15086 + priority: -15072 } symbol { name: "place-of-worship-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3793,18 +3808,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 area { color: 16316664 - priority: -15086 + priority: -15072 } symbol { name: "place-of-worship-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3812,7 +3827,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -3822,7 +3837,7 @@ cont { scale: 17 symbol { name: "police-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3830,14 +3845,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "police-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3845,14 +3860,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "police-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3860,7 +3875,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -3889,7 +3904,7 @@ cont { symbol { name: "mail-l" apply_for_type: 1 - priority: 16871 + priority: 16885 } caption { primary { @@ -3897,7 +3912,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { @@ -3905,7 +3920,7 @@ cont { symbol { name: "mail-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } caption { primary { @@ -3913,14 +3928,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 19 symbol { name: "mail-m" - priority: 16871 + priority: 16885 } caption { primary { @@ -3928,7 +3943,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -3938,7 +3953,7 @@ cont { scale: 18 symbol { name: "beer-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3946,14 +3961,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "beer-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3961,7 +3976,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -3971,7 +3986,7 @@ cont { scale: 19 symbol { name: "recycling-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3979,7 +3994,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -3989,7 +4004,7 @@ cont { scale: 16 symbol { name: "restaurant-m" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -3998,14 +4013,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4013,14 +4028,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4028,14 +4043,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4043,7 +4058,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -4053,7 +4068,7 @@ cont { scale: 16 symbol { name: "restaurant-m" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -4062,14 +4077,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4077,14 +4092,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4092,14 +4107,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4107,7 +4122,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -4117,7 +4132,7 @@ cont { scale: 16 symbol { name: "restaurant-m" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -4126,14 +4141,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4141,14 +4156,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4156,14 +4171,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4171,7 +4186,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -4181,7 +4196,7 @@ cont { scale: 17 symbol { name: "school-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4189,14 +4204,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "school-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4204,14 +4219,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "school-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4219,7 +4234,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4229,7 +4244,7 @@ cont { scale: 17 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4237,14 +4252,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4252,14 +4267,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "none" - priority: 16885 + priority: 16900 } caption { primary { @@ -4267,7 +4282,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4313,7 +4328,7 @@ cont { scale: 19 symbol { name: "phone-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4321,7 +4336,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4331,7 +4346,7 @@ cont { scale: 16 symbol { name: "theatre-l" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -4340,14 +4355,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "theatre-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4355,14 +4370,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "theatre-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4370,14 +4385,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "theatre-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4385,7 +4400,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -4395,7 +4410,7 @@ cont { scale: 18 symbol { name: "toilets-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4403,14 +4418,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "toilets-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4418,7 +4433,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4453,12 +4468,12 @@ cont { scale: 15 area { color: 15456432 - priority: -15072 + priority: -15986 } symbol { name: "college-m" apply_for_type: 1 - priority: 16928 + priority: 16014 min_distance: 12 } caption { @@ -4467,7 +4482,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15014 } apply_if: "name" } @@ -4475,7 +4490,7 @@ cont { scale: 15 area { color: 15456432 - priority: -15072 + priority: -15058 } caption { primary { @@ -4483,7 +4498,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } apply_if: "!name" } @@ -4491,11 +4506,11 @@ cont { scale: 16 area { color: 15456432 - priority: -15086 + priority: -15986 } symbol { name: "college-m" - priority: 16914 + priority: 16014 min_distance: 11 } caption { @@ -4504,7 +4519,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15014 } apply_if: "name" } @@ -4512,12 +4527,12 @@ cont { scale: 16 area { color: 15456432 - priority: -15086 + priority: -15986 } symbol { name: "college-m" apply_for_type: 1 - priority: 16914 + priority: 16014 min_distance: 11 } caption { @@ -4526,7 +4541,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15014 } apply_if: "!name" } @@ -4534,11 +4549,11 @@ cont { scale: 17 area { color: 15456432 - priority: -15115 + priority: -15100 } symbol { name: "college-l" - priority: 16885 + priority: 16900 min_distance: 10 } caption { @@ -4547,7 +4562,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "name" } @@ -4555,12 +4570,12 @@ cont { scale: 17 area { color: 15456432 - priority: -15115 + priority: -15100 } symbol { name: "college-l" apply_for_type: 1 - priority: 16885 + priority: 16900 min_distance: 10 } caption { @@ -4569,7 +4584,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "!name" } @@ -4577,11 +4592,11 @@ cont { scale: 18 area { color: 15456432 - priority: -15115 + priority: -15100 } symbol { name: "college-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4589,7 +4604,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "name" } @@ -4597,12 +4612,12 @@ cont { scale: 18 area { color: 15456432 - priority: -15115 + priority: -15100 } symbol { name: "college-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -4610,7 +4625,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "!name" } @@ -4618,11 +4633,11 @@ cont { scale: 19 area { color: 15456432 - priority: -15115 + priority: -15100 } symbol { name: "college-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4630,7 +4645,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "name" } @@ -4638,11 +4653,11 @@ cont { scale: 19 area { color: 15456432 - priority: -15115 + priority: -15100 } symbol { name: "college-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4650,7 +4665,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "!name" } @@ -4661,7 +4676,7 @@ cont { scale: 18 symbol { name: "recycling-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4669,14 +4684,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "recycling-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4684,7 +4699,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4900,7 +4915,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4908,7 +4923,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -4916,7 +4931,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4924,7 +4939,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -4932,7 +4947,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4940,7 +4955,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -4948,7 +4963,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4956,7 +4971,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -4964,7 +4979,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4972,7 +4987,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -6474,14 +6489,14 @@ cont { scale: 17 symbol { name: "bus-m" - priority: 16928 + priority: 16942 } } element { scale: 18 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } path_text { primary { @@ -6497,14 +6512,14 @@ cont { offset_y: 10 text: "int_name" } - priority: 16928 + priority: 16942 } } element { scale: 19 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } path_text { primary { @@ -6520,7 +6535,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 16928 + priority: 16942 } } } @@ -17943,7 +17958,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } } element { @@ -17951,7 +17966,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } } element { @@ -17959,7 +17974,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } } element { @@ -17967,7 +17982,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } } } @@ -22952,7 +22967,7 @@ cont { scale: 17 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -22960,14 +22975,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -22975,14 +22990,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -22990,7 +23005,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -23000,7 +23015,7 @@ cont { scale: 16 symbol { name: "remains-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -23008,14 +23023,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23023,14 +23038,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23038,14 +23053,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23053,7 +23068,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -23122,7 +23137,7 @@ cont { scale: 17 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23130,14 +23145,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23145,14 +23160,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23160,7 +23175,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -23170,7 +23185,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -23178,14 +23193,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23193,14 +23208,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23208,14 +23223,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23223,7 +23238,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -23233,7 +23248,7 @@ cont { scale: 16 symbol { name: "museum-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -23241,14 +23256,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23256,14 +23271,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23271,14 +23286,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23286,7 +23301,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -23296,7 +23311,7 @@ cont { scale: 17 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23304,14 +23319,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23319,14 +23334,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23334,7 +23349,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -23441,42 +23456,42 @@ cont { scale: 17 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } } @@ -23486,56 +23501,56 @@ cont { scale: 12 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 13 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 15 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 16 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 18 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 19 area { color: 9163744 - priority: 1229 + priority: -15772 } } } @@ -23903,42 +23918,42 @@ cont { scale: 17 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } } @@ -27264,49 +27279,49 @@ cont { scale: 13 area { color: 13620648 - priority: 1186 + priority: -15815 } } element { scale: 14 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 15 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 16 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 17 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 18 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 19 area { color: 13029267 - priority: 1186 + priority: -15815 } } } @@ -27531,42 +27546,42 @@ cont { scale: 17 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } } @@ -27618,42 +27633,42 @@ cont { scale: 17 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } } @@ -27685,7 +27700,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -27700,7 +27715,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27708,7 +27723,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27716,7 +27731,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -27731,7 +27746,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27739,7 +27754,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27747,7 +27762,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -27762,7 +27777,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27770,7 +27785,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27778,7 +27793,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -27793,7 +27808,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27801,7 +27816,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27809,7 +27824,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -27824,7 +27839,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27832,7 +27847,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27840,7 +27855,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -27855,7 +27870,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27863,7 +27878,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27871,7 +27886,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -27886,7 +27901,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27894,7 +27909,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27902,7 +27917,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -27917,7 +27932,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27925,7 +27940,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -28030,42 +28045,42 @@ cont { scale: 17 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 13029267 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 5855577 + color: 4473924 } - priority: 15814 + priority: 15142 } } } @@ -28122,7 +28137,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -28130,7 +28145,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -28138,7 +28153,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -28146,7 +28161,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -28154,7 +28169,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -28162,7 +28177,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -28389,35 +28404,35 @@ cont { scale: 13 area { color: 13620648 - priority: 1186 + priority: -15815 } } element { scale: 14 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 15 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 16 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 17 area { color: 13029267 - priority: 1215 + priority: -15786 } symbol { name: "golf-l" @@ -28429,7 +28444,7 @@ cont { scale: 18 area { color: 13029267 - priority: 1215 + priority: -15786 } symbol { name: "golf-l" @@ -28447,7 +28462,7 @@ cont { scale: 19 area { color: 13029267 - priority: 1215 + priority: -15786 } symbol { name: "golf-l" @@ -28505,11 +28520,11 @@ cont { scale: 12 area { color: 12372094 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -28518,18 +28533,18 @@ cont { stroke_color: 16777215 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 13 area { color: 11781233 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -28538,18 +28553,18 @@ cont { stroke_color: 16777215 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 14 area { color: 11453035 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -28558,18 +28573,18 @@ cont { stroke_color: 16777215 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 15 area { color: 11584112 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -28578,18 +28593,18 @@ cont { stroke_color: 16777215 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 area { color: 11190117 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -28598,18 +28613,18 @@ cont { stroke_color: 16777215 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 area { color: 11190117 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -28618,18 +28633,18 @@ cont { stroke_color: 16777215 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 18 area { color: 11190117 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -28638,18 +28653,18 @@ cont { stroke_color: 16777215 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 19 area { color: 11190117 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -28658,7 +28673,7 @@ cont { stroke_color: 16777215 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -32159,12 +32174,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32172,19 +32187,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32192,19 +32207,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32212,7 +32227,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32229,12 +32244,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32242,19 +32257,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32262,19 +32277,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32282,7 +32297,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32292,50 +32307,50 @@ cont { scale: 17 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } } element { scale: 18 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { height: 10 color: 4473924 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { height: 10 color: 4473924 } - priority: 15885 + priority: 15900 } } } @@ -32345,12 +32360,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32358,19 +32373,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32378,19 +32393,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32398,7 +32413,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32409,7 +32424,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32417,7 +32432,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -32425,7 +32440,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32433,7 +32448,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -32441,7 +32456,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32449,7 +32464,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32506,7 +32521,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -32514,7 +32529,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -32522,7 +32537,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -32530,7 +32545,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -32538,7 +32553,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -32546,7 +32561,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -32563,12 +32578,12 @@ cont { scale: 16 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-m" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32576,19 +32591,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 17 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32596,19 +32611,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32616,19 +32631,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32636,7 +32651,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32646,76 +32661,76 @@ cont { scale: 13 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 15 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 16 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 9163744 - priority: 1915 + priority: -15072 } symbol { name: "swimming-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { scale: 18 area { color: 9163744 - priority: 1915 + priority: -15072 } symbol { name: "swimming-l" - priority: 16914 + priority: 16928 } caption { primary { height: 10 color: 4473924 } - priority: 15914 + priority: 15928 } } element { scale: 19 area { color: 9163744 - priority: 1915 + priority: -15072 } symbol { name: "swimming-l" - priority: 16914 + priority: 16928 } caption { primary { height: 10 color: 4473924 } - priority: 15914 + priority: 15928 } } } @@ -32771,14 +32786,14 @@ cont { scale: 12 area { color: 14934482 - priority: 1272 + priority: -15729 } } element { scale: 13 area { color: 14934482 - priority: 1272 + priority: -15729 } } element { @@ -32792,7 +32807,7 @@ cont { } area { color: 14934482 - priority: 1272 + priority: -15729 } } element { @@ -32806,7 +32821,7 @@ cont { } area { color: 14934482 - priority: 1272 + priority: -15729 } } element { @@ -32820,7 +32835,7 @@ cont { } area { color: 14934482 - priority: 1272 + priority: -15729 } } element { @@ -32834,7 +32849,7 @@ cont { } area { color: 14934482 - priority: 1672 + priority: -15329 } caption { primary { @@ -32855,7 +32870,7 @@ cont { } area { color: 14934482 - priority: 1672 + priority: -15329 } caption { primary { @@ -32876,7 +32891,7 @@ cont { } area { color: 14934482 - priority: 1672 + priority: -15329 } caption { primary { @@ -32893,7 +32908,7 @@ cont { scale: 15 symbol { name: "lighthouse-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -32901,14 +32916,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "lighthouse-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -32916,14 +32931,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "lighthouse-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -32931,14 +32946,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "lighthouse-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -32946,14 +32961,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "lighthouse-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -32961,7 +32976,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -32971,14 +32986,14 @@ cont { scale: 12 area { color: 14934482 - priority: 1272 + priority: -15729 } } element { scale: 13 area { color: 14934482 - priority: 1272 + priority: -15729 } } element { @@ -32992,7 +33007,7 @@ cont { } area { color: 14934482 - priority: 1272 + priority: -15729 } } element { @@ -33006,7 +33021,7 @@ cont { } area { color: 14934482 - priority: 1272 + priority: -15729 } } element { @@ -33020,7 +33035,7 @@ cont { } area { color: 14934482 - priority: 1272 + priority: -15729 } } element { @@ -33034,7 +33049,7 @@ cont { } area { color: 14934482 - priority: 1672 + priority: -15329 } caption { primary { @@ -33055,7 +33070,7 @@ cont { } area { color: 14934482 - priority: 1672 + priority: -15329 } caption { primary { @@ -33076,7 +33091,7 @@ cont { } area { color: 14934482 - priority: 1672 + priority: -15329 } caption { primary { @@ -33093,7 +33108,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -33101,14 +33116,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -33116,14 +33131,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -33131,14 +33146,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -33146,14 +33161,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -33161,7 +33176,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -33171,35 +33186,35 @@ cont { scale: 10 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 11 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 12 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 13 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 9163744 - priority: 1229 + priority: -15772 } caption { primary { @@ -33213,7 +33228,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1229 + priority: -15772 } caption { primary { @@ -33227,7 +33242,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1229 + priority: -15772 } caption { primary { @@ -33241,7 +33256,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1229 + priority: -15772 } caption { primary { @@ -33255,7 +33270,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1229 + priority: -15772 } caption { primary { @@ -33269,7 +33284,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1229 + priority: -15772 } caption { primary { @@ -33458,7 +33473,7 @@ cont { symbol { name: "cave-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33466,7 +33481,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33474,7 +33489,7 @@ cont { symbol { name: "cave-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33482,7 +33497,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33490,7 +33505,7 @@ cont { symbol { name: "cave-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33498,7 +33513,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33506,7 +33521,7 @@ cont { symbol { name: "cave-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33514,7 +33529,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33522,7 +33537,7 @@ cont { symbol { name: "cave-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33530,7 +33545,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33538,7 +33553,7 @@ cont { symbol { name: "cave-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33546,7 +33561,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33554,7 +33569,7 @@ cont { symbol { name: "cave-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33562,7 +33577,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33570,7 +33585,7 @@ cont { symbol { name: "cave-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33578,7 +33593,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -33588,140 +33603,140 @@ cont { scale: 0 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 1 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 2 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 3 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 4 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 5 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 6 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 7 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 8 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 9 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 10 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 11 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 12 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 13 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 14 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 15 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 16 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 17 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 18 area { color: 9163744 - priority: -16728 + priority: -16714 } } element { scale: 19 area { color: 9163744 - priority: -16728 + priority: -16714 } } } @@ -33731,140 +33746,140 @@ cont { scale: 0 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 1 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 2 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 3 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 4 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 5 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 6 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 7 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 8 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 9 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 10 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 11 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 12 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 13 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 14 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 15 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 16 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 17 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 18 area { color: 16777215 - priority: 1015 + priority: -15986 } } element { scale: 19 area { color: 16777215 - priority: 1015 + priority: -15986 } } } @@ -33874,49 +33889,49 @@ cont { scale: 13 area { color: 13620648 - priority: 1186 + priority: -15815 } } element { scale: 14 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 15 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 16 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 17 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 18 area { color: 13029267 - priority: 1186 + priority: -15815 } } element { scale: 19 area { color: 13029267 - priority: 1186 + priority: -15815 } } } @@ -33926,77 +33941,77 @@ cont { scale: 0 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 10 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34011,7 +34026,7 @@ cont { scale: 10 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34019,7 +34034,7 @@ cont { scale: 11 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34034,7 +34049,7 @@ cont { scale: 11 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34042,7 +34057,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34057,7 +34072,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34065,7 +34080,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34073,7 +34088,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34088,7 +34103,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34096,7 +34111,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34104,7 +34119,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34119,7 +34134,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34127,7 +34142,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34135,7 +34150,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34150,7 +34165,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34158,7 +34173,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34166,7 +34181,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34181,7 +34196,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34189,7 +34204,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34197,7 +34212,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34212,7 +34227,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34220,7 +34235,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34228,7 +34243,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34243,7 +34258,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34251,7 +34266,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34259,7 +34274,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -34274,7 +34289,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34282,7 +34297,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34293,140 +34308,140 @@ cont { scale: 0 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 1 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 2 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 3 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 4 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 5 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 6 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 7 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 8 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 9 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 10 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 11 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 12 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 13 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 14 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 15 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 16 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 17 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 18 area { color: 14934482 - priority: 1001 + priority: -16700 } } element { scale: 19 area { color: 14934482 - priority: 1001 + priority: -16700 } } } @@ -34436,7 +34451,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16928 + priority: 16942 } apply_if: "name" } @@ -34444,7 +34459,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16928 + priority: 16942 } apply_if: "name" } @@ -34452,7 +34467,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34460,7 +34475,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15928 + priority: 15942 } apply_if: "name" } @@ -34468,7 +34483,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34476,7 +34491,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15928 + priority: 15942 } apply_if: "name" } @@ -34484,7 +34499,7 @@ cont { scale: 14 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34492,7 +34507,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15928 + priority: 15942 } apply_if: "name" } @@ -34500,7 +34515,7 @@ cont { scale: 14 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34508,7 +34523,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15928 + priority: 15942 } apply_if: "name" } @@ -34516,7 +34531,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34524,14 +34539,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34539,14 +34554,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34554,14 +34569,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34569,14 +34584,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34584,7 +34599,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -34594,140 +34609,140 @@ cont { scale: 0 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 10 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 11 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 12 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 13 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 15 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 16 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 18 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 19 area { color: 9163744 - priority: 1229 + priority: -15772 } } } @@ -34737,7 +34752,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34745,14 +34760,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34760,14 +34775,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34775,14 +34790,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34790,14 +34805,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34805,7 +34820,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -34868,7 +34883,7 @@ cont { symbol { name: "drinking-water-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -34876,14 +34891,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "drinking-water-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34891,14 +34906,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "drinking-water-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34906,14 +34921,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -34921,14 +34936,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -34936,7 +34951,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -34946,7 +34961,7 @@ cont { scale: 10 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34954,14 +34969,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 11 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34969,14 +34984,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 12 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34984,14 +34999,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 13 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34999,14 +35014,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 14 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -35014,14 +35029,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 15 symbol { name: "volcano-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -35029,14 +35044,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "volcano-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -35044,14 +35059,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "volcano-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35059,14 +35074,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "volcano-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35074,14 +35089,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "volcano-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35089,7 +35104,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -35099,77 +35114,77 @@ cont { scale: 0 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 10 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35184,7 +35199,7 @@ cont { scale: 10 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -35192,7 +35207,7 @@ cont { scale: 11 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35207,7 +35222,7 @@ cont { scale: 11 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -35215,7 +35230,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35230,7 +35245,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -35238,7 +35253,7 @@ cont { scale: 12 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -35246,7 +35261,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35261,7 +35276,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -35269,7 +35284,7 @@ cont { scale: 13 area { color: 9163744 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -35277,7 +35292,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35292,7 +35307,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1358 + priority: -15643 } caption { primary { @@ -35307,7 +35322,7 @@ cont { scale: 14 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35322,7 +35337,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35337,7 +35352,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1358 + priority: -15643 } caption { primary { @@ -35352,7 +35367,7 @@ cont { scale: 15 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35367,7 +35382,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35382,7 +35397,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1358 + priority: -15643 } caption { primary { @@ -35397,7 +35412,7 @@ cont { scale: 16 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35412,7 +35427,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35427,7 +35442,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1358 + priority: -15643 } caption { primary { @@ -35442,7 +35457,7 @@ cont { scale: 17 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35457,7 +35472,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35472,7 +35487,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1358 + priority: -15643 } caption { primary { @@ -35487,7 +35502,7 @@ cont { scale: 18 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35502,7 +35517,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35517,7 +35532,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1358 + priority: -15643 } caption { primary { @@ -35532,7 +35547,7 @@ cont { scale: 19 area { color: 9163744 - priority: 1858 + priority: -15143 } caption { primary { @@ -35550,7 +35565,7 @@ cont { scale: 12 symbol { name: "waterfall-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -35558,14 +35573,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 13 symbol { name: "waterfall-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -35573,14 +35588,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 14 symbol { name: "waterfall-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -35588,14 +35603,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 15 symbol { name: "waterfall-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -35603,14 +35618,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "waterfall-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -35618,14 +35633,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "waterfall-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35633,14 +35648,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "waterfall-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35648,14 +35663,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "waterfall-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35663,7 +35678,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -35673,63 +35688,63 @@ cont { scale: 11 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 12 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 13 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 14 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 15 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 16 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 17 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 18 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 19 area { color: 3012285408 - priority: 1201 + priority: -15800 } } } @@ -35739,63 +35754,63 @@ cont { scale: 11 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 12 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 13 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 14 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 15 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 16 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 17 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 18 area { color: 3012285408 - priority: 1201 + priority: -15800 } } element { scale: 19 area { color: 3012285408 - priority: 1201 + priority: -15800 } } } @@ -36097,7 +36112,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36105,14 +36120,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36120,7 +36135,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36130,7 +36145,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36138,14 +36153,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36153,7 +36168,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36163,7 +36178,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36171,14 +36186,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36186,7 +36201,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36196,7 +36211,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36204,14 +36219,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36219,7 +36234,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36229,7 +36244,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36237,14 +36252,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36252,7 +36267,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36262,7 +36277,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36270,14 +36285,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36285,7 +36300,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -43003,7 +43018,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43019,7 +43034,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43027,7 +43042,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43043,7 +43058,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43051,7 +43066,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43067,7 +43082,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43075,7 +43090,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43091,7 +43106,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43099,7 +43114,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43115,7 +43130,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43123,7 +43138,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43139,7 +43154,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -44874,7 +44889,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44890,7 +44905,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44898,7 +44913,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44914,7 +44929,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44922,7 +44937,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44938,7 +44953,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44946,7 +44961,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44962,7 +44977,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44970,7 +44985,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44986,7 +45001,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44994,7 +45009,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45010,7 +45025,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -45021,7 +45036,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45037,7 +45052,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45045,7 +45060,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45061,7 +45076,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45069,7 +45084,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45085,7 +45100,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45093,7 +45108,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45109,7 +45124,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45117,7 +45132,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45133,7 +45148,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45141,7 +45156,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45157,7 +45172,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -45168,7 +45183,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45184,7 +45199,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45192,7 +45207,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45208,7 +45223,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45216,7 +45231,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45232,7 +45247,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45240,7 +45255,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45256,7 +45271,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45264,7 +45279,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45280,7 +45295,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45288,7 +45303,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45304,7 +45319,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -45315,7 +45330,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45331,7 +45346,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45339,7 +45354,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45355,7 +45370,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45363,7 +45378,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45379,7 +45394,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45387,7 +45402,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45403,7 +45418,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45411,7 +45426,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45427,7 +45442,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45435,7 +45450,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45451,7 +45466,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -45462,7 +45477,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45478,7 +45493,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45486,7 +45501,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45502,7 +45517,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45510,7 +45525,7 @@ cont { symbol { name: "subway-barcelona-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45526,7 +45541,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45534,7 +45549,7 @@ cont { symbol { name: "subway-barcelona-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45550,7 +45565,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45558,7 +45573,7 @@ cont { symbol { name: "subway-barcelona-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45574,7 +45589,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45582,7 +45597,7 @@ cont { symbol { name: "subway-barcelona-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45598,7 +45613,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -45609,7 +45624,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45625,7 +45640,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45633,7 +45648,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45649,7 +45664,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45657,7 +45672,7 @@ cont { symbol { name: "subway-berlin-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45673,7 +45688,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45681,7 +45696,7 @@ cont { symbol { name: "subway-berlin-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45697,7 +45712,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45705,7 +45720,7 @@ cont { symbol { name: "subway-berlin-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45721,7 +45736,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45729,7 +45744,7 @@ cont { symbol { name: "subway-berlin-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45745,7 +45760,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -45756,7 +45771,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45772,7 +45787,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45780,7 +45795,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45796,7 +45811,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45804,7 +45819,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45820,7 +45835,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45828,7 +45843,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45844,7 +45859,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45852,7 +45867,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45868,7 +45883,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45876,7 +45891,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45892,7 +45907,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -45903,7 +45918,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45919,7 +45934,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45927,7 +45942,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45943,7 +45958,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45951,7 +45966,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45967,7 +45982,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45975,7 +45990,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45991,7 +46006,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45999,7 +46014,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46015,7 +46030,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46023,7 +46038,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46039,7 +46054,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46050,7 +46065,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46066,7 +46081,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46074,7 +46089,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46090,7 +46105,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46098,7 +46113,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46114,7 +46129,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46122,7 +46137,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46138,7 +46153,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46146,7 +46161,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46162,7 +46177,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46170,7 +46185,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46186,7 +46201,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46197,7 +46212,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46213,7 +46228,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46221,7 +46236,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46237,7 +46252,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46245,7 +46260,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46261,7 +46276,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46269,7 +46284,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46285,7 +46300,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46293,7 +46308,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46309,7 +46324,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46317,7 +46332,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46333,7 +46348,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46344,7 +46359,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46360,7 +46375,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46368,7 +46383,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46384,7 +46399,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46392,7 +46407,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46408,7 +46423,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46416,7 +46431,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46432,7 +46447,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46440,7 +46455,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46456,7 +46471,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46464,7 +46479,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46480,7 +46495,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46491,7 +46506,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46507,7 +46522,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46515,7 +46530,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46531,7 +46546,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46539,7 +46554,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46555,7 +46570,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46563,7 +46578,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46579,7 +46594,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46587,7 +46602,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46603,7 +46618,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46611,7 +46626,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46627,7 +46642,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46655,7 +46670,7 @@ cont { symbol { name: "subway-kiev-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46671,7 +46686,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46679,7 +46694,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46695,7 +46710,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46703,7 +46718,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46717,7 +46732,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46725,7 +46740,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46739,7 +46754,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46747,7 +46762,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46761,7 +46776,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46769,7 +46784,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46783,7 +46798,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46794,7 +46809,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46810,7 +46825,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46818,7 +46833,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46834,7 +46849,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46842,7 +46857,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46858,7 +46873,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46866,7 +46881,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46882,7 +46897,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46890,7 +46905,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46906,7 +46921,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46914,7 +46929,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46930,7 +46945,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46941,7 +46956,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46957,7 +46972,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46965,7 +46980,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46981,7 +46996,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46989,7 +47004,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47005,7 +47020,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47013,7 +47028,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47029,7 +47044,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47037,7 +47052,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47053,7 +47068,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47061,7 +47076,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47077,7 +47092,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47088,7 +47103,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47104,7 +47119,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47112,7 +47127,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47128,7 +47143,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47136,7 +47151,7 @@ cont { symbol { name: "subway-london-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47152,7 +47167,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47160,7 +47175,7 @@ cont { symbol { name: "subway-london-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47176,7 +47191,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47184,7 +47199,7 @@ cont { symbol { name: "subway-london-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47200,7 +47215,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47208,7 +47223,7 @@ cont { symbol { name: "subway-london-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47224,7 +47239,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47235,7 +47250,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47251,7 +47266,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47259,7 +47274,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47275,7 +47290,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47283,7 +47298,7 @@ cont { symbol { name: "subway-madrid-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47299,7 +47314,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47307,7 +47322,7 @@ cont { symbol { name: "subway-madrid-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47323,7 +47338,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47331,7 +47346,7 @@ cont { symbol { name: "subway-madrid-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47347,7 +47362,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47355,7 +47370,7 @@ cont { symbol { name: "subway-madrid-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47371,7 +47386,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47382,7 +47397,7 @@ cont { symbol { name: "subway-minsk-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -47391,7 +47406,7 @@ cont { stroke_color: 2164260863 offset_y: 4 } - priority: 15942 + priority: 15957 } } element { @@ -47399,7 +47414,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47415,7 +47430,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47423,7 +47438,7 @@ cont { symbol { name: "subway-minsk-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47439,7 +47454,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47447,7 +47462,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47461,7 +47476,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47469,7 +47484,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47483,7 +47498,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47491,7 +47506,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47505,7 +47520,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47513,7 +47528,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47527,7 +47542,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47538,7 +47553,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } } element { @@ -47546,7 +47561,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47562,7 +47577,7 @@ cont { offset_y: 22 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47570,7 +47585,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47586,7 +47601,7 @@ cont { offset_y: 22 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47594,7 +47609,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47610,7 +47625,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47618,7 +47633,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47634,7 +47649,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47642,7 +47657,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47656,7 +47671,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47664,7 +47679,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47678,7 +47693,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47686,7 +47701,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47700,7 +47715,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47708,7 +47723,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47722,7 +47737,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47733,7 +47748,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47749,7 +47764,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47757,7 +47772,7 @@ cont { symbol { name: "subway-newyork-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47773,7 +47788,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47781,7 +47796,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47797,7 +47812,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47805,7 +47820,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47821,7 +47836,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47829,7 +47844,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47845,7 +47860,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47853,7 +47868,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47869,7 +47884,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47880,7 +47895,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47896,7 +47911,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47904,7 +47919,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47920,7 +47935,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47928,7 +47943,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47944,7 +47959,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47952,7 +47967,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47968,7 +47983,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47976,7 +47991,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47992,7 +48007,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48000,7 +48015,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48016,7 +48031,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48035,7 +48050,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48051,7 +48066,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48059,7 +48074,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48075,7 +48090,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48083,7 +48098,7 @@ cont { symbol { name: "subway-paris-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48099,7 +48114,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48107,7 +48122,7 @@ cont { symbol { name: "subway-paris-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48123,7 +48138,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48131,7 +48146,7 @@ cont { symbol { name: "subway-paris-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48147,7 +48162,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48155,7 +48170,7 @@ cont { symbol { name: "subway-paris-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48171,7 +48186,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48182,7 +48197,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48198,7 +48213,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48206,7 +48221,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48222,7 +48237,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48230,7 +48245,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48246,7 +48261,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48254,7 +48269,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48270,7 +48285,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48278,7 +48293,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48294,7 +48309,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48302,7 +48317,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48318,7 +48333,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48329,7 +48344,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48345,7 +48360,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48353,7 +48368,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48369,7 +48384,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48377,7 +48392,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48393,7 +48408,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48401,7 +48416,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48417,7 +48432,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48425,7 +48440,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48441,7 +48456,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48449,7 +48464,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48465,7 +48480,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48476,7 +48491,7 @@ cont { symbol { name: "subway-rome-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48492,7 +48507,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48500,7 +48515,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48516,7 +48531,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48524,7 +48539,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48540,7 +48555,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48548,7 +48563,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48562,7 +48577,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48570,7 +48585,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48584,7 +48599,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48592,7 +48607,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48606,7 +48621,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48617,7 +48632,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } } element { @@ -48625,7 +48640,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48641,7 +48656,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48649,7 +48664,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48665,7 +48680,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48673,7 +48688,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48689,7 +48704,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48697,7 +48712,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48713,7 +48728,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48721,7 +48736,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48735,7 +48750,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48743,7 +48758,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48757,7 +48772,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48765,7 +48780,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48779,7 +48794,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48787,7 +48802,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48801,7 +48816,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48812,7 +48827,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48828,7 +48843,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48836,7 +48851,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48852,7 +48867,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48860,7 +48875,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48876,7 +48891,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48884,7 +48899,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48900,7 +48915,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48908,7 +48923,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48924,7 +48939,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48932,7 +48947,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48948,7 +48963,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48959,7 +48974,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48975,7 +48990,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48983,7 +48998,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48999,7 +49014,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -49007,7 +49022,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -49023,7 +49038,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -49031,7 +49046,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -49047,7 +49062,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -49055,7 +49070,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -49071,7 +49086,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -49079,7 +49094,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -49095,7 +49110,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -49106,7 +49121,7 @@ cont { symbol { name: "subway-entrance-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49115,7 +49130,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49123,7 +49138,7 @@ cont { symbol { name: "subway-entrance-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49132,7 +49147,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49140,7 +49155,7 @@ cont { symbol { name: "subway-entrance-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49149,7 +49164,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49160,7 +49175,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49169,7 +49184,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49177,7 +49192,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49186,7 +49201,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49194,7 +49209,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49203,7 +49218,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49214,7 +49229,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49223,7 +49238,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49231,7 +49246,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49240,7 +49255,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49248,7 +49263,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49257,7 +49272,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49339,7 +49354,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49348,7 +49363,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49356,7 +49371,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49365,7 +49380,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49373,7 +49388,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49382,7 +49397,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49393,7 +49408,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49402,7 +49417,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49410,7 +49425,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49419,7 +49434,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49427,7 +49442,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49436,7 +49451,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49447,7 +49462,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49456,7 +49471,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15942 + priority: 15957 } } element { @@ -49464,7 +49479,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49473,7 +49488,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15942 + priority: 15957 } } element { @@ -49481,7 +49496,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49490,7 +49505,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15942 + priority: 15957 } } element { @@ -49498,7 +49513,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49507,7 +49522,7 @@ cont { stroke_color: 2164260863 offset_y: 6 } - priority: 15942 + priority: 15957 } } } @@ -49518,7 +49533,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49534,7 +49549,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49542,7 +49557,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49558,7 +49573,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49566,7 +49581,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49582,7 +49597,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49590,7 +49605,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49606,7 +49621,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -49617,7 +49632,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49626,7 +49641,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49634,7 +49649,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49643,7 +49658,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49651,7 +49666,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49660,7 +49675,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49671,7 +49686,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49680,7 +49695,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49688,7 +49703,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49697,7 +49712,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49705,7 +49720,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49714,7 +49729,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49725,7 +49740,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49734,7 +49749,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49742,7 +49757,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49751,7 +49766,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49759,7 +49774,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49768,7 +49783,7 @@ cont { stroke_color: 2164260863 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49779,7 +49794,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49795,7 +49810,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49803,7 +49818,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49819,7 +49834,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49827,7 +49842,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49843,7 +49858,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49851,7 +49866,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49867,7 +49882,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -50036,21 +50051,21 @@ cont { scale: 15 symbol { name: "tram-m" - priority: 16942 + priority: 16957 } } element { scale: 16 symbol { name: "tram-m" - priority: 16942 + priority: 16957 } } element { scale: 17 symbol { name: "tram-l" - priority: 16942 + priority: 16957 } caption { primary { @@ -50066,14 +50081,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { scale: 18 symbol { name: "tram-l" - priority: 16942 + priority: 16957 } caption { primary { @@ -50089,14 +50104,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { scale: 19 symbol { name: "tram-l" - priority: 16942 + priority: 16957 } caption { primary { @@ -50112,7 +50127,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -50761,7 +50776,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50769,7 +50784,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50780,21 +50795,6 @@ cont { symbol { name: "alcohol-l" apply_for_type: 1 - priority: 16871 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15871 - } - } - element { - scale: 19 - symbol { - name: "shop-m" priority: 16885 } caption { @@ -50806,6 +50806,21 @@ cont { priority: 15885 } } + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15900 + } + } } cont { name: "shop-bakery" @@ -50813,7 +50828,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50821,7 +50836,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50831,7 +50846,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50839,7 +50854,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50849,7 +50864,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50857,7 +50872,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50867,7 +50882,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50875,7 +50890,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50885,7 +50900,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50893,7 +50908,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50903,7 +50918,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50911,7 +50926,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50921,7 +50936,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50929,7 +50944,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50939,7 +50954,7 @@ cont { scale: 17 symbol { name: "car-repair-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -50947,14 +50962,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -50962,14 +50977,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50977,7 +50992,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50987,7 +51002,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50995,7 +51010,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51005,7 +51020,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51013,7 +51028,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51023,7 +51038,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51031,7 +51046,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51041,7 +51056,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51049,7 +51064,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51059,7 +51074,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51067,7 +51082,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51077,7 +51092,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51085,7 +51100,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51095,7 +51110,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51103,7 +51118,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51113,7 +51128,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51121,7 +51136,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51131,7 +51146,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51139,7 +51154,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51149,7 +51164,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51157,7 +51172,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51167,7 +51182,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51175,7 +51190,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51185,7 +51200,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51193,7 +51208,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51203,7 +51218,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51211,7 +51226,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51221,7 +51236,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51229,7 +51244,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51239,7 +51254,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51247,7 +51262,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51257,7 +51272,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51265,7 +51280,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51275,7 +51290,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51283,7 +51298,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51294,7 +51309,7 @@ cont { symbol { name: "laundry-l" apply_for_type: 1 - priority: 16900 + priority: 16914 } caption { primary { @@ -51302,13 +51317,28 @@ cont { color: 4473924 offset_y: 10 } - priority: 15900 + priority: 15914 } } element { scale: 18 symbol { name: "laundry-l" + priority: 16914 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15914 + } + } + element { + scale: 19 + symbol { + name: "shop-m" priority: 16900 } caption { @@ -51320,21 +51350,6 @@ cont { priority: 15900 } } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16885 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15885 - } - } } cont { name: "shop-mall" @@ -51343,7 +51358,7 @@ cont { symbol { name: "shop-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51351,7 +51366,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -51359,7 +51374,7 @@ cont { symbol { name: "shop-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51367,7 +51382,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -51375,7 +51390,7 @@ cont { symbol { name: "shop-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51383,14 +51398,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51398,7 +51413,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51408,7 +51423,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51416,7 +51431,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51426,7 +51441,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51434,7 +51449,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51444,7 +51459,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51452,7 +51467,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51462,7 +51477,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51470,7 +51485,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51481,7 +51496,7 @@ cont { symbol { name: "grocery-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51489,7 +51504,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51497,7 +51512,7 @@ cont { symbol { name: "grocery-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51505,14 +51520,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51520,7 +51535,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51530,7 +51545,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51538,7 +51553,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51549,7 +51564,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51557,7 +51572,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51565,7 +51580,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51573,7 +51588,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51584,7 +51599,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51592,7 +51607,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51600,7 +51615,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51608,7 +51623,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51619,7 +51634,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51627,7 +51642,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51635,7 +51650,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51643,7 +51658,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51654,7 +51669,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51662,7 +51677,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51670,7 +51685,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51678,7 +51693,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51689,7 +51704,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51697,7 +51712,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51705,7 +51720,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51713,7 +51728,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51724,7 +51739,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51732,7 +51747,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51740,7 +51755,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51748,7 +51763,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51765,11 +51780,11 @@ cont { scale: 17 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "soccer-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -51777,19 +51792,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "soccer-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51797,19 +51812,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 13749671 - priority: -15115 + priority: -15100 } symbol { name: "soccer-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51817,7 +51832,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51828,7 +51843,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51836,7 +51851,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51844,7 +51859,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51852,7 +51867,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51863,7 +51878,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51871,7 +51886,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51879,7 +51894,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51887,7 +51902,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51895,7 +51910,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51903,7 +51918,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51917,7 +51932,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { @@ -51928,7 +51943,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -51939,7 +51954,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51947,7 +51962,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -51955,7 +51970,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51963,7 +51978,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -51971,7 +51986,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51979,7 +51994,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -51990,7 +52005,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51998,7 +52013,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52006,7 +52021,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52014,7 +52029,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52022,7 +52037,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52030,7 +52045,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -52040,14 +52055,14 @@ cont { scale: 15 symbol { name: "campsite-m" - priority: 16928 + priority: 16942 } } element { scale: 16 symbol { name: "campsite-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -52055,11 +52070,26 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 + symbol { + name: "campsite-l" + priority: 16942 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15942 + } + } + element { + scale: 18 symbol { name: "campsite-l" priority: 16928 @@ -52073,26 +52103,11 @@ cont { priority: 15928 } } - element { - scale: 18 - symbol { - name: "campsite-l" - priority: 16914 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 10 - } - priority: 15914 - } - } element { scale: 19 symbol { name: "campsite-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -52100,7 +52115,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -52114,7 +52129,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { @@ -52125,7 +52140,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -52139,7 +52154,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { @@ -52150,7 +52165,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -52161,7 +52176,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52169,7 +52184,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52177,7 +52192,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52185,7 +52200,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52193,7 +52208,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52201,7 +52216,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -52212,7 +52227,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52220,7 +52235,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52228,7 +52243,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52236,7 +52251,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52244,7 +52259,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52252,7 +52267,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -52263,7 +52278,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52271,7 +52286,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52279,7 +52294,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52287,7 +52302,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52295,7 +52310,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52303,7 +52318,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52314,7 +52329,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52322,7 +52337,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52330,7 +52345,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52338,7 +52353,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52346,7 +52361,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52354,7 +52369,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52365,7 +52380,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52373,14 +52388,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52388,14 +52403,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52403,7 +52418,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52417,7 +52432,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { @@ -52428,7 +52443,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -52438,7 +52453,7 @@ cont { scale: 15 symbol { name: "museum-m" - priority: 16928 + priority: 16942 min_distance: 1 } caption { @@ -52447,14 +52462,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "museum-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -52462,14 +52477,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52477,14 +52492,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52492,14 +52507,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52507,7 +52522,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -52517,7 +52532,7 @@ cont { scale: 17 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52525,14 +52540,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52540,14 +52555,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52555,7 +52570,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52566,7 +52581,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52574,7 +52589,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52582,7 +52597,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52590,7 +52605,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52598,7 +52613,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52606,7 +52621,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52616,7 +52631,7 @@ cont { scale: 15 symbol { name: "zoo-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -52624,14 +52639,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "zoo-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -52639,14 +52654,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "zoo-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52654,14 +52669,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "zoo-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52669,14 +52684,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "zoo-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52684,7 +52699,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -53116,140 +53131,140 @@ cont { scale: 0 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 10 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 11 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 12 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 13 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 15 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 16 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 18 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 19 area { color: 9163744 - priority: 1229 + priority: -15772 } } } @@ -53266,7 +53281,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } } element { @@ -53280,7 +53295,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53301,7 +53316,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53322,7 +53337,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53343,7 +53358,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53364,7 +53379,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53385,7 +53400,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53406,7 +53421,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53427,7 +53442,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53448,7 +53463,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53472,7 +53487,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } } element { @@ -53486,7 +53501,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53507,7 +53522,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53528,7 +53543,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53549,7 +53564,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53570,7 +53585,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53591,7 +53606,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53612,7 +53627,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53633,7 +53648,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53654,7 +53669,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53671,70 +53686,70 @@ cont { scale: 0 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 9163744 - priority: 1229 + priority: -15772 } } element { @@ -53748,7 +53763,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } } element { @@ -53762,7 +53777,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53783,7 +53798,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53804,7 +53819,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53825,7 +53840,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53846,7 +53861,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53867,7 +53882,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53888,7 +53903,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53909,7 +53924,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53930,7 +53945,7 @@ cont { } area { color: 9163744 - priority: 1215 + priority: -15786 } path_text { primary { diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 92c40921f5..77d0b06928 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -5,7 +5,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -23,7 +23,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -31,7 +31,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -49,7 +49,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -58,7 +58,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -66,7 +66,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -84,7 +84,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -93,7 +93,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -101,7 +101,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -119,7 +119,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -128,7 +128,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -136,7 +136,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -154,7 +154,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -163,7 +163,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -195,7 +195,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -213,7 +213,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -221,7 +221,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -239,7 +239,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -248,7 +248,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -256,7 +256,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -274,7 +274,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -283,7 +283,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -291,7 +291,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -309,7 +309,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -318,7 +318,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -326,7 +326,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -344,7 +344,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -353,7 +353,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -385,7 +385,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -403,7 +403,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -411,7 +411,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -429,7 +429,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -438,7 +438,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -446,7 +446,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -464,7 +464,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -473,7 +473,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -481,7 +481,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -499,7 +499,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -508,7 +508,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -516,7 +516,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -534,7 +534,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -543,7 +543,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -575,7 +575,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -593,7 +593,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -601,7 +601,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: BUTTCAP } @@ -619,7 +619,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -628,7 +628,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -636,7 +636,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -654,7 +654,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -663,7 +663,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -671,7 +671,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -689,7 +689,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -698,7 +698,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -706,7 +706,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1914 + priority: 1928 join: ROUNDJOIN cap: ROUNDCAP } @@ -724,7 +724,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -733,7 +733,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -765,7 +765,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { @@ -773,7 +773,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -782,7 +782,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15914 + priority: 15928 } } element { @@ -790,7 +790,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -799,7 +799,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -807,7 +807,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -816,7 +816,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -824,7 +824,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -833,7 +833,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } element { @@ -841,7 +841,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -850,7 +850,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15914 + priority: 15928 } } } @@ -874,11 +874,11 @@ cont { scale: 14 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -887,18 +887,18 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15957 + priority: 15971 } } element { scale: 15 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -914,18 +914,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 16 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -941,18 +941,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 17 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -968,18 +968,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 18 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -995,18 +995,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 19 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1022,7 +1022,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -1032,11 +1032,11 @@ cont { scale: 10 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-s" - priority: 16957 + priority: 16971 } caption { primary { @@ -1045,18 +1045,18 @@ cont { stroke_color: 2148602112 offset_y: 7 } - priority: 15957 + priority: 15971 } } element { scale: 11 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-m" - priority: 16957 + priority: 16971 } caption { primary { @@ -1072,18 +1072,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 12 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-m" - priority: 16957 + priority: 16971 } caption { primary { @@ -1099,18 +1099,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 13 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-m" - priority: 16957 + priority: 16971 } caption { primary { @@ -1126,18 +1126,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 14 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1153,18 +1153,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 15 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1180,18 +1180,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 16 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1207,18 +1207,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 17 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1234,18 +1234,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 18 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1261,18 +1261,18 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { scale: 19 area { color: 2757700 - priority: -15043 + priority: -15029 } symbol { name: "airport-l" - priority: 16957 + priority: 16971 } caption { primary { @@ -1288,7 +1288,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -1298,7 +1298,7 @@ cont { scale: 17 symbol { name: "heliport-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -1306,14 +1306,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "heliport-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -1321,14 +1321,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "heliport-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -1336,7 +1336,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -1590,7 +1590,7 @@ cont { scale: 18 symbol { name: "atm-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1598,14 +1598,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "atm-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1613,7 +1613,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -1623,7 +1623,7 @@ cont { scale: 17 symbol { name: "bank-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1631,14 +1631,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "bank-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1646,14 +1646,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "bank-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1661,7 +1661,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -1671,7 +1671,7 @@ cont { scale: 18 symbol { name: "beer-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1679,14 +1679,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "beer-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1694,7 +1694,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -1723,14 +1723,14 @@ cont { symbol { name: "bench" apply_for_type: 1 - priority: 16871 + priority: 16885 } } element { scale: 19 symbol { name: "bench" - priority: 16871 + priority: 16885 } caption { primary { @@ -1738,7 +1738,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -1748,7 +1748,7 @@ cont { scale: 17 symbol { name: "bicycle-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1756,14 +1756,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "bicycle-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1771,14 +1771,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "bicycle-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1786,7 +1786,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -1815,7 +1815,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -1823,14 +1823,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "banknote-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -1838,7 +1838,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -1856,7 +1856,7 @@ cont { scale: 16 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -1872,14 +1872,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -1895,14 +1895,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -1918,14 +1918,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "none" - priority: 16928 + priority: 16942 } caption { primary { @@ -1941,7 +1941,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15928 + priority: 15942 } } } @@ -1951,7 +1951,7 @@ cont { scale: 16 symbol { name: "cafe-m" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -1960,14 +1960,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "cafe-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1975,14 +1975,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "cafe-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -1990,14 +1990,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "cafe-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2005,7 +2005,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -2087,7 +2087,7 @@ cont { scale: 16 symbol { name: "hospital-m" - priority: 16871 + priority: 16885 } caption { primary { @@ -2095,14 +2095,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 17 symbol { name: "hospital-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2110,14 +2110,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 18 symbol { name: "hospital-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2125,14 +2125,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 19 symbol { name: "hospital-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2140,7 +2140,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -2150,7 +2150,7 @@ cont { scale: 16 symbol { name: "college-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -2158,14 +2158,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "college-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2173,14 +2173,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "college-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2188,14 +2188,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "college-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2203,7 +2203,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -2249,21 +2249,21 @@ cont { scale: 17 symbol { name: "drinking-water-l" - priority: 16871 + priority: 16885 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16871 + priority: 16885 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2271,7 +2271,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -2281,7 +2281,7 @@ cont { scale: 17 symbol { name: "embassy-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2289,14 +2289,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "embassy-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2304,14 +2304,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "embassy-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2319,7 +2319,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -2329,7 +2329,7 @@ cont { scale: 18 symbol { name: "fastfood-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2337,14 +2337,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "fastfood-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2352,7 +2352,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -2363,7 +2363,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } } element { @@ -2371,7 +2371,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } } element { @@ -2379,7 +2379,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -2388,7 +2388,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15928 + priority: 15942 } } element { @@ -2396,7 +2396,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -2405,7 +2405,7 @@ cont { stroke_color: 2148602112 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -2413,7 +2413,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -2422,14 +2422,14 @@ cont { stroke_color: 2148602112 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "none" - priority: 16928 + priority: 16942 } caption { primary { @@ -2438,17 +2438,17 @@ cont { stroke_color: 2148602112 offset_y: 10 } - priority: 15928 + priority: 15942 } } } cont { name: "amenity-fire_station" element { - scale: 19 + scale: 18 symbol { - name: "none" - priority: 16000 + name: "fire_station-l" + priority: 16900 } caption { primary { @@ -2456,7 +2456,22 @@ cont { color: 5592405 offset_y: 10 } - priority: 15000 + priority: 15900 + } + } + element { + scale: 19 + symbol { + name: "none" + priority: 16900 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15900 } } } @@ -2466,18 +2481,18 @@ cont { scale: 16 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 8738 - priority: 1886 + priority: -15100 } symbol { name: "fountain-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2485,18 +2500,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 8738 - priority: 1886 + priority: -15100 } symbol { name: "fountain-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2504,18 +2519,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 8738 - priority: 1886 + priority: -15100 } symbol { name: "fountain-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2523,7 +2538,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -2533,7 +2548,7 @@ cont { scale: 17 symbol { name: "fuel-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2541,14 +2556,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "fuel-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2556,14 +2571,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "fuel-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -2571,7 +2586,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -2757,11 +2772,11 @@ cont { scale: 16 area { color: 3878179 - priority: -15072 + priority: -15058 } symbol { name: "hospital-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -2769,18 +2784,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 area { color: 3878179 - priority: -15072 + priority: -15058 } symbol { name: "hospital-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -2788,18 +2803,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 area { color: 3878179 - priority: -15072 + priority: -15058 } symbol { name: "hospital-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -2807,18 +2822,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 area { color: 3878179 - priority: -15072 + priority: -15058 } symbol { name: "hospital-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -2826,7 +2841,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -2837,7 +2852,7 @@ cont { symbol { name: "hunting-tower-m" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -2845,7 +2860,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -2853,7 +2868,7 @@ cont { symbol { name: "hunting-tower-m" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -2861,7 +2876,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -2869,7 +2884,7 @@ cont { symbol { name: "hunting-tower-m" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -2877,14 +2892,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "hunting-tower-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2892,14 +2907,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "hunting-tower-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2907,7 +2922,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -2932,7 +2947,7 @@ cont { scale: 18 symbol { name: "kindergarten-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2940,14 +2955,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 19 symbol { name: "kindergarten-l" - priority: 16871 + priority: 16885 } caption { primary { @@ -2955,7 +2970,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -2966,7 +2981,7 @@ cont { symbol { name: "library-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -2974,14 +2989,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "library-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -2989,7 +3004,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -3017,7 +3032,7 @@ cont { scale: 18 symbol { name: "bar-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3025,14 +3040,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "bar-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3040,7 +3055,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -3057,23 +3072,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3081,18 +3096,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3100,7 +3115,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3117,23 +3132,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3141,18 +3156,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3160,7 +3175,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3177,23 +3192,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3201,18 +3216,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3220,7 +3235,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3237,23 +3252,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3261,18 +3276,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3280,7 +3295,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3297,23 +3312,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3321,18 +3336,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3340,7 +3355,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3357,23 +3372,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3381,18 +3396,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3400,7 +3415,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3417,23 +3432,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "zero-icon" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3441,18 +3456,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3460,7 +3475,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3477,23 +3492,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "zero-icon" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3501,18 +3516,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3520,7 +3535,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3537,23 +3552,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "zero-icon" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3561,18 +3576,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3580,7 +3595,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3597,23 +3612,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3621,18 +3636,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3640,7 +3655,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3657,23 +3672,23 @@ cont { scale: 17 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-s" apply_for_type: 1 - priority: 16871 + priority: 16071 } } element { scale: 18 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3681,18 +3696,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } element { scale: 19 area { color: 4369 - priority: -15129 + priority: -15929 } symbol { name: "parking-m" - priority: 16871 + priority: 16071 } caption { primary { @@ -3700,7 +3715,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15071 } } } @@ -3710,7 +3725,7 @@ cont { scale: 18 symbol { name: "pharmacy-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3718,14 +3733,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "pharmacy-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3733,7 +3748,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -3743,11 +3758,11 @@ cont { scale: 16 area { color: 3355426 - priority: -15086 + priority: -15072 } symbol { name: "place-of-worship-m" - priority: 16914 + priority: 16928 } caption { primary { @@ -3755,18 +3770,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 area { color: 3355426 - priority: -15086 + priority: -15072 } symbol { name: "place-of-worship-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3774,18 +3789,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 area { color: 3355426 - priority: -15086 + priority: -15072 } symbol { name: "place-of-worship-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3793,18 +3808,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 area { color: 3355426 - priority: -15086 + priority: -15072 } symbol { name: "place-of-worship-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3812,7 +3827,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -3822,7 +3837,7 @@ cont { scale: 17 symbol { name: "police-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3830,14 +3845,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "police-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3845,14 +3860,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "police-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3860,7 +3875,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -3889,7 +3904,7 @@ cont { symbol { name: "mail-l" apply_for_type: 1 - priority: 16871 + priority: 16885 } caption { primary { @@ -3897,7 +3912,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { @@ -3905,7 +3920,7 @@ cont { symbol { name: "mail-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } caption { primary { @@ -3913,14 +3928,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } element { scale: 19 symbol { name: "mail-m" - priority: 16871 + priority: 16885 } caption { primary { @@ -3928,7 +3943,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15871 + priority: 15885 } } } @@ -3938,7 +3953,7 @@ cont { scale: 18 symbol { name: "beer-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3946,14 +3961,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "beer-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -3961,7 +3976,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -3971,7 +3986,7 @@ cont { scale: 19 symbol { name: "recycling-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -3979,7 +3994,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -3989,7 +4004,7 @@ cont { scale: 16 symbol { name: "restaurant-m" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -3998,14 +4013,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4013,14 +4028,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4028,14 +4043,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4043,7 +4058,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -4053,7 +4068,7 @@ cont { scale: 16 symbol { name: "restaurant-m" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -4062,14 +4077,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4077,14 +4092,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4092,14 +4107,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4107,7 +4122,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -4117,7 +4132,7 @@ cont { scale: 16 symbol { name: "restaurant-m" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -4126,14 +4141,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4141,14 +4156,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4156,14 +4171,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4171,7 +4186,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -4181,7 +4196,7 @@ cont { scale: 17 symbol { name: "school-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4189,14 +4204,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "school-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4204,14 +4219,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "school-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4219,7 +4234,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4229,7 +4244,7 @@ cont { scale: 17 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4237,14 +4252,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4252,14 +4267,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "none" - priority: 16885 + priority: 16900 } caption { primary { @@ -4267,7 +4282,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4313,7 +4328,7 @@ cont { scale: 19 symbol { name: "phone-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4321,7 +4336,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4331,7 +4346,7 @@ cont { scale: 16 symbol { name: "theatre-l" - priority: 16914 + priority: 16928 min_distance: 10 } caption { @@ -4340,14 +4355,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 17 symbol { name: "theatre-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4355,14 +4370,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "theatre-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4370,14 +4385,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "theatre-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -4385,7 +4400,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -4395,7 +4410,7 @@ cont { scale: 18 symbol { name: "toilets-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4403,14 +4418,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "toilets-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4418,7 +4433,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4453,12 +4468,12 @@ cont { scale: 15 area { color: 2894359 - priority: -15072 + priority: -15986 } symbol { name: "college-m" apply_for_type: 1 - priority: 16928 + priority: 16014 min_distance: 12 } caption { @@ -4467,7 +4482,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15014 } apply_if: "name" } @@ -4475,7 +4490,7 @@ cont { scale: 15 area { color: 2894359 - priority: -15072 + priority: -15058 } caption { primary { @@ -4483,7 +4498,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } apply_if: "!name" } @@ -4491,11 +4506,11 @@ cont { scale: 16 area { color: 2894359 - priority: -15086 + priority: -15986 } symbol { name: "college-m" - priority: 16914 + priority: 16014 min_distance: 11 } caption { @@ -4504,7 +4519,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15014 } apply_if: "name" } @@ -4512,12 +4527,12 @@ cont { scale: 16 area { color: 2894359 - priority: -15086 + priority: -15986 } symbol { name: "college-m" apply_for_type: 1 - priority: 16914 + priority: 16014 min_distance: 11 } caption { @@ -4526,7 +4541,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15014 } apply_if: "!name" } @@ -4534,11 +4549,11 @@ cont { scale: 17 area { color: 2894359 - priority: -15115 + priority: -15100 } symbol { name: "college-l" - priority: 16885 + priority: 16900 min_distance: 10 } caption { @@ -4547,7 +4562,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "name" } @@ -4555,12 +4570,12 @@ cont { scale: 17 area { color: 2894359 - priority: -15115 + priority: -15100 } symbol { name: "college-l" apply_for_type: 1 - priority: 16885 + priority: 16900 min_distance: 10 } caption { @@ -4569,7 +4584,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "!name" } @@ -4577,11 +4592,11 @@ cont { scale: 18 area { color: 2894359 - priority: -15115 + priority: -15100 } symbol { name: "college-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4589,7 +4604,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "name" } @@ -4597,12 +4612,12 @@ cont { scale: 18 area { color: 2894359 - priority: -15115 + priority: -15100 } symbol { name: "college-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -4610,7 +4625,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "!name" } @@ -4618,11 +4633,11 @@ cont { scale: 19 area { color: 2894359 - priority: -15115 + priority: -15100 } symbol { name: "college-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4630,7 +4645,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "name" } @@ -4638,11 +4653,11 @@ cont { scale: 19 area { color: 2894359 - priority: -15115 + priority: -15100 } symbol { name: "college-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4650,7 +4665,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } apply_if: "!name" } @@ -4661,7 +4676,7 @@ cont { scale: 18 symbol { name: "recycling-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4669,14 +4684,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "recycling-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -4684,7 +4699,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -4900,7 +4915,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4908,7 +4923,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -4916,7 +4931,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4924,7 +4939,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -4932,7 +4947,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4940,7 +4955,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -4948,7 +4963,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4956,7 +4971,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -4964,7 +4979,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -4972,7 +4987,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -6474,14 +6489,14 @@ cont { scale: 17 symbol { name: "bus-m" - priority: 16928 + priority: 16942 } } element { scale: 18 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } path_text { primary { @@ -6497,14 +6512,14 @@ cont { offset_y: 10 text: "int_name" } - priority: 16928 + priority: 16942 } } element { scale: 19 symbol { name: "bus-l" - priority: 16928 + priority: 16942 } path_text { primary { @@ -6520,7 +6535,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 16928 + priority: 16942 } } } @@ -17943,7 +17958,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } } element { @@ -17951,7 +17966,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } } element { @@ -17959,7 +17974,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } } element { @@ -17967,7 +17982,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16871 + priority: 16885 } } } @@ -22952,7 +22967,7 @@ cont { scale: 17 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -22960,14 +22975,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -22975,14 +22990,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -22990,7 +23005,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -23000,7 +23015,7 @@ cont { scale: 16 symbol { name: "remains-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -23008,14 +23023,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23023,14 +23038,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23038,14 +23053,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23053,7 +23068,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -23122,7 +23137,7 @@ cont { scale: 17 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23130,14 +23145,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23145,14 +23160,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23160,7 +23175,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -23170,7 +23185,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -23178,14 +23193,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23193,14 +23208,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 18 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23208,14 +23223,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "monument-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -23223,7 +23238,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -23233,7 +23248,7 @@ cont { scale: 16 symbol { name: "museum-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -23241,14 +23256,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23256,14 +23271,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23271,14 +23286,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23286,7 +23301,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -23296,7 +23311,7 @@ cont { scale: 17 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23304,14 +23319,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23319,14 +23334,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "remains-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -23334,7 +23349,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -23441,42 +23456,42 @@ cont { scale: 17 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } } @@ -23486,56 +23501,56 @@ cont { scale: 12 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 13 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 15 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 16 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 18 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 19 area { color: 8738 - priority: 1229 + priority: -15772 } } } @@ -23903,42 +23918,42 @@ cont { scale: 17 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } } @@ -27264,49 +27279,49 @@ cont { scale: 13 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 14 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 15 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 16 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 17 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 18 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 19 area { color: 1778944 - priority: 1186 + priority: -15815 } } } @@ -27531,42 +27546,42 @@ cont { scale: 17 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } } @@ -27618,42 +27633,42 @@ cont { scale: 17 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } } @@ -27685,7 +27700,7 @@ cont { scale: 12 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -27700,7 +27715,7 @@ cont { scale: 12 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27708,7 +27723,7 @@ cont { scale: 12 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27716,7 +27731,7 @@ cont { scale: 13 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -27731,7 +27746,7 @@ cont { scale: 13 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27739,7 +27754,7 @@ cont { scale: 13 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27747,7 +27762,7 @@ cont { scale: 14 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -27762,7 +27777,7 @@ cont { scale: 14 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27770,7 +27785,7 @@ cont { scale: 14 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27778,7 +27793,7 @@ cont { scale: 15 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -27793,7 +27808,7 @@ cont { scale: 15 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27801,7 +27816,7 @@ cont { scale: 15 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27809,7 +27824,7 @@ cont { scale: 16 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -27824,7 +27839,7 @@ cont { scale: 16 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27832,7 +27847,7 @@ cont { scale: 16 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27840,7 +27855,7 @@ cont { scale: 17 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -27855,7 +27870,7 @@ cont { scale: 17 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27863,7 +27878,7 @@ cont { scale: 17 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27871,7 +27886,7 @@ cont { scale: 18 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -27886,7 +27901,7 @@ cont { scale: 18 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27894,7 +27909,7 @@ cont { scale: 18 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -27902,7 +27917,7 @@ cont { scale: 19 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -27917,7 +27932,7 @@ cont { scale: 19 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -27925,7 +27940,7 @@ cont { scale: 19 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -28030,42 +28045,42 @@ cont { scale: 17 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 18 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } element { scale: 19 area { color: 1778944 - priority: -15186 + priority: -15858 } caption { primary { height: 10 - color: 10066329 + color: 5592405 } - priority: 15814 + priority: 15142 } } } @@ -28122,7 +28137,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -28130,7 +28145,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -28138,7 +28153,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -28146,7 +28161,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -28154,7 +28169,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -28162,7 +28177,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -28389,35 +28404,35 @@ cont { scale: 13 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 14 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 15 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 16 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 17 area { color: 1778944 - priority: 1215 + priority: -15786 } symbol { name: "golf-l" @@ -28429,7 +28444,7 @@ cont { scale: 18 area { color: 1778944 - priority: 1215 + priority: -15786 } symbol { name: "golf-l" @@ -28447,7 +28462,7 @@ cont { scale: 19 area { color: 1778944 - priority: 1215 + priority: -15786 } symbol { name: "golf-l" @@ -28505,11 +28520,11 @@ cont { scale: 12 area { color: 1778944 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -28518,18 +28533,18 @@ cont { stroke_color: 1118464 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 13 area { color: 1778944 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -28538,18 +28553,18 @@ cont { stroke_color: 1118464 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 14 area { color: 1778944 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -28558,18 +28573,18 @@ cont { stroke_color: 1118464 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 15 area { color: 1778944 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -28578,18 +28593,18 @@ cont { stroke_color: 1118464 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 area { color: 1778944 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -28598,18 +28613,18 @@ cont { stroke_color: 1118464 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 area { color: 1778944 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -28618,18 +28633,18 @@ cont { stroke_color: 1118464 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 18 area { color: 1778944 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -28638,18 +28653,18 @@ cont { stroke_color: 1118464 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 19 area { color: 1778944 - priority: -15072 + priority: -15058 } symbol { name: "nparkf-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -28658,7 +28673,7 @@ cont { stroke_color: 1118464 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -32159,12 +32174,12 @@ cont { scale: 17 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32172,19 +32187,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32192,19 +32207,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32212,7 +32227,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32229,12 +32244,12 @@ cont { scale: 17 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32242,19 +32257,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32262,19 +32277,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32282,7 +32297,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32292,50 +32307,50 @@ cont { scale: 17 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } } element { scale: 18 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { height: 10 color: 5592405 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { height: 10 color: 5592405 } - priority: 15885 + priority: 15900 } } } @@ -32345,12 +32360,12 @@ cont { scale: 17 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32358,19 +32373,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32378,19 +32393,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32398,7 +32413,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32409,7 +32424,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32417,7 +32432,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -32425,7 +32440,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32433,7 +32448,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -32441,7 +32456,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32449,7 +32464,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32506,7 +32521,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -32514,7 +32529,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -32522,7 +32537,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -32530,7 +32545,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -32538,7 +32553,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -32546,7 +32561,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -32563,12 +32578,12 @@ cont { scale: 16 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-m" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32576,19 +32591,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 17 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32596,19 +32611,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32616,19 +32631,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -32636,7 +32651,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -32646,76 +32661,76 @@ cont { scale: 13 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 15 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 16 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 8738 - priority: 1915 + priority: -15072 } symbol { name: "swimming-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } } element { scale: 18 area { color: 8738 - priority: 1915 + priority: -15072 } symbol { name: "swimming-l" - priority: 16914 + priority: 16928 } caption { primary { height: 10 color: 5592405 } - priority: 15914 + priority: 15928 } } element { scale: 19 area { color: 8738 - priority: 1915 + priority: -15072 } symbol { name: "swimming-l" - priority: 16914 + priority: 16928 } caption { primary { height: 10 color: 5592405 } - priority: 15914 + priority: 15928 } } } @@ -32771,14 +32786,14 @@ cont { scale: 12 area { color: 0 - priority: 1272 + priority: -15729 } } element { scale: 13 area { color: 0 - priority: 1272 + priority: -15729 } } element { @@ -32792,7 +32807,7 @@ cont { } area { color: 0 - priority: 1272 + priority: -15729 } } element { @@ -32806,7 +32821,7 @@ cont { } area { color: 0 - priority: 1272 + priority: -15729 } } element { @@ -32820,7 +32835,7 @@ cont { } area { color: 0 - priority: 1272 + priority: -15729 } } element { @@ -32834,7 +32849,7 @@ cont { } area { color: 0 - priority: 1672 + priority: -15329 } caption { primary { @@ -32855,7 +32870,7 @@ cont { } area { color: 0 - priority: 1672 + priority: -15329 } caption { primary { @@ -32876,7 +32891,7 @@ cont { } area { color: 0 - priority: 1672 + priority: -15329 } caption { primary { @@ -32893,7 +32908,7 @@ cont { scale: 15 symbol { name: "lighthouse-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -32901,14 +32916,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "lighthouse-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -32916,14 +32931,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "lighthouse-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -32931,14 +32946,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "lighthouse-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -32946,14 +32961,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "lighthouse-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -32961,7 +32976,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -32971,14 +32986,14 @@ cont { scale: 12 area { color: 0 - priority: 1272 + priority: -15729 } } element { scale: 13 area { color: 0 - priority: 1272 + priority: -15729 } } element { @@ -32992,7 +33007,7 @@ cont { } area { color: 0 - priority: 1272 + priority: -15729 } } element { @@ -33006,7 +33021,7 @@ cont { } area { color: 0 - priority: 1272 + priority: -15729 } } element { @@ -33020,7 +33035,7 @@ cont { } area { color: 0 - priority: 1272 + priority: -15729 } } element { @@ -33034,7 +33049,7 @@ cont { } area { color: 0 - priority: 1672 + priority: -15329 } caption { primary { @@ -33055,7 +33070,7 @@ cont { } area { color: 0 - priority: 1672 + priority: -15329 } caption { primary { @@ -33076,7 +33091,7 @@ cont { } area { color: 0 - priority: 1672 + priority: -15329 } caption { primary { @@ -33093,7 +33108,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -33101,14 +33116,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -33116,14 +33131,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -33131,14 +33146,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -33146,14 +33161,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -33161,7 +33176,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -33171,35 +33186,35 @@ cont { scale: 10 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 11 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 12 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 13 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 8738 - priority: 1229 + priority: -15772 } caption { primary { @@ -33213,7 +33228,7 @@ cont { scale: 15 area { color: 8738 - priority: 1229 + priority: -15772 } caption { primary { @@ -33227,7 +33242,7 @@ cont { scale: 16 area { color: 8738 - priority: 1229 + priority: -15772 } caption { primary { @@ -33241,7 +33256,7 @@ cont { scale: 17 area { color: 8738 - priority: 1229 + priority: -15772 } caption { primary { @@ -33255,7 +33270,7 @@ cont { scale: 18 area { color: 8738 - priority: 1229 + priority: -15772 } caption { primary { @@ -33269,7 +33284,7 @@ cont { scale: 19 area { color: 8738 - priority: 1229 + priority: -15772 } caption { primary { @@ -33458,7 +33473,7 @@ cont { symbol { name: "cave-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33466,7 +33481,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33474,7 +33489,7 @@ cont { symbol { name: "cave-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33482,7 +33497,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33490,7 +33505,7 @@ cont { symbol { name: "cave-s" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33498,7 +33513,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33506,7 +33521,7 @@ cont { symbol { name: "cave-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33514,7 +33529,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33522,7 +33537,7 @@ cont { symbol { name: "cave-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33530,7 +33545,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33538,7 +33553,7 @@ cont { symbol { name: "cave-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33546,7 +33561,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33554,7 +33569,7 @@ cont { symbol { name: "cave-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33562,7 +33577,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { @@ -33570,7 +33585,7 @@ cont { symbol { name: "cave-l" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -33578,7 +33593,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -33588,140 +33603,140 @@ cont { scale: 0 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 1 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 2 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 3 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 4 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 5 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 6 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 7 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 8 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 9 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 10 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 11 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 12 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 13 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 14 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 15 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 16 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 17 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 18 area { color: 8738 - priority: -16728 + priority: -16714 } } element { scale: 19 area { color: 8738 - priority: -16728 + priority: -16714 } } } @@ -33731,140 +33746,140 @@ cont { scale: 0 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 1 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 2 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 3 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 4 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 5 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 6 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 7 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 8 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 9 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 10 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 11 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 12 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 13 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 14 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 15 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 16 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 17 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 18 area { color: 1118481 - priority: 1015 + priority: -15986 } } element { scale: 19 area { color: 1118481 - priority: 1015 + priority: -15986 } } } @@ -33874,49 +33889,49 @@ cont { scale: 13 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 14 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 15 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 16 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 17 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 18 area { color: 1778944 - priority: 1186 + priority: -15815 } } element { scale: 19 area { color: 1778944 - priority: 1186 + priority: -15815 } } } @@ -33926,77 +33941,77 @@ cont { scale: 0 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 10 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34011,7 +34026,7 @@ cont { scale: 10 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34019,7 +34034,7 @@ cont { scale: 11 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34034,7 +34049,7 @@ cont { scale: 11 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34042,7 +34057,7 @@ cont { scale: 12 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34057,7 +34072,7 @@ cont { scale: 12 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34065,7 +34080,7 @@ cont { scale: 12 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34073,7 +34088,7 @@ cont { scale: 13 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34088,7 +34103,7 @@ cont { scale: 13 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34096,7 +34111,7 @@ cont { scale: 13 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34104,7 +34119,7 @@ cont { scale: 14 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34119,7 +34134,7 @@ cont { scale: 14 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34127,7 +34142,7 @@ cont { scale: 14 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34135,7 +34150,7 @@ cont { scale: 15 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34150,7 +34165,7 @@ cont { scale: 15 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34158,7 +34173,7 @@ cont { scale: 15 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34166,7 +34181,7 @@ cont { scale: 16 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34181,7 +34196,7 @@ cont { scale: 16 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34189,7 +34204,7 @@ cont { scale: 16 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34197,7 +34212,7 @@ cont { scale: 17 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34212,7 +34227,7 @@ cont { scale: 17 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34220,7 +34235,7 @@ cont { scale: 17 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34228,7 +34243,7 @@ cont { scale: 18 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34243,7 +34258,7 @@ cont { scale: 18 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34251,7 +34266,7 @@ cont { scale: 18 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34259,7 +34274,7 @@ cont { scale: 19 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -34274,7 +34289,7 @@ cont { scale: 19 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -34282,7 +34297,7 @@ cont { scale: 19 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -34293,140 +34308,140 @@ cont { scale: 0 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 1 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 2 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 3 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 4 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 5 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 6 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 7 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 8 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 9 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 10 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 11 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 12 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 13 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 14 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 15 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 16 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 17 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 18 area { color: 0 - priority: 1001 + priority: -16700 } } element { scale: 19 area { color: 0 - priority: 1001 + priority: -16700 } } } @@ -34436,7 +34451,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16928 + priority: 16942 } apply_if: "name" } @@ -34444,7 +34459,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16928 + priority: 16942 } apply_if: "name" } @@ -34452,7 +34467,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34460,7 +34475,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15928 + priority: 15942 } apply_if: "name" } @@ -34468,7 +34483,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34476,7 +34491,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15928 + priority: 15942 } apply_if: "name" } @@ -34484,7 +34499,7 @@ cont { scale: 14 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34492,7 +34507,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15928 + priority: 15942 } apply_if: "name" } @@ -34500,7 +34515,7 @@ cont { scale: 14 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34508,7 +34523,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15928 + priority: 15942 } apply_if: "name" } @@ -34516,7 +34531,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34524,14 +34539,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34539,14 +34554,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34554,14 +34569,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34569,14 +34584,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34584,7 +34599,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -34594,140 +34609,140 @@ cont { scale: 0 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 10 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 11 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 12 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 13 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 15 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 16 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 18 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 19 area { color: 8738 - priority: 1229 + priority: -15772 } } } @@ -34737,7 +34752,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34745,14 +34760,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34760,14 +34775,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34775,14 +34790,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34790,14 +34805,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34805,7 +34820,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -34868,7 +34883,7 @@ cont { symbol { name: "drinking-water-m" apply_for_type: 1 - priority: 16928 + priority: 16942 } caption { primary { @@ -34876,14 +34891,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "drinking-water-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -34891,14 +34906,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "drinking-water-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -34906,14 +34921,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -34921,14 +34936,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -34936,7 +34951,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -34946,7 +34961,7 @@ cont { scale: 10 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34954,14 +34969,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 11 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34969,14 +34984,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 12 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34984,14 +34999,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 13 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -34999,14 +35014,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 14 symbol { name: "volcano-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -35014,14 +35029,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 15 symbol { name: "volcano-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -35029,14 +35044,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "volcano-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -35044,14 +35059,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "volcano-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35059,14 +35074,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "volcano-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35074,14 +35089,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "volcano-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35089,7 +35104,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -35099,77 +35114,77 @@ cont { scale: 0 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 10 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35184,7 +35199,7 @@ cont { scale: 10 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -35192,7 +35207,7 @@ cont { scale: 11 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35207,7 +35222,7 @@ cont { scale: 11 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -35215,7 +35230,7 @@ cont { scale: 12 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35230,7 +35245,7 @@ cont { scale: 12 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -35238,7 +35253,7 @@ cont { scale: 12 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -35246,7 +35261,7 @@ cont { scale: 13 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35261,7 +35276,7 @@ cont { scale: 13 area { color: 8738 - priority: 1358 + priority: -15643 } apply_if: "bbox_area<4000000" } @@ -35269,7 +35284,7 @@ cont { scale: 13 area { color: 8738 - priority: 1858 + priority: -15143 } apply_if: "bbox_area<10000000" } @@ -35277,7 +35292,7 @@ cont { scale: 14 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35292,7 +35307,7 @@ cont { scale: 14 area { color: 8738 - priority: 1358 + priority: -15643 } caption { primary { @@ -35307,7 +35322,7 @@ cont { scale: 14 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35322,7 +35337,7 @@ cont { scale: 15 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35337,7 +35352,7 @@ cont { scale: 15 area { color: 8738 - priority: 1358 + priority: -15643 } caption { primary { @@ -35352,7 +35367,7 @@ cont { scale: 15 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35367,7 +35382,7 @@ cont { scale: 16 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35382,7 +35397,7 @@ cont { scale: 16 area { color: 8738 - priority: 1358 + priority: -15643 } caption { primary { @@ -35397,7 +35412,7 @@ cont { scale: 16 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35412,7 +35427,7 @@ cont { scale: 17 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35427,7 +35442,7 @@ cont { scale: 17 area { color: 8738 - priority: 1358 + priority: -15643 } caption { primary { @@ -35442,7 +35457,7 @@ cont { scale: 17 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35457,7 +35472,7 @@ cont { scale: 18 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35472,7 +35487,7 @@ cont { scale: 18 area { color: 8738 - priority: 1358 + priority: -15643 } caption { primary { @@ -35487,7 +35502,7 @@ cont { scale: 18 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35502,7 +35517,7 @@ cont { scale: 19 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35517,7 +35532,7 @@ cont { scale: 19 area { color: 8738 - priority: 1358 + priority: -15643 } caption { primary { @@ -35532,7 +35547,7 @@ cont { scale: 19 area { color: 8738 - priority: 1858 + priority: -15143 } caption { primary { @@ -35550,7 +35565,7 @@ cont { scale: 12 symbol { name: "waterfall-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -35558,14 +35573,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 13 symbol { name: "waterfall-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -35573,14 +35588,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 14 symbol { name: "waterfall-s" - priority: 16928 + priority: 16942 } caption { primary { @@ -35588,14 +35603,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 15 symbol { name: "waterfall-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -35603,14 +35618,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "waterfall-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -35618,14 +35633,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "waterfall-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35633,14 +35648,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "waterfall-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35648,14 +35663,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "waterfall-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -35663,7 +35678,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -35673,63 +35688,63 @@ cont { scale: 11 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 12 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 13 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 14 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 15 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 16 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 17 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 18 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 19 area { color: 3003130402 - priority: 1201 + priority: -15800 } } } @@ -35739,63 +35754,63 @@ cont { scale: 11 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 12 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 13 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 14 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 15 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 16 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 17 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 18 area { color: 3003130402 - priority: 1201 + priority: -15800 } } element { scale: 19 area { color: 3003130402 - priority: 1201 + priority: -15800 } } } @@ -36097,7 +36112,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36105,14 +36120,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36120,7 +36135,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36130,7 +36145,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36138,14 +36153,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36153,7 +36168,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36163,7 +36178,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36171,14 +36186,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36186,7 +36201,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36196,7 +36211,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36204,14 +36219,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36219,7 +36234,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36229,7 +36244,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36237,14 +36252,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36252,7 +36267,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -36262,7 +36277,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36270,14 +36285,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -36285,7 +36300,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -43003,7 +43018,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43019,7 +43034,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43027,7 +43042,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43043,7 +43058,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43051,7 +43066,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43067,7 +43082,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43075,7 +43090,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43091,7 +43106,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43099,7 +43114,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43115,7 +43130,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -43123,7 +43138,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -43139,7 +43154,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -44874,7 +44889,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44890,7 +44905,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44898,7 +44913,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44914,7 +44929,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44922,7 +44937,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44938,7 +44953,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44946,7 +44961,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44962,7 +44977,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44970,7 +44985,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -44986,7 +45001,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -44994,7 +45009,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45010,7 +45025,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -45021,7 +45036,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45037,7 +45052,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45045,7 +45060,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45061,7 +45076,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45069,7 +45084,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45085,7 +45100,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45093,7 +45108,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45109,7 +45124,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45117,7 +45132,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45133,7 +45148,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45141,7 +45156,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45157,7 +45172,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -45168,7 +45183,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45184,7 +45199,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45192,7 +45207,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45208,7 +45223,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45216,7 +45231,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45232,7 +45247,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45240,7 +45255,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45256,7 +45271,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45264,7 +45279,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45280,7 +45295,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -45288,7 +45303,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -45304,7 +45319,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -45315,7 +45330,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45331,7 +45346,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45339,7 +45354,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45355,7 +45370,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45363,7 +45378,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45379,7 +45394,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45387,7 +45402,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45403,7 +45418,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45411,7 +45426,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45427,7 +45442,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45435,7 +45450,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45451,7 +45466,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -45462,7 +45477,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45478,7 +45493,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45486,7 +45501,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45502,7 +45517,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45510,7 +45525,7 @@ cont { symbol { name: "subway-barcelona-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45526,7 +45541,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45534,7 +45549,7 @@ cont { symbol { name: "subway-barcelona-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45550,7 +45565,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45558,7 +45573,7 @@ cont { symbol { name: "subway-barcelona-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45574,7 +45589,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45582,7 +45597,7 @@ cont { symbol { name: "subway-barcelona-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45598,7 +45613,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -45609,7 +45624,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45625,7 +45640,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45633,7 +45648,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45649,7 +45664,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45657,7 +45672,7 @@ cont { symbol { name: "subway-berlin-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45673,7 +45688,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45681,7 +45696,7 @@ cont { symbol { name: "subway-berlin-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45697,7 +45712,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45705,7 +45720,7 @@ cont { symbol { name: "subway-berlin-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45721,7 +45736,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45729,7 +45744,7 @@ cont { symbol { name: "subway-berlin-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45745,7 +45760,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -45756,7 +45771,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45772,7 +45787,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45780,7 +45795,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45796,7 +45811,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45804,7 +45819,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45820,7 +45835,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45828,7 +45843,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45844,7 +45859,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45852,7 +45867,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45868,7 +45883,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45876,7 +45891,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45892,7 +45907,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -45903,7 +45918,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45919,7 +45934,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45927,7 +45942,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45943,7 +45958,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45951,7 +45966,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45967,7 +45982,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45975,7 +45990,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -45991,7 +46006,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -45999,7 +46014,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46015,7 +46030,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46023,7 +46038,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46039,7 +46054,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46050,7 +46065,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46066,7 +46081,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46074,7 +46089,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46090,7 +46105,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46098,7 +46113,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46114,7 +46129,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46122,7 +46137,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46138,7 +46153,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46146,7 +46161,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46162,7 +46177,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46170,7 +46185,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46186,7 +46201,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46197,7 +46212,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46213,7 +46228,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46221,7 +46236,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46237,7 +46252,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46245,7 +46260,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46261,7 +46276,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46269,7 +46284,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46285,7 +46300,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46293,7 +46308,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46309,7 +46324,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46317,7 +46332,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46333,7 +46348,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46344,7 +46359,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46360,7 +46375,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46368,7 +46383,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46384,7 +46399,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46392,7 +46407,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46408,7 +46423,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46416,7 +46431,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46432,7 +46447,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46440,7 +46455,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46456,7 +46471,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46464,7 +46479,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46480,7 +46495,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46491,7 +46506,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46507,7 +46522,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46515,7 +46530,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46531,7 +46546,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46539,7 +46554,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46555,7 +46570,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46563,7 +46578,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46579,7 +46594,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46587,7 +46602,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46603,7 +46618,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46611,7 +46626,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46627,7 +46642,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46655,7 +46670,7 @@ cont { symbol { name: "subway-kiev-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46671,7 +46686,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46679,7 +46694,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46695,7 +46710,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46703,7 +46718,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46717,7 +46732,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46725,7 +46740,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46739,7 +46754,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46747,7 +46762,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46761,7 +46776,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46769,7 +46784,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46783,7 +46798,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46794,7 +46809,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46810,7 +46825,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46818,7 +46833,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46834,7 +46849,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46842,7 +46857,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46858,7 +46873,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46866,7 +46881,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46882,7 +46897,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46890,7 +46905,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46906,7 +46921,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46914,7 +46929,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46930,7 +46945,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -46941,7 +46956,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46957,7 +46972,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46965,7 +46980,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -46981,7 +46996,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -46989,7 +47004,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47005,7 +47020,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47013,7 +47028,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47029,7 +47044,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47037,7 +47052,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47053,7 +47068,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47061,7 +47076,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47077,7 +47092,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47088,7 +47103,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47104,7 +47119,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47112,7 +47127,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47128,7 +47143,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47136,7 +47151,7 @@ cont { symbol { name: "subway-london-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47152,7 +47167,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47160,7 +47175,7 @@ cont { symbol { name: "subway-london-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47176,7 +47191,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47184,7 +47199,7 @@ cont { symbol { name: "subway-london-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47200,7 +47215,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47208,7 +47223,7 @@ cont { symbol { name: "subway-london-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47224,7 +47239,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47235,7 +47250,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47251,7 +47266,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47259,7 +47274,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47275,7 +47290,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47283,7 +47298,7 @@ cont { symbol { name: "subway-madrid-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47299,7 +47314,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47307,7 +47322,7 @@ cont { symbol { name: "subway-madrid-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47323,7 +47338,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47331,7 +47346,7 @@ cont { symbol { name: "subway-madrid-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47347,7 +47362,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47355,7 +47370,7 @@ cont { symbol { name: "subway-madrid-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47371,7 +47386,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47382,7 +47397,7 @@ cont { symbol { name: "subway-minsk-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -47391,7 +47406,7 @@ cont { stroke_color: 2148602112 offset_y: 4 } - priority: 15942 + priority: 15957 } } element { @@ -47399,7 +47414,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47415,7 +47430,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47423,7 +47438,7 @@ cont { symbol { name: "subway-minsk-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47439,7 +47454,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47447,7 +47462,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47461,7 +47476,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47469,7 +47484,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47483,7 +47498,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47491,7 +47506,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47505,7 +47520,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47513,7 +47528,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47527,7 +47542,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47538,7 +47553,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } } element { @@ -47546,7 +47561,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47562,7 +47577,7 @@ cont { offset_y: 22 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47570,7 +47585,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47586,7 +47601,7 @@ cont { offset_y: 22 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47594,7 +47609,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47610,7 +47625,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47618,7 +47633,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47634,7 +47649,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47642,7 +47657,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47656,7 +47671,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47664,7 +47679,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47678,7 +47693,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47686,7 +47701,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47700,7 +47715,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47708,7 +47723,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47722,7 +47737,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47733,7 +47748,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47749,7 +47764,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47757,7 +47772,7 @@ cont { symbol { name: "subway-newyork-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47773,7 +47788,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47781,7 +47796,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47797,7 +47812,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47805,7 +47820,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47821,7 +47836,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47829,7 +47844,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47845,7 +47860,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47853,7 +47868,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47869,7 +47884,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -47880,7 +47895,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47896,7 +47911,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47904,7 +47919,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47920,7 +47935,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47928,7 +47943,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47944,7 +47959,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47952,7 +47967,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47968,7 +47983,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -47976,7 +47991,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -47992,7 +48007,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48000,7 +48015,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48016,7 +48031,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48035,7 +48050,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48051,7 +48066,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48059,7 +48074,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48075,7 +48090,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48083,7 +48098,7 @@ cont { symbol { name: "subway-paris-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48099,7 +48114,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48107,7 +48122,7 @@ cont { symbol { name: "subway-paris-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48123,7 +48138,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48131,7 +48146,7 @@ cont { symbol { name: "subway-paris-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48147,7 +48162,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48155,7 +48170,7 @@ cont { symbol { name: "subway-paris-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48171,7 +48186,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48182,7 +48197,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48198,7 +48213,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48206,7 +48221,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48222,7 +48237,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48230,7 +48245,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48246,7 +48261,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48254,7 +48269,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48270,7 +48285,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48278,7 +48293,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48294,7 +48309,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48302,7 +48317,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48318,7 +48333,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48329,7 +48344,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48345,7 +48360,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48353,7 +48368,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48369,7 +48384,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48377,7 +48392,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48393,7 +48408,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48401,7 +48416,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48417,7 +48432,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48425,7 +48440,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48441,7 +48456,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48449,7 +48464,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48465,7 +48480,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48476,7 +48491,7 @@ cont { symbol { name: "subway-rome-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48492,7 +48507,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48500,7 +48515,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48516,7 +48531,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48524,7 +48539,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48540,7 +48555,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48548,7 +48563,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48562,7 +48577,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48570,7 +48585,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48584,7 +48599,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48592,7 +48607,7 @@ cont { symbol { name: "none" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48606,7 +48621,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48617,7 +48632,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } } element { @@ -48625,7 +48640,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48641,7 +48656,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48649,7 +48664,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48665,7 +48680,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48673,7 +48688,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48689,7 +48704,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48697,7 +48712,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48713,7 +48728,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48721,7 +48736,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48735,7 +48750,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48743,7 +48758,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48757,7 +48772,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48765,7 +48780,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48779,7 +48794,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48787,7 +48802,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48801,7 +48816,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48812,7 +48827,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48828,7 +48843,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48836,7 +48851,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48852,7 +48867,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48860,7 +48875,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48876,7 +48891,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48884,7 +48899,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48900,7 +48915,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48908,7 +48923,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48924,7 +48939,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48932,7 +48947,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48948,7 +48963,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -48959,7 +48974,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48975,7 +48990,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -48983,7 +48998,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -48999,7 +49014,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -49007,7 +49022,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -49023,7 +49038,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -49031,7 +49046,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -49047,7 +49062,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -49055,7 +49070,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -49071,7 +49086,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } element { @@ -49079,7 +49094,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16957 + priority: 16971 } caption { primary { @@ -49095,7 +49110,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15957 + priority: 15971 } } } @@ -49106,7 +49121,7 @@ cont { symbol { name: "subway-entrance-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49115,7 +49130,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49123,7 +49138,7 @@ cont { symbol { name: "subway-entrance-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49132,7 +49147,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49140,7 +49155,7 @@ cont { symbol { name: "subway-entrance-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49149,7 +49164,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49160,7 +49175,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49169,7 +49184,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49177,7 +49192,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49186,7 +49201,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49194,7 +49209,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49203,7 +49218,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49214,7 +49229,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49223,7 +49238,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49231,7 +49246,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49240,7 +49255,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49248,7 +49263,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49257,7 +49272,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49339,7 +49354,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49348,7 +49363,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49356,7 +49371,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49365,7 +49380,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49373,7 +49388,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49382,7 +49397,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49393,7 +49408,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49402,7 +49417,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49410,7 +49425,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49419,7 +49434,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49427,7 +49442,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49436,7 +49451,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49447,7 +49462,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49456,7 +49471,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15942 + priority: 15957 } } element { @@ -49464,7 +49479,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49473,7 +49488,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15942 + priority: 15957 } } element { @@ -49481,7 +49496,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49490,7 +49505,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15942 + priority: 15957 } } element { @@ -49498,7 +49513,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49507,7 +49522,7 @@ cont { stroke_color: 2148602112 offset_y: 6 } - priority: 15942 + priority: 15957 } } } @@ -49518,7 +49533,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49534,7 +49549,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49542,7 +49557,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49558,7 +49573,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49566,7 +49581,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49582,7 +49597,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49590,7 +49605,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49606,7 +49621,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -49617,7 +49632,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49626,7 +49641,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49634,7 +49649,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49643,7 +49658,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49651,7 +49666,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49660,7 +49675,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49671,7 +49686,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49680,7 +49695,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49688,7 +49703,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49697,7 +49712,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49705,7 +49720,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49714,7 +49729,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49725,7 +49740,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49734,7 +49749,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49742,7 +49757,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49751,7 +49766,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } element { @@ -49759,7 +49774,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49768,7 +49783,7 @@ cont { stroke_color: 2148602112 offset_y: 8 } - priority: 15942 + priority: 15957 } } } @@ -49779,7 +49794,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49795,7 +49810,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49803,7 +49818,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49819,7 +49834,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49827,7 +49842,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49843,7 +49858,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15942 + priority: 15957 } } element { @@ -49851,7 +49866,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16942 + priority: 16957 } caption { primary { @@ -49867,7 +49882,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -50036,21 +50051,21 @@ cont { scale: 15 symbol { name: "tram-m" - priority: 16942 + priority: 16957 } } element { scale: 16 symbol { name: "tram-m" - priority: 16942 + priority: 16957 } } element { scale: 17 symbol { name: "tram-l" - priority: 16942 + priority: 16957 } caption { primary { @@ -50066,14 +50081,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { scale: 18 symbol { name: "tram-l" - priority: 16942 + priority: 16957 } caption { primary { @@ -50089,14 +50104,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } element { scale: 19 symbol { name: "tram-l" - priority: 16942 + priority: 16957 } caption { primary { @@ -50112,7 +50127,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15942 + priority: 15957 } } } @@ -50761,7 +50776,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50769,7 +50784,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50780,21 +50795,6 @@ cont { symbol { name: "alcohol-l" apply_for_type: 1 - priority: 16871 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15871 - } - } - element { - scale: 19 - symbol { - name: "shop-m" priority: 16885 } caption { @@ -50806,6 +50806,21 @@ cont { priority: 15885 } } + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16900 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15900 + } + } } cont { name: "shop-bakery" @@ -50813,7 +50828,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50821,7 +50836,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50831,7 +50846,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50839,7 +50854,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50849,7 +50864,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50857,7 +50872,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50867,7 +50882,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50875,7 +50890,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50885,7 +50900,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50893,7 +50908,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50903,7 +50918,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50911,7 +50926,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50921,7 +50936,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50929,7 +50944,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50939,7 +50954,7 @@ cont { scale: 17 symbol { name: "car-repair-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -50947,14 +50962,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -50962,14 +50977,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50977,7 +50992,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -50987,7 +51002,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -50995,7 +51010,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51005,7 +51020,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51013,7 +51028,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51023,7 +51038,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51031,7 +51046,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51041,7 +51056,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51049,7 +51064,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51059,7 +51074,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51067,7 +51082,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51077,7 +51092,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51085,7 +51100,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51095,7 +51110,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51103,7 +51118,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51113,7 +51128,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51121,7 +51136,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51131,7 +51146,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51139,7 +51154,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51149,7 +51164,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51157,7 +51172,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51167,7 +51182,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51175,7 +51190,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51185,7 +51200,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51193,7 +51208,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51203,7 +51218,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51211,7 +51226,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51221,7 +51236,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51229,7 +51244,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51239,7 +51254,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51247,7 +51262,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51257,7 +51272,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51265,7 +51280,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51275,7 +51290,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51283,7 +51298,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51294,7 +51309,7 @@ cont { symbol { name: "laundry-l" apply_for_type: 1 - priority: 16900 + priority: 16914 } caption { primary { @@ -51302,13 +51317,28 @@ cont { color: 5592405 offset_y: 10 } - priority: 15900 + priority: 15914 } } element { scale: 18 symbol { name: "laundry-l" + priority: 16914 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15914 + } + } + element { + scale: 19 + symbol { + name: "shop-m" priority: 16900 } caption { @@ -51320,21 +51350,6 @@ cont { priority: 15900 } } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16885 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15885 - } - } } cont { name: "shop-mall" @@ -51343,7 +51358,7 @@ cont { symbol { name: "shop-m" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51351,7 +51366,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -51359,7 +51374,7 @@ cont { symbol { name: "shop-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51367,7 +51382,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -51375,7 +51390,7 @@ cont { symbol { name: "shop-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51383,14 +51398,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51398,7 +51413,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51408,7 +51423,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51416,7 +51431,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51426,7 +51441,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51434,7 +51449,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51444,7 +51459,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51452,7 +51467,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51462,7 +51477,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51470,7 +51485,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51481,7 +51496,7 @@ cont { symbol { name: "grocery-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51489,7 +51504,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51497,7 +51512,7 @@ cont { symbol { name: "grocery-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51505,14 +51520,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51520,7 +51535,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51530,7 +51545,7 @@ cont { scale: 19 symbol { name: "shop-m" - priority: 16885 + priority: 16900 } caption { primary { @@ -51538,7 +51553,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51549,7 +51564,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51557,7 +51572,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51565,7 +51580,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51573,7 +51588,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51584,7 +51599,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51592,7 +51607,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51600,7 +51615,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51608,7 +51623,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51619,7 +51634,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51627,7 +51642,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51635,7 +51650,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51643,7 +51658,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51654,7 +51669,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51662,7 +51677,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51670,7 +51685,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51678,7 +51693,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51689,7 +51704,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51697,7 +51712,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51705,7 +51720,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51713,7 +51728,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51724,7 +51739,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51732,7 +51747,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51740,7 +51755,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51748,7 +51763,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51765,11 +51780,11 @@ cont { scale: 17 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "soccer-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -51777,19 +51792,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "soccer-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51797,19 +51812,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 area { color: 1118464 - priority: -15115 + priority: -15100 } symbol { name: "soccer-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51817,7 +51832,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51828,7 +51843,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51836,7 +51851,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51844,7 +51859,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51852,7 +51867,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51863,7 +51878,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51871,7 +51886,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51879,7 +51894,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51887,7 +51902,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -51895,7 +51910,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -51903,7 +51918,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -51917,7 +51932,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { @@ -51928,7 +51943,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -51939,7 +51954,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51947,7 +51962,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -51955,7 +51970,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51963,7 +51978,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -51971,7 +51986,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51979,7 +51994,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -51990,7 +52005,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -51998,7 +52013,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52006,7 +52021,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52014,7 +52029,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52022,7 +52037,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52030,7 +52045,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -52040,14 +52055,14 @@ cont { scale: 15 symbol { name: "campsite-m" - priority: 16928 + priority: 16942 } } element { scale: 16 symbol { name: "campsite-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -52055,11 +52070,26 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 + symbol { + name: "campsite-l" + priority: 16942 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15942 + } + } + element { + scale: 18 symbol { name: "campsite-l" priority: 16928 @@ -52073,26 +52103,11 @@ cont { priority: 15928 } } - element { - scale: 18 - symbol { - name: "campsite-l" - priority: 16914 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 10 - } - priority: 15914 - } - } element { scale: 19 symbol { name: "campsite-l" - priority: 16914 + priority: 16928 } caption { primary { @@ -52100,7 +52115,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -52114,7 +52129,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { @@ -52125,7 +52140,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -52139,7 +52154,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { @@ -52150,7 +52165,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -52161,7 +52176,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52169,7 +52184,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52177,7 +52192,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52185,7 +52200,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52193,7 +52208,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52201,7 +52216,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -52212,7 +52227,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52220,7 +52235,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52228,7 +52243,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52236,7 +52251,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } element { @@ -52244,7 +52259,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16914 + priority: 16928 } caption { primary { @@ -52252,7 +52267,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15914 + priority: 15928 } } } @@ -52263,7 +52278,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52271,7 +52286,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52279,7 +52294,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52287,7 +52302,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52295,7 +52310,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52303,7 +52318,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52314,7 +52329,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52322,7 +52337,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52330,7 +52345,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52338,7 +52353,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52346,7 +52361,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52354,7 +52369,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52365,7 +52380,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52373,14 +52388,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52388,14 +52403,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "office-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52403,7 +52418,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52417,7 +52432,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { @@ -52428,7 +52443,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } } @@ -52438,7 +52453,7 @@ cont { scale: 15 symbol { name: "museum-m" - priority: 16928 + priority: 16942 min_distance: 1 } caption { @@ -52447,14 +52462,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "museum-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -52462,14 +52477,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52477,14 +52492,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52492,14 +52507,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "museum-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52507,7 +52522,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -52517,7 +52532,7 @@ cont { scale: 17 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52525,14 +52540,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52540,14 +52555,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { scale: 19 symbol { name: "picnic-l" - priority: 16885 + priority: 16900 } caption { primary { @@ -52555,7 +52570,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52566,7 +52581,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52574,7 +52589,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52582,7 +52597,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52590,7 +52605,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } element { @@ -52598,7 +52613,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16885 + priority: 16900 } caption { primary { @@ -52606,7 +52621,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15885 + priority: 15900 } } } @@ -52616,7 +52631,7 @@ cont { scale: 15 symbol { name: "zoo-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -52624,14 +52639,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 16 symbol { name: "zoo-m" - priority: 16928 + priority: 16942 } caption { primary { @@ -52639,14 +52654,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15928 + priority: 15942 } } element { scale: 17 symbol { name: "zoo-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52654,14 +52669,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 18 symbol { name: "zoo-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52669,14 +52684,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } element { scale: 19 symbol { name: "zoo-l" - priority: 16928 + priority: 16942 } caption { primary { @@ -52684,7 +52699,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15928 + priority: 15942 } } } @@ -53116,140 +53131,140 @@ cont { scale: 0 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 10 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 11 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 12 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 13 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 14 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 15 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 16 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 17 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 18 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 19 area { color: 8738 - priority: 1229 + priority: -15772 } } } @@ -53266,7 +53281,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } } element { @@ -53280,7 +53295,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53301,7 +53316,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53322,7 +53337,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53343,7 +53358,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53364,7 +53379,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53385,7 +53400,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53406,7 +53421,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53427,7 +53442,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53448,7 +53463,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53472,7 +53487,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } } element { @@ -53486,7 +53501,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53507,7 +53522,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53528,7 +53543,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53549,7 +53564,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53570,7 +53585,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53591,7 +53606,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53612,7 +53627,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53633,7 +53648,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53654,7 +53669,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53671,70 +53686,70 @@ cont { scale: 0 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 1 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 2 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 3 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 4 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 5 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 6 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 7 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 8 area { color: 8738 - priority: 1229 + priority: -15772 } } element { scale: 9 area { color: 8738 - priority: 1229 + priority: -15772 } } element { @@ -53748,7 +53763,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } } element { @@ -53762,7 +53777,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53783,7 +53798,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53804,7 +53819,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53825,7 +53840,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53846,7 +53861,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53867,7 +53882,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53888,7 +53903,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53909,7 +53924,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { @@ -53930,7 +53945,7 @@ cont { } area { color: 8738 - priority: 1215 + priority: -15786 } path_text { primary { diff --git a/data/external_resources.txt b/data/external_resources.txt index 4ed7ab1c8f..64f1a9adb9 100644 --- a/data/external_resources.txt +++ b/data/external_resources.txt @@ -1,5 +1,5 @@ -WorldCoasts.mwm 4555988 -World.mwm 28786714 +WorldCoasts.mwm 4557539 +World.mwm 28682046 01_dejavusans.ttf 633604 02_droidsans-fallback.ttf 4033420 03_jomolhari-id-a3d.ttf 1817160 diff --git a/data/resources-6plus/symbols.png b/data/resources-6plus/symbols.png index b0b48904b1..210d0cb957 100644 Binary files a/data/resources-6plus/symbols.png and b/data/resources-6plus/symbols.png differ diff --git a/data/resources-6plus/symbols.sdf b/data/resources-6plus/symbols.sdf index 71717c9318..38a36c18cc 100644 --- a/data/resources-6plus/symbols.sdf +++ b/data/resources-6plus/symbols.sdf @@ -1,179 +1,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index a111fdabcb..6e2ea9b419 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -26,305 +26,311 @@ - - - - - - - + + + + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - + - - - - - - + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index 90c33d5bf0..e4cac18c60 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -1,377 +1,382 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi/symbols.png b/data/resources-hdpi/symbols.png index 4bbeec2ebd..e95d7e07b7 100644 Binary files a/data/resources-hdpi/symbols.png and b/data/resources-hdpi/symbols.png differ diff --git a/data/resources-hdpi/symbols.sdf b/data/resources-hdpi/symbols.sdf index 5b2c2ec2ea..ffcb90da95 100644 --- a/data/resources-hdpi/symbols.sdf +++ b/data/resources-hdpi/symbols.sdf @@ -1,179 +1,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index aff2a41275..0529289283 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -26,305 +26,311 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - + - - - - - - + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index ecfb936071..b494a03245 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -8,370 +8,375 @@ - - - - - - - - + + + + + + + + - - - - + + + + - - + + - + - - + + - - - - + + + + - - - - + + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi/symbols.png b/data/resources-ldpi/symbols.png index 378c3cdcc4..18e3014d85 100644 Binary files a/data/resources-ldpi/symbols.png and b/data/resources-ldpi/symbols.png differ diff --git a/data/resources-ldpi_clear/symbols.sdf b/data/resources-ldpi_clear/symbols.sdf index 692a1dfc71..64ddd8a9d8 100644 --- a/data/resources-ldpi_clear/symbols.sdf +++ b/data/resources-ldpi_clear/symbols.sdf @@ -1,330 +1,336 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf index 75306e170e..f3576d05de 100644 --- a/data/resources-ldpi_dark/symbols.sdf +++ b/data/resources-ldpi_dark/symbols.sdf @@ -15,363 +15,368 @@ - + - - + + - + - + - + - - + + - - + + - - - + + + - + - - + + - + - + - - + + - + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi/symbols.png b/data/resources-mdpi/symbols.png index 7f29e73a50..bd14a7a7d2 100644 Binary files a/data/resources-mdpi/symbols.png and b/data/resources-mdpi/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index 3c5a1fd976..4c3641b6e5 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -18,316 +18,322 @@ - + - + - + - + - - + + - + - - - + + + - + - - + + - + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 6116520908..5603aaf505 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -1,380 +1,385 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi/symbols.png b/data/resources-xhdpi/symbols.png index 01285b0951..692ec388c5 100644 Binary files a/data/resources-xhdpi/symbols.png and b/data/resources-xhdpi/symbols.png differ diff --git a/data/resources-xhdpi/symbols.sdf b/data/resources-xhdpi/symbols.sdf index e303764fa1..fa66ddc9c5 100644 --- a/data/resources-xhdpi/symbols.sdf +++ b/data/resources-xhdpi/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index dd562f1a84..fba5060813 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -31,303 +31,309 @@ - - - - - - - - - + + + + + + + + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index 205748f3bd..c1683252a9 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -19,362 +19,367 @@ - + - + - + - + - - + + - + - - - + + + - + - - - + + + - - + + - + - - + + - - + + - + - + - - + + - + - - + + - + - + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi/symbols.png b/data/resources-xxhdpi/symbols.png index f524ae0d39..f04fb4cba9 100644 Binary files a/data/resources-xxhdpi/symbols.png and b/data/resources-xxhdpi/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index d2ec2d4717..0f21029b21 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -31,303 +31,309 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index 4ebfb7b3e5..3680ce42b8 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -1,380 +1,385 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-yota/symbols.png b/data/resources-yota/symbols.png index f74efc88f5..4e46db39aa 100644 Binary files a/data/resources-yota/symbols.png and b/data/resources-yota/symbols.png differ diff --git a/data/resources-yota/symbols.sdf b/data/resources-yota/symbols.sdf index 14ae67f309..ac31337562 100644 --- a/data/resources-yota/symbols.sdf +++ b/data/resources-yota/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss index 8d04e0309c..692216692b 100644 --- a/data/styles/clear/include/POI.mapcss +++ b/data/styles/clear/include/POI.mapcss @@ -11,7 +11,7 @@ node|z15[tourism=gallery] node|z15[tourism=zoo], area|z15[tourism=zoo] { icon-image: zoo-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 27000; } node|z15[amenity=university][name] -{ icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 27000; icon-min-distance: 12;} +{ icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 1; icon-min-distance: 12;} node|z15[amenity=university][!name]{}; node|z15[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 27000; } @@ -81,14 +81,19 @@ node|z17-[historic=archaeological_site],area|z17-[historic=archaeological_site] node|z17-[historic=ruins],area|z17-[historic=ruins] { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 26000; } node|z17-[historic=fort],area|z17-[historic=fort] { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 26000; } node|z17-[historic=castle],area|z17-[historic=castle] { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 26000; } +/*node|z17-[amenity=fire_station], area|z17-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000; }*/ + node|z18-[tourism=camp_site], area|z18-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 26000; } node|z18-[tourism=picnic_site], area|z18-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000; } node|z18-[amenity=shelter], area|z18-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000; } +node|z18-[amenity=fire_station], area|z18-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000; } + node|z19-[tourism=camp_site], area|z19-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 26000; } node|z19-[tourism=picnic_site], area|z19-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 25000; } node|z19-[amenity=shelter], area|z19-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 25000; } +node|z19-[amenity=fire_station], area|z19-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000; } /* NATURAL*/ @@ -186,7 +191,7 @@ node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; t node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 26000; } node|z16[amenity=hospital], area|z16[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 27000;} node|z16[amenity=clinic], area|z16[amenity=clinic] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 24000; } -node|z16[amenity=university], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 4;z-index: 26000;icon-min-distance: 11; } +node|z16[amenity=university], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1;icon-min-distance: 11; } node|z16[amenity=university], area|z16[amenity=university][!name]{}; node|z16[amenity=fuel], area|z16[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; } node|z16-[natural=spring],area|z16-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 100; z-index: 27000; } @@ -197,12 +202,12 @@ node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-l.svg node|z17[amenity=place_of_worship], area|z17[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 26000;} node|z17[amenity=theatre], area|z17[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 26000; } -node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 24000; } +node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 21000; } node|z17[amenity=school], area|z17[amenity=school] { icon-image: school-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000;} node|z17[amenity=college], area|z17[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 26000;} node|z17[amenity=hospital], area|z17[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 27000; } node|z17[amenity=clinic], area|z17[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 24000;} -node|z17[amenity=university], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 4; z-index: 26000;icon-min-distance: 10;} +node|z17[amenity=university], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1; icon-min-distance: 10;} node|z17[amenity=university], area|z17[amenity=university][!name]{}; node|z17[amenity=cinema], area|z17[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000;} node|z17[amenity=bank], area|z17[amenity=bank] { z-index: 4500; icon-image: bank-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 26000;} @@ -231,7 +236,7 @@ node|z18-[amenity=school], area|z18-[amenity=school] { icon-image: school-l.svg; node|z18-[amenity=college], area|z18-[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 26000;} node|z18-[amenity=hospital], area|z18-[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 27000; } node|z18-[amenity=clinic], area|z18-[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 24000;} -node|z18-[amenity=university], area|z18-[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 26000; } +node|z18-[amenity=university], area|z18-[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 1; } node|z18-[amenity=university], area|z18-[amenity=university][!name]{}; node|z18-[amenity=cinema], area|z18-[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000;} node|z18-[amenity=bank], area|z18-[amenity=bank] { z-index: 4500; icon-image: bank-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 26000;} @@ -316,12 +321,12 @@ node|z17-[building=hospital], area|z17-[building=hospital] { icon-image: hospita /* PARKINGS */ area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;fill-position:background;z-index: 6; } -node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 24000; } -node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 24000; } +node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 6; } +node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 6; } node|z17[amenity=parking][access=permissive], -node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 24000; } +node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 6; } -node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 24000; } +node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } area|z17-[aeroway=heliport], diff --git a/data/styles/clear/include/Z-INDEXES b/data/styles/clear/include/Z-INDEXES index 46eadd1247..6a482e6d3e 100644 --- a/data/styles/clear/include/Z-INDEXES +++ b/data/styles/clear/include/Z-INDEXES @@ -3,7 +3,7 @@ Z-INDEXES /*NATURE -1000 - 1 */ area|z0-[natural=coastline] -{z-index: -1000;} +{z-index: -10;} area|z0-[natural=land] {z-index: 0;} area|z0-[natural=glacier] diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss index e3d3c120e5..1d541b581b 100644 --- a/data/styles/clear/include/labels.mapcss +++ b/data/styles/clear/include/labels.mapcss @@ -1780,11 +1780,13 @@ area|z17-[landuse=vineyard], } /* SPORT */ +/* {text: name; font-size: 10; text-color: @city_label; text-position: center; z-index: 5000;} +*/ /* MILITARY */ diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss index c3bc7bbdc7..009346f122 100644 --- a/data/styles/clear/include/landuse.mapcss +++ b/data/styles/clear/include/landuse.mapcss @@ -16,6 +16,7 @@ area|z12-[man_made=breakwater], fill-color: @background; fill-opacity: 1; z-index: 120; + fill-position: background; } line|z14-[man_made=pier], @@ -25,6 +26,7 @@ line|z14-[man_made=breakwater] fill-color: @background; fill-opacity: 1; z-index: 120; + fill-position: background; } line|z17-[man_made=pier], line|z17-[man_made=breakwater] @@ -33,6 +35,7 @@ line|z17-[man_made=breakwater] fill-color: @background; fill-opacity: 1; z-index: 120; + fill-position: background; } /* PEDESTRIAN AREAS */ @@ -47,6 +50,7 @@ area|z14-[area:highway=living_street], fill-position: background; fill-opacity: 1; z-index: 44; + } area|z16-[highway=pedestrian][area?], diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss index ac9919a4c5..95a5d2df14 100644 --- a/data/styles/clear/include/natural.mapcss +++ b/data/styles/clear/include/natural.mapcss @@ -4,6 +4,7 @@ area|z0-9[natural=land] { fill-opacity: 1; fill-color: @background; + fill-position: background; z-index: 0; } @@ -11,6 +12,7 @@ area|z10-[natural=land] { fill-opacity: 1; fill-color: @background; + fill-position: background; z-index: 0; } @@ -18,6 +20,7 @@ area|z10-[natural=land] area|z0-[natural=glacier] { fill-color: @glacier; + fill-position: background; z-index: 1; } @@ -28,7 +31,7 @@ area|z0-10[natural=coastline] fill-color: @water; fill-position: background; opacity: 1; - z-index: -1000; + z-index: -10; } area|z11-19[natural=coastline] @@ -36,14 +39,14 @@ area|z11-19[natural=coastline] fill-color: @water; fill-position: background; opacity: 1; - z-index: -1000; + z-index: -10; } area|z10-19[natural=coastline] { fill-color: @water; fill-position: background; - z-index: -1000; + z-index: -10; } area|z16-[amenity=fountain], area|z12-[landuse=basin], @@ -59,6 +62,7 @@ area|z10-[natural=bay], { fill-color: @water; z-index: 100; + fill-position: background; } @@ -66,6 +70,8 @@ area|z11-[natural=wetland] { z-index: 49; fill-opacity: 0.3; fill-color: @water; + fill-position: background; + } /* rivers */ @@ -288,6 +294,7 @@ area|z13-[leisure=golf_course] fill-color: @green0; fill-opacity: 1; z-index: 45; + fill-position: background; } area|z13-[landuse=farmland], @@ -314,6 +321,7 @@ area|z14-[leisure=golf_course] fill-color: @green1; fill-opacity: 1; z-index: 45; + fill-position: background; } area|z14-[landuse=farmland], @@ -340,6 +348,7 @@ area|z17-[leisure=golf_course] fill-color: @green1; fill-opacity: 1; z-index: 45; + fill-position: background; } /* BEACH */ diff --git a/data/styles/clear/style-clear/6plus/route_from.png b/data/styles/clear/style-clear/6plus/route_from.png index f073e4df01..130060ea78 100644 Binary files a/data/styles/clear/style-clear/6plus/route_from.png and b/data/styles/clear/style-clear/6plus/route_from.png differ diff --git a/data/styles/clear/style-clear/6plus/route_to.png b/data/styles/clear/style-clear/6plus/route_to.png index 41d23aafad..4c3f8b727b 100644 Binary files a/data/styles/clear/style-clear/6plus/route_to.png and b/data/styles/clear/style-clear/6plus/route_to.png differ diff --git a/data/styles/clear/style-clear/hdpi/route_from.png b/data/styles/clear/style-clear/hdpi/route_from.png index 793fa6b817..b457b0f2a5 100644 Binary files a/data/styles/clear/style-clear/hdpi/route_from.png and b/data/styles/clear/style-clear/hdpi/route_from.png differ diff --git a/data/styles/clear/style-clear/hdpi/route_to.png b/data/styles/clear/style-clear/hdpi/route_to.png index 718f6d1b0e..4b0ecaab94 100644 Binary files a/data/styles/clear/style-clear/hdpi/route_to.png and b/data/styles/clear/style-clear/hdpi/route_to.png differ diff --git a/data/styles/clear/style-clear/ldpi/route_from.png b/data/styles/clear/style-clear/ldpi/route_from.png index 541626a1d5..e305504f3b 100644 Binary files a/data/styles/clear/style-clear/ldpi/route_from.png and b/data/styles/clear/style-clear/ldpi/route_from.png differ diff --git a/data/styles/clear/style-clear/ldpi/route_to.png b/data/styles/clear/style-clear/ldpi/route_to.png index da6017cf44..4c87d967b2 100644 Binary files a/data/styles/clear/style-clear/ldpi/route_to.png and b/data/styles/clear/style-clear/ldpi/route_to.png differ diff --git a/data/styles/clear/style-clear/mdpi/route_from.png b/data/styles/clear/style-clear/mdpi/route_from.png index 8d22b8243d..c3d31ff777 100644 Binary files a/data/styles/clear/style-clear/mdpi/route_from.png and b/data/styles/clear/style-clear/mdpi/route_from.png differ diff --git a/data/styles/clear/style-clear/mdpi/route_to.png b/data/styles/clear/style-clear/mdpi/route_to.png index 581bb0e408..47d548989f 100644 Binary files a/data/styles/clear/style-clear/mdpi/route_to.png and b/data/styles/clear/style-clear/mdpi/route_to.png differ diff --git a/data/styles/clear/style-clear/symbols/bcontrol-l.svg b/data/styles/clear/style-clear/symbols/bcontrol-l.svg index 05d8d1faa3..2ff50d6997 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-l.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-l.svg @@ -1,17 +1,17 @@ - + bcontrol-l Created with Sketch. - + - + - + diff --git a/data/styles/clear/style-clear/symbols/bcontrol-m.svg b/data/styles/clear/style-clear/symbols/bcontrol-m.svg index bd2fbf45c1..4835c849f9 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-m.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-m.svg @@ -1,13 +1,13 @@ - + bcontrol-m Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/clear/style-clear/symbols/bcontrol-s.svg index daae8381a6..1600d49c50 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-s.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-s.svg @@ -1,15 +1,15 @@ - + bcontrol-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 index a449898102..1c853749cf 100755 --- a/data/styles/clear/style-clear/symbols/beer-l.svg +++ b/data/styles/clear/style-clear/symbols/beer-l.svg @@ -1,15 +1,18 @@ - - - - - - - - - - - - + + + + beer-l + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/beer-m.svg b/data/styles/clear/style-clear/symbols/beer-m.svg index 126091802a..daee436372 100755 --- a/data/styles/clear/style-clear/symbols/beer-m.svg +++ b/data/styles/clear/style-clear/symbols/beer-m.svg @@ -1,15 +1,18 @@ - - - - - - - - - - - - + + + + beer-m + 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 index d65eaed025..a8bb477425 100644 --- a/data/styles/clear/style-clear/symbols/beer-s.svg +++ b/data/styles/clear/style-clear/symbols/beer-s.svg @@ -1,14 +1,8 @@ - + beer-s Created with Sketch. - - - - - - - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/car-repair-l.svg b/data/styles/clear/style-clear/symbols/car-repair-l.svg index b9e68bfe2f..6bb867e67d 100755 --- a/data/styles/clear/style-clear/symbols/car-repair-l.svg +++ b/data/styles/clear/style-clear/symbols/car-repair-l.svg @@ -1,15 +1,18 @@ - - - - - - - - - - - - + + + + car-repair-l + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/car-repair-m.svg b/data/styles/clear/style-clear/symbols/car-repair-m.svg index b6cd451f4a..ab08bef315 100755 --- a/data/styles/clear/style-clear/symbols/car-repair-m.svg +++ b/data/styles/clear/style-clear/symbols/car-repair-m.svg @@ -1,15 +1,18 @@ - - - - - - - - - - - - + + + + car-repair-m + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/car-repair-s.svg b/data/styles/clear/style-clear/symbols/car-repair-s.svg new file mode 100644 index 0000000000..dd782631fe --- /dev/null +++ b/data/styles/clear/style-clear/symbols/car-repair-s.svg @@ -0,0 +1,8 @@ + + + + car-repair-s + Created with Sketch. + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/cave-l.svg b/data/styles/clear/style-clear/symbols/cave-l.svg index 0de66ef01b..7ebbfb8eb8 100644 --- a/data/styles/clear/style-clear/symbols/cave-l.svg +++ b/data/styles/clear/style-clear/symbols/cave-l.svg @@ -1,6 +1,6 @@ - + cave-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/cave-m.svg b/data/styles/clear/style-clear/symbols/cave-m.svg index 84119c320b..f0824ab477 100644 --- a/data/styles/clear/style-clear/symbols/cave-m.svg +++ b/data/styles/clear/style-clear/symbols/cave-m.svg @@ -1,6 +1,6 @@ - + cave-m Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/cave-s.svg b/data/styles/clear/style-clear/symbols/cave-s.svg index 4d082c45a9..6b74d69b59 100644 --- a/data/styles/clear/style-clear/symbols/cave-s.svg +++ b/data/styles/clear/style-clear/symbols/cave-s.svg @@ -1,6 +1,6 @@ - + cave-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/cemetery-l.svg b/data/styles/clear/style-clear/symbols/cemetery-l.svg index bdc54a6307..43284e4f1b 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-l.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-l.svg @@ -1,11 +1,11 @@ - - cementry-l + + cemetery-l Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/cemetery-m.svg b/data/styles/clear/style-clear/symbols/cemetery-m.svg index 3a839809bd..19178779f4 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-m.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-m.svg @@ -1,11 +1,11 @@ - - cementry-m + + cemetery-m Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/cemetery-s.svg b/data/styles/clear/style-clear/symbols/cemetery-s.svg index b8ca3e075a..07a1577b18 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-s.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-s.svg @@ -1,11 +1,11 @@ - - cementry-s + + cemetery-s Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/color_test2.sketch b/data/styles/clear/style-clear/symbols/color_test2.sketch new file mode 100644 index 0000000000..427022690a Binary files /dev/null and b/data/styles/clear/style-clear/symbols/color_test2.sketch differ diff --git a/data/styles/clear/style-clear/symbols/fire_station-l.svg b/data/styles/clear/style-clear/symbols/fire_station-l.svg new file mode 100644 index 0000000000..10168916d9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/fire_station-l.svg @@ -0,0 +1,14 @@ + + + + fire_station-l + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/fire_station-m.svg b/data/styles/clear/style-clear/symbols/fire_station-m.svg new file mode 100644 index 0000000000..bedb1dc49e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/fire_station-m.svg @@ -0,0 +1,14 @@ + + + + fire_station-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/fire_station-s.svg b/data/styles/clear/style-clear/symbols/fire_station-s.svg new file mode 100644 index 0000000000..9bed05646b --- /dev/null +++ b/data/styles/clear/style-clear/symbols/fire_station-s.svg @@ -0,0 +1,8 @@ + + + + fire_station-s + Created with Sketch. + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/fountain-l.svg b/data/styles/clear/style-clear/symbols/fountain-l.svg index 04e019472f..33a4369301 100644 --- a/data/styles/clear/style-clear/symbols/fountain-l.svg +++ b/data/styles/clear/style-clear/symbols/fountain-l.svg @@ -1,6 +1,6 @@ - - + + fountain-l Created with Sketch. @@ -8,14 +8,10 @@ - - - - - - - - + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/fountain-m.svg b/data/styles/clear/style-clear/symbols/fountain-m.svg index e6b41558e9..44c983997a 100644 --- a/data/styles/clear/style-clear/symbols/fountain-m.svg +++ b/data/styles/clear/style-clear/symbols/fountain-m.svg @@ -1,6 +1,6 @@ - - + + fountain-m Created with Sketch. @@ -8,12 +8,10 @@ - - - - - - + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/fountain-s.svg b/data/styles/clear/style-clear/symbols/fountain-s.svg index 83113ccbdc..ca45ff9e31 100644 --- a/data/styles/clear/style-clear/symbols/fountain-s.svg +++ b/data/styles/clear/style-clear/symbols/fountain-s.svg @@ -1,6 +1,6 @@ - - + + fountain-s Created with Sketch. @@ -8,12 +8,10 @@ - - - - - - + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/heliport-l.svg b/data/styles/clear/style-clear/symbols/heliport-l.svg index 33a6b3ed16..dcd7b23feb 100644 --- a/data/styles/clear/style-clear/symbols/heliport-l.svg +++ b/data/styles/clear/style-clear/symbols/heliport-l.svg @@ -1,6 +1,6 @@ - + heliport-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/heliport-m.svg b/data/styles/clear/style-clear/symbols/heliport-m.svg index 7e68eeb89c..c0943c94f6 100644 --- a/data/styles/clear/style-clear/symbols/heliport-m.svg +++ b/data/styles/clear/style-clear/symbols/heliport-m.svg @@ -1,6 +1,6 @@ - + heliport-m Created with Sketch. @@ -10,6 +10,5 @@ - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/heliport-s copy.svg b/data/styles/clear/style-clear/symbols/heliport-s copy.svg new file mode 100644 index 0000000000..755b62a379 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/heliport-s copy.svg @@ -0,0 +1,14 @@ + + + + heliport-s copy + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/heliport-s.svg b/data/styles/clear/style-clear/symbols/heliport-s.svg index 5bee26b2b6..d2df32d14f 100644 --- a/data/styles/clear/style-clear/symbols/heliport-s.svg +++ b/data/styles/clear/style-clear/symbols/heliport-s.svg @@ -1,6 +1,6 @@ - + heliport-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-l.svg b/data/styles/clear/style-clear/symbols/hunting-tower-l.svg index 01200d780e..c2bf68ae8a 100755 --- a/data/styles/clear/style-clear/symbols/hunting-tower-l.svg +++ b/data/styles/clear/style-clear/symbols/hunting-tower-l.svg @@ -1,15 +1,18 @@ - - - - - - - - - - - - + + + + hunting-tower-l + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg index 24ffb1a9b1..a75c8995a0 100755 --- a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg +++ b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg @@ -1,15 +1,18 @@ - - - - - - - - - - - - + + + + hunting-tower-m + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-s.svg b/data/styles/clear/style-clear/symbols/hunting-tower-s.svg new file mode 100644 index 0000000000..92a5e947f0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hunting-tower-s.svg @@ -0,0 +1,8 @@ + + + + hunting-tower-s + Created with Sketch. + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/kindergarten-l.svg b/data/styles/clear/style-clear/symbols/kindergarten-l.svg index 5a0997757c..6b8c154bec 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-l.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-l.svg @@ -1,6 +1,6 @@ - + kindergarten-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/kindergarten-m.svg b/data/styles/clear/style-clear/symbols/kindergarten-m.svg index 062ae9cf3e..3951b225e7 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-m.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-m.svg @@ -1,6 +1,6 @@ - + kindergarten-m Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/kindergarten-s.svg b/data/styles/clear/style-clear/symbols/kindergarten-s.svg index 4961a884bd..389af5ff2f 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-s.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-s.svg @@ -1,6 +1,6 @@ - + kindergarten-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/laundry-l.svg b/data/styles/clear/style-clear/symbols/laundry-l.svg index 731e4c9130..5d2bb6cc1e 100755 --- a/data/styles/clear/style-clear/symbols/laundry-l.svg +++ b/data/styles/clear/style-clear/symbols/laundry-l.svg @@ -1,6 +1,6 @@ - + laundry-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/laundry-m.svg b/data/styles/clear/style-clear/symbols/laundry-m.svg index 5e8c2cef00..ad1c48b37f 100755 --- a/data/styles/clear/style-clear/symbols/laundry-m.svg +++ b/data/styles/clear/style-clear/symbols/laundry-m.svg @@ -1,6 +1,6 @@ - + laundry-m Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/lighthouse-l.svg b/data/styles/clear/style-clear/symbols/lighthouse-l.svg index 9f6d7a0ae8..ad1477c718 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-l.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-l.svg @@ -1,6 +1,6 @@ - + lighthouse-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/lighthouse-m.svg b/data/styles/clear/style-clear/symbols/lighthouse-m.svg index 36eee26010..554beb14ef 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-m.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-m.svg @@ -1,6 +1,6 @@ - + lighthouse-m Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/lighthouse-s.svg b/data/styles/clear/style-clear/symbols/lighthouse-s.svg index 42330b04a7..c7198b114f 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-s.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-s.svg @@ -1,6 +1,6 @@ - + lighthouse-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/military-l.svg b/data/styles/clear/style-clear/symbols/military-l.svg index 6125af9799..aba483057f 100644 --- a/data/styles/clear/style-clear/symbols/military-l.svg +++ b/data/styles/clear/style-clear/symbols/military-l.svg @@ -1,19 +1,14 @@ - - - millitary-l + + + military-l Created with Sketch. - + - - - - - - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/clear/style-clear/symbols/military-m.svg index d6dba43a82..dbde33d8f5 100644 --- a/data/styles/clear/style-clear/symbols/military-m.svg +++ b/data/styles/clear/style-clear/symbols/military-m.svg @@ -1,19 +1,14 @@ - - - millitary-m + + + military-m Created with Sketch. - + - - - - - - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/military-s.svg b/data/styles/clear/style-clear/symbols/military-s.svg index 1336e0c9cd..f379b1c46d 100644 --- a/data/styles/clear/style-clear/symbols/military-s.svg +++ b/data/styles/clear/style-clear/symbols/military-s.svg @@ -1,19 +1,14 @@ - - - millitary-s + + + military-s Created with Sketch. - + - - - - - - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/office-l.svg b/data/styles/clear/style-clear/symbols/office-l.svg index 14398b144b..56bccd5fec 100644 --- a/data/styles/clear/style-clear/symbols/office-l.svg +++ b/data/styles/clear/style-clear/symbols/office-l.svg @@ -1,6 +1,6 @@ - + office-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/office-m.svg b/data/styles/clear/style-clear/symbols/office-m.svg index 2c1abc1aee..8ae4bf21e1 100644 --- a/data/styles/clear/style-clear/symbols/office-m.svg +++ b/data/styles/clear/style-clear/symbols/office-m.svg @@ -1,6 +1,6 @@ - + office-m Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/office-s.svg b/data/styles/clear/style-clear/symbols/office-s.svg index 1cbecee942..3723332efd 100644 --- a/data/styles/clear/style-clear/symbols/office-s.svg +++ b/data/styles/clear/style-clear/symbols/office-s.svg @@ -1,6 +1,6 @@ - + office-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/picnic-l.svg b/data/styles/clear/style-clear/symbols/picnic-l.svg index 4c98810005..39746523a0 100644 --- a/data/styles/clear/style-clear/symbols/picnic-l.svg +++ b/data/styles/clear/style-clear/symbols/picnic-l.svg @@ -1,6 +1,6 @@ - + picnic-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/picnic-m.svg b/data/styles/clear/style-clear/symbols/picnic-m.svg index f0a2adbdd8..f6689f8848 100644 --- a/data/styles/clear/style-clear/symbols/picnic-m.svg +++ b/data/styles/clear/style-clear/symbols/picnic-m.svg @@ -1,6 +1,6 @@ - + picnic-m Created with Sketch. @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/clear/style-clear/symbols/picnic-s.svg index ec3150cf0d..dea5b0fd34 100644 --- a/data/styles/clear/style-clear/symbols/picnic-s.svg +++ b/data/styles/clear/style-clear/symbols/picnic-s.svg @@ -1,6 +1,6 @@ - + picnic-s Created with Sketch. @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/remains-l.svg b/data/styles/clear/style-clear/symbols/remains-l.svg index cd8a1c8dc7..795994ee07 100644 --- a/data/styles/clear/style-clear/symbols/remains-l.svg +++ b/data/styles/clear/style-clear/symbols/remains-l.svg @@ -1,6 +1,6 @@ - + remains-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/remains-m.svg b/data/styles/clear/style-clear/symbols/remains-m.svg index 126947d2ff..38abd6dc32 100644 --- a/data/styles/clear/style-clear/symbols/remains-m.svg +++ b/data/styles/clear/style-clear/symbols/remains-m.svg @@ -1,6 +1,6 @@ - + remains-m Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/remains-s.svg b/data/styles/clear/style-clear/symbols/remains-s.svg index 9ecaa87fb8..a254a1a777 100644 --- a/data/styles/clear/style-clear/symbols/remains-s.svg +++ b/data/styles/clear/style-clear/symbols/remains-s.svg @@ -1,6 +1,6 @@ - + remains-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/volcano-l.svg b/data/styles/clear/style-clear/symbols/volcano-l.svg index c147fe095d..6219cdb5dd 100644 --- a/data/styles/clear/style-clear/symbols/volcano-l.svg +++ b/data/styles/clear/style-clear/symbols/volcano-l.svg @@ -1,6 +1,6 @@ - + volcano-l Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/volcano-m.svg b/data/styles/clear/style-clear/symbols/volcano-m.svg index 9cb5040bee..b6fca65485 100644 --- a/data/styles/clear/style-clear/symbols/volcano-m.svg +++ b/data/styles/clear/style-clear/symbols/volcano-m.svg @@ -1,6 +1,6 @@ - + volcano-m Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/volcano-s.svg b/data/styles/clear/style-clear/symbols/volcano-s.svg index 8989b41416..5fbdaf20c1 100644 --- a/data/styles/clear/style-clear/symbols/volcano-s.svg +++ b/data/styles/clear/style-clear/symbols/volcano-s.svg @@ -1,6 +1,6 @@ - + volcano-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/waterfall-l.svg b/data/styles/clear/style-clear/symbols/waterfall-l.svg index 919661137a..ff22a86677 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-l.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-l.svg @@ -1,11 +1,11 @@ - - + + waterfall-l Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/waterfall-m.svg b/data/styles/clear/style-clear/symbols/waterfall-m.svg index f3fd3c201e..1005320c4c 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-m.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-m.svg @@ -1,11 +1,11 @@ - - + + waterfall-m Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/waterfall-s.svg b/data/styles/clear/style-clear/symbols/waterfall-s.svg index 85c9eb9474..3cbda8b3dd 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-s.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-s.svg @@ -1,11 +1,11 @@ - - + + waterfall-s Created with Sketch. - + diff --git a/data/styles/clear/style-clear/xhdpi/route_from.png b/data/styles/clear/style-clear/xhdpi/route_from.png index be419ee49d..3e2de72ae2 100644 Binary files a/data/styles/clear/style-clear/xhdpi/route_from.png and b/data/styles/clear/style-clear/xhdpi/route_from.png differ diff --git a/data/styles/clear/style-clear/xhdpi/route_to.png b/data/styles/clear/style-clear/xhdpi/route_to.png index 7226f77951..71ac6ff4ec 100644 Binary files a/data/styles/clear/style-clear/xhdpi/route_to.png and b/data/styles/clear/style-clear/xhdpi/route_to.png differ diff --git a/data/styles/clear/style-clear/xxhdpi/route_from.png b/data/styles/clear/style-clear/xxhdpi/route_from.png index 347cf712fb..3464497403 100644 Binary files a/data/styles/clear/style-clear/xxhdpi/route_from.png and b/data/styles/clear/style-clear/xxhdpi/route_from.png differ diff --git a/data/styles/clear/style-clear/xxhdpi/route_to.png b/data/styles/clear/style-clear/xxhdpi/route_to.png index 452f859594..449b7be1b7 100644 Binary files a/data/styles/clear/style-clear/xxhdpi/route_to.png and b/data/styles/clear/style-clear/xxhdpi/route_to.png differ diff --git a/data/styles/clear/style-night/symbols/bcontrol-l.svg b/data/styles/clear/style-night/symbols/bcontrol-l.svg index 723706ecbb..9b87ba0847 100644 --- a/data/styles/clear/style-night/symbols/bcontrol-l.svg +++ b/data/styles/clear/style-night/symbols/bcontrol-l.svg @@ -1,6 +1,6 @@ - + bcontrol-l Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/bcontrol-m.svg b/data/styles/clear/style-night/symbols/bcontrol-m.svg index 062a9a179c..8385ea55e4 100644 --- a/data/styles/clear/style-night/symbols/bcontrol-m.svg +++ b/data/styles/clear/style-night/symbols/bcontrol-m.svg @@ -1,7 +1,7 @@ - - bcontrol-m copy + + bcontrol-m Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/bcontrol-s.svg b/data/styles/clear/style-night/symbols/bcontrol-s.svg index 22bd41cf35..1f818aa6e6 100644 --- a/data/styles/clear/style-night/symbols/bcontrol-s.svg +++ b/data/styles/clear/style-night/symbols/bcontrol-s.svg @@ -1,7 +1,7 @@ - - bcontrol-s copy + + bcontrol-s Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/beer-l.svg b/data/styles/clear/style-night/symbols/beer-l.svg index d4b56565e9..b19f3afa01 100644 --- a/data/styles/clear/style-night/symbols/beer-l.svg +++ b/data/styles/clear/style-night/symbols/beer-l.svg @@ -1,14 +1,18 @@ - + beer-l Created with Sketch. - - - + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/beer-m.svg b/data/styles/clear/style-night/symbols/beer-m.svg index 954ac7c8b8..3c7e414fa2 100644 --- a/data/styles/clear/style-night/symbols/beer-m.svg +++ b/data/styles/clear/style-night/symbols/beer-m.svg @@ -1,14 +1,18 @@ - + beer-m Created with Sketch. - - - + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/campsite-l.svg b/data/styles/clear/style-night/symbols/campsite-l.svg index d906f5931b..efa64cf314 100644 --- a/data/styles/clear/style-night/symbols/campsite-l.svg +++ b/data/styles/clear/style-night/symbols/campsite-l.svg @@ -1,14 +1,14 @@ - + campsite-l Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/campsite-m.svg b/data/styles/clear/style-night/symbols/campsite-m.svg index 8599f22779..79a4db3663 100644 --- a/data/styles/clear/style-night/symbols/campsite-m.svg +++ b/data/styles/clear/style-night/symbols/campsite-m.svg @@ -1,14 +1,14 @@ - + campsite-m Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/campsite-s.svg b/data/styles/clear/style-night/symbols/campsite-s.svg index b5df92c40c..c920e2efcb 100644 --- a/data/styles/clear/style-night/symbols/campsite-s.svg +++ b/data/styles/clear/style-night/symbols/campsite-s.svg @@ -1,14 +1,14 @@ - + campsite-s Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/car-repair-l.svg b/data/styles/clear/style-night/symbols/car-repair-l.svg index f88cf4180d..99f5d8036e 100644 --- a/data/styles/clear/style-night/symbols/car-repair-l.svg +++ b/data/styles/clear/style-night/symbols/car-repair-l.svg @@ -1,6 +1,6 @@ - + car-repair-l Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/car-repair-m.svg b/data/styles/clear/style-night/symbols/car-repair-m.svg index 502d846470..48820129d7 100644 --- a/data/styles/clear/style-night/symbols/car-repair-m.svg +++ b/data/styles/clear/style-night/symbols/car-repair-m.svg @@ -1,6 +1,6 @@ - + car-repair-m Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/cave-l.svg b/data/styles/clear/style-night/symbols/cave-l.svg index 54d30490af..1a2d2a6593 100644 --- a/data/styles/clear/style-night/symbols/cave-l.svg +++ b/data/styles/clear/style-night/symbols/cave-l.svg @@ -1,16 +1,16 @@ - + cave-l Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/cave-m.svg b/data/styles/clear/style-night/symbols/cave-m.svg index d6c3c200b1..602e938881 100644 --- a/data/styles/clear/style-night/symbols/cave-m.svg +++ b/data/styles/clear/style-night/symbols/cave-m.svg @@ -1,14 +1,14 @@ - + cave-m Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/cave-s.svg b/data/styles/clear/style-night/symbols/cave-s.svg index 6b7046485c..2e18ad51e1 100644 --- a/data/styles/clear/style-night/symbols/cave-s.svg +++ b/data/styles/clear/style-night/symbols/cave-s.svg @@ -1,14 +1,14 @@ - + cave-s Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/cemetery-l.svg b/data/styles/clear/style-night/symbols/cemetery-l.svg index d15896e2a4..dffb3710cc 100644 --- a/data/styles/clear/style-night/symbols/cemetery-l.svg +++ b/data/styles/clear/style-night/symbols/cemetery-l.svg @@ -1,14 +1,14 @@ - + cemetery-l Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/cemetery-m.svg b/data/styles/clear/style-night/symbols/cemetery-m.svg index b49b6d9304..6ad000ebdb 100644 --- a/data/styles/clear/style-night/symbols/cemetery-m.svg +++ b/data/styles/clear/style-night/symbols/cemetery-m.svg @@ -1,14 +1,14 @@ - + cemetery-m Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/cemetery-s.svg b/data/styles/clear/style-night/symbols/cemetery-s.svg index a82105c7a5..6af10371b2 100644 --- a/data/styles/clear/style-night/symbols/cemetery-s.svg +++ b/data/styles/clear/style-night/symbols/cemetery-s.svg @@ -1,14 +1,14 @@ - + cemetery-s Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/fire_station-l.svg b/data/styles/clear/style-night/symbols/fire_station-l.svg new file mode 100644 index 0000000000..44981f243a --- /dev/null +++ b/data/styles/clear/style-night/symbols/fire_station-l.svg @@ -0,0 +1,14 @@ + + + + fire_station-l + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/fire_station-m.svg b/data/styles/clear/style-night/symbols/fire_station-m.svg new file mode 100644 index 0000000000..5909cf0c9e --- /dev/null +++ b/data/styles/clear/style-night/symbols/fire_station-m.svg @@ -0,0 +1,14 @@ + + + + fire_station-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/fire_station-s.svg b/data/styles/clear/style-night/symbols/fire_station-s.svg new file mode 100644 index 0000000000..9bed05646b --- /dev/null +++ b/data/styles/clear/style-night/symbols/fire_station-s.svg @@ -0,0 +1,8 @@ + + + + fire_station-s + Created with Sketch. + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/fountain-l.svg b/data/styles/clear/style-night/symbols/fountain-l.svg index 1e8e65f5f7..66be375a35 100644 --- a/data/styles/clear/style-night/symbols/fountain-l.svg +++ b/data/styles/clear/style-night/symbols/fountain-l.svg @@ -1,14 +1,14 @@ - - + + fountain-l Created with Sketch. - - + + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/fountain-m.svg b/data/styles/clear/style-night/symbols/fountain-m.svg index 365b2f2ec5..ef31dd8f13 100644 --- a/data/styles/clear/style-night/symbols/fountain-m.svg +++ b/data/styles/clear/style-night/symbols/fountain-m.svg @@ -1,14 +1,14 @@ - - + + fountain-m Created with Sketch. - - + + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/fountain-s.svg b/data/styles/clear/style-night/symbols/fountain-s.svg index 7fcbf1dc62..4750b8a24e 100644 --- a/data/styles/clear/style-night/symbols/fountain-s.svg +++ b/data/styles/clear/style-night/symbols/fountain-s.svg @@ -1,14 +1,14 @@ - - + + fountain-s Created with Sketch. - - + + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/heliport-l.svg b/data/styles/clear/style-night/symbols/heliport-l.svg index 4f451a7ab7..770fcbba04 100644 --- a/data/styles/clear/style-night/symbols/heliport-l.svg +++ b/data/styles/clear/style-night/symbols/heliport-l.svg @@ -1,6 +1,6 @@ - + heliport-l Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/heliport-m.svg b/data/styles/clear/style-night/symbols/heliport-m.svg index 1fbe9de95a..aa9ccfc348 100644 --- a/data/styles/clear/style-night/symbols/heliport-m.svg +++ b/data/styles/clear/style-night/symbols/heliport-m.svg @@ -1,6 +1,6 @@ - + heliport-m Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/heliport-s copy.svg b/data/styles/clear/style-night/symbols/heliport-s copy.svg new file mode 100644 index 0000000000..44c84e5925 --- /dev/null +++ b/data/styles/clear/style-night/symbols/heliport-s copy.svg @@ -0,0 +1,14 @@ + + + + heliport-s copy + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/heliport-s.svg b/data/styles/clear/style-night/symbols/heliport-s.svg index 18acfcbfc6..e2973f67e0 100644 --- a/data/styles/clear/style-night/symbols/heliport-s.svg +++ b/data/styles/clear/style-night/symbols/heliport-s.svg @@ -1,6 +1,6 @@ - + heliport-s Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/hunting-tower-l.svg b/data/styles/clear/style-night/symbols/hunting-tower-l.svg index 059732fe5d..58bde4f081 100644 --- a/data/styles/clear/style-night/symbols/hunting-tower-l.svg +++ b/data/styles/clear/style-night/symbols/hunting-tower-l.svg @@ -1,6 +1,6 @@ - + hunting-tower-l Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/hunting-tower-m.svg b/data/styles/clear/style-night/symbols/hunting-tower-m.svg index 02294ce561..64e03d96ad 100644 --- a/data/styles/clear/style-night/symbols/hunting-tower-m.svg +++ b/data/styles/clear/style-night/symbols/hunting-tower-m.svg @@ -1,6 +1,6 @@ - + hunting-tower-m Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/kindergarten-l.svg b/data/styles/clear/style-night/symbols/kindergarten-l.svg index 9fb398e91f..ed9b984749 100644 --- a/data/styles/clear/style-night/symbols/kindergarten-l.svg +++ b/data/styles/clear/style-night/symbols/kindergarten-l.svg @@ -1,14 +1,14 @@ - + kindergarten-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-night/symbols/kindergarten-m.svg b/data/styles/clear/style-night/symbols/kindergarten-m.svg index fdb67df3c1..2495b84c6f 100644 --- a/data/styles/clear/style-night/symbols/kindergarten-m.svg +++ b/data/styles/clear/style-night/symbols/kindergarten-m.svg @@ -1,14 +1,14 @@ - + kindergarten-m Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/kindergarten-s.svg b/data/styles/clear/style-night/symbols/kindergarten-s.svg index 5ca5995ca3..eadb95f90a 100644 --- a/data/styles/clear/style-night/symbols/kindergarten-s.svg +++ b/data/styles/clear/style-night/symbols/kindergarten-s.svg @@ -1,14 +1,14 @@ - + kindergarten-s Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/laundry-l.svg b/data/styles/clear/style-night/symbols/laundry-l.svg index 4a0d0ae1e3..329ea64188 100644 --- a/data/styles/clear/style-night/symbols/laundry-l.svg +++ b/data/styles/clear/style-night/symbols/laundry-l.svg @@ -1,6 +1,6 @@ - + laundry-l Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/laundry-m.svg b/data/styles/clear/style-night/symbols/laundry-m.svg index fea76aaa11..02c6b5b0bb 100644 --- a/data/styles/clear/style-night/symbols/laundry-m.svg +++ b/data/styles/clear/style-night/symbols/laundry-m.svg @@ -1,6 +1,6 @@ - + laundry-m Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/lighthouse-l.svg b/data/styles/clear/style-night/symbols/lighthouse-l.svg index e249735f9f..9e54786e0d 100644 --- a/data/styles/clear/style-night/symbols/lighthouse-l.svg +++ b/data/styles/clear/style-night/symbols/lighthouse-l.svg @@ -1,14 +1,14 @@ - + lighthouse-l Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/lighthouse-m.svg b/data/styles/clear/style-night/symbols/lighthouse-m.svg index f41eff8f9a..0b23516c2b 100644 --- a/data/styles/clear/style-night/symbols/lighthouse-m.svg +++ b/data/styles/clear/style-night/symbols/lighthouse-m.svg @@ -1,14 +1,14 @@ - + lighthouse-m Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/lighthouse-s.svg b/data/styles/clear/style-night/symbols/lighthouse-s.svg index 58779c960c..97bcb1238f 100644 --- a/data/styles/clear/style-night/symbols/lighthouse-s.svg +++ b/data/styles/clear/style-night/symbols/lighthouse-s.svg @@ -1,14 +1,14 @@ - + lighthouse-s Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/military-l.svg b/data/styles/clear/style-night/symbols/military-l.svg index f0e228dc12..f4af920342 100644 --- a/data/styles/clear/style-night/symbols/military-l.svg +++ b/data/styles/clear/style-night/symbols/military-l.svg @@ -1,14 +1,14 @@ - - + + military-l Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/military-m.svg b/data/styles/clear/style-night/symbols/military-m.svg index 77f53d8ff1..098f9f3014 100644 --- a/data/styles/clear/style-night/symbols/military-m.svg +++ b/data/styles/clear/style-night/symbols/military-m.svg @@ -1,14 +1,14 @@ - - - military-m copy + + + military-m Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/military-s.svg b/data/styles/clear/style-night/symbols/military-s.svg index e21dca17c3..c009aebde2 100644 --- a/data/styles/clear/style-night/symbols/military-s.svg +++ b/data/styles/clear/style-night/symbols/military-s.svg @@ -1,14 +1,14 @@ - - + + military-s Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/nparkF-l.svg b/data/styles/clear/style-night/symbols/nparkF-l.svg index d2fc5c3415..864074bee4 100644 --- a/data/styles/clear/style-night/symbols/nparkF-l.svg +++ b/data/styles/clear/style-night/symbols/nparkF-l.svg @@ -1,14 +1,14 @@ - + nparkF-l Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/nparkF-m.svg b/data/styles/clear/style-night/symbols/nparkF-m.svg index 4acd240520..a8766f0aad 100644 --- a/data/styles/clear/style-night/symbols/nparkF-m.svg +++ b/data/styles/clear/style-night/symbols/nparkF-m.svg @@ -1,14 +1,14 @@ - - nparkF-m + + nparkF-m Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/nparkF-s.svg b/data/styles/clear/style-night/symbols/nparkF-s.svg index ce83354621..6c23ab8866 100644 --- a/data/styles/clear/style-night/symbols/nparkF-s.svg +++ b/data/styles/clear/style-night/symbols/nparkF-s.svg @@ -1,14 +1,14 @@ - + nparkF-s Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/office-l.svg b/data/styles/clear/style-night/symbols/office-l.svg index 22d2d51615..85468a79de 100644 --- a/data/styles/clear/style-night/symbols/office-l.svg +++ b/data/styles/clear/style-night/symbols/office-l.svg @@ -1,6 +1,6 @@ - + office-l Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/office-m.svg b/data/styles/clear/style-night/symbols/office-m.svg index 1966cdaf94..e8bd8d5287 100644 --- a/data/styles/clear/style-night/symbols/office-m.svg +++ b/data/styles/clear/style-night/symbols/office-m.svg @@ -1,6 +1,6 @@ - + office-m Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/office-s.svg b/data/styles/clear/style-night/symbols/office-s.svg index 9882bb28a6..57d56a8aae 100644 --- a/data/styles/clear/style-night/symbols/office-s.svg +++ b/data/styles/clear/style-night/symbols/office-s.svg @@ -1,6 +1,6 @@ - + office-s Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/peak-l.svg b/data/styles/clear/style-night/symbols/peak-l.svg index 7e6f2db5ad..5f560a19b3 100644 --- a/data/styles/clear/style-night/symbols/peak-l.svg +++ b/data/styles/clear/style-night/symbols/peak-l.svg @@ -1,14 +1,14 @@ - + peak-l Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/peak-m.svg b/data/styles/clear/style-night/symbols/peak-m.svg index d57db16930..5e5d42f418 100644 --- a/data/styles/clear/style-night/symbols/peak-m.svg +++ b/data/styles/clear/style-night/symbols/peak-m.svg @@ -1,14 +1,14 @@ - + peak-m Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/peak-s.svg b/data/styles/clear/style-night/symbols/peak-s.svg index 40c2ae4fc1..9aa21c51f1 100644 --- a/data/styles/clear/style-night/symbols/peak-s.svg +++ b/data/styles/clear/style-night/symbols/peak-s.svg @@ -1,14 +1,14 @@ - + peak-s Created with Sketch. - + - + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/picnic-l.svg b/data/styles/clear/style-night/symbols/picnic-l.svg index 5723bd7fc1..48e453570d 100644 --- a/data/styles/clear/style-night/symbols/picnic-l.svg +++ b/data/styles/clear/style-night/symbols/picnic-l.svg @@ -1,6 +1,6 @@ - + picnic-l Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/picnic-m.svg b/data/styles/clear/style-night/symbols/picnic-m.svg index 7d02b05d2e..844777c2fd 100644 --- a/data/styles/clear/style-night/symbols/picnic-m.svg +++ b/data/styles/clear/style-night/symbols/picnic-m.svg @@ -1,6 +1,6 @@ - + picnic-m Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/picnic-s.svg b/data/styles/clear/style-night/symbols/picnic-s.svg index 911b2ef180..eeba7474cf 100644 --- a/data/styles/clear/style-night/symbols/picnic-s.svg +++ b/data/styles/clear/style-night/symbols/picnic-s.svg @@ -1,6 +1,6 @@ - + picnic-s Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/remains-l.svg b/data/styles/clear/style-night/symbols/remains-l.svg index 38b46b555a..9043cc6029 100644 --- a/data/styles/clear/style-night/symbols/remains-l.svg +++ b/data/styles/clear/style-night/symbols/remains-l.svg @@ -1,6 +1,6 @@ - + remains-l Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/remains-m.svg b/data/styles/clear/style-night/symbols/remains-m.svg index 50a347e650..1a3068d1ee 100644 --- a/data/styles/clear/style-night/symbols/remains-m.svg +++ b/data/styles/clear/style-night/symbols/remains-m.svg @@ -1,6 +1,6 @@ - + remains-m Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/remains-s.svg b/data/styles/clear/style-night/symbols/remains-s.svg new file mode 100644 index 0000000000..44a383d453 --- /dev/null +++ b/data/styles/clear/style-night/symbols/remains-s.svg @@ -0,0 +1,15 @@ + + + + remains-s + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/volcano-l.svg b/data/styles/clear/style-night/symbols/volcano-l.svg index 080484b03f..aa39061ecf 100644 --- a/data/styles/clear/style-night/symbols/volcano-l.svg +++ b/data/styles/clear/style-night/symbols/volcano-l.svg @@ -1,16 +1,16 @@ - + volcano-l Created with Sketch. - + - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/volcano-m.svg b/data/styles/clear/style-night/symbols/volcano-m.svg index 630dc57016..7fef024eb1 100644 --- a/data/styles/clear/style-night/symbols/volcano-m.svg +++ b/data/styles/clear/style-night/symbols/volcano-m.svg @@ -1,16 +1,16 @@ - + volcano-m Created with Sketch. - + - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/volcano-s.svg b/data/styles/clear/style-night/symbols/volcano-s.svg index e79e70ee38..034261015f 100644 --- a/data/styles/clear/style-night/symbols/volcano-s.svg +++ b/data/styles/clear/style-night/symbols/volcano-s.svg @@ -1,16 +1,16 @@ - + volcano-s Created with Sketch. - + - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/waterfall-l.svg b/data/styles/clear/style-night/symbols/waterfall-l.svg index d19046e6f6..9a0c0dc278 100644 --- a/data/styles/clear/style-night/symbols/waterfall-l.svg +++ b/data/styles/clear/style-night/symbols/waterfall-l.svg @@ -1,19 +1,19 @@ - + waterfall-l Created with Sketch. - + - - - - - - + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/waterfall-m.svg b/data/styles/clear/style-night/symbols/waterfall-m.svg index 72644223c6..76e34913a5 100644 --- a/data/styles/clear/style-night/symbols/waterfall-m.svg +++ b/data/styles/clear/style-night/symbols/waterfall-m.svg @@ -1,19 +1,19 @@ - + waterfall-m Created with Sketch. - + - - - - - - + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/waterfall-s.svg b/data/styles/clear/style-night/symbols/waterfall-s.svg index fc7052fd2f..aafb618d1d 100644 --- a/data/styles/clear/style-night/symbols/waterfall-s.svg +++ b/data/styles/clear/style-night/symbols/waterfall-s.svg @@ -1,18 +1,18 @@ - + waterfall-s Created with Sketch. - + - - - - - + + + + + \ No newline at end of file diff --git a/drape/shaders/doc/line_fragment_shader_fsh.txt b/drape/shaders/doc/line_fragment_shader_fsh.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/drape/shaders/doc/line_vertex_shader_vsh.txt b/drape/shaders/doc/line_vertex_shader_vsh.txt deleted file mode 100644 index a26ebcc508..0000000000 --- a/drape/shaders/doc/line_vertex_shader_vsh.txt +++ /dev/null @@ -1,15 +0,0 @@ -Transformation shader for lines. - -Attributes: -- position (vec4) x, y, z, 1 -- direction (vec4) Tx, Ty, lineHalfWidth - -To use this vertex shader you must format vertex data by this rule: - when we draw line we must create 2 triangle on one line segment but 2 vertex that produced by one line point - (vertex + halfWidthNormalVector). must be equal. Width will be computed in this shader. - For example we have one segment line { A = (0, 0), B = (10, 10) } - thiangles must be [ A, A, B, B]. - Direction is the vector for normal calculate, and direction for upper "A" must be opposite for direction for bottom "A" - [B - A, A - B, B - A, A - B] - In this case we can mul direction on modelView separate from position and get line rotation in pixel coordinate, - format normal and create a width of line diff --git a/drape/shaders/doc/normalize_vertex_shader_vsh.txt b/drape/shaders/doc/normalize_vertex_shader_vsh.txt deleted file mode 100644 index a7fe31b62a..0000000000 --- a/drape/shaders/doc/normalize_vertex_shader_vsh.txt +++ /dev/null @@ -1,23 +0,0 @@ -Transform point from mercator to current model view and forming triangles by normals - -mercatorPoint -> currentModelViewPoint -currentModelViewPoint + normal; - -Example: -vertex number 1 2 3 4 -pt stream = [{ 0.0, 0.0}, { 0.0, 0.0} , {0.0, 0.0} , {0.0, 0.0}] -normal stream = [{-1.0, 1.0}, {-1.0, -1.0} , {1.0, 1.0} , {1.0, -1.0}] -Type = Triangle strip - -1 3 -_____ -| /| -| . | -|/__| -2 4 - -attribute a_position - [x, y] - mercator position - [z ] - depth -attribute a_normal - [x, y] - forming normal diff --git a/drape/shaders/doc/simple_vertex_shader_vsh.txt b/drape/shaders/doc/simple_vertex_shader_vsh.txt deleted file mode 100644 index 579e883711..0000000000 --- a/drape/shaders/doc/simple_vertex_shader_vsh.txt +++ /dev/null @@ -1,8 +0,0 @@ -Simple transformation position by modelViewProjection - -Attributes: - - position (vec2) xy of point - - depth (float) z of point - -Uniforms: - - modelViewProjectionMatrix (mat4) \ No newline at end of file diff --git a/drape/shaders/doc/solid_color_fragment_shader_fsh.txt b/drape/shaders/doc/solid_color_fragment_shader_fsh.txt deleted file mode 100644 index e03a883694..0000000000 --- a/drape/shaders/doc/solid_color_fragment_shader_fsh.txt +++ /dev/null @@ -1,4 +0,0 @@ -Translate input uniform color into output gl_FragColor - -Uniforms: - - color (vec4) \ No newline at end of file diff --git a/drape/shaders/doc/texturing_fragment_shader_fsh.txt b/drape/shaders/doc/texturing_fragment_shader_fsh.txt deleted file mode 100644 index e5f77008de..0000000000 --- a/drape/shaders/doc/texturing_fragment_shader_fsh.txt +++ /dev/null @@ -1,7 +0,0 @@ -Transfer color from texture into gl_FragColor - -uniforms: - - textureUnit (sampler2D) - -varying: - - varTexCoords (vec4) coordinates of result color on texture “textureUnit” \ No newline at end of file diff --git a/drape/shaders/doc/texturing_vertex_shader_vsh.txt b/drape/shaders/doc/texturing_vertex_shader_vsh.txt deleted file mode 100644 index 6f20a957a8..0000000000 --- a/drape/shaders/doc/texturing_vertex_shader_vsh.txt +++ /dev/null @@ -1,13 +0,0 @@ -Translate global position into pixels by modelViewProjectionMatrix -Texture coordinates transfer without changes into (gl interpolator) pixel shader - -attributes: -- position (vec2) xy of point -- depth (float) z of point -- texCoords (vec4) texture coordinates of vertex - -uniforms: -- modelViewPorjectionMatrix (mat4) - -varying: -- varTexCoords (vec4) output texture coordinates filled by texCoords \ No newline at end of file diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp index b0f518b7b8..d08c0897c7 100644 --- a/drape_frontend/drape_engine.cpp +++ b/drape_frontend/drape_engine.cpp @@ -395,6 +395,13 @@ void DrapeEngine::RemoveRoute(bool deactivateFollowing) MessagePriority::Normal); } +void DrapeEngine::DeactivateRouteFollowing() +{ + m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, + make_unique_dp(), + MessagePriority::Normal); +} + void DrapeEngine::SetWidgetLayout(gui::TWidgetsLayoutInfo && info) { m_widgetsLayout = move(info); diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp index 028d38497c..a3ce76ecc2 100644 --- a/drape_frontend/drape_engine.hpp +++ b/drape_frontend/drape_engine.hpp @@ -108,6 +108,7 @@ public: void AddRoute(m2::PolylineD const & routePolyline, vector const & turns, dp::Color const & color); void RemoveRoute(bool deactivateFollowing); void FollowRoute(int preferredZoomLevel); + void DeactivateRouteFollowing(); void SetWidgetLayout(gui::TWidgetsLayoutInfo && info); gui::TWidgetsSizeInfo const & GetWidgetSizes(); diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 8768e94a85..f3fa3f4937 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -336,6 +336,12 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) break; } + case Message::DeactivateRouteFollowing: + { + m_myPositionController->DeactivateRouting(); + break; + } + case Message::UpdateMapStyle: { // Clear tile tree. diff --git a/drape_frontend/message.hpp b/drape_frontend/message.hpp index cc60bfaa8c..d31f949e4a 100644 --- a/drape_frontend/message.hpp +++ b/drape_frontend/message.hpp @@ -37,6 +37,7 @@ public: AddRoute, RemoveRoute, FlushRoute, + DeactivateRouteFollowing, UpdateMapStyle, InvalidateTextures, Invalidate diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp index 6b7de8c757..d5c2182707 100644 --- a/drape_frontend/message_subclasses.hpp +++ b/drape_frontend/message_subclasses.hpp @@ -596,4 +596,12 @@ public: Type GetType() const override { return Message::Invalidate; } }; +class DeactivateRouteFollowingMessage : public Message +{ +public: + DeactivateRouteFollowingMessage(){} + + Type GetType() const override { return Message::DeactivateRouteFollowing; } +}; + } // namespace df diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index 9b9f37bd2e..a523f07a5b 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -148,10 +148,13 @@ void CacheUserPoints(UserMarksProvider const * provider, AlignHorizontal(pxSize.x * 0.5f, anchor, left, right); AlignVertical(pxSize.y * 0.5f, anchor, up, down); - buffer.emplace_back(pos, left + down, glsl::ToVec2(texRect.LeftTop()), runAnim); - buffer.emplace_back(pos, left + up, glsl::ToVec2(texRect.LeftBottom()), runAnim); - buffer.emplace_back(pos, right + down, glsl::ToVec2(texRect.RightTop()), runAnim); - buffer.emplace_back(pos, right + up, glsl::ToVec2(texRect.RightBottom()), runAnim); + m2::PointD const & pixelOffset = pointMark->GetPixelOffset(); + glsl::vec2 const offset(pixelOffset.x, pixelOffset.y); + + buffer.emplace_back(pos, left + down + offset, glsl::ToVec2(texRect.LeftTop()), runAnim); + buffer.emplace_back(pos, left + up + offset, glsl::ToVec2(texRect.LeftBottom()), runAnim); + buffer.emplace_back(pos, right + down + offset, glsl::ToVec2(texRect.RightTop()), runAnim); + buffer.emplace_back(pos, right + up + offset, glsl::ToVec2(texRect.RightBottom()), runAnim); } dp::GLState state(gpu::BOOKMARK_PROGRAM, dp::GLState::UserMarkLayer); diff --git a/drape_frontend/user_marks_provider.hpp b/drape_frontend/user_marks_provider.hpp index b647901daa..a775051bb8 100644 --- a/drape_frontend/user_marks_provider.hpp +++ b/drape_frontend/user_marks_provider.hpp @@ -16,6 +16,7 @@ class UserPointMark public: virtual ~UserPointMark() {} virtual m2::PointD const & GetPivot() const = 0; + virtual m2::PointD const & GetPixelOffset() const = 0; virtual string GetSymbolName() const = 0; virtual dp::Anchor GetAnchor() const = 0; virtual float GetDepth() const = 0; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm index 83f899bc11..a4dccde010 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm @@ -58,7 +58,7 @@ static NSString * const kKeyPath = @"subviews"; UserMarkControllerGuard guard(f.GetBookmarkManager(), UserMarkType::API_MARK); guard.m_controller.Clear(); self.isVisible = NO; - NSURL * url = [NSURL URLWithString:@(f.GetApiDataHolder().m_globalBackUrl.c_str())]; + NSURL * url = [NSURL URLWithString:@(f.GetApiDataHolder().GetGlobalBackUrl().c_str())]; [[UIApplication sharedApplication] openURL:url]; } @@ -85,7 +85,7 @@ static NSString * const kKeyPath = @"subviews"; if (isVisible) { self.backLabel.text = [NSString - stringWithFormat:L(@"back_to"), @(GetFramework().GetApiDataHolder().m_appTitle.c_str())]; + stringWithFormat:L(@"back_to"), @(GetFramework().GetApiDataHolder().GetAppTitle().c_str())]; [self.controller.view addSubview:self.rootView]; [self.controller.view addObserver:self forKeyPath:kKeyPath diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index 6bbf8d3cff..48e64ac543 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -14,6 +14,7 @@ @property (nonatomic) MWMBottomMenuState menuState; @property (nonatomic, readonly) MWMNavigationDashboardState navigationState; @property (nonatomic) BOOL searchHidden; +@property (nonatomic) location::EMyPositionMode myPositionMode; - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentController:(MapViewController *)controller; @@ -45,6 +46,5 @@ - (void)routingNavigation; - (void)handleRoutingError; - (void)setRouteBuildingProgress:(CGFloat)progress; -- (void)setMyPositionMode:(location::EMyPositionMode)mode; @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 06b107f0db..d6101d1c1f 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -45,8 +45,9 @@ extern NSString * const kAlohalyticsTapEventKey; @implementation MWMMapViewControlsManager -- (void)setMyPositionMode:(location::EMyPositionMode) mode +- (void)setMyPositionMode:(location::EMyPositionMode)mode { + _myPositionMode = mode; [self.menuController onLocationStateModeChanged:mode]; } @@ -429,10 +430,10 @@ extern NSString * const kAlohalyticsTapEventKey; { MWMAlertViewController * controller = [[MWMAlertViewController alloc] initWithViewController:self.ownerController]; LocationManager * manager = MapsAppDelegate.theApp.m_locationManager; - auto const m = GetFramework().GetLocationState()->GetMode(); + auto const m = self.myPositionMode; BOOL const needToRebuild = manager.lastLocationIsValid && - m != location::State::Mode::PendingPosition && - m != location::State::Mode::UnknownPosition && + m != location::MODE_PENDING_POSITION && + m != location::MODE_UNKNOWN_POSITION && !isDestinationMyPosition; [controller presentPoint2PointAlertWithOkBlock:^ { diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm index 4ccab33b70..9273b25350 100644 --- a/iphone/Maps/Classes/MWMPlacePageEntity.mm +++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm @@ -121,7 +121,7 @@ using feature::Metadata; { self.type = MWMPlacePageEntityTypeAPI; self.title = @(apiMark->GetName().c_str()); - self.category = @(GetFramework().GetApiDataHolder().m_appTitle.c_str()); + self.category = @(GetFramework().GetApiDataHolder().GetAppTitle().c_str()); NSMutableArray const * types = [NSMutableArray array]; NSMutableArray const * values = [NSMutableArray array]; [types addObject:kPatternTypesArray.lastObject]; diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.mm b/iphone/Maps/Classes/MWMPlacePageViewManager.mm index c4c59f768f..1cbc360cb5 100644 --- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm +++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm @@ -225,7 +225,7 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageManagerState) - (MWMRoutePoint)target { UserMark const * m = m_userMark->GetUserMark(); - m2::PointD const & org = m->GetOrg(); + m2::PointD const & org = m->GetPivot(); return m->GetMarkType() == UserMark::Type::MY_POSITION ? MWMRoutePoint(org) : MWMRoutePoint(org, self.placePage.basePlacePageView.titleLabel.text); diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 70ef5fdf35..3868c560b9 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -569,11 +569,10 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) { case routing::IRouter::ResultCode::NoError: { - if (f.GetRouter() == routing::RouterType::Pedestrian) - [self countPedestrianRoute]; self.controlsManager.routeBuildingProgress = 100.; f.ActivateUserMark(nullptr, true); - [self.searchView setState:SearchViewStateHidden animated:YES]; + self.controlsManager.routeBuildingProgress = 100.; + self.controlsManager.searchHidden = YES; if (self.forceRoutingStateChange == ForceRoutingStateChangeStartFollowing) [self.controlsManager routingNavigation]; else @@ -727,102 +726,6 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) return _alertController; } -#pragma mark - Map state - -- (void)checkCurrentLocationMap -{ - Framework & f = GetFramework(); - ActiveMapsLayout & activeMapLayout = f.GetCountryTree().GetActiveMapLayout(); - int const mapsCount = activeMapLayout.GetCountInGroup(ActiveMapsLayout::TGroup::EOutOfDate) + activeMapLayout.GetCountInGroup(ActiveMapsLayout::TGroup::EUpToDate); - self.haveMap = mapsCount > 0; -} - -#pragma mark - SearchViewDelegate - -- (void)searchViewWillEnterState:(SearchViewState)state -{ - [self checkCurrentLocationMap]; - switch (state) - { - case SearchViewStateHidden: - self.controlsManager.hidden = NO; - break; - case SearchViewStateResults: - self.controlsManager.hidden = NO; - break; - case SearchViewStateAlpha: - self.controlsManager.hidden = NO; - break; - case SearchViewStateFullscreen: - self.controlsManager.hidden = YES; - GetFramework().DiactivateUserMark(); - break; - } -} - -- (void)searchViewDidEnterState:(SearchViewState)state -{ - switch (state) - { - case SearchViewStateResults: - [self setMapInfoViewFlag:MapInfoViewSearch]; - break; - case SearchViewStateHidden: - case SearchViewStateAlpha: - case SearchViewStateFullscreen: - [self clearMapInfoViewFlag:MapInfoViewSearch]; - break; - } - [self updateStatusBarStyle]; -} - -#pragma mark - MWMNavigationDelegate - -- (void)pushDownloadMaps -{ - [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"downloader"]; - CountryTreeVC * vc = [[CountryTreeVC alloc] initWithNodePosition:-1]; - [self.navigationController pushViewController:vc animated:YES]; -} - -#pragma mark - MWMPlacePageViewManagerDelegate - -- (void)addPlacePageViews:(NSArray *)views -{ - [views enumerateObjectsUsingBlock:^(UIView * view, NSUInteger idx, BOOL *stop) - { - if ([self.view.subviews containsObject:view]) - return; - [self.view insertSubview:view belowSubview:self.searchView]; - }]; -} - -#pragma mark - ActiveMapsObserverProtocol - -- (void)countryStatusChangedAtPosition:(int)position inGroup:(ActiveMapsLayout::TGroup const &)group -{ - auto const status = GetFramework().GetCountryTree().GetActiveMapLayout().GetCountryStatus(group, position); - if (status == TStatus::EDownloadFailed) - { - [self.searchView downloadFailed]; - } - else if (status == TStatus::EOnDisk) - { - [self checkCurrentLocationMap]; - [self.searchView downloadComplete]; - } -} - -- (void)countryDownloadingProgressChanged:(LocalAndRemoteSizeT const &)progress atPosition:(int)position inGroup:(ActiveMapsLayout::TGroup const &)group -{ - if (self.searchView.state != SearchViewStateFullscreen) - return; - CGFloat const normProgress = (CGFloat)progress.first / (CGFloat)progress.second; - ActiveMapsLayout & activeMapLayout = GetFramework().GetCountryTree().GetActiveMapLayout(); - NSString * countryName = [NSString stringWithUTF8String:activeMapLayout.GetFormatedCountryName(activeMapLayout.GetCoreIndex(group, position)).c_str()]; - [self.searchView downloadProgress:normProgress countryName:countryName]; -} - #pragma mark - Private methods - (void)destroyPopover diff --git a/map/api_mark_container.cpp b/map/api_mark_container.cpp index a1de15a524..b4d43d6bc0 100644 --- a/map/api_mark_container.cpp +++ b/map/api_mark_container.cpp @@ -4,15 +4,12 @@ #include "map/framework.hpp" ApiUserMarkContainer::ApiUserMarkContainer(double layerDepth, Framework & framework) - : UserMarkContainer(layerDepth, framework) + : UserMarkContainer(layerDepth, UserMarkType::API_MARK, framework) { } -string ApiUserMarkContainer::GetTypeName() const { return "api-result"; } - -string ApiUserMarkContainer::GetActiveTypeName() const { return "search-result-active"; } - UserMark * ApiUserMarkContainer::AllocateUserMark(const m2::PointD & ptOrg) { return new ApiMarkPoint(ptOrg, this); } + diff --git a/map/api_mark_container.hpp b/map/api_mark_container.hpp index 7984b7b6df..760f1c2434 100644 --- a/map/api_mark_container.hpp +++ b/map/api_mark_container.hpp @@ -1,6 +1,5 @@ #pragma once -#include "map/api_mark_point.hpp" #include "map/user_mark_container.hpp" class ApiUserMarkContainer : public UserMarkContainer @@ -8,12 +7,6 @@ class ApiUserMarkContainer : public UserMarkContainer public: ApiUserMarkContainer(double layerDepth, Framework & framework); - // UserMarkContainer overrides: - Type GetType() const override { return API_MARK; } - string GetActiveTypeName() const override; - protected: - // UserMarkContainer overrides: - string GetTypeName() const override; UserMark * AllocateUserMark(m2::PointD const & ptOrg) override; }; diff --git a/map/api_mark_point.hpp b/map/api_mark_point.hpp index 45ad891270..e46338e104 100644 --- a/map/api_mark_point.hpp +++ b/map/api_mark_point.hpp @@ -1,6 +1,5 @@ #pragma once -#include "map/user_mark.hpp" #include "map/styled_point.hpp" class ApiMarkPoint : public style::StyledPoint @@ -17,33 +16,35 @@ public: { } + string GetSymbolName() const override { return "api-result"; } + + UserMark::Type GetMarkType() const override { return UserMark::Type::API; } + string const & GetName() const { return m_name; } + void SetName(string const & name) { m_name = name; } string const & GetID() const { return m_id; } + void SetID(string const & id) { m_id = id; } + unique_ptr Copy() const override + { + return unique_ptr( + new UserMarkCopy(new ApiMarkPoint(m_name, m_id, m_style, m_ptOrg, m_container))); + } + + void FillLogEvent(UserMark::TEventContainer & details) const override + { + UserMark::FillLogEvent(details); + details.emplace("name", GetName()); + } + void SetStyle(string const & style) { m_style = style; } // StyledPoint overrides: string const & GetStyle() const override { return m_style; } - // UserMark overrides: - UserMark::Type GetMarkType() const override { return UserMark::Type::API; } - - unique_ptr Copy() const override - { - return make_unique( - new ApiMarkPoint(m_name, m_id, GetStyle(), m_ptOrg, m_container)); - } - - void FillLogEvent(TEventContainer & details) const override - { - UserMark::FillLogEvent(details); - details["markType"] = "API"; - details["name"] = GetName(); - } - private: string m_name; string m_id; diff --git a/map/bookmark.cpp b/map/bookmark.cpp index 39bdc3181f..d5c6d840b3 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -137,8 +137,6 @@ void Bookmark::SetScale(double scale) m_data.SetScale(scale); } -////////////////////////////////////////////////////////////////// - void BookmarkCategory::AddTrack(unique_ptr && track) { SetDirty(); diff --git a/map/bookmark.hpp b/map/bookmark.hpp index 0a21a11c51..a1ddca705f 100644 --- a/map/bookmark.hpp +++ b/map/bookmark.hpp @@ -66,7 +66,7 @@ private: time_t m_timeStamp; }; -class Bookmark : public UserMark, public style::StyledPoint +class Bookmark : public UserMark { using TBase = UserMark; public: @@ -104,11 +104,6 @@ public: unique_ptr Copy() const override; - // StyledPoint overrides: - double GetAnimScaleFactor() const override; - m2::PointD const & GetPixelOffset() const override; - string const & GetStyle() const override { return m_data.GetType(); } - private: BookmarkData m_data; mutable bool m_runCreationAnim; @@ -147,10 +142,8 @@ public: BookmarkCategory(string const & name, Framework & framework); ~BookmarkCategory(); - ////////////////////////////////////////////////////////////////////// size_t GetUserLineCount() const override; df::UserLineMark const * GetUserLineMark(size_t index) const override; - ////////////////////////////////////////////////////////////////////// static string GetDefaultType(); diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index 0a5cd5615d..9dc2a872ea 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -1,3 +1,4 @@ +#include "map/api_mark_container.hpp" #include "map/bookmark_manager.hpp" #include "map/framework.hpp" #include "map/user_mark.hpp" diff --git a/map/framework.cpp b/map/framework.cpp index 14e235741e..8f6a600099 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -199,6 +199,8 @@ Framework::Framework() mapStyle = MapStyleClear; GetStyleReader().SetCurrentStyle(static_cast(mapStyle)); + m_ParsedMapApi.SetBookmarkManager(&m_bmManager); + // Init strings bundle. // @TODO. There are hardcoded strings below which are defined in strings.txt as well. // It's better to use strings form strings.txt intead of hardcoding them here. @@ -1361,22 +1363,30 @@ bool Framework::ShowMapForURL(string const & url) } else if (StartsWith(url, "mapswithme://") || StartsWith(url, "mwm://")) { - UserMarkControllerGuard guard(m_bmManager, UserMarkType::API_MARK); - guard.m_controller.Clear(); - - apiMark = url_scheme::ParseUrl(guard.m_controller, url, m_ParsedMapApi, rect); - - if (m_ParsedMapApi.m_isValid) + if (m_ParsedMapApi.SetUriAndParse(url)) { - guard.m_controller.SetIsVisible(true); - guard.m_controller.SetIsDrawable(true); - if (apiMark) + if (!m_ParsedMapApi.GetViewportRect(rect)) + rect = df::GetWorldRect(); + + // set up controller guard to show api marks + { + UserMarkControllerGuard guard(m_bmManager, UserMarkType::API_MARK); + guard.m_controller.Clear(); + guard.m_controller.SetIsVisible(true); + guard.m_controller.SetIsDrawable(true); + } + + if ((apiMark = m_ParsedMapApi.GetSinglePoint())) result = NEED_CLICK; else result = NO_NEED_CLICK; } else + { + UserMarkControllerGuard guard(m_bmManager, UserMarkType::API_MARK); + guard.m_controller.Clear(); guard.m_controller.SetIsVisible(false); + } } else // Actually, we can parse any geo url scheme with correct coordinates. { @@ -1732,7 +1742,7 @@ string Framework::CodeGe0url(double lat, double lon, double zoomLevel, string co string Framework::GenerateApiBackUrl(ApiMarkPoint const & point) { - string res = m_ParsedMapApi.m_globalBackUrl; + string res = m_ParsedMapApi.GetGlobalBackUrl(); if (!res.empty()) { double lat, lon; @@ -1832,6 +1842,15 @@ void Framework::FollowRoute() m_drapeEngine->FollowRoute(scale); } +bool Framework::DisableFollowMode() +{ + bool const disabled = m_routingSession.DisableFollowMode(); + if (disabled && m_drapeEngine != nullptr) + m_drapeEngine->DeactivateRouteFollowing(); + + return disabled; +} + void Framework::SetRouter(RouterType type) { ASSERT_THREAD_CHECKER(m_threadChecker, ("SetRouter")); @@ -1932,12 +1951,8 @@ void Framework::CheckLocationForRouting(GpsInfo const & info) } }; - m2::PointD const & position = m_routingSession.GetUserCurrentPosition(); - m_routingSession.RebuildRoute(position, readyCallback, m_progressCallback, 0 /* timeoutSec */); - } - else if (state == RoutingSession::RouteFinished) - { - RemoveRoute(false /* deactivateFollowing */); + m_routingSession.RebuildRoute(MercatorBounds::FromLatLon(info.m_latitude, info.m_longitude), + readyCallback, m_progressCallback, 0 /* timeoutSec */); } } diff --git a/map/framework.hpp b/map/framework.hpp index 147acafae6..d5da42e6dd 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -1,6 +1,7 @@ #pragma once #include "map/active_maps_layout.hpp" +#include "map/api_mark_point.hpp" #include "map/bookmark.hpp" #include "map/bookmark_manager.hpp" #include "map/country_tree.hpp" diff --git a/map/map.pro b/map/map.pro index 7359d2dd90..c96935f8f7 100644 --- a/map/map.pro +++ b/map/map.pro @@ -12,6 +12,8 @@ include($$ROOT_DIR/common.pri) HEADERS += \ active_maps_layout.hpp \ + api_mark_container.hpp \ + api_mark_point.hpp \ bookmark.hpp \ bookmark_manager.hpp \ country_tree.hpp \ @@ -21,14 +23,16 @@ HEADERS += \ geourl_process.hpp \ mwm_url.hpp \ storage_bridge.hpp \ + styled_point.hpp \ track.hpp \ user_mark.hpp \ user_mark_container.hpp \ SOURCES += \ - ../api/src/c/api-client.c \ + ../api/src/c/api-client.c \ active_maps_layout.cpp \ address_finder.cpp \ + api_mark_container.cpp \ bookmark.cpp \ bookmark_manager.cpp \ country_tree.cpp \ @@ -38,6 +42,7 @@ SOURCES += \ geourl_process.cpp \ mwm_url.cpp \ storage_bridge.cpp \ + styled_point.cpp \ track.cpp \ user_mark.cpp \ user_mark_container.cpp \ diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp index fb313a23f4..08d758aa79 100644 --- a/map/map_tests/mwm_url_tests.cpp +++ b/map/map_tests/mwm_url_tests.cpp @@ -3,6 +3,8 @@ #include "map/framework.hpp" #include "map/mwm_url.hpp" +#include "drape_frontend/visual_params.hpp" + #include "coding/uri.hpp" #include "base/string_format.hpp" @@ -27,18 +29,23 @@ namespace ApiTest(string const & uriString) { m_m = &m_fm.GetBookmarkManager(); - UserMarkControllerGuard guard(*m_m, type); - url_scheme::ParseUrl(guard.m_controller, uriString, m_api, m_viewportRect); + m_api.SetBookmarkManager(m_m); + + if (m_api.SetUriAndParse(uriString)) + { + if (!m_api.GetViewportRect(m_viewportRect)) + m_viewportRect = df::GetWorldRect(); + } } - bool IsValid() const { return m_api.m_isValid; } + bool IsValid() const { return m_api.IsValid(); } m2::RectD GetViewport() const { return m_viewportRect; } - string const & GetAppTitle() const { return m_api.m_appTitle; } - bool GoBackOnBalloonClick() const { return m_api.m_goBackOnBalloonClick; } + string const & GetAppTitle() const { return m_api.GetAppTitle(); } + bool GoBackOnBalloonClick() const { return m_api.GoBackOnBalloonClick(); } int GetPointCount() const { return UserMarkControllerGuard(*m_m, type).m_controller.GetUserMarkCount(); } - string const & GetGlobalBackUrl() const { return m_api.m_globalBackUrl; } - int GetApiVersion() const { return m_api.m_version; } + string const & GetGlobalBackUrl() const { return m_api.GetGlobalBackUrl(); } + int GetApiVersion() const { return m_api.GetApiVersion(); } bool TestLatLon(int index, double lat, double lon) const { double tLat, tLon; @@ -71,17 +78,20 @@ namespace BookmarkManager * m_m; }; - bool IsValid(Framework & fm, string const & uriStrig) + bool IsValid(Framework & fm, string const & uriString) { ParsedMapApi api; + bool isValid = false; { + api.SetBookmarkManager(&fm.GetBookmarkManager()); + if (api.SetUriAndParse(uriString)) + isValid = api.IsValid(); + UserMarkControllerGuard guard(fm.GetBookmarkManager(), UserMarkType::API_MARK); - m2::RectD dummyRect; - url_scheme::ParseUrl(guard.m_controller, uriStrig, api, dummyRect); guard.m_controller.Clear(); } - return api.m_isValid; + return isValid; } } diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp index 0f3479e2aa..6ba57150c4 100644 --- a/map/mwm_url.cpp +++ b/map/mwm_url.cpp @@ -1,10 +1,13 @@ -#include "map/mwm_url.hpp" +#include "mwm_url.hpp" -#include "drape_frontend/visual_params.hpp" +#include "map/api_mark_point.hpp" +#include "map/bookmark_manager.hpp" #include "indexer/mercator.hpp" #include "indexer/scales.hpp" +#include "drape_frontend/visual_params.hpp" + #include "coding/uri.hpp" #include "base/logging.hpp" @@ -27,16 +30,16 @@ bool IsInvalidApiPoint(ApiPoint const & p) { return p.m_lat == INVALID_LAT_VALUE } // unnames namespace ParsedMapApi::ParsedMapApi() - : m_controller(NULL) + : m_bmManager(nullptr) , m_version(0) , m_zoomLevel(0.0) , m_goBackOnBalloonClick(false) { } -void ParsedMapApi::SetController(UserMarkContainer::Controller * controller) +void ParsedMapApi::SetBookmarkManager(BookmarkManager * manager) { - m_controller = controller; + m_bmManager = manager; } bool ParsedMapApi::SetUriAndParse(string const & url) @@ -47,18 +50,20 @@ bool ParsedMapApi::SetUriAndParse(string const & url) bool ParsedMapApi::IsValid() const { - ASSERT(m_controller != NULL, ()); - return m_controller->GetUserMarkCount() > 0; + ASSERT(m_bmManager != nullptr, ()); + UserMarkControllerGuard guard(*m_bmManager, UserMarkType::API_MARK); + return guard.m_controller.GetUserMarkCount() > 0; } bool ParsedMapApi::Parse(Uri const & uri) { - ASSERT(m_controller != NULL, ()); - string const & scheme = uri.GetScheme(); if ((scheme != "mapswithme" && scheme != "mwm") || uri.GetPath() != "map") return false; + ASSERT(m_bmManager != nullptr, ()); + UserMarkControllerGuard guard(*m_bmManager, UserMarkType::API_MARK); + vector points; uri.ForEachKeyValue(bind(&ParsedMapApi::AddKeyValue, this, _1, _2, ref(points))); points.erase(remove_if(points.begin(), points.end(), &IsInvalidApiPoint), points.end()); @@ -67,7 +72,7 @@ bool ParsedMapApi::Parse(Uri const & uri) { ApiPoint const & p = points[i]; m2::PointD glPoint(MercatorBounds::FromLatLon(p.m_lat, p.m_lon)); - ApiMarkPoint * mark = static_cast(m_controller->CreateUserMark(glPoint)); + ApiMarkPoint * mark = static_cast(guard.m_controller.CreateUserMark(glPoint)); mark->SetName(p.m_name); mark->SetID(p.m_id); mark->SetStyle(style::GetSupportedStyle(p.m_style, p.m_name, "")); @@ -176,19 +181,21 @@ void ParsedMapApi::Reset() bool ParsedMapApi::GetViewportRect(m2::RectD & rect) const { - ASSERT(m_controller != NULL, ()); - size_t markCount = m_controller->GetUserMarkCount(); + ASSERT(m_bmManager != nullptr, ()); + UserMarkControllerGuard guard(*m_bmManager, UserMarkType::API_MARK); + + size_t markCount = guard.m_controller.GetUserMarkCount(); if (markCount == 1 && m_zoomLevel >= 1) { double zoom = min(static_cast(scales::GetUpperComfortScale()), m_zoomLevel); - rect = df::GetRectForDrawScale(zoom, m_controller->GetUserMark(0)->GetOrg()); + rect = df::GetRectForDrawScale(zoom, guard.m_controller.GetUserMark(0)->GetPivot()); return true; } else { m2::RectD result; - for (size_t i = 0; i < m_controller->GetUserMarkCount(); ++i) - result.Add(m_controller->GetUserMark(i)->GetOrg()); + for (size_t i = 0; i < guard.m_controller.GetUserMarkCount(); ++i) + result.Add(guard.m_controller.GetUserMark(i)->GetPivot()); if (result.IsValid()) { @@ -202,11 +209,13 @@ bool ParsedMapApi::GetViewportRect(m2::RectD & rect) const UserMark const * ParsedMapApi::GetSinglePoint() const { - ASSERT(m_controller != NULL, ()); - if (m_controller->GetUserMarkCount() != 1) - return 0; + ASSERT(m_bmManager != nullptr, ()); + UserMarkControllerGuard guard(*m_bmManager, UserMarkType::API_MARK); - return m_controller->GetUserMark(0); + if (guard.m_controller.GetUserMarkCount() != 1) + return nullptr; + + return guard.m_controller.GetUserMark(0); } } diff --git a/map/mwm_url.hpp b/map/mwm_url.hpp index efc656daba..edd6e00adb 100644 --- a/map/mwm_url.hpp +++ b/map/mwm_url.hpp @@ -1,11 +1,14 @@ #pragma once -#include "api_mark_container.hpp" +#include "map/user_mark.hpp" #include "geometry/rect2d.hpp" #include "std/string.hpp" +class ScalesProcessor; +class BookmarkManager; + namespace url_scheme { @@ -18,24 +21,40 @@ struct ApiPoint string m_style; }; -struct ParsedMapApi -{ - string m_globalBackUrl; - string m_appTitle; - int m_version = 0; - /// Zoom level in OSM format (e.g. from 1.0 to 20.0) - /// Taken into an account when calculating viewport rect, but only if points count is == 1 - double m_zoomLevel = 0.0; - bool m_goBackOnBalloonClick = false; - bool m_isValid = false; -}; +class Uri; /// Handles [mapswithme|mwm]://map?params - everything related to displaying info on a map -/// apiData - extracted data from url. If apiData.m_isValid == true then returned mark or rect is valid -/// If return nullptr and apiData.m_isValid == true, than more than one api point exists. -/// In rect returned bound rect of api points -/// If return not nullptr, than only one api point exists -UserMark const * ParseUrl(UserMarksController & controller, string const & url, - ParsedMapApi & apiData, m2::RectD & rect); +class ParsedMapApi +{ +public: + ParsedMapApi(); + + void SetBookmarkManager(BookmarkManager * manager); + + bool SetUriAndParse(string const & url); + bool IsValid() const; + string const & GetGlobalBackUrl() const { return m_globalBackUrl; } + string const & GetAppTitle() const { return m_appTitle; } + int GetApiVersion() const { return m_version; } + void Reset(); + bool GoBackOnBalloonClick() const { return m_goBackOnBalloonClick; } + + /// @name Used in settings map viewport after invoking API. + bool GetViewportRect(m2::RectD & rect) const; + UserMark const * GetSinglePoint() const; + +private: + bool Parse(Uri const & uri); + void AddKeyValue(string key, string const & value, vector & points); + + BookmarkManager * m_bmManager; + string m_globalBackUrl; + string m_appTitle; + int m_version; + /// Zoom level in OSM format (e.g. from 1.0 to 20.0) + /// Taken into an account when calculating viewport rect, but only if points count is == 1 + double m_zoomLevel; + bool m_goBackOnBalloonClick; +}; } diff --git a/map/styled_point.cpp b/map/styled_point.cpp index f5fbecdb6f..fdd6466ab4 100644 --- a/map/styled_point.cpp +++ b/map/styled_point.cpp @@ -1,5 +1,7 @@ #include "map/styled_point.hpp" +#include "base/logging.hpp" + namespace { char const * kSupportedColors[] = {"placemark-red", "placemark-blue", "placemark-purple", @@ -9,22 +11,10 @@ char const * kSupportedColors[] = {"placemark-red", "placemark-blue", "place namespace style { -graphics::DisplayList * StyledPoint::GetDisplayList(UserMarkDLCache * cache) const -{ - UserMarkContainer const * container = GetContainer(); - UserMarkDLCache::Key const key = - GetStyle().empty() - ? container->GetDefaultKey() - : UserMarkDLCache::Key(GetStyle(), graphics::EPosAbove, container->GetDepth()); - return cache->FindUserMark(key); -} -double StyledPoint::GetAnimScaleFactor() const +StyledPoint::StyledPoint(m2::PointD const & ptOrg, UserMarkContainer * container) + : UserMark(ptOrg, container) { - // Matches the behaviour for non-custom drawables. The only caller - // of ::DrawUserMark is UserMarkContainer::Draw and it always passes - // this value. - return 1.0; } m2::PointD const & StyledPoint::GetPixelOffset() const diff --git a/map/styled_point.hpp b/map/styled_point.hpp index 684a14ea0a..64f2155349 100644 --- a/map/styled_point.hpp +++ b/map/styled_point.hpp @@ -20,17 +20,11 @@ string GetSupportedStyle(string const & s, string const & context, string const // Default icon. string GetDefaultStyle(); -class StyledPoint : public ICustomDrawable +class StyledPoint : public UserMark { public: - StyledPoint(m2::PointD const & ptOrg, UserMarkContainer * container) - : ICustomDrawable(ptOrg, container) - { - } + StyledPoint(m2::PointD const & ptOrg, UserMarkContainer * container); - // ICustomDrawable overrides: - graphics::DisplayList * GetDisplayList(UserMarkDLCache * cache) const override; - double GetAnimScaleFactor() const override; m2::PointD const & GetPixelOffset() const override; /// @return name of icon, or empty string for plain circle. diff --git a/map/user_mark.cpp b/map/user_mark.cpp index 7a8feaee13..d1f935eb6a 100644 --- a/map/user_mark.cpp +++ b/map/user_mark.cpp @@ -29,6 +29,12 @@ m2::PointD const & UserMark::GetPivot() const return m_ptOrg; } +m2::PointD const & UserMark::GetPixelOffset() const +{ + static m2::PointD const s_centre(0.0, 0.0); + return s_centre; +} + dp::Anchor UserMark::GetAnchor() const { return dp::Center; @@ -65,8 +71,6 @@ void UserMark::FillLogEvent(UserMark::TEventContainer & details) const details.emplace("markType", ToString(GetMarkType())); } -//////////////////////////////////////////////////////////////// - UserMarkCopy::UserMarkCopy(UserMark const * srcMark, bool needDestroy) : m_srcMark(srcMark) , m_needDestroy(needDestroy) @@ -84,65 +88,6 @@ UserMark const * UserMarkCopy::GetUserMark() const return m_srcMark; } -//////////////////////////////////////////////////////////////// - -ApiMarkPoint::ApiMarkPoint(m2::PointD const & ptOrg, UserMarkContainer * container) - : UserMark(ptOrg, container) -{ -} - -ApiMarkPoint::ApiMarkPoint(string const & name, string const & id, m2::PointD const & ptOrg, - UserMarkContainer * container) - : UserMark(ptOrg, container) - , m_name(name) - , m_id(id) -{ -} - -string ApiMarkPoint::GetSymbolName() const -{ - return "api-result"; -} - -UserMark::Type ApiMarkPoint::GetMarkType() const -{ - return UserMark::Type::API; -} - -string const & ApiMarkPoint::GetName() const -{ - return m_name; -} - -void ApiMarkPoint::SetName(string const & name) -{ - m_name = name; -} - -string const & ApiMarkPoint::GetID() const -{ - return m_id; -} - -void ApiMarkPoint::SetID(string const & id) -{ - m_id = id; -} - -unique_ptr ApiMarkPoint::Copy() const -{ - return unique_ptr( - new UserMarkCopy(new ApiMarkPoint(m_name, m_id, m_ptOrg, m_container))); -} - -void ApiMarkPoint::FillLogEvent(UserMark::TEventContainer & details) const -{ - UserMark::FillLogEvent(details); - details.emplace("name", GetName()); -} - -///////////////////////////////////////////////////////////////// - SearchMarkPoint::SearchMarkPoint(search::AddressInfo const & info, m2::PointD const & ptOrg, UserMarkContainer * container) : UserMark(ptOrg, container) @@ -199,8 +144,6 @@ void SearchMarkPoint::FillLogEvent(UserMark::TEventContainer & details) const details.emplace("metaData", m_metadata.Empty() ? "0" : "1"); } -///////////////////////////////////////////////////////////////// - PoiMarkPoint::PoiMarkPoint(UserMarkContainer * container) : SearchMarkPoint(m2::PointD(0.0, 0.0), container) {} @@ -223,8 +166,6 @@ void PoiMarkPoint::SetName(string const & name) m_info.m_name = name; } -///////////////////////////////////////////////////////////////// - MyPositionMarkPoint::MyPositionMarkPoint(UserMarkContainer * container) : PoiMarkPoint(container) { diff --git a/map/user_mark.hpp b/map/user_mark.hpp index ba6a0436e2..d9948a0703 100644 --- a/map/user_mark.hpp +++ b/map/user_mark.hpp @@ -39,6 +39,7 @@ public: /////////////////////////////////////////////////////// /// df::UserPointMark m2::PointD const & GetPivot() const override; + m2::PointD const & GetPixelOffset() const override; dp::Anchor GetAnchor() const override; float GetDepth() const override; bool RunCreationAnim() const override; @@ -70,34 +71,6 @@ private: bool m_needDestroy; }; -class ApiMarkPoint : public UserMark -{ -public: - ApiMarkPoint(m2::PointD const & ptOrg, UserMarkContainer * container); - - ApiMarkPoint(string const & name, - string const & id, - m2::PointD const & ptOrg, - UserMarkContainer * container); - - string GetSymbolName() const override; - UserMark::Type GetMarkType() const override; - - string const & GetName() const; - void SetName(string const & name); - - string const & GetID() const; - void SetID(string const & id); - - unique_ptr Copy() const override; - - virtual void FillLogEvent(TEventContainer & details) const override; - -private: - string m_name; - string m_id; -}; - class SearchMarkPoint : public UserMark { public: diff --git a/map/user_mark_container.cpp b/map/user_mark_container.cpp index e5fe5fbff9..43ef1c4486 100644 --- a/map/user_mark_container.cpp +++ b/map/user_mark_container.cpp @@ -101,11 +101,6 @@ unique_ptr g_selectionUserMark; unique_ptr g_myPosition; } -UserMarkDLCache::Key UserMarkContainer::GetDefaultKey() const -{ - return UserMarkDLCache::Key(GetTypeName(), graphics::EPosCenter, GetDepth()); -} - void UserMarkContainer::InitStaticMarks(UserMarkContainer * container) { if (g_selectionUserMark == NULL) @@ -282,16 +277,6 @@ UserMark * SearchUserMarkContainer::AllocateUserMark(const m2::PointD & ptOrg) return new SearchMarkPoint(ptOrg, this); } -ApiUserMarkContainer::ApiUserMarkContainer(double layerDepth, Framework & framework) - : UserMarkContainer(layerDepth, UserMarkType::API_MARK, framework) -{ -} - -UserMark * ApiUserMarkContainer::AllocateUserMark(const m2::PointD & ptOrg) -{ - return new ApiMarkPoint(ptOrg, this); -} - DebugUserMarkContainer::DebugUserMarkContainer(double layerDepth, Framework & framework) : UserMarkContainer(layerDepth, UserMarkType::DEBUG_MARK, framework) { diff --git a/map/user_mark_container.hpp b/map/user_mark_container.hpp index 0035c80352..bc94fa1ed0 100644 --- a/map/user_mark_container.hpp +++ b/map/user_mark_container.hpp @@ -108,15 +108,6 @@ protected: UserMark * AllocateUserMark(m2::PointD const & ptOrg) override; }; -class ApiUserMarkContainer : public UserMarkContainer -{ -public: - ApiUserMarkContainer(double layerDepth, Framework & framework); - -protected: - UserMark * AllocateUserMark(m2::PointD const & ptOrg) override; -}; - class DebugUserMarkContainer : public UserMarkContainer { public: diff --git a/routing/routing_tests/routing_session_test.cpp b/routing/routing_tests/routing_session_test.cpp index a2cc532acd..cb92a741c7 100644 --- a/routing/routing_tests/routing_session_test.cpp +++ b/routing/routing_tests/routing_session_test.cpp @@ -124,8 +124,7 @@ UNIT_TEST(TestRouteRebuilding) RoutingSession::State code; while (info.m_latitude < kTestRoute.back().y) { - code = session.OnLocationPositionChanged( - MercatorBounds::FromLatLon(info.m_latitude, info.m_longitude), info, index); + code = session.OnLocationPositionChanged(info, index); TEST_EQUAL(code, RoutingSession::State::OnRoute, ()); info.m_latitude += 0.01; } @@ -147,8 +146,7 @@ UNIT_TEST(TestRouteRebuilding) info.m_latitude = 1.; for (size_t i = 0; i < 10; ++i) { - code = session.OnLocationPositionChanged( - MercatorBounds::FromLatLon(info.m_latitude, info.m_longitude), info, index); + code = session.OnLocationPositionChanged(info, index); info.m_latitude -= 0.1; } TEST_EQUAL(code, RoutingSession::State::RouteNeedRebuild, ()); diff --git a/tools/kothic b/tools/kothic index b8d935731e..d8d6ea0d99 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit b8d935731e502c5390ba6764f32ba60be2fca884 +Subproject commit d8d6ea0d997f57ba39bd9d6e8e107f6a64970800