diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 529a5525b1..cd259647ce 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 59d6805fe2..72e2391987 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -3000,14 +3000,14 @@ cont { scale: 18 symbol { name: "bench" - priority: 30 + priority: -9980 } } element { scale: 19 symbol { name: "bench" - priority: 30 + priority: -9980 } caption { primary { @@ -3016,7 +3016,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -5883,7 +5883,7 @@ cont { scale: 18 symbol { name: "entrance-s" - priority: 10 + priority: -10000 } caption { primary { @@ -5893,14 +5893,14 @@ cont { text: "ref" is_optional: true } - priority: -9990 + priority: -10000 } } element { scale: 19 symbol { name: "entrance-s" - priority: 10 + priority: -10000 } caption { primary { @@ -5910,7 +5910,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9990 + priority: -10000 } } } @@ -7102,7 +7102,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7113,7 +7113,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7124,7 +7124,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7135,7 +7135,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7146,7 +7146,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7156,35 +7156,35 @@ cont { scale: 15 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } } element { scale: 16 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } } element { scale: 17 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } } element { scale: 18 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } } element { scale: 19 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } caption { primary { @@ -7193,7 +7193,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -7207,7 +7207,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7218,7 +7218,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7229,7 +7229,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7240,7 +7240,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7251,7 +7251,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7265,7 +7265,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7276,7 +7276,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7287,7 +7287,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7298,7 +7298,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7309,7 +7309,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7323,7 +7323,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7334,7 +7334,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7345,7 +7345,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7356,7 +7356,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } element { @@ -7367,7 +7367,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -9293,21 +9293,21 @@ cont { scale: 17 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } } element { scale: 18 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } } element { scale: 19 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } caption { primary { @@ -9316,7 +9316,7 @@ cont { offset_y: 1 is_optional: true } - priority: -8800 + priority: -10000 } } } @@ -9706,7 +9706,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9715,14 +9715,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9731,7 +9731,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9741,7 +9741,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9750,14 +9750,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9766,7 +9766,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9776,7 +9776,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9785,14 +9785,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9801,7 +9801,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9811,7 +9811,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9820,14 +9820,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9836,7 +9836,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9846,7 +9846,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9855,14 +9855,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9871,7 +9871,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9881,7 +9881,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9890,14 +9890,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9906,7 +9906,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9916,7 +9916,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9925,14 +9925,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9941,7 +9941,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -10002,7 +10002,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -10011,14 +10011,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -10027,7 +10027,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -10139,7 +10139,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -10148,14 +10148,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -10164,7 +10164,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -10241,14 +10241,14 @@ cont { scale: 18 symbol { name: "waste-basket-s" - priority: 20 + priority: -9990 } } element { scale: 19 symbol { name: "waste-basket-s" - priority: 20 + priority: -9990 } caption { primary { @@ -10257,7 +10257,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -10267,7 +10267,7 @@ cont { scale: 18 symbol { name: "waste-basket-m" - priority: 30 + priority: -9980 } caption { primary { @@ -10276,14 +10276,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } element { scale: 19 symbol { name: "waste-basket-m" - priority: 30 + priority: -9980 } caption { primary { @@ -10292,7 +10292,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -14845,7 +14845,7 @@ cont { scale: 18 symbol { name: "defibrillator-m" - priority: 30 + priority: -9980 } caption { primary { @@ -14854,14 +14854,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } element { scale: 19 symbol { name: "defibrillator-m" - priority: 30 + priority: -9980 } caption { primary { @@ -14870,7 +14870,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -14880,7 +14880,7 @@ cont { scale: 18 symbol { name: "firehydrant-m" - priority: 20 + priority: -9990 } caption { primary { @@ -14889,14 +14889,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } element { scale: 19 symbol { name: "firehydrant-m" - priority: 20 + priority: -9990 } caption { primary { @@ -14905,7 +14905,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -14915,21 +14915,21 @@ cont { scale: 17 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } element { scale: 18 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } element { scale: 19 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } } @@ -14939,7 +14939,7 @@ cont { scale: 19 symbol { name: "entrance-s" - priority: 50 + priority: -9960 } caption { primary { @@ -14955,7 +14955,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9950 + priority: -10000 } } } @@ -14965,7 +14965,7 @@ cont { scale: 18 symbol { name: "exit-s" - priority: 10 + priority: -10000 } caption { primary { @@ -14975,14 +14975,14 @@ cont { text: "ref" is_optional: true } - priority: -9990 + priority: -10000 } } element { scale: 19 symbol { name: "exit-s" - priority: 10 + priority: -10000 } caption { primary { @@ -14998,7 +14998,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9990 + priority: -10000 } } } @@ -43911,7 +43911,7 @@ cont { scale: 16 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43920,14 +43920,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43936,14 +43936,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43952,14 +43952,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43968,7 +43968,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -56557,7 +56557,7 @@ cont { scale: 19 symbol { name: "power-m" - priority: 20 + priority: -9990 } caption { primary { @@ -56566,7 +56566,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -101741,7 +101741,7 @@ cont { scale: 16 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101751,14 +101751,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101768,14 +101768,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101785,14 +101785,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101802,7 +101802,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -101812,7 +101812,7 @@ cont { scale: 16 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101822,14 +101822,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101839,14 +101839,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101856,14 +101856,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101873,7 +101873,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -101883,7 +101883,7 @@ cont { scale: 16 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101893,14 +101893,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101910,14 +101910,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101927,14 +101927,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101944,7 +101944,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index e373e2ee36..23d11764df 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 68369da23a..5517954dc7 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -3000,14 +3000,14 @@ cont { scale: 18 symbol { name: "bench" - priority: 30 + priority: -9980 } } element { scale: 19 symbol { name: "bench" - priority: 30 + priority: -9980 } caption { primary { @@ -3016,7 +3016,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -5849,7 +5849,7 @@ cont { scale: 18 symbol { name: "entrance-s" - priority: 10 + priority: -10000 } caption { primary { @@ -5859,14 +5859,14 @@ cont { text: "ref" is_optional: true } - priority: -9990 + priority: -10000 } } element { scale: 19 symbol { name: "entrance-s" - priority: 10 + priority: -10000 } caption { primary { @@ -5876,7 +5876,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9990 + priority: -10000 } } } @@ -7054,7 +7054,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7064,14 +7064,14 @@ cont { scale: 18 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } } element { scale: 19 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } caption { primary { @@ -7080,7 +7080,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -7094,7 +7094,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7108,7 +7108,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7122,7 +7122,7 @@ cont { color: 4473924 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -9048,21 +9048,21 @@ cont { scale: 17 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } } element { scale: 18 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } } element { scale: 19 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } caption { primary { @@ -9071,7 +9071,7 @@ cont { offset_y: 1 is_optional: true } - priority: -8800 + priority: -10000 } } } @@ -9461,7 +9461,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9470,14 +9470,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9486,7 +9486,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9496,7 +9496,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9505,14 +9505,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9521,7 +9521,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9531,7 +9531,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9540,14 +9540,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9556,7 +9556,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9566,7 +9566,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9575,14 +9575,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9591,7 +9591,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9601,7 +9601,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9610,14 +9610,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9626,7 +9626,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9636,7 +9636,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9645,14 +9645,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9661,7 +9661,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9671,7 +9671,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9680,14 +9680,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9696,7 +9696,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9741,7 +9741,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9750,14 +9750,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9766,7 +9766,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9878,7 +9878,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9887,14 +9887,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9903,7 +9903,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9980,14 +9980,14 @@ cont { scale: 18 symbol { name: "waste-basket-s" - priority: 20 + priority: -9990 } } element { scale: 19 symbol { name: "waste-basket-s" - priority: 20 + priority: -9990 } caption { primary { @@ -9996,7 +9996,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -10006,7 +10006,7 @@ cont { scale: 18 symbol { name: "waste-basket-m" - priority: 30 + priority: -9980 } caption { primary { @@ -10015,14 +10015,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } element { scale: 19 symbol { name: "waste-basket-m" - priority: 30 + priority: -9980 } caption { primary { @@ -10031,7 +10031,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -14584,7 +14584,7 @@ cont { scale: 18 symbol { name: "defibrillator-m" - priority: 30 + priority: -9980 } caption { primary { @@ -14593,14 +14593,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } element { scale: 19 symbol { name: "defibrillator-m" - priority: 30 + priority: -9980 } caption { primary { @@ -14609,7 +14609,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -14619,7 +14619,7 @@ cont { scale: 18 symbol { name: "firehydrant-m" - priority: 20 + priority: -9990 } caption { primary { @@ -14628,14 +14628,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } element { scale: 19 symbol { name: "firehydrant-m" - priority: 20 + priority: -9990 } caption { primary { @@ -14644,7 +14644,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -14654,21 +14654,21 @@ cont { scale: 17 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } element { scale: 18 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } element { scale: 19 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } } @@ -14678,7 +14678,7 @@ cont { scale: 19 symbol { name: "entrance-s" - priority: 50 + priority: -9960 } caption { primary { @@ -14694,7 +14694,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9950 + priority: -10000 } } } @@ -14704,7 +14704,7 @@ cont { scale: 18 symbol { name: "exit-s" - priority: 10 + priority: -10000 } caption { primary { @@ -14714,14 +14714,14 @@ cont { text: "ref" is_optional: true } - priority: -9990 + priority: -10000 } } element { scale: 19 symbol { name: "exit-s" - priority: 10 + priority: -10000 } caption { primary { @@ -14737,7 +14737,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9990 + priority: -10000 } } } @@ -43484,7 +43484,7 @@ cont { scale: 16 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43493,14 +43493,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43509,14 +43509,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43525,14 +43525,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43541,7 +43541,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -56130,7 +56130,7 @@ cont { scale: 19 symbol { name: "power-m" - priority: 20 + priority: -9990 } caption { primary { @@ -56139,7 +56139,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -101154,7 +101154,7 @@ cont { scale: 16 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101164,14 +101164,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101181,14 +101181,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101198,14 +101198,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101215,7 +101215,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -101225,7 +101225,7 @@ cont { scale: 16 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101235,14 +101235,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101252,14 +101252,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101269,14 +101269,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101286,7 +101286,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -101296,7 +101296,7 @@ cont { scale: 16 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101306,14 +101306,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101323,14 +101323,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101340,14 +101340,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101357,7 +101357,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 1dcca9a747..e4fd23d2b1 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 ba3163cb6f..9ba8fdf7fc 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -3000,14 +3000,14 @@ cont { scale: 18 symbol { name: "bench" - priority: 30 + priority: -9980 } } element { scale: 19 symbol { name: "bench" - priority: 30 + priority: -9980 } caption { primary { @@ -3016,7 +3016,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -5849,7 +5849,7 @@ cont { scale: 18 symbol { name: "entrance-s" - priority: 10 + priority: -10000 } caption { primary { @@ -5859,14 +5859,14 @@ cont { text: "ref" is_optional: true } - priority: -9990 + priority: -10000 } } element { scale: 19 symbol { name: "entrance-s" - priority: 10 + priority: -10000 } caption { primary { @@ -5876,7 +5876,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9990 + priority: -10000 } } } @@ -7054,7 +7054,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7064,14 +7064,14 @@ cont { scale: 18 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } } element { scale: 19 symbol { name: "parking-disabled-m" - priority: 40 + priority: -9970 } caption { primary { @@ -7080,7 +7080,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -7094,7 +7094,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7108,7 +7108,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -7122,7 +7122,7 @@ cont { color: 5592405 offset_y: 1 } - priority: 40 + priority: -9970 } } } @@ -9048,21 +9048,21 @@ cont { scale: 17 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } } element { scale: 18 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } } element { scale: 19 symbol { name: "phone-m" - priority: 1200 + priority: -9960 } caption { primary { @@ -9071,7 +9071,7 @@ cont { offset_y: 1 is_optional: true } - priority: -8800 + priority: -10000 } } } @@ -9461,7 +9461,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9470,14 +9470,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9486,7 +9486,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9496,7 +9496,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9505,14 +9505,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9521,7 +9521,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9531,7 +9531,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9540,14 +9540,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9556,7 +9556,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9566,7 +9566,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9575,14 +9575,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9591,7 +9591,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9601,7 +9601,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9610,14 +9610,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9626,7 +9626,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9636,7 +9636,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9645,14 +9645,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9661,7 +9661,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9671,7 +9671,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9680,14 +9680,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9696,7 +9696,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9741,7 +9741,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9750,14 +9750,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9766,7 +9766,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9878,7 +9878,7 @@ cont { scale: 18 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9887,14 +9887,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } element { scale: 19 symbol { name: "vending-m" - priority: 40 + priority: -9970 } caption { primary { @@ -9903,7 +9903,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9960 + priority: -10000 } } } @@ -9980,14 +9980,14 @@ cont { scale: 18 symbol { name: "waste-basket-s" - priority: 20 + priority: -9990 } } element { scale: 19 symbol { name: "waste-basket-s" - priority: 20 + priority: -9990 } caption { primary { @@ -9996,7 +9996,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -10006,7 +10006,7 @@ cont { scale: 18 symbol { name: "waste-basket-m" - priority: 30 + priority: -9980 } caption { primary { @@ -10015,14 +10015,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } element { scale: 19 symbol { name: "waste-basket-m" - priority: 30 + priority: -9980 } caption { primary { @@ -10031,7 +10031,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -14584,7 +14584,7 @@ cont { scale: 18 symbol { name: "defibrillator-m" - priority: 30 + priority: -9980 } caption { primary { @@ -14593,14 +14593,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } element { scale: 19 symbol { name: "defibrillator-m" - priority: 30 + priority: -9980 } caption { primary { @@ -14609,7 +14609,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9970 + priority: -10000 } } } @@ -14619,7 +14619,7 @@ cont { scale: 18 symbol { name: "firehydrant-m" - priority: 20 + priority: -9990 } caption { primary { @@ -14628,14 +14628,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } element { scale: 19 symbol { name: "firehydrant-m" - priority: 20 + priority: -9990 } caption { primary { @@ -14644,7 +14644,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -14654,21 +14654,21 @@ cont { scale: 17 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } element { scale: 18 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } element { scale: 19 symbol { name: "emergency-phone-m" - priority: 1200 + priority: -9980 } } } @@ -14678,7 +14678,7 @@ cont { scale: 19 symbol { name: "entrance-s" - priority: 50 + priority: -9960 } caption { primary { @@ -14694,7 +14694,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9950 + priority: -10000 } } } @@ -14704,7 +14704,7 @@ cont { scale: 18 symbol { name: "exit-s" - priority: 10 + priority: -10000 } caption { primary { @@ -14714,14 +14714,14 @@ cont { text: "ref" is_optional: true } - priority: -9990 + priority: -10000 } } element { scale: 19 symbol { name: "exit-s" - priority: 10 + priority: -10000 } caption { primary { @@ -14737,7 +14737,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9990 + priority: -10000 } } } @@ -43599,7 +43599,7 @@ cont { scale: 16 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43608,14 +43608,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43624,14 +43624,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43640,14 +43640,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "survey_point-m" - priority: 2850 + priority: -9950 } caption { primary { @@ -43656,7 +43656,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -56216,7 +56216,7 @@ cont { scale: 19 symbol { name: "power-m" - priority: 20 + priority: -9990 } caption { primary { @@ -56225,7 +56225,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9980 + priority: -10000 } } } @@ -101240,7 +101240,7 @@ cont { scale: 16 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101250,14 +101250,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101267,14 +101267,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101284,14 +101284,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "board" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101301,7 +101301,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -101311,7 +101311,7 @@ cont { scale: 16 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101321,14 +101321,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101338,14 +101338,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101355,14 +101355,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "guidepost" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101372,7 +101372,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } } @@ -101382,7 +101382,7 @@ cont { scale: 16 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101392,14 +101392,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 17 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101409,14 +101409,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 18 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101426,14 +101426,14 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } element { scale: 19 symbol { name: "map" - priority: 2850 + priority: -9950 min_distance: 10 } caption { @@ -101443,7 +101443,7 @@ cont { offset_y: 1 is_optional: true } - priority: -7150 + priority: -10000 } } }