diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 57dc39f5d1..d12eadf9c3 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 597e85c71d..e156efc9bc 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -2193,7 +2193,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -2203,7 +2203,7 @@ cont { scale: 17 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2213,14 +2213,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2230,14 +2230,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2247,7 +2247,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -2696,7 +2696,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -3820,7 +3820,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -4407,32 +4407,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15695 + priority: -15635 } } element { scale: 15 area { color: 12372094 - priority: -15695 + priority: -15635 } } element { scale: 16 area { color: 11781233 - priority: -15695 + priority: -15635 } } element { scale: 17 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4440,18 +4440,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 18 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4459,18 +4459,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 19 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4478,7 +4478,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } } @@ -4488,32 +4488,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15695 + priority: -15635 } } element { scale: 15 area { color: 12372094 - priority: -15695 + priority: -15635 } } element { scale: 16 area { color: 11781233 - priority: -15695 + priority: -15635 } } element { scale: 17 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4521,18 +4521,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 18 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4540,18 +4540,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 19 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4559,7 +4559,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } } @@ -4728,14 +4728,14 @@ cont { scale: 16 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } } @@ -4743,7 +4743,7 @@ cont { scale: 18 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } } @@ -4751,7 +4751,7 @@ cont { scale: 19 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } caption { @@ -4761,7 +4761,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -4775,7 +4775,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -4873,7 +4873,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16044 + priority: 16365 } caption { primary { @@ -4882,7 +4882,7 @@ cont { offset_x: 1 text: "ref" } - priority: 15044 + priority: 15365 } } element { @@ -4890,7 +4890,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16044 + priority: 16365 } caption { primary { @@ -4899,7 +4899,7 @@ cont { offset_x: 1 offset_y: 1 } - priority: 15044 + priority: 15365 } } } @@ -4976,7 +4976,7 @@ cont { scale: 17 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -4986,14 +4986,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5003,14 +5003,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5020,7 +5020,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5093,7 +5093,7 @@ cont { scale: 17 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5102,14 +5102,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5118,14 +5118,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5134,7 +5134,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5144,7 +5144,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5163,22 +5163,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5187,18 +5187,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5207,7 +5207,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5217,7 +5217,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5236,22 +5236,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5260,18 +5260,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5280,7 +5280,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5290,7 +5290,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5309,22 +5309,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5333,18 +5333,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5353,7 +5353,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5363,7 +5363,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5382,22 +5382,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5406,18 +5406,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5426,7 +5426,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5436,7 +5436,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5455,22 +5455,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5479,18 +5479,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5499,7 +5499,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5509,7 +5509,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5528,22 +5528,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "zero-icon" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5552,18 +5552,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5572,7 +5572,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5582,7 +5582,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5601,22 +5601,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "zero-icon" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5625,18 +5625,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5645,7 +5645,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5655,7 +5655,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5674,22 +5674,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5698,18 +5698,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5718,7 +5718,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5744,14 +5744,14 @@ cont { scale: 17 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5760,14 +5760,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5776,7 +5776,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5802,14 +5802,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5818,14 +5818,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5834,7 +5834,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5860,14 +5860,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5876,14 +5876,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5892,7 +5892,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5918,14 +5918,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } caption { primary { @@ -5934,14 +5934,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } caption { primary { @@ -5950,7 +5950,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5960,7 +5960,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5969,14 +5969,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5985,14 +5985,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -6001,7 +6001,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7319,7 +7319,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7896,7 +7896,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7906,11 +7906,11 @@ cont { scale: 14 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-s" - priority: 16007 + priority: 16365 min_distance: 12 } caption { @@ -7927,11 +7927,11 @@ cont { scale: 15 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 12 } caption { @@ -7948,7 +7948,7 @@ cont { scale: 15 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -7956,7 +7956,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -7964,11 +7964,11 @@ cont { scale: 16 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 11 } caption { @@ -7985,7 +7985,7 @@ cont { scale: 16 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -7993,7 +7993,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -8001,11 +8001,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 10 } caption { @@ -8022,7 +8022,7 @@ cont { scale: 17 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -8030,7 +8030,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -8038,11 +8038,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 } caption { primary { @@ -8059,7 +8059,7 @@ cont { scale: 18 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -8067,7 +8067,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -8075,11 +8075,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 } caption { primary { @@ -8096,7 +8096,7 @@ cont { scale: 19 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -8104,7 +8104,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -37340,7 +37340,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 cap: BUTTCAP } } @@ -37349,7 +37349,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 cap: BUTTCAP } } @@ -37358,7 +37358,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 } } element { @@ -37366,7 +37366,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 } } element { @@ -37374,7 +37374,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 } } element { @@ -37382,7 +37382,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 } } } @@ -37598,21 +37598,21 @@ cont { scale: 16 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37620,14 +37620,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37635,7 +37635,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -37645,21 +37645,21 @@ cont { scale: 16 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37667,14 +37667,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37682,7 +37682,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -37805,21 +37805,21 @@ cont { scale: 16 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -37827,14 +37827,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -37842,7 +37842,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index b2d0772dcf..ecc1abc992 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index c57acc2787..c61c907441 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -2193,7 +2193,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -2203,7 +2203,7 @@ cont { scale: 17 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2213,14 +2213,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2230,14 +2230,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2247,7 +2247,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -2696,7 +2696,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -3820,7 +3820,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -4373,32 +4373,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15695 + priority: -15635 } } element { scale: 15 area { color: 12372094 - priority: -15695 + priority: -15635 } } element { scale: 16 area { color: 11781233 - priority: -15695 + priority: -15635 } } element { scale: 17 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4406,18 +4406,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 18 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4425,18 +4425,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 19 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4444,7 +4444,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } } @@ -4454,32 +4454,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15695 + priority: -15635 } } element { scale: 15 area { color: 12372094 - priority: -15695 + priority: -15635 } } element { scale: 16 area { color: 11781233 - priority: -15695 + priority: -15635 } } element { scale: 17 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4487,18 +4487,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 18 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4506,18 +4506,18 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 19 area { color: 11781233 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4525,7 +4525,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15305 + priority: 15365 } } } @@ -4694,14 +4694,14 @@ cont { scale: 16 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } } @@ -4709,7 +4709,7 @@ cont { scale: 18 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } } @@ -4717,7 +4717,7 @@ cont { scale: 19 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } caption { @@ -4727,7 +4727,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -4741,7 +4741,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -4839,7 +4839,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16044 + priority: 16365 } caption { primary { @@ -4848,7 +4848,7 @@ cont { offset_x: 1 text: "ref" } - priority: 15044 + priority: 15365 } } element { @@ -4856,7 +4856,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16044 + priority: 16365 } caption { primary { @@ -4865,7 +4865,7 @@ cont { offset_x: 1 offset_y: 1 } - priority: 15044 + priority: 15365 } } } @@ -4942,7 +4942,7 @@ cont { scale: 17 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -4952,14 +4952,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -4969,14 +4969,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -4986,7 +4986,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5059,7 +5059,7 @@ cont { scale: 17 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5068,14 +5068,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5084,14 +5084,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5100,7 +5100,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5110,7 +5110,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5129,22 +5129,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5153,18 +5153,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5173,7 +5173,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5183,7 +5183,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5202,22 +5202,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5226,18 +5226,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5246,7 +5246,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5256,7 +5256,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5275,22 +5275,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5299,18 +5299,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5319,7 +5319,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5329,7 +5329,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5348,22 +5348,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5372,18 +5372,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5392,7 +5392,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5402,7 +5402,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5421,22 +5421,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5445,18 +5445,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5465,7 +5465,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5475,7 +5475,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5494,22 +5494,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "zero-icon" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5518,18 +5518,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5538,7 +5538,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5548,7 +5548,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5567,22 +5567,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "zero-icon" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5591,18 +5591,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5611,7 +5611,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5621,7 +5621,7 @@ cont { scale: 15 area { color: 15921870 - priority: -15963 + priority: -15635 } } element { @@ -5640,22 +5640,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5664,18 +5664,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 15921870 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5684,7 +5684,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5702,14 +5702,14 @@ cont { scale: 17 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5718,14 +5718,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5734,7 +5734,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5752,14 +5752,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5768,14 +5768,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5784,7 +5784,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5802,14 +5802,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5818,14 +5818,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5834,7 +5834,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5852,14 +5852,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } caption { primary { @@ -5868,14 +5868,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } caption { primary { @@ -5884,7 +5884,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5894,7 +5894,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5903,14 +5903,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5919,14 +5919,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5935,7 +5935,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7253,7 +7253,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7830,7 +7830,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7840,11 +7840,11 @@ cont { scale: 14 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-s" - priority: 16007 + priority: 16365 min_distance: 12 } caption { @@ -7861,11 +7861,11 @@ cont { scale: 15 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 12 } caption { @@ -7882,7 +7882,7 @@ cont { scale: 15 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -7890,7 +7890,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -7898,11 +7898,11 @@ cont { scale: 16 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 11 } caption { @@ -7919,7 +7919,7 @@ cont { scale: 16 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -7927,7 +7927,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -7935,11 +7935,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 10 } caption { @@ -7956,7 +7956,7 @@ cont { scale: 17 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -7964,7 +7964,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -7972,11 +7972,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 } caption { primary { @@ -7993,7 +7993,7 @@ cont { scale: 18 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -8001,7 +8001,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -8009,11 +8009,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 } caption { primary { @@ -8030,7 +8030,7 @@ cont { scale: 19 area { color: 16311482 - priority: -15993 + priority: -15635 } caption { primary { @@ -8038,7 +8038,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -37138,7 +37138,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 cap: BUTTCAP } } @@ -37147,7 +37147,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 cap: BUTTCAP } } @@ -37156,7 +37156,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 } } element { @@ -37164,7 +37164,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 } } element { @@ -37172,7 +37172,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 } } element { @@ -37180,7 +37180,7 @@ cont { lines { width: 2.0 color: 14934482 - priority: 1149 + priority: 1365 } } } @@ -37396,21 +37396,21 @@ cont { scale: 16 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37418,14 +37418,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37433,7 +37433,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -37443,21 +37443,21 @@ cont { scale: 16 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37465,14 +37465,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37480,7 +37480,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -37603,21 +37603,21 @@ cont { scale: 16 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -37625,14 +37625,14 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -37640,7 +37640,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 15000 + priority: 15365 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 1b70e958bb..923f4cabae 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 93424aa3cb..279a37bdf0 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -2193,7 +2193,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -2203,7 +2203,7 @@ cont { scale: 17 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2213,14 +2213,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2230,14 +2230,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "gallery-m" - priority: 16000 + priority: 16365 min_distance: 12 } caption { @@ -2247,7 +2247,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -2696,7 +2696,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -3820,7 +3820,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -4373,32 +4373,32 @@ cont { scale: 14 area { color: 655629312 - priority: -15695 + priority: -15635 } } element { scale: 15 area { color: 1317888 - priority: -15695 + priority: -15635 } } element { scale: 16 area { color: 1317888 - priority: -15695 + priority: -15635 } } element { scale: 17 area { color: 1317888 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4406,18 +4406,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 18 area { color: 1317888 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4425,18 +4425,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 19 area { color: 1317888 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4444,7 +4444,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15305 + priority: 15365 } } } @@ -4454,32 +4454,32 @@ cont { scale: 14 area { color: 655629312 - priority: -15695 + priority: -15635 } } element { scale: 15 area { color: 1317888 - priority: -15695 + priority: -15635 } } element { scale: 16 area { color: 1317888 - priority: -15695 + priority: -15635 } } element { scale: 17 area { color: 1317888 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4487,18 +4487,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 18 area { color: 1317888 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4506,18 +4506,18 @@ cont { color: 5592405 offset_y: 1 } - priority: 15305 + priority: 15365 } } element { scale: 19 area { color: 1317888 - priority: -15695 + priority: -15635 } symbol { name: "cemetery-m" - priority: 16305 + priority: 16365 } caption { primary { @@ -4525,7 +4525,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15305 + priority: 15365 } } } @@ -4694,14 +4694,14 @@ cont { scale: 16 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } } @@ -4709,7 +4709,7 @@ cont { scale: 18 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } } @@ -4717,7 +4717,7 @@ cont { scale: 19 symbol { name: "ice_cream-m" - priority: 16000 + priority: 16365 min_distance: 24 } caption { @@ -4727,7 +4727,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -4741,7 +4741,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -4839,7 +4839,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16044 + priority: 16365 } caption { primary { @@ -4848,7 +4848,7 @@ cont { offset_x: 1 text: "ref" } - priority: 15044 + priority: 15365 } } element { @@ -4856,7 +4856,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16044 + priority: 16365 } caption { primary { @@ -4865,7 +4865,7 @@ cont { offset_x: 1 offset_y: 1 } - priority: 15044 + priority: 15365 } } } @@ -4942,7 +4942,7 @@ cont { scale: 17 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -4952,14 +4952,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -4969,14 +4969,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "motorcycle-parking-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -4986,7 +4986,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5059,7 +5059,7 @@ cont { scale: 17 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5068,14 +5068,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5084,14 +5084,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "home-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5100,7 +5100,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5110,7 +5110,7 @@ cont { scale: 15 area { color: 2038555 - priority: -15963 + priority: -15635 } } element { @@ -5129,22 +5129,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5153,18 +5153,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5173,7 +5173,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5183,7 +5183,7 @@ cont { scale: 15 area { color: 2038555 - priority: -15963 + priority: -15635 } } element { @@ -5202,22 +5202,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5226,18 +5226,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5246,7 +5246,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5256,7 +5256,7 @@ cont { scale: 15 area { color: 2038555 - priority: -15963 + priority: -15635 } } element { @@ -5275,22 +5275,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5299,18 +5299,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5319,7 +5319,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5329,7 +5329,7 @@ cont { scale: 15 area { color: 2038555 - priority: -15963 + priority: -15635 } } element { @@ -5348,22 +5348,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5372,18 +5372,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5392,7 +5392,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5402,7 +5402,7 @@ cont { scale: 15 area { color: 2038555 - priority: -15963 + priority: -15635 } } element { @@ -5421,22 +5421,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5445,18 +5445,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5465,7 +5465,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5475,7 +5475,7 @@ cont { scale: 15 area { color: 2038555 - priority: -15963 + priority: -15635 } } element { @@ -5494,22 +5494,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "zero-icon" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5518,18 +5518,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5538,7 +5538,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5548,7 +5548,7 @@ cont { scale: 15 area { color: 2038555 - priority: -15963 + priority: -15635 } } element { @@ -5567,22 +5567,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "zero-icon" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5591,18 +5591,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5611,7 +5611,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5621,7 +5621,7 @@ cont { scale: 15 area { color: 2038555 - priority: -15963 + priority: -15635 } } element { @@ -5640,22 +5640,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } } element { scale: 18 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5664,18 +5664,18 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } element { scale: 19 area { color: 2038555 - priority: -15963 + priority: -15635 } symbol { name: "parking-m" - priority: 16037 + priority: 16365 } caption { primary { @@ -5684,7 +5684,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15037 + priority: 15365 } } } @@ -5702,14 +5702,14 @@ cont { scale: 17 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5718,14 +5718,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5734,7 +5734,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5752,14 +5752,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5768,14 +5768,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5784,7 +5784,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5802,14 +5802,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5818,14 +5818,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "parking-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -5834,7 +5834,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5852,14 +5852,14 @@ cont { scale: 17 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } caption { primary { @@ -5868,14 +5868,14 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "zero-icon" - priority: 16000 + priority: 16365 } caption { primary { @@ -5884,7 +5884,7 @@ cont { offset_y: 1 is_optional: true } - priority: 15000 + priority: 15365 } } } @@ -5894,7 +5894,7 @@ cont { scale: 17 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5903,14 +5903,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 18 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5919,14 +5919,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "vending-m" - priority: 16000 + priority: 16365 min_distance: 20 } caption { @@ -5935,7 +5935,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7253,7 +7253,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7830,7 +7830,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -7840,11 +7840,11 @@ cont { scale: 14 area { color: 2498323 - priority: -15993 + priority: -15635 } symbol { name: "college-s" - priority: 16007 + priority: 16365 min_distance: 12 } caption { @@ -7861,11 +7861,11 @@ cont { scale: 15 area { color: 2498323 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 12 } caption { @@ -7882,7 +7882,7 @@ cont { scale: 15 area { color: 2498323 - priority: -15993 + priority: -15635 } caption { primary { @@ -7890,7 +7890,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -7898,11 +7898,11 @@ cont { scale: 16 area { color: 2498323 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 11 } caption { @@ -7919,7 +7919,7 @@ cont { scale: 16 area { color: 2498323 - priority: -15993 + priority: -15635 } caption { primary { @@ -7927,7 +7927,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -7935,11 +7935,11 @@ cont { scale: 17 area { color: 2498323 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 min_distance: 10 } caption { @@ -7956,7 +7956,7 @@ cont { scale: 17 area { color: 2498323 - priority: -15993 + priority: -15635 } caption { primary { @@ -7964,7 +7964,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -7972,11 +7972,11 @@ cont { scale: 18 area { color: 2498323 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 } caption { primary { @@ -7993,7 +7993,7 @@ cont { scale: 18 area { color: 2498323 - priority: -15993 + priority: -15635 } caption { primary { @@ -8001,7 +8001,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -8009,11 +8009,11 @@ cont { scale: 19 area { color: 2498323 - priority: -15993 + priority: -15635 } symbol { name: "college-m" - priority: 16007 + priority: 16365 } caption { primary { @@ -8030,7 +8030,7 @@ cont { scale: 19 area { color: 2498323 - priority: -15993 + priority: -15635 } caption { primary { @@ -8038,7 +8038,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15007 + priority: 15365 } apply_if: "!name" } @@ -37274,7 +37274,7 @@ cont { scale: 14 lines { width: 2.0 - priority: 1149 + priority: 1365 cap: BUTTCAP } } @@ -37282,7 +37282,7 @@ cont { scale: 15 lines { width: 2.0 - priority: 1149 + priority: 1365 cap: BUTTCAP } } @@ -37290,28 +37290,28 @@ cont { scale: 16 lines { width: 2.0 - priority: 1149 + priority: 1365 } } element { scale: 17 lines { width: 2.0 - priority: 1149 + priority: 1365 } } element { scale: 18 lines { width: 2.0 - priority: 1149 + priority: 1365 } } element { scale: 19 lines { width: 2.0 - priority: 1149 + priority: 1365 } } } @@ -37513,21 +37513,21 @@ cont { scale: 16 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37535,14 +37535,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37550,7 +37550,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -37560,21 +37560,21 @@ cont { scale: 16 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37582,14 +37582,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "storage-tank" - priority: 16000 + priority: 16365 } caption { primary { @@ -37597,7 +37597,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } } @@ -37720,21 +37720,21 @@ cont { scale: 16 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } } element { scale: 17 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } } element { scale: 18 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -37742,14 +37742,14 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } element { scale: 19 symbol { name: "chimney-m" - priority: 16000 + priority: 16365 } caption { primary { @@ -37757,7 +37757,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 15000 + priority: 15365 } } }