diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b872e3cb03..9edfb3872a 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 509105295c..2954077ca4 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3414,6 +3414,38 @@ cont {
}
cont {
name: "amenity-bbq"
+ element {
+ scale: 16
+ symbol {
+ name: "bbq-m"
+ priority: 450
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9550
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "bbq-m"
+ priority: 450
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9550
+ }
+ }
element {
scale: 18
symbol {
@@ -5527,7 +5559,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5535,7 +5566,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5543,7 +5573,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5551,7 +5580,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5559,7 +5587,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5567,7 +5594,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5575,7 +5601,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5583,7 +5608,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5600,7 +5624,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -6971,6 +6994,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 18
@@ -6979,6 +7011,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 19
@@ -12598,6 +12639,54 @@ cont {
}
cont {
name: "amenity-toilets"
+ element {
+ scale: 15
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9530
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9530
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9530
+ }
+ }
element {
scale: 18
symbol {
@@ -13911,7 +14000,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13919,7 +14007,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13927,7 +14014,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13935,7 +14021,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13943,7 +14028,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13951,7 +14035,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13959,7 +14042,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13967,7 +14049,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13984,7 +14065,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -14405,10 +14485,42 @@ cont {
}
cont {
name: "barrier-border_control"
+ element {
+ scale: 12
+ symbol {
+ name: "bcontrol-s"
+ priority: 5800
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -4200
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "bcontrol-s"
+ priority: 5800
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -4200
+ }
+ }
element {
scale: 14
symbol {
- name: "bcontrol-m"
+ name: "bcontrol-s"
priority: 5800
}
caption {
@@ -14855,7 +14967,7 @@ cont {
element {
scale: 16
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14871,7 +14983,7 @@ cont {
element {
scale: 17
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14887,7 +14999,7 @@ cont {
element {
scale: 18
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14903,7 +15015,7 @@ cont {
element {
scale: 19
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14919,7 +15031,7 @@ cont {
element {
scale: 20
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -15532,7 +15644,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15540,7 +15651,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15548,7 +15658,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15565,7 +15674,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15582,7 +15690,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15599,7 +15706,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15616,7 +15722,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15633,7 +15738,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15650,7 +15754,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -24642,7 +24745,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24666,7 +24769,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24690,7 +24793,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24714,7 +24817,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24738,7 +24841,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -52413,6 +52516,11 @@ cont {
color: 13029267
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 16
@@ -52420,6 +52528,11 @@ cont {
color: 13029267
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 17
@@ -56398,6 +56511,38 @@ cont {
}
cont {
name: "man_made-survey_point"
+ element {
+ scale: 14
+ symbol {
+ name: "survey_point-m"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "survey_point-m"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -56517,7 +56662,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56525,7 +56669,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56533,7 +56676,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56541,7 +56683,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56549,7 +56690,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56557,7 +56697,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56565,7 +56704,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56573,7 +56711,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56581,7 +56718,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
}
@@ -56592,7 +56728,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56600,7 +56735,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56608,7 +56742,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56616,7 +56749,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56624,7 +56756,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56632,7 +56763,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56640,7 +56770,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56648,7 +56777,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
element {
@@ -56656,7 +56784,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
}
@@ -56827,7 +56954,7 @@ cont {
element {
scale: 11
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
caption {
@@ -56843,7 +56970,7 @@ cont {
element {
scale: 12
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
caption {
@@ -56859,7 +56986,7 @@ cont {
element {
scale: 13
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
caption {
@@ -56875,7 +57002,7 @@ cont {
element {
scale: 14
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
caption {
@@ -56891,7 +57018,7 @@ cont {
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -56907,7 +57034,7 @@ cont {
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -56923,7 +57050,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -56939,7 +57066,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -56955,7 +57082,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -56971,7 +57098,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -59378,135 +59505,83 @@ cont {
}
cont {
name: "natural-rock"
+ element {
+ scale: 14
+ symbol {
+ name: "peakt-s"
+ priority: 2850
+ }
+ }
element {
scale: 15
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 16
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 17
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 18
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 19
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 20
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
}
cont {
name: "natural-saddle"
- element {
- scale: 11
- symbol {
- name: "mountain-pass"
- priority: 4500
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
- }
- element {
- scale: 12
- symbol {
- name: "mountain-pass"
- priority: 4500
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
- }
element {
scale: 13
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 14
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -59522,7 +59597,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -59538,7 +59613,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -59554,7 +59629,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -59570,7 +59645,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -126666,6 +126741,23 @@ cont {
}
cont {
name: "tourism-camp_site"
+ element {
+ scale: 13
+ symbol {
+ name: "campsite-m"
+ priority: 3800
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 14
symbol {
@@ -126788,6 +126880,23 @@ cont {
}
cont {
name: "tourism-caravan_site"
+ element {
+ scale: 13
+ symbol {
+ name: "caravan_site-m"
+ priority: 3800
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 14
symbol {
@@ -126910,6 +127019,23 @@ cont {
}
cont {
name: "tourism-chalet"
+ element {
+ scale: 14
+ symbol {
+ name: "alpine_hut-m"
+ priority: 3800
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 15
symbol {
@@ -127383,6 +127509,23 @@ cont {
}
cont {
name: "tourism-information"
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ priority: -9950
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -127471,6 +127614,23 @@ cont {
}
cont {
name: "tourism-information-board"
+ element {
+ scale: 15
+ symbol {
+ name: "board"
+ priority: -9950
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -127559,6 +127719,23 @@ cont {
}
cont {
name: "tourism-information-guidepost"
+ element {
+ scale: 15
+ symbol {
+ name: "guidepost"
+ priority: -9950
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -127647,6 +127824,23 @@ cont {
}
cont {
name: "tourism-information-map"
+ element {
+ scale: 15
+ symbol {
+ name: "map"
+ priority: -9950
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -127735,6 +127929,40 @@ cont {
}
cont {
name: "tourism-information-office"
+ element {
+ scale: 13
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -5600
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -5600
+ }
+ }
element {
scale: 15
symbol {
@@ -127840,6 +128068,40 @@ cont {
}
cont {
name: "tourism-information-visitor_centre"
+ element {
+ scale: 13
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -5600
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -5600
+ }
+ }
element {
scale: 15
symbol {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 37537ac71a..83b9371faa 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 2021c1ef0c..277f3ca94a 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5522,20 +5522,11 @@ cont {
}
cont {
name: "amenity-drinking_water"
- element {
- scale: 15
- symbol {
- name: "drinking-water-s"
- priority: 3500
- min_distance: 36
- }
- }
element {
scale: 16
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5543,7 +5534,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5551,7 +5541,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5559,7 +5548,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5576,7 +5564,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -6913,6 +6900,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 18
@@ -6921,6 +6917,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 19
@@ -13637,20 +13642,11 @@ cont {
}
cont {
name: "amenity-water_point"
- element {
- scale: 15
- symbol {
- name: "drinking-water-s"
- priority: 3050
- min_distance: 36
- }
- }
element {
scale: 16
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13658,7 +13654,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13666,7 +13661,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13674,7 +13668,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13691,7 +13684,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -14112,6 +14104,22 @@ cont {
}
cont {
name: "barrier-border_control"
+ element {
+ scale: 14
+ symbol {
+ name: "bcontrol-s"
+ priority: 5800
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -4200
+ }
+ }
element {
scale: 15
symbol {
@@ -14534,7 +14542,7 @@ cont {
element {
scale: 16
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14550,7 +14558,7 @@ cont {
element {
scale: 17
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14566,7 +14574,7 @@ cont {
element {
scale: 18
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14582,7 +14590,7 @@ cont {
element {
scale: 19
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14598,7 +14606,7 @@ cont {
element {
scale: 20
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -15203,7 +15211,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15211,7 +15218,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15219,7 +15225,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15236,7 +15241,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15253,7 +15257,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15270,7 +15273,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15287,7 +15289,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15304,7 +15305,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15321,7 +15321,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -23529,7 +23528,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -23553,7 +23552,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -23577,7 +23576,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -23601,7 +23600,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -23625,7 +23624,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -50100,6 +50099,11 @@ cont {
color: 13029267
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 16
@@ -50107,6 +50111,11 @@ cont {
color: 13029267
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 17
@@ -53950,38 +53959,6 @@ cont {
}
cont {
name: "man_made-survey_point"
- element {
- scale: 16
- symbol {
- name: "survey_point-m"
- priority: -9950
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -10000
- }
- }
- element {
- scale: 17
- symbol {
- name: "survey_point-m"
- priority: -9950
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -10000
- }
- }
element {
scale: 18
symbol {
@@ -54064,20 +54041,11 @@ cont {
}
cont {
name: "man_made-water_tap"
- element {
- scale: 15
- symbol {
- name: "drinking-water-s"
- priority: 3050
- min_distance: 36
- }
- }
element {
scale: 16
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54085,7 +54053,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54093,7 +54060,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54101,7 +54067,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54109,26 +54074,16 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
}
cont {
name: "man_made-water_well"
- element {
- scale: 15
- symbol {
- name: "drinking-water-s"
- priority: 3050
- min_distance: 36
- }
- }
element {
scale: 16
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54136,7 +54091,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54144,7 +54098,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54152,7 +54105,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54160,7 +54112,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
}
@@ -54331,7 +54282,7 @@ cont {
element {
scale: 14
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
caption {
@@ -54347,7 +54298,7 @@ cont {
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54363,7 +54314,7 @@ cont {
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54379,7 +54330,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54395,7 +54346,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54411,7 +54362,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54427,7 +54378,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -56630,87 +56581,55 @@ cont {
}
cont {
name: "natural-rock"
- element {
- scale: 15
- symbol {
- name: "peakt-m"
- priority: 2850
- }
- }
element {
scale: 16
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 17
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 18
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 19
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 20
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
}
cont {
name: "natural-saddle"
- element {
- scale: 14
- symbol {
- name: "mountain-pass"
- priority: 4500
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
- }
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -56726,7 +56645,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -56742,7 +56661,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -56758,7 +56677,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -56774,7 +56693,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index f18649a515..40ae0f2981 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 170b61178f..15bb7f9e3b 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5522,20 +5522,11 @@ cont {
}
cont {
name: "amenity-drinking_water"
- element {
- scale: 15
- symbol {
- name: "drinking-water-s"
- priority: 3500
- min_distance: 36
- }
- }
element {
scale: 16
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5543,7 +5534,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5551,7 +5541,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3500
- min_distance: 36
}
}
element {
@@ -5559,7 +5548,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5576,7 +5564,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -6913,6 +6900,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 18
@@ -6921,6 +6917,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 19
@@ -13637,20 +13642,11 @@ cont {
}
cont {
name: "amenity-water_point"
- element {
- scale: 15
- symbol {
- name: "drinking-water-s"
- priority: 3050
- min_distance: 36
- }
- }
element {
scale: 16
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13658,7 +13654,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13666,7 +13661,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -13674,7 +13668,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13691,7 +13684,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -14112,6 +14104,22 @@ cont {
}
cont {
name: "barrier-border_control"
+ element {
+ scale: 14
+ symbol {
+ name: "bcontrol-s"
+ priority: 5800
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -4200
+ }
+ }
element {
scale: 15
symbol {
@@ -14534,7 +14542,7 @@ cont {
element {
scale: 16
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14550,7 +14558,7 @@ cont {
element {
scale: 17
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14566,7 +14574,7 @@ cont {
element {
scale: 18
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14582,7 +14590,7 @@ cont {
element {
scale: 19
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14598,7 +14606,7 @@ cont {
element {
scale: 20
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -15203,7 +15211,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15211,7 +15218,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15219,7 +15225,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15236,7 +15241,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15253,7 +15257,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15270,7 +15273,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15287,7 +15289,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15304,7 +15305,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15321,7 +15321,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -23529,7 +23528,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -23553,7 +23552,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -23577,7 +23576,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -23601,7 +23600,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -23625,7 +23624,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -50364,6 +50363,11 @@ cont {
color: 1251584
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 16
@@ -50371,6 +50375,11 @@ cont {
color: 1251584
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 17
@@ -54196,38 +54205,6 @@ cont {
}
cont {
name: "man_made-survey_point"
- element {
- scale: 16
- symbol {
- name: "survey_point-m"
- priority: -9950
- }
- caption {
- primary {
- height: 11
- color: 5592405
- offset_y: 1
- is_optional: true
- }
- priority: -10000
- }
- }
- element {
- scale: 17
- symbol {
- name: "survey_point-m"
- priority: -9950
- }
- caption {
- primary {
- height: 11
- color: 5592405
- offset_y: 1
- is_optional: true
- }
- priority: -10000
- }
- }
element {
scale: 18
symbol {
@@ -54310,20 +54287,11 @@ cont {
}
cont {
name: "man_made-water_tap"
- element {
- scale: 15
- symbol {
- name: "drinking-water-s"
- priority: 3050
- min_distance: 36
- }
- }
element {
scale: 16
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54331,7 +54299,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54339,7 +54306,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54347,7 +54313,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54355,26 +54320,16 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
}
cont {
name: "man_made-water_well"
- element {
- scale: 15
- symbol {
- name: "drinking-water-s"
- priority: 3050
- min_distance: 36
- }
- }
element {
scale: 16
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54382,7 +54337,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54390,7 +54344,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54398,7 +54351,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
element {
@@ -54406,7 +54358,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
}
}
@@ -54577,7 +54528,7 @@ cont {
element {
scale: 14
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
caption {
@@ -54593,7 +54544,7 @@ cont {
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54609,7 +54560,7 @@ cont {
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54625,7 +54576,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54641,7 +54592,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54657,7 +54608,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -54673,7 +54624,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -56856,87 +56807,55 @@ cont {
}
cont {
name: "natural-rock"
- element {
- scale: 15
- symbol {
- name: "peakt-m"
- priority: 2850
- }
- }
element {
scale: 16
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 17
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 18
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 19
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 20
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
}
cont {
name: "natural-saddle"
- element {
- scale: 14
- symbol {
- name: "mountain-pass"
- priority: 4500
- }
- caption {
- primary {
- height: 10
- color: 5592405
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
- }
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 10
- color: 5592405
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -56952,7 +56871,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -56968,7 +56887,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -56984,7 +56903,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -57000,7 +56919,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index 62bc4dc135..8a9fe6a796 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 559d188980..8925735658 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -3414,6 +3414,38 @@ cont {
}
cont {
name: "amenity-bbq"
+ element {
+ scale: 16
+ symbol {
+ name: "bbq-m"
+ priority: 450
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9550
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "bbq-m"
+ priority: 450
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9550
+ }
+ }
element {
scale: 18
symbol {
@@ -5557,7 +5589,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5574,7 +5605,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5591,7 +5621,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5608,7 +5637,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5625,7 +5653,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5642,7 +5669,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -6979,6 +7005,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 18
@@ -6987,6 +7022,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 19
@@ -11949,7 +11993,7 @@ cont {
element {
scale: 13
symbol {
- name: "shelter-m"
+ name: "shelter-s"
priority: 1500
min_distance: 10
}
@@ -12457,6 +12501,27 @@ cont {
}
cont {
name: "amenity-toilets"
+ element {
+ scale: 15
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ }
element {
scale: 18
symbol {
@@ -13784,7 +13849,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13801,7 +13865,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13818,7 +13881,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13835,7 +13897,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13852,7 +13913,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13869,7 +13929,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -14290,12 +14349,35 @@ cont {
}
cont {
name: "barrier-border_control"
+ element {
+ scale: 12
+ symbol {
+ name: "bcontrol-s"
+ priority: 5800
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "bcontrol-s"
+ priority: 5800
+ }
+ }
element {
scale: 14
symbol {
name: "bcontrol-m"
priority: 5800
}
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -4200
+ }
}
element {
scale: 15
@@ -14732,7 +14814,7 @@ cont {
element {
scale: 16
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14748,7 +14830,7 @@ cont {
element {
scale: 17
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14764,7 +14846,7 @@ cont {
element {
scale: 18
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14780,7 +14862,7 @@ cont {
element {
scale: 19
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14796,7 +14878,7 @@ cont {
element {
scale: 20
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -15410,7 +15492,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15418,7 +15499,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15426,7 +15506,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15443,7 +15522,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15460,7 +15538,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15477,7 +15554,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15494,7 +15570,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15511,7 +15586,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15528,7 +15602,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -24784,7 +24857,7 @@ cont {
cap: BUTTCAP
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
}
@@ -24801,7 +24874,7 @@ cont {
cap: BUTTCAP
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
}
@@ -24817,7 +24890,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24841,7 +24914,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24865,7 +24938,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24889,7 +24962,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24913,7 +24986,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -33252,6 +33325,13 @@ cont {
}
cont {
name: "highway-rest_area"
+ element {
+ scale: 14
+ symbol {
+ name: "picnic-m"
+ priority: 3800
+ }
+ }
element {
scale: 15
symbol {
@@ -52937,6 +53017,11 @@ cont {
color: 13029267
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 16
@@ -52944,6 +53029,11 @@ cont {
color: 13029267
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 17
@@ -56391,49 +56481,49 @@ cont {
element {
scale: 14
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 15
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 16
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 17
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 18
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 19
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 20
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
@@ -56589,49 +56679,49 @@ cont {
element {
scale: 14
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 15
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 16
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 17
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 18
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 19
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 20
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
@@ -56900,7 +56990,14 @@ cont {
cont {
name: "man_made-survey_point"
element {
- scale: 16
+ scale: 14
+ symbol {
+ name: "survey_point-m"
+ priority: -9950
+ }
+ }
+ element {
+ scale: 15
symbol {
name: "survey_point-m"
priority: -9950
@@ -56915,6 +57012,22 @@ cont {
priority: -10000
}
}
+ element {
+ scale: 16
+ symbol {
+ name: "survey_point-m"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 17
symbol {
@@ -56923,7 +57036,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -56939,7 +57052,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -56955,7 +57068,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -56971,7 +57084,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -57048,7 +57161,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57065,7 +57177,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57082,7 +57193,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57099,7 +57209,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57116,7 +57225,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57133,7 +57241,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57183,7 +57290,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57200,7 +57306,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57217,7 +57322,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57234,7 +57338,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57251,7 +57354,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57268,7 +57370,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57448,14 +57549,14 @@ cont {
element {
scale: 11
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
}
element {
scale: 12
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
caption {
@@ -57471,7 +57572,7 @@ cont {
element {
scale: 13
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57487,7 +57588,7 @@ cont {
element {
scale: 14
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57503,7 +57604,7 @@ cont {
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57519,7 +57620,7 @@ cont {
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57535,7 +57636,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57551,7 +57652,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57567,7 +57668,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57583,7 +57684,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -60092,110 +60193,76 @@ cont {
}
cont {
name: "natural-rock"
+ element {
+ scale: 14
+ symbol {
+ name: "peakt-s"
+ priority: 2850
+ }
+ }
element {
scale: 15
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 16
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 17
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 18
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 19
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 20
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
}
cont {
name: "natural-saddle"
- element {
- scale: 11
- symbol {
- name: "mountain-pass"
- priority: 4500
- }
- }
- element {
- scale: 12
- symbol {
- name: "mountain-pass"
- priority: 4500
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
- }
element {
scale: 13
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 14
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60211,7 +60278,7 @@ cont {
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60227,7 +60294,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60243,7 +60310,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60259,7 +60326,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60275,7 +60342,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -73693,49 +73760,49 @@ cont {
element {
scale: 14
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 15
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 16
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 17
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 18
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 19
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 20
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
@@ -126382,7 +126449,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 10
color: 4473924
offset_y: 1
is_optional: true
@@ -126399,7 +126466,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 10
color: 4473924
offset_y: 1
is_optional: true
@@ -127607,6 +127674,23 @@ cont {
}
cont {
name: "tourism-camp_site"
+ element {
+ scale: 13
+ symbol {
+ name: "campsite-s"
+ priority: 3800
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 14
symbol {
@@ -127724,12 +127808,29 @@ cont {
}
cont {
name: "tourism-caravan_site"
+ element {
+ scale: 13
+ symbol {
+ name: "caravan_site-s"
+ priority: 3800
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 14
symbol {
name: "caravan_site-m"
priority: 3800
- min_distance: 30
+ min_distance: 12
}
caption {
primary {
@@ -127746,7 +127847,7 @@ cont {
symbol {
name: "caravan_site-m"
priority: 3800
- min_distance: 30
+ min_distance: 12
}
caption {
primary {
@@ -127841,6 +127942,22 @@ cont {
}
cont {
name: "tourism-chalet"
+ element {
+ scale: 14
+ symbol {
+ name: "alpine_hut-m"
+ priority: 3800
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 15
symbol {
@@ -128308,6 +128425,22 @@ cont {
}
cont {
name: "tourism-information"
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -128317,7 +128450,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128334,7 +128467,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128351,7 +128484,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128368,7 +128501,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128385,7 +128518,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128396,6 +128529,22 @@ cont {
}
cont {
name: "tourism-information-board"
+ element {
+ scale: 15
+ symbol {
+ name: "board"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -128405,7 +128554,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128422,7 +128571,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128439,7 +128588,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128456,7 +128605,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128473,7 +128622,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128484,6 +128633,22 @@ cont {
}
cont {
name: "tourism-information-guidepost"
+ element {
+ scale: 15
+ symbol {
+ name: "guidepost"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -128493,7 +128658,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128510,7 +128675,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128527,7 +128692,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128544,7 +128709,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128561,7 +128726,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128572,6 +128737,22 @@ cont {
}
cont {
name: "tourism-information-map"
+ element {
+ scale: 15
+ symbol {
+ name: "map"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -128581,7 +128762,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128598,7 +128779,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128615,7 +128796,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128632,7 +128813,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128649,7 +128830,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128660,6 +128841,29 @@ cont {
}
cont {
name: "tourism-information-office"
+ element {
+ scale: 13
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -5600
+ }
+ }
element {
scale: 15
symbol {
@@ -128669,7 +128873,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 11
color: 4473924
offset_y: 1
is_optional: true
@@ -128686,7 +128890,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128703,7 +128907,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128720,7 +128924,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128737,7 +128941,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128754,7 +128958,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128765,6 +128969,29 @@ cont {
}
cont {
name: "tourism-information-visitor_centre"
+ element {
+ scale: 13
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -5600
+ }
+ }
element {
scale: 15
symbol {
@@ -128774,7 +129001,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 11
color: 4473924
offset_y: 1
is_optional: true
@@ -128791,7 +129018,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128808,7 +129035,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128825,7 +129052,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128842,7 +129069,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
@@ -128859,7 +129086,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 4473924
offset_y: 1
is_optional: true
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index b7dfe2b599..676b69f981 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 38dcbecd84..8bdd6542b3 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -3414,6 +3414,38 @@ cont {
}
cont {
name: "amenity-bbq"
+ element {
+ scale: 16
+ symbol {
+ name: "bbq-m"
+ priority: 450
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9550
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "bbq-m"
+ priority: 450
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9550
+ }
+ }
element {
scale: 18
symbol {
@@ -5557,7 +5589,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5574,7 +5605,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5591,7 +5621,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5608,7 +5637,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5625,7 +5653,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -5642,7 +5669,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3500
- min_distance: 36
}
caption {
primary {
@@ -6979,6 +7005,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 18
@@ -6987,6 +7022,15 @@ cont {
priority: 2550
min_distance: 24
}
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7450
+ }
}
element {
scale: 19
@@ -11949,7 +11993,7 @@ cont {
element {
scale: 13
symbol {
- name: "shelter-m"
+ name: "shelter-s"
priority: 1500
min_distance: 10
}
@@ -12457,6 +12501,27 @@ cont {
}
cont {
name: "amenity-toilets"
+ element {
+ scale: 15
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "toilets-m"
+ priority: 470
+ }
+ }
element {
scale: 18
symbol {
@@ -13784,7 +13849,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13801,7 +13865,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13818,7 +13881,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13835,7 +13897,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13852,7 +13913,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -13869,7 +13929,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -14290,12 +14349,35 @@ cont {
}
cont {
name: "barrier-border_control"
+ element {
+ scale: 12
+ symbol {
+ name: "bcontrol-s"
+ priority: 5800
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "bcontrol-s"
+ priority: 5800
+ }
+ }
element {
scale: 14
symbol {
name: "bcontrol-m"
priority: 5800
}
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -4200
+ }
}
element {
scale: 15
@@ -14732,7 +14814,7 @@ cont {
element {
scale: 16
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14748,7 +14830,7 @@ cont {
element {
scale: 17
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14764,7 +14846,7 @@ cont {
element {
scale: 18
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14780,7 +14862,7 @@ cont {
element {
scale: 19
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -14796,7 +14878,7 @@ cont {
element {
scale: 20
symbol {
- name: "gate-s"
+ name: "barrier-entrance-s"
priority: 220
}
caption {
@@ -15410,7 +15492,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15418,7 +15499,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
}
element {
@@ -15426,7 +15506,6 @@ cont {
symbol {
name: "toll_booth-s"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15443,7 +15522,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15460,7 +15538,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15477,7 +15554,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15494,7 +15570,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15511,7 +15586,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -15528,7 +15602,6 @@ cont {
symbol {
name: "toll_booth-m"
priority: 6600
- min_distance: 8
}
caption {
primary {
@@ -24784,7 +24857,7 @@ cont {
cap: BUTTCAP
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
}
@@ -24801,7 +24874,7 @@ cont {
cap: BUTTCAP
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
}
@@ -24817,7 +24890,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24841,7 +24914,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24865,7 +24938,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24889,7 +24962,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -24913,7 +24986,7 @@ cont {
priority: 200
}
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 2850
}
path_text {
@@ -33405,6 +33478,13 @@ cont {
}
cont {
name: "highway-rest_area"
+ element {
+ scale: 14
+ symbol {
+ name: "picnic-m"
+ priority: 3800
+ }
+ }
element {
scale: 15
symbol {
@@ -53201,6 +53281,11 @@ cont {
color: 1251584
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 16
@@ -53208,6 +53293,11 @@ cont {
color: 1251584
priority: -1860
}
+ symbol {
+ name: "golf-m"
+ priority: 1800
+ min_distance: 10
+ }
}
element {
scale: 17
@@ -56646,49 +56736,49 @@ cont {
element {
scale: 14
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 15
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 16
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 17
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 18
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 19
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
element {
scale: 20
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 850
}
}
@@ -56844,49 +56934,49 @@ cont {
element {
scale: 14
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 15
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 16
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 17
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 18
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 19
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
element {
scale: 20
symbol {
- name: "dot-m"
+ name: "mast-m"
priority: 450
}
}
@@ -57146,7 +57236,14 @@ cont {
cont {
name: "man_made-survey_point"
element {
- scale: 16
+ scale: 14
+ symbol {
+ name: "survey_point-m"
+ priority: -9950
+ }
+ }
+ element {
+ scale: 15
symbol {
name: "survey_point-m"
priority: -9950
@@ -57161,6 +57258,22 @@ cont {
priority: -10000
}
}
+ element {
+ scale: 16
+ symbol {
+ name: "survey_point-m"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 12
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 17
symbol {
@@ -57169,7 +57282,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -57185,7 +57298,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -57201,7 +57314,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -57217,7 +57330,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -57294,7 +57407,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57311,7 +57423,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57328,7 +57439,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57345,7 +57455,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57362,7 +57471,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57379,7 +57487,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57429,7 +57536,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57446,7 +57552,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57463,7 +57568,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57480,7 +57584,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57497,7 +57600,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57514,7 +57616,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 3050
- min_distance: 36
}
caption {
primary {
@@ -57694,14 +57795,14 @@ cont {
element {
scale: 11
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
}
element {
scale: 12
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-s"
priority: 5050
}
caption {
@@ -57717,7 +57818,7 @@ cont {
element {
scale: 13
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57733,7 +57834,7 @@ cont {
element {
scale: 14
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57749,7 +57850,7 @@ cont {
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57765,7 +57866,7 @@ cont {
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57781,7 +57882,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57797,7 +57898,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57813,7 +57914,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -57829,7 +57930,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 5050
}
caption {
@@ -60318,110 +60419,76 @@ cont {
}
cont {
name: "natural-rock"
+ element {
+ scale: 14
+ symbol {
+ name: "peakt-s"
+ priority: 2850
+ }
+ }
element {
scale: 15
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 16
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 17
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 18
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 19
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
element {
scale: 20
symbol {
- name: "peakt-m"
+ name: "peakt-s"
priority: 2850
}
}
}
cont {
name: "natural-saddle"
- element {
- scale: 11
- symbol {
- name: "mountain-pass"
- priority: 4500
- }
- }
- element {
- scale: 12
- symbol {
- name: "mountain-pass"
- priority: 4500
- }
- caption {
- primary {
- height: 10
- color: 5592405
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
- }
element {
scale: 13
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 11
- color: 5592405
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 14
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
- caption {
- primary {
- height: 11
- color: 5592405
- offset_y: 1
- is_optional: true
- }
- priority: -5500
- }
}
element {
scale: 15
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60437,7 +60504,7 @@ cont {
element {
scale: 16
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60453,7 +60520,7 @@ cont {
element {
scale: 17
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60469,7 +60536,7 @@ cont {
element {
scale: 18
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60485,7 +60552,7 @@ cont {
element {
scale: 19
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -60501,7 +60568,7 @@ cont {
element {
scale: 20
symbol {
- name: "mountain-pass"
+ name: "mountain-pass-m"
priority: 4500
}
caption {
@@ -73908,49 +73975,49 @@ cont {
element {
scale: 14
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 15
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 16
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 17
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 18
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 19
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
element {
scale: 20
symbol {
- name: "dot-m"
+ name: "power-tower-m"
priority: 450
}
}
@@ -126597,7 +126664,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 10
color: 5592405
offset_y: 1
is_optional: true
@@ -126614,7 +126681,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 10
color: 5592405
offset_y: 1
is_optional: true
@@ -127822,6 +127889,23 @@ cont {
}
cont {
name: "tourism-camp_site"
+ element {
+ scale: 13
+ symbol {
+ name: "campsite-s"
+ priority: 3800
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 14
symbol {
@@ -127939,12 +128023,29 @@ cont {
}
cont {
name: "tourism-caravan_site"
+ element {
+ scale: 13
+ symbol {
+ name: "caravan_site-s"
+ priority: 3800
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 14
symbol {
name: "caravan_site-m"
priority: 3800
- min_distance: 30
+ min_distance: 12
}
caption {
primary {
@@ -127961,7 +128062,7 @@ cont {
symbol {
name: "caravan_site-m"
priority: 3800
- min_distance: 30
+ min_distance: 12
}
caption {
primary {
@@ -128056,6 +128157,22 @@ cont {
}
cont {
name: "tourism-chalet"
+ element {
+ scale: 14
+ symbol {
+ name: "alpine_hut-m"
+ priority: 3800
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6200
+ }
+ }
element {
scale: 15
symbol {
@@ -128523,6 +128640,22 @@ cont {
}
cont {
name: "tourism-information"
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -128532,7 +128665,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128549,7 +128682,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128566,7 +128699,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128583,7 +128716,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128600,7 +128733,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128611,6 +128744,22 @@ cont {
}
cont {
name: "tourism-information-board"
+ element {
+ scale: 15
+ symbol {
+ name: "board"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -128620,7 +128769,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128637,7 +128786,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128654,7 +128803,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128671,7 +128820,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128688,7 +128837,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128699,6 +128848,22 @@ cont {
}
cont {
name: "tourism-information-guidepost"
+ element {
+ scale: 15
+ symbol {
+ name: "guidepost"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -128708,7 +128873,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128725,7 +128890,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128742,7 +128907,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128759,7 +128924,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128776,7 +128941,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128787,6 +128952,22 @@ cont {
}
cont {
name: "tourism-information-map"
+ element {
+ scale: 15
+ symbol {
+ name: "map"
+ priority: -9950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -10000
+ }
+ }
element {
scale: 16
symbol {
@@ -128796,7 +128977,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128813,7 +128994,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128830,7 +129011,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128847,7 +129028,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128864,7 +129045,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128875,6 +129056,29 @@ cont {
}
cont {
name: "tourism-information-office"
+ element {
+ scale: 13
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -5600
+ }
+ }
element {
scale: 15
symbol {
@@ -128884,7 +129088,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 11
color: 5592405
offset_y: 1
is_optional: true
@@ -128901,7 +129105,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128918,7 +129122,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128935,7 +129139,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128952,7 +129156,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128969,7 +129173,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -128980,6 +129184,29 @@ cont {
}
cont {
name: "tourism-information-visitor_centre"
+ element {
+ scale: 13
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-office-m"
+ priority: 4400
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -5600
+ }
+ }
element {
scale: 15
symbol {
@@ -128989,7 +129216,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 11
color: 5592405
offset_y: 1
is_optional: true
@@ -129006,7 +129233,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -129023,7 +129250,7 @@ cont {
}
caption {
primary {
- height: 10
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -129040,7 +129267,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -129057,7 +129284,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
@@ -129074,7 +129301,7 @@ cont {
}
caption {
primary {
- height: 11
+ height: 12
color: 5592405
offset_y: 1
is_optional: true
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index cafd1edd91..d30cbcfda1 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index b07f64624e..c462755e1e 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -5257,6 +5257,73 @@ cont {
}
}
}
+cont {
+ name: "amenity-toilets"
+ element {
+ scale: 17
+ symbol {
+ name: "toilets-m"
+ priority: 200
+ }
+ caption {
+ primary {
+ height: 13
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "toilets-m"
+ priority: 200
+ }
+ caption {
+ primary {
+ height: 14
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "toilets-m"
+ priority: 200
+ }
+ caption {
+ primary {
+ height: 14
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "toilets-m"
+ priority: 200
+ }
+ caption {
+ primary {
+ height: 14
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9800
+ }
+ }
+}
cont {
name: "amenity-university"
element {
@@ -5577,6 +5644,22 @@ cont {
}
cont {
name: "barrier-border_control"
+ element {
+ scale: 14
+ symbol {
+ name: "bcontrol-m"
+ priority: 1950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8050
+ }
+ }
element {
scale: 15
symbol {
@@ -6015,7 +6098,7 @@ cont {
element {
scale: 12
symbol {
- name: "toll_booth-m"
+ name: "toll_booth-s"
priority: 2850
min_distance: 8
}
@@ -9375,7 +9458,7 @@ cont {
element {
scale: 14
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9383,7 +9466,7 @@ cont {
element {
scale: 15
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9391,7 +9474,7 @@ cont {
element {
scale: 16
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9399,7 +9482,7 @@ cont {
element {
scale: 17
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9407,7 +9490,7 @@ cont {
element {
scale: 18
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9415,7 +9498,7 @@ cont {
element {
scale: 19
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9423,7 +9506,7 @@ cont {
element {
scale: 20
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -80213,6 +80296,64 @@ cont {
}
}
}
+cont {
+ name: "shop-convenience"
+ element {
+ scale: 17
+ symbol {
+ name: "convenience-m"
+ priority: 250
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "convenience-m"
+ priority: 250
+ }
+ caption {
+ primary {
+ height: 14
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "convenience-m"
+ priority: 250
+ }
+ caption {
+ primary {
+ height: 14
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "convenience-m"
+ priority: 250
+ }
+ caption {
+ primary {
+ height: 14
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9750
+ }
+ }
+}
cont {
name: "shop-mall"
element {
@@ -80491,63 +80632,11 @@ cont {
}
cont {
name: "tourism-artwork"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80564,7 +80653,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80581,7 +80669,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80596,63 +80683,11 @@ cont {
}
cont {
name: "tourism-artwork-architecture"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80669,7 +80704,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80686,7 +80720,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80701,63 +80734,11 @@ cont {
}
cont {
name: "tourism-artwork-painting"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80774,7 +80755,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80791,7 +80771,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80806,63 +80785,11 @@ cont {
}
cont {
name: "tourism-artwork-sculpture"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80879,7 +80806,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80896,7 +80822,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80911,63 +80836,11 @@ cont {
}
cont {
name: "tourism-artwork-statue"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -80984,7 +80857,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81001,7 +80873,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index ac7eb7d5c5..c0693109dc 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index f97cea8ba4..f5a9474e6d 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -5257,6 +5257,73 @@ cont {
}
}
}
+cont {
+ name: "amenity-toilets"
+ element {
+ scale: 17
+ symbol {
+ name: "toilets-m"
+ priority: 200
+ }
+ caption {
+ primary {
+ height: 13
+ color: 6710886
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "toilets-m"
+ priority: 200
+ }
+ caption {
+ primary {
+ height: 14
+ color: 6710886
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "toilets-m"
+ priority: 200
+ }
+ caption {
+ primary {
+ height: 14
+ color: 6710886
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "toilets-m"
+ priority: 200
+ }
+ caption {
+ primary {
+ height: 14
+ color: 6710886
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9800
+ }
+ }
+}
cont {
name: "amenity-university"
element {
@@ -5577,6 +5644,22 @@ cont {
}
cont {
name: "barrier-border_control"
+ element {
+ scale: 14
+ symbol {
+ name: "bcontrol-m"
+ priority: 1950
+ }
+ caption {
+ primary {
+ height: 11
+ color: 6710886
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8050
+ }
+ }
element {
scale: 15
symbol {
@@ -6015,7 +6098,7 @@ cont {
element {
scale: 12
symbol {
- name: "toll_booth-m"
+ name: "toll_booth-s"
priority: 2850
min_distance: 8
}
@@ -9375,7 +9458,7 @@ cont {
element {
scale: 14
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9383,7 +9466,7 @@ cont {
element {
scale: 15
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9391,7 +9474,7 @@ cont {
element {
scale: 16
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9399,7 +9482,7 @@ cont {
element {
scale: 17
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9407,7 +9490,7 @@ cont {
element {
scale: 18
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9415,7 +9498,7 @@ cont {
element {
scale: 19
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -9423,7 +9506,7 @@ cont {
element {
scale: 20
symbol {
- name: "dot-m"
+ name: "ford-m"
priority: 4150
min_distance: 20
}
@@ -80753,6 +80836,64 @@ cont {
}
}
}
+cont {
+ name: "shop-convenience"
+ element {
+ scale: 17
+ symbol {
+ name: "convenience-m"
+ priority: 250
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "convenience-m"
+ priority: 250
+ }
+ caption {
+ primary {
+ height: 14
+ color: 6710886
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "convenience-m"
+ priority: 250
+ }
+ caption {
+ primary {
+ height: 14
+ color: 6710886
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "convenience-m"
+ priority: 250
+ }
+ caption {
+ primary {
+ height: 14
+ color: 6710886
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9750
+ }
+ }
+}
cont {
name: "shop-mall"
element {
@@ -81031,63 +81172,11 @@ cont {
}
cont {
name: "tourism-artwork"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81104,7 +81193,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81121,7 +81209,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81136,63 +81223,11 @@ cont {
}
cont {
name: "tourism-artwork-architecture"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81209,7 +81244,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81226,7 +81260,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81241,63 +81274,11 @@ cont {
}
cont {
name: "tourism-artwork-painting"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81314,7 +81295,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81331,7 +81311,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81346,63 +81325,11 @@ cont {
}
cont {
name: "tourism-artwork-sculpture"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81419,7 +81346,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81436,7 +81362,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81451,63 +81376,11 @@ cont {
}
cont {
name: "tourism-artwork-statue"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 8
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 28
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1150
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8850
- }
- }
element {
scale: 18
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81524,7 +81397,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
@@ -81541,7 +81413,6 @@ cont {
symbol {
name: "tourism-m"
priority: 1150
- min_distance: 24
}
caption {
primary {
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index bfc64db861..9f6cbfacb2 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index 86a5d3d35b..83d926d6ba 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 4ae883a680..88ae5f9d55 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index 8e3a2521fe..d22f2d7660 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index 486ee40f9d..2b39b6eb90 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index 9b92c57af5..f2a5c0dee9 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 7a53fab652..e774bc9c38 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 36601d6d8e..b2bd6d411f 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 7330feaddc..d685946790 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index 8666aaf836..acd433bd4c 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index b26e8e0530..653379a4a3 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index 2629d64f9d..3aa9137e58 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index acf592cdce..7189466a2a 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index e535325fad..9813d89b8e 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index e33c89960f..a8d369f053 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index c6a5dcf157..95edb78bfe 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index b5e1ee21b5..c8febe2edf 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index 6046bf371f..32ba96072e 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index d9f0459405..2c659e8891 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index 8a5c3cae0e..ecf09f7f5e 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png
index 48752d1e0a..5cdee0cf06 100644
Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf
index e7de5310aa..f86e6ab92b 100644
--- a/data/resources-xxxhdpi_clear/symbols.sdf
+++ b/data/resources-xxxhdpi_clear/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index ec58082520..5314c66447 100644
Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf
index 66cd8d62b7..f703124591 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -1,761 +1,771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index a9ce79ef5d..a9013265b9 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -34,10 +34,8 @@ area|z11-[waterway=waterfall],
node|z12-[natural=cave_entrance],
area|z12-[natural=cave_entrance],
node|z13-[natural=peak][name],
-node|z14-[natural=saddle],
-area|z14-[natural=saddle],
+node|z16-[natural=saddle],
node|z14-[mountain_pass],
-area|z14-[mountain_pass],
node|z14-[natural=spring],
area|z14-[natural=spring],
node|z14-[natural=hot_spring],
@@ -95,19 +93,20 @@ node|z13[natural=peak][name],
node|z14[natural=peak][name],
{icon-image: peakt-s.svg;font-size: 10;}
node|z15-[natural=peak][name],
-node|z15-[natural=rock],
-area|z15-[natural=rock],
{icon-image: peakt-m.svg;font-size: 10;}
node|z15-[natural=peak][!name],
{icon-image: peakt-m.svg;font-size: 10;}
-/* ToDo: Make the same as natural=peak when we will have -s,-m icons */
-node|z14-[natural=saddle],
-area|z14-[natural=saddle],
-node|z14-[mountain_pass],
-area|z14-[mountain_pass],
-{icon-image: mountain-pass.svg;text-offset: 1;font-size: 10;}
+node|z16-[natural=rock],
+area|z16-[natural=rock],
+{icon-image: peakt-s.svg; font-size: 10;}
+
+node|z14[mountain_pass],
+{icon-image: mountain-pass-s.svg; font-size: 10;}
+node|z15-[mountain_pass],
+node|z15-[natural=saddle],
+{icon-image: mountain-pass-m.svg; font-size: 10;}
node|z16[leisure=beach_resort],
area|z16[leisure=beach_resort]
@@ -180,15 +179,15 @@ node|z15-[natural=geyser],
area|z15-[natural=geyser]
{icon-image: geyser-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;}
-node|z15-[amenity=water_point],
-area|z15-[amenity=water_point],
-node|z15-[amenity=drinking_water],
-area|z15-[amenity=drinking_water],
-node|z15-[man_made=water_tap],
-area|z15-[man_made=water_tap],
-node|z15-[man_made=water_well],
-area|z15-[man_made=water_well],
-{icon-image: drinking-water-s.svg;icon-min-distance: 36;}
+node|z16-[amenity=water_point],
+area|z16-[amenity=water_point],
+node|z16-[amenity=drinking_water],
+area|z16-[amenity=drinking_water],
+node|z16-[man_made=water_tap],
+area|z16-[man_made=water_tap],
+node|z16-[man_made=water_well],
+area|z16-[man_made=water_well],
+{icon-image: drinking-water-s.svg;}
node|z19-[amenity=water_point],
area|z19-[amenity=water_point],
node|z19-[amenity=drinking_water],
@@ -197,7 +196,7 @@ node|z19-[man_made=water_tap],
area|z19-[man_made=water_tap],
node|z19-[man_made=water_well],
area|z19-[man_made=water_well],
-{icon-image: drinking-water-m.svg;icon-min-distance: 36;}
+{icon-image: drinking-water-m.svg;}
/* 3. TRANSPORT */
@@ -436,10 +435,10 @@ area|z15-[historic=battlefield],
node|z15-[tourism=gallery],
area|z15-[tourism=gallery],
node|z15-[tourism=artwork],
-node|z15-[tourism=information][information=office],
-node|z15-[tourism=information][information=visitor_centre],
node|z15-[historic=ship],
node|z16-[tourism=information],
+node|z15-[tourism=information][information=office],
+node|z15-[tourism=information][information=visitor_centre],
node|z16-[historic=aircraft],
node|z16-[historic=tank],
node|z16-[historic=wreck],
@@ -887,7 +886,7 @@ node|z15-[landuse=quarry],
area|z15-[landuse=quarry],
node|z15-[landuse=industrial][industrial=mine],
area|z15-[landuse=industrial][industrial=mine],
-node|z15-[barrier=border_control],
+node|z14-[barrier=border_control],
node|z16-[amenity=veterinary],
area|z16-[amenity=veterinary],
node|z16-[amenity=fountain],
@@ -918,7 +917,6 @@ node|z16-[leisure=dog_park],
area|z16-[leisure=dog_park],
node|z16-[man_made=windmill],
area|z16-[man_made=windmill],
-node|z16-[man_made=survey_point],
node|z16-[amenity=college],
area|z16-[amenity=college],
node|z16-[amenity=conference_centre],
@@ -975,6 +973,8 @@ node|z17-[amenity=school],
area|z17-[amenity=school],
node|z17-[amenity=cinema],
area|z17-[amenity=cinema],
+node|z17-[amenity=ice_cream],
+area|z17-[amenity=ice_cream],
node|z17-[leisure=bowling_alley],
area|z17-[leisure=bowling_alley],
node|z17-[amenity=police],
@@ -1053,6 +1053,7 @@ node|z18-[amenity=public_bookcase],
area|z18-[amenity=public_bookcase],
node|z19-[power=substation],
area|z19-[power=substation],
+node|z18-[man_made=survey_point],
node|z18-[tourism],
area|z18-[tourism],
node|z18-[office],
@@ -1271,8 +1272,8 @@ area|z17-[leisure=swimming_pool]
node|z17-[leisure=swimming_pool][access=private],
area|z17-[leisure=swimming_pool][access=private]
{icon-image: zero-icon.svg;}
-node|z17-[leisure=golf_course],
-area|z17-[leisure=golf_course]
+node|z15-[leisure=golf_course],
+area|z15-[leisure=golf_course],
{icon-image: golf-m.svg;icon-min-distance: 10;}
node|z17-[sport],
@@ -1501,14 +1502,16 @@ area|z15-[man_made=lighthouse]
{icon-image: lighthouse-m.svg;}
node|z12-14[barrier=toll_booth],
-area|z12-14[barrier=toll_booth]
-{icon-image: toll_booth-s.svg;icon-min-distance: 8;}
+area|z12-14[barrier=toll_booth],
+{icon-image: toll_booth-s.svg;}
node|z15-[barrier=toll_booth],
-area|z15-[barrier=toll_booth]
-{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
+area|z15-[barrier=toll_booth],
+{icon-image: toll_booth-m.svg;}
-node|z15-[barrier=border_control]
-{icon-image:bcontrol-m.svg;}
+node|z14[barrier=border_control],
+{icon-image: bcontrol-s.svg;}
+node|z15-[barrier=border_control],
+{icon-image: bcontrol-m.svg;}
node|z16-[barrier=block],
node|z16-[barrier=bollard],
@@ -1518,6 +1521,8 @@ node|z16-[barrier=turnstile],
{icon-image: dot-m.svg;font-size: 11;}
node|z16-[barrier=entrance],
+{icon-image: barrier-entrance-s.svg; font-size: 11;}
+
node|z16-[barrier=gate],
node|z16-[barrier=kissing_gate],
{icon-image: gate-s.svg;font-size: 11;}
@@ -1526,6 +1531,8 @@ node|z16-[barrier=cycle_barrier],
{icon-image: cycle_barrier-s.svg;font-size: 11;}
node|z16-[highway=ford],
+{icon-image: ford-m.svg;}
+
/* ToDo: Make separate tower icon? Because of a good landmark */
node|z16-[power=tower],
node|z15-[man_made=flagpole],
@@ -1767,7 +1774,7 @@ node|z18-[amenity=bbq],
area|z18-[amenity=bbq]
{icon-image: bbq-m.svg;font-size: 11;}
-node|z16-[man_made=survey_point]
+node|z18-[man_made=survey_point],
{icon-image: survey_point-m.svg;font-size: 11;}
node|z19-[man_made=cairn]
diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
index 73c66f6c03..48ff25bc25 100644
--- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
@@ -63,7 +63,7 @@ leisure-track-area # area z15- (also has captio
aeroway-terminal # area z14- (also has caption z15-)
=== 150
-leisure-golf_course # area z12- (also has icon z17-, caption(optional) z17-)
+leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-)
=== 140
landuse-flowerbed # area z16-
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index efbe87b7b3..90c842655f 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -278,7 +278,7 @@ highway-primary_link-bridge # pathtext z11- (also has sh
highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
=== 6100
-barrier-border_control # icon z15- (also has caption(optional) z15-)
+barrier-border_control # icon z14- (also has caption(optional) z14-)
railway-halt # icon z13- (also has caption(optional) z13-)
tourism-alpine_hut # icon z13- (also has caption(optional) z13-)
waterway-waterfall # icon z11- (also has caption(optional) z11-)
@@ -342,7 +342,7 @@ natural-hot_spring # icon z14- (also has captio
natural-spring # icon z14- (also has caption(optional) z14-)
=== 4650
-natural-saddle # icon z14- (also has caption(optional) z14-)
+natural-saddle # icon z15- (also has caption(optional) z16-)
place-islet # caption z14- (also has area z10-)
=== 4500
@@ -533,7 +533,7 @@ railway-tram_stop # icon z14- (also has captio
highway-bus_stop # icon z16- (also has caption(optional) z17-)
=== 3600
-amenity-drinking_water # icon z15- (also has caption(optional) z19-)
+amenity-drinking_water # icon z16- (also has caption(optional) z19-)
=== 3500
isoline-step_1000 # pathtext z11- (also has line z11-)
@@ -586,7 +586,7 @@ highway-unclassified-bridge # pathtext z13- (also has li
highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-)
=== 3100
-amenity-water_point # icon z15- (also has caption(optional) z19-)
+amenity-water_point # icon z16- (also has caption(optional) z19-)
highway-raceway # pathtext z16- (also has line z14-)
historic-aircraft # icon z16- (also has caption(optional) z16-)
historic-locomotive # icon z16- (also has caption(optional) z16-)
@@ -597,8 +597,8 @@ historic-wreck # icon z16- (also has captio
landuse-allotments # caption z15- (also has area z12-)
landuse-cemetery # icon z15- (also has caption(optional) z15-, area z14-)
landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z14-)
-man_made-water_tap # icon z15-
-man_made-water_well # icon z15-
+man_made-water_tap # icon z16-
+man_made-water_well # icon z16-
man_made-windmill # icon z16- (also has caption(optional) z16-)
=== 3050
@@ -683,7 +683,7 @@ waterway-weir # pathtext z15- (also has li
=== 2900
highway-ford # icon z16- and pathtext z16- (also has line z13-)
-natural-rock # icon z15-
+natural-rock # icon z16-
=== 2850
highway-bridleway # pathtext z15- (also has line z14-)
@@ -782,7 +782,7 @@ tourism-guest_house # icon z16- (also has captio
tourism-hostel # icon z16- (also has caption(optional) z16-)
=== 2570
-amenity-ice_cream # icon z16- (also has caption(optional) z19-)
+amenity-ice_cream # icon z16- (also has caption(optional) z17-)
shop-bakery # icon z16- (also has caption(optional) z16-)
shop-butcher # icon z16- (also has caption(optional) z16-)
shop-cheese # icon z16- (also has caption(optional) z16-)
@@ -880,7 +880,7 @@ landuse-military-danger_area # icon z16- (also has captio
=== 2000
amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-)
-leisure-golf_course # icon z17- (also has caption(optional) z17-, area z12-)
+leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-)
natural-wetland # caption z16- (also has area z11-)
natural-wetland-bog # caption z16- (also has area z11-)
natural-wetland-marsh # caption z16- (also has area z11-)
@@ -1404,7 +1404,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-)
# === -3750
-# barrier-border_control # caption(optional) z15- (also has icon z15-)
+# barrier-border_control # caption(optional) z14- (also has icon z14-)
# railway-halt # caption(optional) z13- (also has icon z13-)
# tourism-alpine_hut # caption(optional) z13- (also has icon z13-)
# waterway-waterfall # caption(optional) z11- (also has icon z11-)
@@ -1453,7 +1453,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# natural-spring # caption(optional) z14- (also has icon z14-)
# === -5350
-# natural-saddle # caption(optional) z14- (also has icon z14-)
+# natural-saddle # caption(optional) z16- (also has icon z15-)
# === -5500
# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-)
@@ -1643,7 +1643,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# highway-bus_stop # caption(optional) z17- (also has icon z16-)
# === -6400
-# amenity-drinking_water # caption(optional) z19- (also has icon z15-)
+# amenity-drinking_water # caption(optional) z19- (also has icon z16-)
# === -6500
# leisure-beach_resort # caption(optional) z16- (also has icon z16-, area z10-)
@@ -1652,7 +1652,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# shop-supermarket # caption(optional) z16- (also has icon z16-)
# === -6800
-# amenity-water_point # caption(optional) z19- (also has icon z15-)
+# amenity-water_point # caption(optional) z19- (also has icon z16-)
# historic-aircraft # caption(optional) z16- (also has icon z16-)
# historic-locomotive # caption(optional) z16- (also has icon z16-)
# historic-mine # caption(optional) z15- (also has icon z15-)
@@ -1701,7 +1701,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-hostel # caption(optional) z16- (also has icon z16-)
# === -7430
-# amenity-ice_cream # caption(optional) z19- (also has icon z16-)
+# amenity-ice_cream # caption(optional) z17- (also has icon z16-)
# shop-bakery # caption(optional) z16- (also has icon z16-)
# shop-butcher # caption(optional) z16- (also has icon z16-)
# shop-cheese # caption(optional) z16- (also has icon z16-)
@@ -1790,7 +1790,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -8000
# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-)
-# leisure-golf_course # caption(optional) z17- (also has icon z17-, area z12-)
+# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-)
# tourism-picnic_site # caption(optional) z16- (also has icon z16-)
# === -8200
@@ -2085,7 +2085,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -9900
man_made-cairn # icon z19- (also has caption(optional) z19-)
-man_made-survey_point # icon z16- (also has caption(optional) z16-)
+man_made-survey_point # icon z18- (also has caption(optional) z18-)
tourism-information # icon z16- (also has caption(optional) z16-)
tourism-information-board # icon z16- (also has caption(optional) z16-)
tourism-information-guidepost # icon z16- (also has caption(optional) z16-)
@@ -2149,7 +2149,7 @@ amenity-loading_dock # icon z19- (also has captio
entrance-exit # icon z19- (also has caption(optional) z19-)
# entrance-exit # caption(optional) z19- (also has icon z19-)
# man_made-cairn # caption(optional) z19- (also has icon z19-)
-# man_made-survey_point # caption(optional) z16- (also has icon z16-)
+# man_made-survey_point # caption(optional) z18- (also has icon z18-)
# power-substation # caption(optional) z19- (also has icon z19-)
# tourism-information # caption(optional) z16- (also has icon z16-)
# tourism-information-board # caption(optional) z16- (also has icon z16-)
diff --git a/data/styles/clear/style-clear/symbols/barrier-entrance-s.svg b/data/styles/clear/style-clear/symbols/barrier-entrance-s.svg
new file mode 100644
index 0000000000..18ed5e1d60
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/barrier-entrance-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
new file mode 100644
index 0000000000..a4346ba2a4
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-clear/symbols/campsite-s.svg b/data/styles/clear/style-clear/symbols/campsite-s.svg
new file mode 100644
index 0000000000..986684bc68
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/campsite-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-clear/symbols/caravan_site-s.svg b/data/styles/clear/style-clear/symbols/caravan_site-s.svg
new file mode 100644
index 0000000000..36408262a1
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/caravan_site-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-clear/symbols/ford-m.svg b/data/styles/clear/style-clear/symbols/ford-m.svg
new file mode 100644
index 0000000000..dc8fea1551
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/ford-m.svg
@@ -0,0 +1,4 @@
+
diff --git a/data/styles/clear/style-clear/symbols/mast-m.svg b/data/styles/clear/style-clear/symbols/mast-m.svg
new file mode 100644
index 0000000000..59947de4f8
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/mast-m.svg
@@ -0,0 +1,4 @@
+
diff --git a/data/styles/clear/style-clear/symbols/mountain-pass-m.svg b/data/styles/clear/style-clear/symbols/mountain-pass-m.svg
new file mode 100644
index 0000000000..4545e07079
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/mountain-pass-m.svg
@@ -0,0 +1,3 @@
+
diff --git a/data/styles/clear/style-clear/symbols/mountain-pass-s.svg b/data/styles/clear/style-clear/symbols/mountain-pass-s.svg
new file mode 100644
index 0000000000..be4300e53d
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/mountain-pass-s.svg
@@ -0,0 +1,3 @@
+
diff --git a/data/styles/clear/style-clear/symbols/mountain-pass.svg b/data/styles/clear/style-clear/symbols/mountain-pass.svg
deleted file mode 100644
index 4fb5c4c98c..0000000000
--- a/data/styles/clear/style-clear/symbols/mountain-pass.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/clear/style-clear/symbols/picnic-s.svg
new file mode 100644
index 0000000000..6322a761da
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/picnic-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-clear/symbols/power-tower-m.svg b/data/styles/clear/style-clear/symbols/power-tower-m.svg
new file mode 100644
index 0000000000..6f64cfb882
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/power-tower-m.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-clear/symbols/shelter-s.svg b/data/styles/clear/style-clear/symbols/shelter-s.svg
new file mode 100644
index 0000000000..3dee6f4649
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/shelter-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/barrier-entrance-s.svg b/data/styles/clear/style-night/symbols/barrier-entrance-s.svg
new file mode 100644
index 0000000000..c46aa9ce16
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/barrier-entrance-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/bcontrol-s.svg b/data/styles/clear/style-night/symbols/bcontrol-s.svg
new file mode 100644
index 0000000000..a60d403eeb
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/bcontrol-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/campsite-s.svg b/data/styles/clear/style-night/symbols/campsite-s.svg
new file mode 100644
index 0000000000..dd79b9b0af
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/campsite-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/caravan_site-s.svg b/data/styles/clear/style-night/symbols/caravan_site-s.svg
new file mode 100644
index 0000000000..8dd718b4b0
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/caravan_site-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/ford-m.svg b/data/styles/clear/style-night/symbols/ford-m.svg
new file mode 100644
index 0000000000..23473eb03d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/ford-m.svg
@@ -0,0 +1,4 @@
+
diff --git a/data/styles/clear/style-night/symbols/mast-m.svg b/data/styles/clear/style-night/symbols/mast-m.svg
new file mode 100644
index 0000000000..88750a521b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/mast-m.svg
@@ -0,0 +1,4 @@
+
diff --git a/data/styles/clear/style-night/symbols/mountain-pass-m.svg b/data/styles/clear/style-night/symbols/mountain-pass-m.svg
new file mode 100644
index 0000000000..b40fcaa346
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/mountain-pass-m.svg
@@ -0,0 +1,3 @@
+
diff --git a/data/styles/clear/style-night/symbols/mountain-pass-s.svg b/data/styles/clear/style-night/symbols/mountain-pass-s.svg
new file mode 100644
index 0000000000..49abe00b77
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/mountain-pass-s.svg
@@ -0,0 +1,3 @@
+
diff --git a/data/styles/clear/style-night/symbols/mountain-pass.svg b/data/styles/clear/style-night/symbols/mountain-pass.svg
deleted file mode 100644
index 725ad9be2e..0000000000
--- a/data/styles/clear/style-night/symbols/mountain-pass.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/data/styles/clear/style-night/symbols/picnic-s.svg b/data/styles/clear/style-night/symbols/picnic-s.svg
new file mode 100644
index 0000000000..91a586548b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/picnic-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/power-tower-m.svg b/data/styles/clear/style-night/symbols/power-tower-m.svg
new file mode 100644
index 0000000000..6968465aaf
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/power-tower-m.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/shelter-s.svg b/data/styles/clear/style-night/symbols/shelter-s.svg
new file mode 100644
index 0000000000..2e06579855
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/shelter-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 3b2d0e5981..b3ed35256a 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -9,10 +9,8 @@ area|z11-[natural=cave_entrance],
node|z11-[waterway=waterfall],
area|z11-[waterway=waterfall],
node|z11-[natural=peak][name],
-node|z12-[natural=saddle],
-area|z12-[natural=saddle],
+node|z15-[natural=saddle],
node|z12-[mountain_pass],
-area|z12-[mountain_pass],
node|z14-[natural=spring],
area|z14-[natural=spring],
node|z14-[amenity=water_point],
@@ -23,6 +21,10 @@ node|z14-[man_made=water_tap],
area|z14-[man_made=water_tap],
node|z14-[man_made=water_well],
area|z14-[man_made=water_well],
+node|z15-[tourism=information],
+node|z14-[tourism=information][information=office],
+node|z14-[tourism=information][information=visitor_centre],
+node|z15-[man_made=survey_point],
node|z15-[natural=hot_spring],
area|z15-[natural=hot_spring],
node|z12-[natural=geyser],
@@ -106,21 +108,18 @@ node|z13-15[natural=peak][!name],
node|z16-[natural=peak][!name],
{icon-image: peakt-m.svg;}
-/* ToDo: Make the same as natural=peak when we will have -s,-m icons */
-node|z11-[natural=saddle],
-area|z11-[natural=saddle],
-node|z11-[mountain_pass],
-area|z11-[mountain_pass],
-{icon-image: mountain-pass.svg;}
-node|z13-[natural=saddle],
-area|z13-[natural=saddle],
+node|z14-[natural=rock],
+{icon-image: peakt-s.svg; font-size: 11;}
+node|z16-[natural=rock],
+{font-size: 12;}
+
+node|z11-12[mountain_pass],
+{icon-image: mountain-pass-s.svg;}
node|z13-[mountain_pass],
-area|z13-[mountain_pass],
-{font-size: 11;}
+node|z13-[natural=saddle],
+{icon-image: mountain-pass-m.svg; font-size: 11;}
node|z16-[natural=saddle],
-area|z16-[natural=saddle],
node|z16-[mountain_pass],
-area|z16-[mountain_pass],
{font-size: 12;}
node|z10-12[natural=geyser],
@@ -170,18 +169,20 @@ area|z11-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
node|z13-[tourism=viewpoint],
-node|z15-[tourism=chalet],
-area|z15-[tourism=chalet],
-node|z14-[tourism=camp_site],
-area|z14-[tourism=camp_site],
+node|z14-[tourism=chalet],
+area|z14-[tourism=chalet],
+node|z13-[tourism=camp_site],
+area|z13-[tourism=camp_site],
node|z14-[tourism=picnic_site],
area|z14-[tourism=picnic_site],
node|z16-[leisure=picnic_table],
area|z16-[leisure=picnic_table],
+node|z16-[amenity=bbq],
+area|z16-[amenity=bbq],
node|z13-[amenity=shelter],
area|z13-[amenity=shelter],
-node|z14-[tourism=caravan_site],
-area|z14-[tourism=caravan_site],
+node|z13-[tourism=caravan_site],
+area|z13-[tourism=caravan_site],
{text: name; text-color: @poi_label; text-offset: 1; font-size: 10;}
node|z11-[tourism=alpine_hut],
@@ -189,19 +190,19 @@ area|z11-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
{icon-image: alpine_hut-s.svg; icon-min-distance: 24;}
-node|z11-[tourism=alpine_hut],
-area|z11-[tourism=alpine_hut],
+node|z13-[tourism=alpine_hut],
+area|z13-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
-node|z15-[tourism=chalet],
-area|z15-[tourism=chalet],
+node|z14-[tourism=chalet],
+area|z14-[tourism=chalet],
{font-size: 11;}
node|z14-[tourism=alpine_hut],
area|z14-[tourism=alpine_hut],
node|z14-[tourism=wilderness_hut],
area|z14-[tourism=wilderness_hut],
-node|z15-[tourism=chalet],
-area|z15-[tourism=chalet],
+node|z14-[tourism=chalet],
+area|z14-[tourism=chalet],
{icon-image: alpine_hut-m.svg;}
node|z16-[tourism=alpine_hut],
area|z16-[tourism=alpine_hut],
@@ -211,9 +212,12 @@ node|z16-[tourism=chalet],
area|z16-[tourism=chalet],
{font-size: 12; icon-min-distance: 0;}
+node|z13-[tourism=camp_site],
+area|z13-[tourism=camp_site],
+{icon-image: campsite-s.svg; icon-min-distance: 12; font-size: 11;}
node|z14-[tourism=camp_site],
area|z14-[tourism=camp_site],
-{icon-image: campsite-m.svg; icon-min-distance: 12; font-size: 11;}
+{icon-image: campsite-m.svg;}
node|z16-[tourism=camp_site],
area|z16-[tourism=camp_site],
{font-size: 12; icon-min-distance: 0;}
@@ -232,17 +236,26 @@ node|z16-[leisure=picnic_table],
area|z16-[leisure=picnic_table],
{font-size: 11;}
-/* need a small icon */
+node|z16-[amenity=bbq],
+area|z16-[amenity=bbq],
+{icon-image: bbq-m.svg; font-size: 11;}
+
node|z13-[amenity=shelter],
area|z13-[amenity=shelter],
-{icon-image: shelter-m.svg;icon-min-distance: 10; font-size: 11;}
+{icon-image: shelter-s.svg; icon-min-distance: 10; font-size: 11;}
+node|z14-[amenity=shelter],
+area|z14-[amenity=shelter],
+{icon-image: shelter-m.svg;}
node|z16-[amenity=shelter],
area|z16-[amenity=shelter],
{font-size: 12; icon-min-distance: 0;}
+node|z13-[tourism=caravan_site],
+area|z13-[tourism=caravan_site],
+{icon-image: caravan_site-s.svg; font-size: 11; icon-min-distance: 12;}
node|z14-[tourism=caravan_site],
area|z14-[tourism=caravan_site],
-{icon-image: caravan_site-m.svg;font-size: 11;icon-min-distance: 30;}
+{icon-image: caravan_site-m.svg;}
node|z16-[tourism=caravan_site],
area|z16-[tourism=caravan_site],
{font-size: 12; icon-min-distance: 0;}
@@ -254,9 +267,36 @@ node|z13-[tourism=viewpoint],
node|z16-[tourism=viewpoint],
{font-size: 12;}
+node|z13-15[tourism=information],
+{font-size: 11;}
+node|z16-[tourism=information],
+{font-size: 12;}
+node|z15-[tourism=information],
+{icon-image: information-m.svg;}
+node|z13-[tourism=information][information=office],
+node|z13-[tourism=information][information=visitor_centre],
+{icon-image: information-office-m.svg;}
+node|z15-[tourism=information][information=board],
+{icon-image: board.svg;}
+node|z15-[tourism=information][information=guidepost],
+{icon-image: guidepost.svg;}
+node|z15-[tourism=information][information=map],
+{icon-image: map.svg;}
+
+node|z14-[man_made=survey_point],
+{icon-image: survey_point-m.svg; font-size: 11;}
+node|z16-[man_made=survey_point],
+{font-size: 12;}
/* 5.5 Others */
+area|z14-[highway=rest_area],
+{icon-image: picnic-m.svg;}
+
+node|z15-[amenity=toilets],
+area|z15-[amenity=toilets],
+{icon-image: toilets-m.svg; font-size: 11;}
+
node|z11-12[man_made=lighthouse],
area|z11-12[man_made=lighthouse],
{icon-image: lighthouse-s.svg; icon-min-distance: 10;}
@@ -267,14 +307,23 @@ node|z16-[man_made=lighthouse],
area|z16-[man_made=lighthouse],
{font-size: 12;}
-node|z14-[barrier=border_control]
+node|z12-[barrier=border_control],
+{icon-image: bcontrol-s.svg;}
+node|z14-[barrier=border_control],
{icon-image: bcontrol-m.svg;}
node|z14-[highway=ford],
+{icon-image: ford-m.svg;}
+
node|z14-[power=tower],
+{icon-image: power-tower-m.svg;}
+
node|z12-[man_made=flagpole],
node|z13-[man_made=mast],
{icon-image: dot-m.svg;}
+node|z14-[man_made=flagpole],
+node|z14-[man_made=mast],
+{icon-image: mast-m.svg;}
node|z18-[man_made=cairn],
{icon-image: cairn-m.svg;text: name;text-color: @poi_label;font-size: 12;text-offset: 1;}
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 1cb903d84e..fc715dbe34 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -63,7 +63,7 @@ leisure-track-area # area z15- (also has captio
aeroway-terminal # area z14- (also has caption z15-)
=== 150
-leisure-golf_course # area z12- (also has icon z17-, caption(optional) z17-)
+leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-)
=== 140
landuse-flowerbed # area z16-
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index bf8e3e7a2b..ea586f644f 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -278,7 +278,7 @@ highway-primary_link-bridge # pathtext z11- (also has sh
highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
=== 6100
-barrier-border_control # icon z14- (also has caption(optional) z15-)
+barrier-border_control # icon z12- (also has caption(optional) z14-)
railway-halt # icon z13- (also has caption(optional) z13-)
tourism-alpine_hut # icon z11- (also has caption(optional) z11-)
waterway-waterfall # icon z10- (also has caption(optional) z11-)
@@ -342,7 +342,7 @@ natural-hot_spring # icon z12- (also has captio
natural-spring # icon z12- (also has caption(optional) z14-)
=== 4650
-natural-saddle # icon z11- (also has caption(optional) z12-)
+natural-saddle # icon z13- (also has caption(optional) z15-)
place-islet # caption z14- (also has area z10-)
=== 4500
@@ -351,8 +351,8 @@ railway-subway_entrance-spb # icon z15- (also has captio
=== 4450
historic-monument # icon z13- (also has caption(optional) z13-)
-tourism-information-office # icon z15- (also has caption(optional) z15-)
-tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-)
+tourism-information-office # icon z13- (also has caption(optional) z14-)
+tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-)
=== 4400
amenity-community_centre # icon z15- (also has caption(optional) z15-)
@@ -403,10 +403,10 @@ amenity-pub # icon z15- (also has captio
tourism-wilderness_hut # icon z13- (also has caption(optional) z13-)
=== 3900
-highway-rest_area # icon z15- (also has caption(optional) z15-)
-tourism-camp_site # icon z14- (also has caption(optional) z14-)
-tourism-caravan_site # icon z14- (also has caption(optional) z14-)
-tourism-chalet # icon z15- (also has caption(optional) z15-)
+highway-rest_area # icon z14- (also has caption(optional) z15-)
+tourism-camp_site # icon z13- (also has caption(optional) z13-)
+tourism-caravan_site # icon z13- (also has caption(optional) z13-)
+tourism-chalet # icon z14- (also has caption(optional) z14-)
=== 3800
amenity-charging_station # icon z16- (also has caption(optional) z16-)
@@ -683,7 +683,7 @@ waterway-weir # pathtext z15- (also has li
=== 2900
highway-ford # icon z14- and pathtext z16- (also has line z13-)
-natural-rock # icon z15-
+natural-rock # icon z14-
=== 2850
highway-bridleway # pathtext z13- (also has line z11-)
@@ -782,7 +782,7 @@ tourism-guest_house # icon z16- (also has captio
tourism-hostel # icon z16- (also has caption(optional) z16-)
=== 2570
-amenity-ice_cream # icon z16- (also has caption(optional) z19-)
+amenity-ice_cream # icon z16- (also has caption(optional) z17-)
shop-bakery # icon z16- (also has caption(optional) z16-)
shop-butcher # icon z16- (also has caption(optional) z16-)
shop-cheese # icon z16- (also has caption(optional) z16-)
@@ -880,7 +880,7 @@ landuse-military-danger_area # icon z16- (also has captio
=== 2000
amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-)
-leisure-golf_course # icon z17- (also has caption(optional) z17-, area z12-)
+leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-)
natural-wetland # caption z16- (also has area z11-)
natural-wetland-bog # caption z16- (also has area z11-)
natural-wetland-marsh # caption z16- (also has area z11-)
@@ -1139,12 +1139,12 @@ shop-wholesale # icon z17- (also has captio
=== 500
amenity-shower # icon z17- (also has caption(optional) z17-)
-amenity-toilets # icon z18- (also has caption(optional) z18-)
+amenity-toilets # icon z15- (also has caption(optional) z18-)
office # icon z18- (also has caption(optional) z18-)
shop # icon z18- (also has caption(optional) z18-)
=== 470
-amenity-bbq # icon z18- (also has caption(optional) z18-)
+amenity-bbq # icon z16- (also has caption(optional) z16-)
amenity-public_bookcase # icon z18- (also has caption(optional) z18-)
cemetery-grave # icon z17- (also has caption(optional) z17-)
leisure-outdoor_seating # icon z18-
@@ -1404,7 +1404,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-)
# === -3750
-# barrier-border_control # caption(optional) z15- (also has icon z14-)
+# barrier-border_control # caption(optional) z14- (also has icon z12-)
# railway-halt # caption(optional) z13- (also has icon z13-)
# tourism-alpine_hut # caption(optional) z11- (also has icon z11-)
# waterway-waterfall # caption(optional) z11- (also has icon z10-)
@@ -1453,7 +1453,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# natural-spring # caption(optional) z14- (also has icon z12-)
# === -5350
-# natural-saddle # caption(optional) z12- (also has icon z11-)
+# natural-saddle # caption(optional) z15- (also has icon z13-)
# === -5500
# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-)
@@ -1461,8 +1461,8 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -5550
# historic-monument # caption(optional) z13- (also has icon z13-)
-# tourism-information-office # caption(optional) z15- (also has icon z15-)
-# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-)
+# tourism-information-office # caption(optional) z14- (also has icon z13-)
+# tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-)
# === -5600
# amenity-community_centre # caption(optional) z15- (also has icon z15-)
@@ -1513,10 +1513,10 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-wilderness_hut # caption(optional) z13- (also has icon z13-)
# === -6100
-# highway-rest_area # caption(optional) z15- (also has icon z15-)
-# tourism-camp_site # caption(optional) z14- (also has icon z14-)
-# tourism-caravan_site # caption(optional) z14- (also has icon z14-)
-# tourism-chalet # caption(optional) z15- (also has icon z15-)
+# highway-rest_area # caption(optional) z15- (also has icon z14-)
+# tourism-camp_site # caption(optional) z13- (also has icon z13-)
+# tourism-caravan_site # caption(optional) z13- (also has icon z13-)
+# tourism-chalet # caption(optional) z14- (also has icon z14-)
# === -6200
# amenity-charging_station # caption(optional) z16- (also has icon z16-)
@@ -1703,7 +1703,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-hostel # caption(optional) z16- (also has icon z16-)
# === -7430
-# amenity-ice_cream # caption(optional) z19- (also has icon z16-)
+# amenity-ice_cream # caption(optional) z17- (also has icon z16-)
# shop-bakery # caption(optional) z16- (also has icon z16-)
# shop-butcher # caption(optional) z16- (also has icon z16-)
# shop-cheese # caption(optional) z16- (also has icon z16-)
@@ -1792,7 +1792,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -8000
# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-)
-# leisure-golf_course # caption(optional) z17- (also has icon z17-, area z12-)
+# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-)
# tourism-picnic_site # caption(optional) z14- (also has icon z14-)
# === -8200
@@ -2020,12 +2020,12 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -9500
# amenity-shower # caption(optional) z17- (also has icon z17-)
-# amenity-toilets # caption(optional) z18- (also has icon z18-)
+# amenity-toilets # caption(optional) z18- (also has icon z15-)
# office # caption(optional) z18- (also has icon z18-)
# shop # caption(optional) z18- (also has icon z18-)
# === -9530
-# amenity-bbq # caption(optional) z18- (also has icon z18-)
+# amenity-bbq # caption(optional) z16- (also has icon z16-)
# amenity-public_bookcase # caption(optional) z18- (also has icon z18-)
# cemetery-grave # caption(optional) z17- (also has icon z17-)
# man_made-silo # caption(optional) z18- (also has icon z16-)
@@ -2087,11 +2087,11 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -9900
man_made-cairn # icon z18- (also has caption(optional) z18-)
-man_made-survey_point # icon z16- (also has caption(optional) z16-)
-tourism-information # icon z16- (also has caption(optional) z16-)
-tourism-information-board # icon z16- (also has caption(optional) z16-)
-tourism-information-guidepost # icon z16- (also has caption(optional) z16-)
-tourism-information-map # icon z16- (also has caption(optional) z16-)
+man_made-survey_point # icon z14- (also has caption(optional) z15-)
+tourism-information # icon z15- (also has caption(optional) z15-)
+tourism-information-board # icon z15- (also has caption(optional) z15-)
+tourism-information-guidepost # icon z15- (also has caption(optional) z15-)
+tourism-information-map # icon z15- (also has caption(optional) z15-)
=== -9950
amenity # caption z19-
@@ -2151,10 +2151,10 @@ amenity-loading_dock # icon z19- (also has captio
entrance-exit # icon z19- (also has caption(optional) z19-)
# entrance-exit # caption(optional) z19- (also has icon z19-)
# man_made-cairn # caption(optional) z18- (also has icon z18-)
-# man_made-survey_point # caption(optional) z16- (also has icon z16-)
+# man_made-survey_point # caption(optional) z15- (also has icon z14-)
# power-substation # caption(optional) z19- (also has icon z19-)
-# tourism-information # caption(optional) z16- (also has icon z16-)
-# tourism-information-board # caption(optional) z16- (also has icon z16-)
-# tourism-information-guidepost # caption(optional) z16- (also has icon z16-)
-# tourism-information-map # caption(optional) z16- (also has icon z16-)
+# tourism-information # caption(optional) z15- (also has icon z15-)
+# tourism-information-board # caption(optional) z15- (also has icon z15-)
+# tourism-information-guidepost # caption(optional) z15- (also has icon z15-)
+# tourism-information-map # caption(optional) z15- (also has icon z15-)
=== -10000
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 7b81c656b5..53c16e437e 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -38,7 +38,7 @@ area|z12-[leisure=nature_reserve]
node|z14-[highway=ford]
-{icon-image: dot-m.svg;icon-min-distance: 20;}
+{icon-image: ford-m.svg; icon-min-distance: 20;}
/*
node|z11[landuse=forest][name],
@@ -238,7 +238,6 @@ node|z15-[historic=battlefield],
area|z15-[historic=battlefield],
node|z15-[tourism=gallery],
area|z15-[tourism=gallery],
-node|z15-[tourism=artwork],
node|z16-[amenity=community_centre],
area|z16-[amenity=community_centre],
node|z16-[historic=boundary_stone],
@@ -260,7 +259,8 @@ area|z17-[historic=wayside_shrine],
node|z17-[historic=archaeological_site],
area|z17-[historic=archaeological_site],
node|z17-[amenity=arts_centre],
-area|z17-[amenity=arts_centre]
+area|z17-[amenity=arts_centre],
+node|z18-[tourism=artwork],
{text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
node|z12-14[historic=fort],
@@ -404,10 +404,9 @@ node|z17-[historic=wayside_shrine],
area|z17-[historic=wayside_shrine]
{icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;}
-node|z15[tourism=artwork]
-{icon-image: tourism-m.svg;icon-min-distance: 8;}
-node|z16[tourism=artwork]
-{icon-image: tourism-m.svg;icon-min-distance: 28;}
+node|z18-[tourism=artwork]
+{icon-image: tourism-m.svg;}
+
node|z14[tourism=theme_park],
area|z14[tourism=theme_park]
{icon-image: theme_park-m.svg;icon-min-distance: 12;}
@@ -423,8 +422,6 @@ area|z16-[tourism=attraction]
node|z16-[tourism=theme_park],
area|z16-[tourism=theme_park]
{icon-image: theme_park-m.svg;icon-min-distance: 24;}
-node|z17-[tourism=artwork]
-{icon-image: tourism-m.svg;icon-min-distance: 24;}
node|z16-[amenity=community_centre],
area|z16-[amenity=community_centre],
@@ -503,7 +500,7 @@ node|z15-[amenity=university],
node|z15-[amenity=hospital],
node|z14-[barrier=toll_booth],
area|z14-[barrier=toll_booth],
-node|z15-[barrier=border_control],
+node|z14-[barrier=border_control],
node|z16-[barrier=lift_gate],
area|z16-[barrier=lift_gate],
node|z17-[amenity=bank],
@@ -626,20 +623,15 @@ node|z18-[amenity=police],
area|z18-[amenity=police]
{icon-image: police-m.svg; font-size: 14.5; icon-min-distance: 10;}
-node|z12-14[barrier=toll_booth],
-area|z12-14[barrier=toll_booth]
-{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
-node|z15-16[barrier=toll_booth],
-area|z15-16[barrier=toll_booth]
-{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
-node|z17-[barrier=toll_booth],
-area|z17-[barrier=toll_booth]
-{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
+node|z12[barrier=toll_booth],
+area|z12[barrier=toll_booth],
+{icon-image: toll_booth-s.svg; icon-min-distance: 8;}
+node|z13-[barrier=toll_booth],
+area|z13-[barrier=toll_booth],
+{icon-image: toll_booth-m.svg; icon-min-distance: 8;}
-node|z15-[barrier=border_control]
-{icon-image:bcontrol-m.svg;}
-node|z17-[barrier=border_control]
-{icon-image:bcontrol-m.svg;}
+node|z14-[barrier=border_control],
+{icon-image: bcontrol-m.svg;}
node|z16-[barrier=lift_gate],
area|z16-[barrier=lift_gate]
@@ -678,6 +670,7 @@ node|z14-[shop=supermarket],
area|z14-[shop=supermarket],
node|z15-[shop=car_repair][service=tyres],
area|z15-[shop=car_repair][service=tyres],
+node|z18-[shop=convenience],
{text: name;text-color: @poi_label;text-offset: 1;font-size: 11.5;text-min-distance: 3;}
@@ -709,6 +702,10 @@ node|z18-[shop=supermarket],
area|z18-[shop=supermarket]
{icon-image: grocery-m.svg;font-size: 14.5;icon-min-distance: 15;}
+node|z17-[shop=convenience],
+{icon-image: convenience-m.svg; font-size: 13.25;}
+node|z18-[shop=convenience],
+{font-size: 14.5;}
node|z15[shop=car_repair][service=tyres],
area|z15[shop=car_repair][service=tyres]
@@ -782,6 +779,7 @@ node|z16-[amenity=parking],
area|z16-[amenity=parking],
node|z17-[amenity=car_wash],
area|z17-[amenity=car_wash],
+node|z17-[amenity=toilets],
node|z18-[amenity=car_rental],
area|z18-[amenity=car_rental],
node|z18-[amenity=car_sharing],
@@ -863,6 +861,11 @@ node|z18-[amenity=car_wash],
area|z18-[amenity=car_wash],
{icon-image: car-wash-m.svg;text-offset: 1;font-size: 14.5;}
+node|z17-[amenity=toilets],
+{icon-image: toilets-m.svg; font-size: 13.75;}
+node|z18-[amenity=toilets],
+{font-size: 14.5;}
+
node|z18-[amenity=car_rental],
area|z18-[amenity=car_rental]
{icon-image: car_sharing-m.svg;text-offset: 1;font-size: 14.5;}
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index ec2f967b0e..472884ecc0 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -423,7 +423,7 @@ railway-station-subway-yerevan # icon z13- (also has captio
railway-station-subway-yokohama # icon z13- (also has caption(optional) z15-)
=== 2000
-barrier-border_control # icon z15- (also has caption(optional) z15-)
+barrier-border_control # icon z14- (also has caption(optional) z14-)
historic-city_gate # icon z13- (also has caption(optional) z15-)
historic-monument # icon z13- (also has caption(optional) z15-)
=== 1950
@@ -488,11 +488,11 @@ tourism-attraction-specified # icon z15- (also has captio
=== 1200
amenity-community_centre # icon z16- (also has caption(optional) z16-)
-tourism-artwork # icon z15- (also has caption(optional) z15-)
-tourism-artwork-architecture # icon z15- (also has caption(optional) z15-)
-tourism-artwork-painting # icon z15- (also has caption(optional) z15-)
-tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-)
-tourism-artwork-statue # icon z15- (also has caption(optional) z15-)
+tourism-artwork # icon z18- (also has caption(optional) z18-)
+tourism-artwork-architecture # icon z18- (also has caption(optional) z18-)
+tourism-artwork-painting # icon z18- (also has caption(optional) z18-)
+tourism-artwork-sculpture # icon z18- (also has caption(optional) z18-)
+tourism-artwork-statue # icon z18- (also has caption(optional) z18-)
=== 1150
amenity-cafe # icon z15- (also has caption(optional) z15-)
@@ -699,12 +699,14 @@ historic-ruins # icon z17- (also has captio
=== 300
amenity-fast_food # icon z17- (also has caption(optional) z17-)
+shop-convenience # icon z17- (also has caption(optional) z18-)
=== 250
amenity-bank # icon z17- (also has caption(optional) z17-)
amenity-parcel_locker # icon z17- (also has caption(optional) z17-)
amenity-police # icon z17-
amenity-post_office # icon z17- (also has caption(optional) z17-)
+amenity-toilets # icon z17- (also has caption(optional) z17-)
shop-motorcycle # icon z17-
=== 200
@@ -943,7 +945,7 @@ entrance-main # icon z18- (also has captio
# railway-station-subway-yokohama # caption(optional) z15- (also has icon z13-)
# === -8000
-# barrier-border_control # caption(optional) z15- (also has icon z15-)
+# barrier-border_control # caption(optional) z14- (also has icon z14-)
# historic-city_gate # caption(optional) z15- (also has icon z13-)
# historic-monument # caption(optional) z15- (also has icon z13-)
# === -8050
@@ -984,11 +986,11 @@ entrance-main # icon z18- (also has captio
# === -8800
# amenity-community_centre # caption(optional) z16- (also has icon z16-)
-# tourism-artwork # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-painting # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-statue # caption(optional) z15- (also has icon z15-)
+# tourism-artwork # caption(optional) z18- (also has icon z18-)
+# tourism-artwork-architecture # caption(optional) z18- (also has icon z18-)
+# tourism-artwork-painting # caption(optional) z18- (also has icon z18-)
+# tourism-artwork-sculpture # caption(optional) z18- (also has icon z18-)
+# tourism-artwork-statue # caption(optional) z18- (also has icon z18-)
# === -8850
# amenity-cafe # caption(optional) z15- (also has icon z15-)
@@ -1167,11 +1169,13 @@ entrance-main # icon z18- (also has captio
# === -9700
# amenity-fast_food # caption(optional) z17- (also has icon z17-)
+# shop-convenience # caption(optional) z18- (also has icon z17-)
# === -9750
# amenity-bank # caption(optional) z17- (also has icon z17-)
# amenity-parcel_locker # caption(optional) z17- (also has icon z17-)
# amenity-post_office # caption(optional) z17- (also has icon z17-)
+# amenity-toilets # caption(optional) z17- (also has icon z17-)
# === -9800
# leisure-park-no-access # caption(optional) z14- (also has icon z14-, area z10-)
diff --git a/data/visibility.txt b/data/visibility.txt
index 8a24bca021..28fb52e635 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -155,7 +155,7 @@ world 000000000000000000000 +
taxi 000000000000000000000 -
telephone 000000000000000000000 -
theatre 000000000000000111111 -
- toilets 000000000000000000000 -
+ toilets 000000000000000001111 -
townhall 000000000000000000000 -
university 000000000000000111111 -
vehicle_inspection 000000000000000001111 -
@@ -198,7 +198,7 @@ world 000000000000000000000 +
barrier 000000000000000000000 +
block 000000000000000000000 -
bollard 000000000000000000000 -
- border_control 000000000000000111111 -
+ border_control 000000000000001111111 -
cattle_grid 000000000000000000000 -
chain 000000000000000000000 -
city_wall 000000000000000111111 -
@@ -1248,7 +1248,7 @@ world 000000000000000000000 +
collector 000000000000000000000 -
computer 000000000000000000000 -
confectionery 000000000000000000000 -
- convenience 000000000000000000000 -
+ convenience 000000000000000001111 -
copyshop 000000000000000000000 -
cosmetics 000000000000000000000 -
craft 000000000000000000000 -
@@ -1374,11 +1374,11 @@ world 000000000000000000000 +
alpine_hut 000000000000000000000 -
apartment 000000000000000000000 -
aquarium 000000000000000000000 -
- artwork 000000000000000111111 +
- architecture 000000000000000111111 -
- painting 000000000000000111111 -
- sculpture 000000000000000111111 -
- statue 000000000000000111111 -
+ artwork 000000000000000000111 +
+ architecture 000000000000000000111 -
+ painting 000000000000000000111 -
+ sculpture 000000000000000000111 -
+ statue 000000000000000000111 -
{}
attraction 000000000000000111111 +
animal 000000000000000111111 -