diff --git a/data/drules_proto.bin b/data/drules_proto.bin index c5b09ee92a..52c15e4d52 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 55b76f0005..872d5e451d 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -6056,10 +6056,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "place-of-worship-m" priority: 16813 @@ -6076,10 +6072,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -6095,10 +6087,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -6114,10 +6102,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -6152,10 +6136,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "buddhist-m" priority: 16813 @@ -6172,10 +6152,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -6191,10 +6167,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -6210,10 +6182,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -6248,10 +6216,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "christian-m" priority: 16813 @@ -6268,10 +6232,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -6287,10 +6247,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -6306,10 +6262,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -6344,10 +6296,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "hindu-m" priority: 16813 @@ -6364,10 +6312,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -6383,10 +6327,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -6402,10 +6342,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -6440,10 +6376,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "jewish-m" priority: 16813 @@ -6460,10 +6392,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -6479,10 +6407,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -6498,10 +6422,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -6536,10 +6456,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "muslim-m" priority: 16813 @@ -6556,10 +6472,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -6575,10 +6487,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -6594,10 +6502,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -6632,10 +6536,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "shinto-m" priority: 16813 @@ -6652,10 +6552,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6671,10 +6567,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6690,10 +6582,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6728,10 +6616,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "taoist-m" priority: 16813 @@ -6748,10 +6632,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -6767,10 +6647,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -6786,10 +6662,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -7833,12 +7705,12 @@ cont { scale: 15 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-m" apply_for_type: 1 - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7900,11 +7772,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7929,11 +7801,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7958,11 +7830,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -7986,11 +7858,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -8014,11 +7886,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -8054,11 +7926,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 1aecd21c5a..b3a17a4060 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 f0c7ac11a2..7b3d60a9d0 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -5480,10 +5480,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "place-of-worship-m" priority: 16813 @@ -5500,10 +5496,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -5519,10 +5511,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -5538,10 +5526,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -5576,10 +5560,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "buddhist-m" priority: 16813 @@ -5596,10 +5576,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -5615,10 +5591,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -5634,10 +5606,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -5672,10 +5640,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "christian-m" priority: 16813 @@ -5692,10 +5656,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -5711,10 +5671,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -5730,10 +5686,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -5768,10 +5720,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "hindu-m" priority: 16813 @@ -5788,10 +5736,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -5807,10 +5751,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -5826,10 +5766,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -5864,10 +5800,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "jewish-m" priority: 16813 @@ -5884,10 +5816,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -5903,10 +5831,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -5922,10 +5846,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -5960,10 +5880,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "muslim-m" priority: 16813 @@ -5980,10 +5896,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -5999,10 +5911,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -6018,10 +5926,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -6056,10 +5960,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "shinto-m" priority: 16813 @@ -6076,10 +5976,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6095,10 +5991,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6114,10 +6006,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6152,10 +6040,6 @@ cont { } element { scale: 16 - area { - color: 16316664 - priority: -15187 - } symbol { name: "taoist-m" priority: 16813 @@ -6172,10 +6056,6 @@ cont { } element { scale: 17 - area { - color: 16316664 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -6191,10 +6071,6 @@ cont { } element { scale: 18 - area { - color: 16316664 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -6210,10 +6086,6 @@ cont { } element { scale: 19 - area { - color: 16316664 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -6969,12 +6841,12 @@ cont { scale: 15 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-m" apply_for_type: 1 - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7036,11 +6908,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7065,11 +6937,11 @@ cont { scale: 17 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7094,11 +6966,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -7122,11 +6994,11 @@ cont { scale: 18 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -7150,11 +7022,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -7190,11 +7062,11 @@ cont { scale: 19 area { color: 16311482 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 48b3baa1e7..9daad6edcc 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 611a3e7271..172b44e8ab 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -5480,10 +5480,6 @@ cont { } element { scale: 16 - area { - color: 5064516 - priority: -15187 - } symbol { name: "place-of-worship-m" priority: 16813 @@ -5500,10 +5496,6 @@ cont { } element { scale: 17 - area { - color: 5064516 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -5519,10 +5511,6 @@ cont { } element { scale: 18 - area { - color: 5064516 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -5538,10 +5526,6 @@ cont { } element { scale: 19 - area { - color: 5064516 - priority: -15187 - } symbol { name: "place-of-worship-l" priority: 16813 @@ -5576,10 +5560,6 @@ cont { } element { scale: 16 - area { - color: 5064516 - priority: -15187 - } symbol { name: "buddhist-m" priority: 16813 @@ -5596,10 +5576,6 @@ cont { } element { scale: 17 - area { - color: 5064516 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -5615,10 +5591,6 @@ cont { } element { scale: 18 - area { - color: 5064516 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -5634,10 +5606,6 @@ cont { } element { scale: 19 - area { - color: 5064516 - priority: -15187 - } symbol { name: "buddhist-l" priority: 16813 @@ -5672,10 +5640,6 @@ cont { } element { scale: 16 - area { - color: 5064516 - priority: -15187 - } symbol { name: "christian-m" priority: 16813 @@ -5692,10 +5656,6 @@ cont { } element { scale: 17 - area { - color: 5064516 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -5711,10 +5671,6 @@ cont { } element { scale: 18 - area { - color: 5064516 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -5730,10 +5686,6 @@ cont { } element { scale: 19 - area { - color: 5064516 - priority: -15187 - } symbol { name: "christian-l" priority: 16813 @@ -5768,10 +5720,6 @@ cont { } element { scale: 16 - area { - color: 5064516 - priority: -15187 - } symbol { name: "hindu-m" priority: 16813 @@ -5788,10 +5736,6 @@ cont { } element { scale: 17 - area { - color: 5064516 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -5807,10 +5751,6 @@ cont { } element { scale: 18 - area { - color: 5064516 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -5826,10 +5766,6 @@ cont { } element { scale: 19 - area { - color: 5064516 - priority: -15187 - } symbol { name: "hindu-l" priority: 16813 @@ -5864,10 +5800,6 @@ cont { } element { scale: 16 - area { - color: 5064516 - priority: -15187 - } symbol { name: "jewish-m" priority: 16813 @@ -5884,10 +5816,6 @@ cont { } element { scale: 17 - area { - color: 5064516 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -5903,10 +5831,6 @@ cont { } element { scale: 18 - area { - color: 5064516 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -5922,10 +5846,6 @@ cont { } element { scale: 19 - area { - color: 5064516 - priority: -15187 - } symbol { name: "jewish-l" priority: 16813 @@ -5960,10 +5880,6 @@ cont { } element { scale: 16 - area { - color: 5064516 - priority: -15187 - } symbol { name: "muslim-m" priority: 16813 @@ -5980,10 +5896,6 @@ cont { } element { scale: 17 - area { - color: 5064516 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -5999,10 +5911,6 @@ cont { } element { scale: 18 - area { - color: 5064516 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -6018,10 +5926,6 @@ cont { } element { scale: 19 - area { - color: 5064516 - priority: -15187 - } symbol { name: "muslim-l" priority: 16813 @@ -6056,10 +5960,6 @@ cont { } element { scale: 16 - area { - color: 5064516 - priority: -15187 - } symbol { name: "shinto-m" priority: 16813 @@ -6076,10 +5976,6 @@ cont { } element { scale: 17 - area { - color: 5064516 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6095,10 +5991,6 @@ cont { } element { scale: 18 - area { - color: 5064516 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6114,10 +6006,6 @@ cont { } element { scale: 19 - area { - color: 5064516 - priority: -15187 - } symbol { name: "shinto-l" priority: 16813 @@ -6152,10 +6040,6 @@ cont { } element { scale: 16 - area { - color: 5064516 - priority: -15187 - } symbol { name: "taoist-m" priority: 16813 @@ -6172,10 +6056,6 @@ cont { } element { scale: 17 - area { - color: 5064516 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -6191,10 +6071,6 @@ cont { } element { scale: 18 - area { - color: 5064516 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -6210,10 +6086,6 @@ cont { } element { scale: 19 - area { - color: 5064516 - priority: -15187 - } symbol { name: "taoist-l" priority: 16813 @@ -6969,12 +6841,12 @@ cont { scale: 15 area { color: 2498323 - priority: -15099 + priority: -15991 } symbol { name: "college-m" apply_for_type: 1 - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7036,11 +6908,11 @@ cont { scale: 17 area { color: 2498323 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7065,11 +6937,11 @@ cont { scale: 17 area { color: 2498323 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 min_distance: 10 } caption { @@ -7094,11 +6966,11 @@ cont { scale: 18 area { color: 2498323 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -7122,11 +6994,11 @@ cont { scale: 18 area { color: 2498323 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -7150,11 +7022,11 @@ cont { scale: 19 area { color: 2498323 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary { @@ -7190,11 +7062,11 @@ cont { scale: 19 area { color: 2498323 - priority: -15099 + priority: -15991 } symbol { name: "college-l" - priority: 16901 + priority: 16009 } caption { primary {