diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 2154c3ae12..fb5a45e4de 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 48c77a56c9..b3f64cd09a 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -2124,8 +2124,42 @@ cont {
}
cont {
name: "amenity-arts_centre"
+ element {
+ scale: 17
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -2475,14 +2509,81 @@ cont {
cont {
name: "amenity-biergarten"
element {
- scale: 19
+ scale: 15
+ symbol {
+ name: "beer-m"
+ priority: 16673
+ min_distance: 28
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15000
+ priority: 15673
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "beer-m"
+ priority: 16673
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15673
}
}
}
@@ -3840,14 +3941,81 @@ cont {
cont {
name: "amenity-food_court"
element {
- scale: 19
+ scale: 15
+ symbol {
+ name: "fastfood-m"
+ priority: 16693
+ min_distance: 28
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15000
+ priority: 15693
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "fastfood-m"
+ priority: 16693
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15693
}
}
}
@@ -4377,8 +4545,34 @@ cont {
}
cont {
name: "amenity-ice_cream"
+ element {
+ scale: 16
+ symbol {
+ name: "ice_cream-m"
+ priority: 16000
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ min_distance: 24
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -4553,8 +4747,45 @@ cont {
}
cont {
name: "amenity-motorcycle_parking"
+ element {
+ scale: 17
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
caption {
primary {
height: 10
@@ -4630,8 +4861,42 @@ cont {
}
cont {
name: "amenity-nursing_home"
+ element {
+ scale: 17
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -5425,8 +5690,45 @@ cont {
}
cont {
name: "amenity-payment_terminal"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
caption {
primary {
height: 10
@@ -6525,14 +6827,48 @@ cont {
cont {
name: "amenity-prison"
element {
- scale: 19
+ scale: 17
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15000
+ priority: 15653
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15653
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15653
}
}
}
@@ -6865,14 +7201,51 @@ cont {
cont {
name: "amenity-shower"
element {
- scale: 19
+ scale: 17
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15000
+ priority: 15584
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15584
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15584
}
}
}
@@ -10489,6 +10862,72 @@ cont {
}
}
}
+cont {
+ name: "emergency-defibrillator"
+ element {
+ scale: 18
+ symbol {
+ name: "defibrillator-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "defibrillator-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "emergency-fire_hydrant"
+ element {
+ scale: 18
+ symbol {
+ name: "firehydrant-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "firehydrant-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "emergency-phone"
element {
@@ -12901,8 +13340,6 @@ cont {
lines {
width: 5.8
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -12939,8 +13376,6 @@ cont {
lines {
width: 7.8
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -12977,8 +13412,6 @@ cont {
lines {
width: 9.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -13910,16 +14343,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -13949,16 +14378,12 @@ cont {
lines {
width: 7.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -13988,16 +14413,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14026,16 +14447,12 @@ cont {
lines {
width: 12.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14064,16 +14481,12 @@ cont {
lines {
width: 19.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 21.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14102,16 +14515,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14140,16 +14549,12 @@ cont {
lines {
width: 32.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 34.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14826,16 +15231,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14865,16 +15266,12 @@ cont {
lines {
width: 4.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14903,16 +15300,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14941,16 +15334,12 @@ cont {
lines {
width: 10.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14979,16 +15368,12 @@ cont {
lines {
width: 14.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 16.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -15017,16 +15402,12 @@ cont {
lines {
width: 17.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 19.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -16657,8 +17038,6 @@ cont {
lines {
width: 5.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -16695,8 +17074,6 @@ cont {
lines {
width: 7.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -16733,8 +17110,6 @@ cont {
lines {
width: 9.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -17084,8 +17459,6 @@ cont {
lines {
width: 1.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -17105,16 +17478,12 @@ cont {
lines {
width: 3.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17142,16 +17511,12 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17178,16 +17543,12 @@ cont {
lines {
width: 5.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17214,16 +17575,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17250,16 +17607,12 @@ cont {
lines {
width: 8.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17286,16 +17639,12 @@ cont {
lines {
width: 10.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 11.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17867,16 +18216,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17906,16 +18251,12 @@ cont {
lines {
width: 8.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17944,16 +18285,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17982,16 +18319,12 @@ cont {
lines {
width: 15.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18020,16 +18353,12 @@ cont {
lines {
width: 22.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18058,16 +18387,12 @@ cont {
lines {
width: 28.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18637,16 +18962,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18676,16 +18997,12 @@ cont {
lines {
width: 8.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18714,16 +19031,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18752,16 +19065,12 @@ cont {
lines {
width: 15.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18790,16 +19099,12 @@ cont {
lines {
width: 22.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18828,16 +19133,12 @@ cont {
lines {
width: 28.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19771,16 +20072,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19810,16 +20107,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19848,16 +20141,12 @@ cont {
lines {
width: 8.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19886,16 +20175,12 @@ cont {
lines {
width: 13.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19924,16 +20209,12 @@ cont {
lines {
width: 20.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19962,16 +20243,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20477,16 +20754,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20509,16 +20782,12 @@ cont {
lines {
width: 12.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20541,16 +20810,12 @@ cont {
lines {
width: 18.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 18.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20573,16 +20838,12 @@ cont {
lines {
width: 24.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21032,16 +21293,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21071,16 +21328,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21109,16 +21362,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21147,16 +21396,12 @@ cont {
lines {
width: 15.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21185,16 +21430,12 @@ cont {
lines {
width: 22.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21223,16 +21464,12 @@ cont {
lines {
width: 28.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21610,16 +21847,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21635,16 +21868,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21659,16 +21888,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21691,16 +21916,12 @@ cont {
lines {
width: 15.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21723,16 +21944,12 @@ cont {
lines {
width: 22.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21755,16 +21972,12 @@ cont {
lines {
width: 28.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22103,16 +22316,12 @@ cont {
lines {
width: 3.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22135,16 +22344,12 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22167,16 +22372,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22199,16 +22400,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22432,16 +22629,12 @@ cont {
lines {
width: 3.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22464,16 +22657,12 @@ cont {
lines {
width: 3.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22496,16 +22685,12 @@ cont {
lines {
width: 3.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22528,16 +22713,12 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22560,16 +22741,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22592,16 +22769,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22884,6 +23057,85 @@ cont {
}
}
}
+cont {
+ name: "highway-services"
+ element {
+ scale: 15
+ symbol {
+ name: "car-repair-s"
+ priority: 16653
+ min_distance: 20
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "car-repair-m"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+}
cont {
name: "highway-speed_camera"
element {
@@ -23448,16 +23700,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23487,16 +23735,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23525,16 +23769,12 @@ cont {
lines {
width: 8.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23563,16 +23803,12 @@ cont {
lines {
width: 13.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23601,16 +23837,12 @@ cont {
lines {
width: 20.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23639,16 +23871,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23975,16 +24203,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23999,16 +24223,12 @@ cont {
lines {
width: 8.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -24023,16 +24243,12 @@ cont {
lines {
width: 13.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -24047,16 +24263,12 @@ cont {
lines {
width: 20.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -24079,16 +24291,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26568,16 +26776,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26607,16 +26811,12 @@ cont {
lines {
width: 7.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26646,16 +26846,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26684,16 +26880,12 @@ cont {
lines {
width: 12.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26722,16 +26914,12 @@ cont {
lines {
width: 19.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 21.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26760,16 +26948,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26798,16 +26982,12 @@ cont {
lines {
width: 32.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 34.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27431,16 +27611,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27470,16 +27646,12 @@ cont {
lines {
width: 4.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27508,16 +27680,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27546,16 +27714,12 @@ cont {
lines {
width: 10.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27584,16 +27748,12 @@ cont {
lines {
width: 14.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 16.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27622,16 +27782,12 @@ cont {
lines {
width: 17.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 19.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28186,16 +28342,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28219,16 +28371,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28251,16 +28399,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28283,16 +28427,12 @@ cont {
lines {
width: 13.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28315,16 +28455,12 @@ cont {
lines {
width: 20.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28347,16 +28483,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -32846,35 +32978,53 @@ cont {
name: "leisure-fitness_station"
element {
scale: 17
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 18
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 19
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
}
@@ -33151,35 +33301,53 @@ cont {
name: "leisure-ice_rink"
element {
scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
}
@@ -33221,8 +33389,54 @@ cont {
}
cont {
name: "leisure-marina"
+ element {
+ scale: 11
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 12
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 13
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 14
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
element {
scale: 17
+ area {
+ color: 13229526
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -33234,6 +33448,10 @@ cont {
}
element {
scale: 18
+ area {
+ color: 13229526
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -33245,6 +33463,10 @@ cont {
}
element {
scale: 19
+ area {
+ color: 13229526
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -36099,6 +36321,25 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_tap"
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-m"
+ priority: 16574
+ min_distance: 36
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-m"
+ priority: 16574
+ min_distance: 36
+ }
+ }
+}
cont {
name: "man_made-windmill"
element {
@@ -36166,6 +36407,39 @@ cont {
}
}
}
+cont {
+ name: "man_made-works"
+ element {
+ scale: 18
+ symbol {
+ name: "chimney-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "chimney-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "natural-bare_rock"
element {
@@ -46470,8 +46744,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46489,8 +46761,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46508,8 +46778,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46527,8 +46795,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47270,8 +47536,6 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -47287,8 +47551,6 @@ cont {
lines {
width: 4.4
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -47303,16 +47565,12 @@ cont {
lines {
width: 5.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 5.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -47336,16 +47594,12 @@ cont {
lines {
width: 6.8
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -47369,16 +47623,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -47402,16 +47652,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -47972,8 +48218,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47991,8 +48235,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -48010,8 +48252,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -48029,8 +48269,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -48247,8 +48485,6 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -48264,8 +48500,6 @@ cont {
lines {
width: 4.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -48280,16 +48514,12 @@ cont {
lines {
width: 5.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -48313,16 +48543,12 @@ cont {
lines {
width: 6.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -48346,16 +48572,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -48379,16 +48601,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -54466,8 +54684,6 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -54483,8 +54699,6 @@ cont {
lines {
width: 4.4
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -54499,16 +54713,12 @@ cont {
lines {
width: 5.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 5.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54532,16 +54742,12 @@ cont {
lines {
width: 6.8
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54565,16 +54771,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54598,16 +54800,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -56365,7 +56563,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "sweets-m"
priority: 16594
min_distance: 10
}
@@ -56381,9 +56579,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -56397,7 +56595,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
min_distance: 10
}
@@ -56413,7 +56611,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
min_distance: 10
}
@@ -57169,7 +57367,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "erotic-m"
priority: 16594
min_distance: 10
}
@@ -57185,9 +57383,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -57201,7 +57399,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -57217,7 +57415,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -57370,7 +57568,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "funeral_directors-m"
priority: 16594
min_distance: 10
}
@@ -57386,9 +57584,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -57402,7 +57600,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
min_distance: 10
}
@@ -57418,7 +57616,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
min_distance: 10
}
@@ -58340,7 +58538,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "media-m"
priority: 16594
min_distance: 10
}
@@ -58356,9 +58554,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58372,7 +58570,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -58388,7 +58586,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -58407,7 +58605,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "music-m"
priority: 16594
min_distance: 10
}
@@ -58423,9 +58621,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58439,7 +58637,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
min_distance: 10
}
@@ -58455,7 +58653,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
min_distance: 10
}
@@ -58490,9 +58688,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58506,7 +58704,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
min_distance: 10
}
@@ -58522,7 +58720,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
min_distance: 10
}
@@ -58676,7 +58874,7 @@ cont {
scale: 16
symbol {
name: "shop-m"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58685,14 +58883,14 @@ cont {
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 17
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58701,14 +58899,14 @@ cont {
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 18
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58717,14 +58915,14 @@ cont {
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 19
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58733,7 +58931,7 @@ cont {
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
}
@@ -59093,9 +59291,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -59109,7 +59307,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
min_distance: 10
}
@@ -59125,7 +59323,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
min_distance: 10
}
@@ -59243,7 +59441,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "erotic-m"
priority: 16594
min_distance: 10
}
@@ -59259,9 +59457,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -59275,7 +59473,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -59291,7 +59489,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -59712,7 +59910,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "media-m"
priority: 16594
min_distance: 10
}
@@ -59728,9 +59926,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -59744,7 +59942,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -59760,7 +59958,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -63014,26 +63212,100 @@ cont {
}
cont {
name: "tourism-theme_park"
+ element {
+ scale: 14
+ symbol {
+ name: "theme_park-s"
+ priority: 16841
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "theme_park-m"
+ priority: 16841
+ min_distance: 36
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "theme_park-m"
+ priority: 16841
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
element {
scale: 18
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
caption {
primary {
height: 11
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15841
}
}
element {
scale: 19
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
caption {
primary {
height: 11
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15841
}
}
}
@@ -63141,26 +63413,70 @@ cont {
}
cont {
name: "tourism-wilderness_hut"
+ element {
+ scale: 16
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16752
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ stroke_color: 872415231
+ offset_y: 1
+ }
+ priority: 15752
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ min_distance: 16
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ stroke_color: 872415231
+ offset_y: 1
+ }
+ priority: 15752
+ }
+ }
element {
scale: 18
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ }
caption {
primary {
height: 11
color: 4473924
+ stroke_color: 872415231
offset_y: 1
}
- priority: 15594
+ priority: 15752
}
}
element {
scale: 19
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ }
caption {
primary {
height: 11
color: 4473924
+ stroke_color: 872415231
offset_y: 1
}
- priority: 15594
+ priority: 15752
}
}
}
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index e1ad7ca290..faebb4b748 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 a55bd16e54..9b52d2adb4 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2124,8 +2124,42 @@ cont {
}
cont {
name: "amenity-arts_centre"
+ element {
+ scale: 17
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -2475,14 +2509,81 @@ cont {
cont {
name: "amenity-biergarten"
element {
- scale: 19
+ scale: 15
+ symbol {
+ name: "beer-m"
+ priority: 16673
+ min_distance: 28
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15000
+ priority: 15673
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "beer-m"
+ priority: 16673
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15673
}
}
}
@@ -3840,14 +3941,81 @@ cont {
cont {
name: "amenity-food_court"
element {
- scale: 19
+ scale: 15
+ symbol {
+ name: "fastfood-m"
+ priority: 16693
+ min_distance: 28
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15000
+ priority: 15693
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "fastfood-m"
+ priority: 16693
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15693
}
}
}
@@ -4345,8 +4513,34 @@ cont {
}
cont {
name: "amenity-ice_cream"
+ element {
+ scale: 16
+ symbol {
+ name: "ice_cream-m"
+ priority: 16000
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ min_distance: 24
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -4521,8 +4715,45 @@ cont {
}
cont {
name: "amenity-motorcycle_parking"
+ element {
+ scale: 17
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
caption {
primary {
height: 10
@@ -4598,8 +4829,42 @@ cont {
}
cont {
name: "amenity-nursing_home"
+ element {
+ scale: 17
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -5393,8 +5658,45 @@ cont {
}
cont {
name: "amenity-payment_terminal"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
caption {
primary {
height: 10
@@ -6493,14 +6795,48 @@ cont {
cont {
name: "amenity-prison"
element {
- scale: 19
+ scale: 17
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15000
+ priority: 15653
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15653
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15653
}
}
}
@@ -6833,14 +7169,51 @@ cont {
cont {
name: "amenity-shower"
element {
- scale: 19
+ scale: 17
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15000
+ priority: 15584
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15584
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15584
}
}
}
@@ -10443,6 +10816,72 @@ cont {
}
}
}
+cont {
+ name: "emergency-defibrillator"
+ element {
+ scale: 18
+ symbol {
+ name: "defibrillator-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "defibrillator-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "emergency-fire_hydrant"
+ element {
+ scale: 18
+ symbol {
+ name: "firehydrant-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "firehydrant-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "emergency-phone"
element {
@@ -12855,8 +13294,6 @@ cont {
lines {
width: 5.8
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -12893,8 +13330,6 @@ cont {
lines {
width: 7.8
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -12931,8 +13366,6 @@ cont {
lines {
width: 9.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -13864,16 +14297,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -13903,16 +14332,12 @@ cont {
lines {
width: 7.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -13942,16 +14367,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -13980,16 +14401,12 @@ cont {
lines {
width: 12.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14018,16 +14435,12 @@ cont {
lines {
width: 19.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 21.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14056,16 +14469,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14094,16 +14503,12 @@ cont {
lines {
width: 32.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 34.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14780,16 +15185,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14819,16 +15220,12 @@ cont {
lines {
width: 4.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14857,16 +15254,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14895,16 +15288,12 @@ cont {
lines {
width: 10.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14933,16 +15322,12 @@ cont {
lines {
width: 14.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 16.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14971,16 +15356,12 @@ cont {
lines {
width: 17.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 19.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -16611,8 +16992,6 @@ cont {
lines {
width: 5.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -16649,8 +17028,6 @@ cont {
lines {
width: 7.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -16687,8 +17064,6 @@ cont {
lines {
width: 9.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -17038,8 +17413,6 @@ cont {
lines {
width: 1.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -17059,16 +17432,12 @@ cont {
lines {
width: 3.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17096,16 +17465,12 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17132,16 +17497,12 @@ cont {
lines {
width: 5.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17168,16 +17529,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17204,16 +17561,12 @@ cont {
lines {
width: 8.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17240,16 +17593,12 @@ cont {
lines {
width: 10.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 11.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17821,16 +18170,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17860,16 +18205,12 @@ cont {
lines {
width: 8.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17898,16 +18239,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17936,16 +18273,12 @@ cont {
lines {
width: 15.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17974,16 +18307,12 @@ cont {
lines {
width: 22.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18012,16 +18341,12 @@ cont {
lines {
width: 28.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18591,16 +18916,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18630,16 +18951,12 @@ cont {
lines {
width: 8.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18668,16 +18985,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18706,16 +19019,12 @@ cont {
lines {
width: 15.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18744,16 +19053,12 @@ cont {
lines {
width: 22.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18782,16 +19087,12 @@ cont {
lines {
width: 28.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19725,16 +20026,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19764,16 +20061,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19802,16 +20095,12 @@ cont {
lines {
width: 8.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19840,16 +20129,12 @@ cont {
lines {
width: 13.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19878,16 +20163,12 @@ cont {
lines {
width: 20.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19916,16 +20197,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20431,16 +20708,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20463,16 +20736,12 @@ cont {
lines {
width: 12.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20495,16 +20764,12 @@ cont {
lines {
width: 18.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 18.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20527,16 +20792,12 @@ cont {
lines {
width: 24.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20986,16 +21247,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21025,16 +21282,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21063,16 +21316,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21101,16 +21350,12 @@ cont {
lines {
width: 15.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21139,16 +21384,12 @@ cont {
lines {
width: 22.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21177,16 +21418,12 @@ cont {
lines {
width: 28.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21564,16 +21801,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21589,16 +21822,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21613,16 +21842,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21645,16 +21870,12 @@ cont {
lines {
width: 15.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21677,16 +21898,12 @@ cont {
lines {
width: 22.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21709,16 +21926,12 @@ cont {
lines {
width: 28.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22030,16 +22243,12 @@ cont {
lines {
width: 3.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22062,16 +22271,12 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22094,16 +22299,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22126,16 +22327,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22295,16 +22492,12 @@ cont {
lines {
width: 3.2
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22327,16 +22520,12 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22359,16 +22548,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22391,16 +22576,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22633,6 +22814,85 @@ cont {
}
}
}
+cont {
+ name: "highway-services"
+ element {
+ scale: 15
+ symbol {
+ name: "car-repair-s"
+ priority: 16653
+ min_distance: 20
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "car-repair-m"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+}
cont {
name: "highway-steps"
element {
@@ -23146,16 +23406,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23185,16 +23441,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23223,16 +23475,12 @@ cont {
lines {
width: 8.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23261,16 +23509,12 @@ cont {
lines {
width: 13.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23299,16 +23543,12 @@ cont {
lines {
width: 20.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23337,16 +23577,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23673,16 +23909,12 @@ cont {
lines {
width: 6.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23697,16 +23929,12 @@ cont {
lines {
width: 8.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23721,16 +23949,12 @@ cont {
lines {
width: 13.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23745,16 +23969,12 @@ cont {
lines {
width: 20.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23777,16 +23997,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26266,16 +26482,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26305,16 +26517,12 @@ cont {
lines {
width: 7.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26344,16 +26552,12 @@ cont {
lines {
width: 9.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26382,16 +26586,12 @@ cont {
lines {
width: 12.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26420,16 +26620,12 @@ cont {
lines {
width: 19.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 21.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26458,16 +26654,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26496,16 +26688,12 @@ cont {
lines {
width: 32.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 34.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27129,16 +27317,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27168,16 +27352,12 @@ cont {
lines {
width: 4.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.6
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27206,16 +27386,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27244,16 +27420,12 @@ cont {
lines {
width: 10.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27282,16 +27454,12 @@ cont {
lines {
width: 14.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 16.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27320,16 +27488,12 @@ cont {
lines {
width: 17.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 19.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27884,16 +28048,12 @@ cont {
lines {
width: 3.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27917,16 +28077,12 @@ cont {
lines {
width: 6.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27949,16 +28105,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27981,16 +28133,12 @@ cont {
lines {
width: 13.6
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28013,16 +28161,12 @@ cont {
lines {
width: 20.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28045,16 +28189,12 @@ cont {
lines {
width: 26.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -32544,35 +32684,53 @@ cont {
name: "leisure-fitness_station"
element {
scale: 17
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 18
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 19
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
}
@@ -32849,35 +33007,53 @@ cont {
name: "leisure-ice_rink"
element {
scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
}
@@ -32919,8 +33095,54 @@ cont {
}
cont {
name: "leisure-marina"
+ element {
+ scale: 11
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 12
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 13
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 14
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 13229526
+ priority: -15892
+ }
+ }
element {
scale: 17
+ area {
+ color: 13229526
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -32932,6 +33154,10 @@ cont {
}
element {
scale: 18
+ area {
+ color: 13229526
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -32943,6 +33169,10 @@ cont {
}
element {
scale: 19
+ area {
+ color: 13229526
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -35789,6 +36019,25 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_tap"
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-m"
+ priority: 16574
+ min_distance: 36
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-m"
+ priority: 16574
+ min_distance: 36
+ }
+ }
+}
cont {
name: "man_made-windmill"
element {
@@ -35856,6 +36105,39 @@ cont {
}
}
}
+cont {
+ name: "man_made-works"
+ element {
+ scale: 18
+ symbol {
+ name: "chimney-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "chimney-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "natural-bare_rock"
element {
@@ -46024,8 +46306,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46043,8 +46323,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46062,8 +46340,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46081,8 +46357,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46808,8 +47082,6 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -46825,8 +47097,6 @@ cont {
lines {
width: 4.4
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -46841,16 +47111,12 @@ cont {
lines {
width: 5.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 5.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -46874,16 +47140,12 @@ cont {
lines {
width: 6.8
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -46907,16 +47169,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -46940,16 +47198,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -47510,8 +47764,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47529,8 +47781,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47548,8 +47798,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47567,8 +47815,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47785,8 +48031,6 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -47802,8 +48046,6 @@ cont {
lines {
width: 4.4
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -47818,16 +48060,12 @@ cont {
lines {
width: 5.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -47851,16 +48089,12 @@ cont {
lines {
width: 6.8
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -47884,16 +48118,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -47917,16 +48147,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -54004,8 +54230,6 @@ cont {
lines {
width: 4.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -54021,8 +54245,6 @@ cont {
lines {
width: 4.4
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -54037,16 +54259,12 @@ cont {
lines {
width: 5.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 5.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54070,16 +54288,12 @@ cont {
lines {
width: 6.8
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54103,16 +54317,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54136,16 +54346,12 @@ cont {
lines {
width: 8.0
color: 15592411
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 8421504
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -55903,7 +56109,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "sweets-m"
priority: 16594
min_distance: 10
}
@@ -55919,9 +56125,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -55935,7 +56141,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
min_distance: 10
}
@@ -55951,7 +56157,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
min_distance: 10
}
@@ -56707,7 +56913,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "erotic-m"
priority: 16594
min_distance: 10
}
@@ -56723,9 +56929,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -56739,7 +56945,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -56755,7 +56961,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -56908,7 +57114,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "funeral_directors-m"
priority: 16594
min_distance: 10
}
@@ -56924,9 +57130,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -56940,7 +57146,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
min_distance: 10
}
@@ -56956,7 +57162,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
min_distance: 10
}
@@ -57878,7 +58084,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "media-m"
priority: 16594
min_distance: 10
}
@@ -57894,9 +58100,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -57910,7 +58116,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -57926,7 +58132,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -57945,7 +58151,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "music-m"
priority: 16594
min_distance: 10
}
@@ -57961,9 +58167,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -57977,7 +58183,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
min_distance: 10
}
@@ -57993,7 +58199,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
min_distance: 10
}
@@ -58028,9 +58234,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58044,7 +58250,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
min_distance: 10
}
@@ -58060,7 +58266,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
min_distance: 10
}
@@ -58214,7 +58420,7 @@ cont {
scale: 16
symbol {
name: "shop-m"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58223,14 +58429,14 @@ cont {
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 17
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58239,14 +58445,14 @@ cont {
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 18
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58255,14 +58461,14 @@ cont {
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 19
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58271,7 +58477,7 @@ cont {
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
}
@@ -58631,9 +58837,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58647,7 +58853,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
min_distance: 10
}
@@ -58663,7 +58869,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
min_distance: 10
}
@@ -58749,7 +58955,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "erotic-m"
priority: 16594
min_distance: 10
}
@@ -58765,9 +58971,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58781,7 +58987,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -58797,7 +59003,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -59218,7 +59424,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "media-m"
priority: 16594
min_distance: 10
}
@@ -59234,9 +59440,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -59250,7 +59456,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -59266,7 +59472,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -62520,26 +62726,100 @@ cont {
}
cont {
name: "tourism-theme_park"
+ element {
+ scale: 14
+ symbol {
+ name: "theme_park-s"
+ priority: 16841
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "theme_park-m"
+ priority: 16841
+ min_distance: 36
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "theme_park-m"
+ priority: 16841
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
element {
scale: 18
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
caption {
primary {
height: 11
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15841
}
}
element {
scale: 19
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
caption {
primary {
height: 11
color: 4473924
offset_y: 1
}
- priority: 15594
+ priority: 15841
}
}
}
@@ -62647,26 +62927,70 @@ cont {
}
cont {
name: "tourism-wilderness_hut"
+ element {
+ scale: 16
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16752
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ stroke_color: 872415231
+ offset_y: 1
+ }
+ priority: 15752
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ min_distance: 16
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ stroke_color: 872415231
+ offset_y: 1
+ }
+ priority: 15752
+ }
+ }
element {
scale: 18
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ }
caption {
primary {
height: 11
color: 4473924
+ stroke_color: 872415231
offset_y: 1
}
- priority: 15594
+ priority: 15752
}
}
element {
scale: 19
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ }
caption {
primary {
height: 11
color: 4473924
+ stroke_color: 872415231
offset_y: 1
}
- priority: 15594
+ priority: 15752
}
}
}
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index c31640103f..b877fd6972 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 8dbbed1097..7db6cc8bef 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -2124,8 +2124,42 @@ cont {
}
cont {
name: "amenity-arts_centre"
+ element {
+ scale: 17
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "gallery-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -2475,14 +2509,81 @@ cont {
cont {
name: "amenity-biergarten"
element {
- scale: 19
+ scale: 15
+ symbol {
+ name: "beer-m"
+ priority: 16673
+ min_distance: 28
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15000
+ priority: 15673
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "beer-m"
+ priority: 16673
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15673
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "beer-l"
+ priority: 16673
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15673
}
}
}
@@ -3840,14 +3941,81 @@ cont {
cont {
name: "amenity-food_court"
element {
- scale: 19
+ scale: 15
+ symbol {
+ name: "fastfood-m"
+ priority: 16693
+ min_distance: 28
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15000
+ priority: 15693
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "fastfood-m"
+ priority: 16693
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15693
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "fastfood-l"
+ priority: 16693
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15693
}
}
}
@@ -4345,8 +4513,34 @@ cont {
}
cont {
name: "amenity-ice_cream"
+ element {
+ scale: 16
+ symbol {
+ name: "ice_cream-m"
+ priority: 16000
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ min_distance: 24
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "ice_cream-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -4521,8 +4715,45 @@ cont {
}
cont {
name: "amenity-motorcycle_parking"
+ element {
+ scale: 17
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "motorcycle-parking-l"
+ priority: 16000
+ min_distance: 20
+ }
caption {
primary {
height: 10
@@ -4598,8 +4829,42 @@ cont {
}
cont {
name: "amenity-nursing_home"
+ element {
+ scale: 17
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "home-l"
+ priority: 16000
+ }
caption {
primary {
height: 10
@@ -5393,8 +5658,45 @@ cont {
}
cont {
name: "amenity-payment_terminal"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
element {
scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16000
+ min_distance: 20
+ }
caption {
primary {
height: 10
@@ -6493,14 +6795,48 @@ cont {
cont {
name: "amenity-prison"
element {
- scale: 19
+ scale: 17
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15000
+ priority: 15653
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15653
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "prison-l"
+ priority: 16653
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15653
}
}
}
@@ -6833,14 +7169,51 @@ cont {
cont {
name: "amenity-shower"
element {
- scale: 19
+ scale: 17
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15000
+ priority: 15584
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15584
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shower-l"
+ priority: 16584
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15584
}
}
}
@@ -10443,6 +10816,72 @@ cont {
}
}
}
+cont {
+ name: "emergency-defibrillator"
+ element {
+ scale: 18
+ symbol {
+ name: "defibrillator-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "defibrillator-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "emergency-fire_hydrant"
+ element {
+ scale: 18
+ symbol {
+ name: "firehydrant-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "firehydrant-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "emergency-phone"
element {
@@ -12855,8 +13294,6 @@ cont {
lines {
width: 5.8
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -12893,8 +13330,6 @@ cont {
lines {
width: 7.8
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -12931,8 +13366,6 @@ cont {
lines {
width: 9.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -13873,16 +14306,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -13913,16 +14342,12 @@ cont {
lines {
width: 7.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -13953,16 +14378,12 @@ cont {
lines {
width: 9.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -13992,16 +14413,12 @@ cont {
lines {
width: 12.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14031,16 +14448,12 @@ cont {
lines {
width: 19.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 21.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14070,16 +14483,12 @@ cont {
lines {
width: 26.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14109,16 +14518,12 @@ cont {
lines {
width: 32.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 34.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14806,16 +15211,12 @@ cont {
lines {
width: 3.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14846,16 +15247,12 @@ cont {
lines {
width: 4.8
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.6
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14885,16 +15282,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14924,16 +15317,12 @@ cont {
lines {
width: 10.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -14963,16 +15352,12 @@ cont {
lines {
width: 14.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 16.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -15002,16 +15387,12 @@ cont {
lines {
width: 17.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 19.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -16643,8 +17024,6 @@ cont {
lines {
width: 5.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -16681,8 +17060,6 @@ cont {
lines {
width: 7.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -16719,8 +17096,6 @@ cont {
lines {
width: 9.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -17070,8 +17445,6 @@ cont {
lines {
width: 1.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -17091,16 +17464,12 @@ cont {
lines {
width: 3.2
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17128,16 +17497,12 @@ cont {
lines {
width: 4.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17164,16 +17529,12 @@ cont {
lines {
width: 5.2
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17200,16 +17561,12 @@ cont {
lines {
width: 6.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17236,16 +17593,12 @@ cont {
lines {
width: 8.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17272,16 +17625,12 @@ cont {
lines {
width: 10.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 11.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17863,16 +18212,12 @@ cont {
lines {
width: 6.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17903,16 +18248,12 @@ cont {
lines {
width: 8.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17942,16 +18283,12 @@ cont {
lines {
width: 9.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -17981,16 +18318,12 @@ cont {
lines {
width: 15.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18020,16 +18353,12 @@ cont {
lines {
width: 22.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18059,16 +18388,12 @@ cont {
lines {
width: 28.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18649,16 +18974,12 @@ cont {
lines {
width: 6.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18689,16 +19010,12 @@ cont {
lines {
width: 8.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18728,16 +19045,12 @@ cont {
lines {
width: 9.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18767,16 +19080,12 @@ cont {
lines {
width: 15.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18806,16 +19115,12 @@ cont {
lines {
width: 22.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -18845,16 +19150,12 @@ cont {
lines {
width: 28.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19807,16 +20108,12 @@ cont {
lines {
width: 3.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19847,16 +20144,12 @@ cont {
lines {
width: 6.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19886,16 +20179,12 @@ cont {
lines {
width: 8.8
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19925,16 +20214,12 @@ cont {
lines {
width: 13.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -19964,16 +20249,12 @@ cont {
lines {
width: 20.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20003,16 +20284,12 @@ cont {
lines {
width: 26.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20523,16 +20800,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20555,16 +20828,12 @@ cont {
lines {
width: 12.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20587,16 +20856,12 @@ cont {
lines {
width: 18.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 18.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -20619,16 +20884,12 @@ cont {
lines {
width: 24.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21088,16 +21349,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21128,16 +21385,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21167,16 +21420,12 @@ cont {
lines {
width: 9.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21206,16 +21455,12 @@ cont {
lines {
width: 15.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21245,16 +21490,12 @@ cont {
lines {
width: 22.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21284,16 +21525,12 @@ cont {
lines {
width: 28.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21676,16 +21913,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21701,16 +21934,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21725,16 +21954,12 @@ cont {
lines {
width: 9.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21757,16 +21982,12 @@ cont {
lines {
width: 15.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 17.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21789,16 +22010,12 @@ cont {
lines {
width: 22.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 24.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -21821,16 +22038,12 @@ cont {
lines {
width: 28.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 30.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22138,16 +22351,12 @@ cont {
lines {
width: 3.2
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22170,16 +22379,12 @@ cont {
lines {
width: 4.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22202,16 +22407,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22234,16 +22435,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22403,16 +22600,12 @@ cont {
lines {
width: 3.2
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 3.6
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22435,16 +22628,12 @@ cont {
lines {
width: 4.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22467,16 +22656,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22499,16 +22684,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -22741,6 +22922,85 @@ cont {
}
}
}
+cont {
+ name: "highway-services"
+ element {
+ scale: 15
+ symbol {
+ name: "car-repair-s"
+ priority: 16653
+ min_distance: 20
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "car-repair-m"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "car-repair-l"
+ priority: 16653
+ }
+ path_text {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 16653
+ }
+ }
+}
cont {
name: "highway-steps"
element {
@@ -23264,16 +23524,12 @@ cont {
lines {
width: 3.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23304,16 +23560,12 @@ cont {
lines {
width: 6.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23343,16 +23595,12 @@ cont {
lines {
width: 8.8
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23382,16 +23630,12 @@ cont {
lines {
width: 13.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23421,16 +23665,12 @@ cont {
lines {
width: 20.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23460,16 +23700,12 @@ cont {
lines {
width: 26.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23801,16 +24037,12 @@ cont {
lines {
width: 6.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23825,16 +24057,12 @@ cont {
lines {
width: 8.8
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 9.6
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23849,16 +24077,12 @@ cont {
lines {
width: 13.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23873,16 +24097,12 @@ cont {
lines {
width: 20.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -23905,16 +24125,12 @@ cont {
lines {
width: 26.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26403,16 +26619,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26443,16 +26655,12 @@ cont {
lines {
width: 7.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26483,16 +26691,12 @@ cont {
lines {
width: 9.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 10.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26522,16 +26726,12 @@ cont {
lines {
width: 12.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26561,16 +26761,12 @@ cont {
lines {
width: 19.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 21.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26600,16 +26796,12 @@ cont {
lines {
width: 26.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -26639,16 +26831,12 @@ cont {
lines {
width: 32.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 34.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27283,16 +27471,12 @@ cont {
lines {
width: 3.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27323,16 +27507,12 @@ cont {
lines {
width: 4.8
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.6
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27362,16 +27542,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27401,16 +27577,12 @@ cont {
lines {
width: 10.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 12.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27440,16 +27612,12 @@ cont {
lines {
width: 14.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 16.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -27479,16 +27647,12 @@ cont {
lines {
width: 17.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 19.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28044,16 +28208,12 @@ cont {
lines {
width: 3.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 4.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28077,16 +28237,12 @@ cont {
lines {
width: 6.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 6.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28109,16 +28265,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.8
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28141,16 +28293,12 @@ cont {
lines {
width: 13.6
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 15.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28173,16 +28321,12 @@ cont {
lines {
width: 20.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 22.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -28205,16 +28349,12 @@ cont {
lines {
width: 26.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 28.0
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -32700,35 +32840,53 @@ cont {
name: "leisure-fitness_station"
element {
scale: 17
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 18
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 19
+ symbol {
+ name: "gym-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
}
@@ -33005,35 +33163,53 @@ cont {
name: "leisure-ice_rink"
element {
scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
element {
scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16049
+ min_distance: 10
+ }
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
- priority: 15049
+ priority: 16000
}
}
}
@@ -33075,8 +33251,54 @@ cont {
}
cont {
name: "leisure-marina"
+ element {
+ scale: 11
+ area {
+ color: 6425
+ priority: -15892
+ }
+ }
+ element {
+ scale: 12
+ area {
+ color: 6425
+ priority: -15892
+ }
+ }
+ element {
+ scale: 13
+ area {
+ color: 6425
+ priority: -15892
+ }
+ }
+ element {
+ scale: 14
+ area {
+ color: 6425
+ priority: -15892
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 6425
+ priority: -15892
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 6425
+ priority: -15892
+ }
+ }
element {
scale: 17
+ area {
+ color: 6425
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -33088,6 +33310,10 @@ cont {
}
element {
scale: 18
+ area {
+ color: 6425
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -33099,6 +33325,10 @@ cont {
}
element {
scale: 19
+ area {
+ color: 6425
+ priority: -15951
+ }
caption {
primary {
height: 10
@@ -35905,6 +36135,25 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_tap"
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-m"
+ priority: 16574
+ min_distance: 36
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-m"
+ priority: 16574
+ min_distance: 36
+ }
+ }
+}
cont {
name: "man_made-windmill"
element {
@@ -35972,6 +36221,39 @@ cont {
}
}
}
+cont {
+ name: "man_made-works"
+ element {
+ scale: 18
+ symbol {
+ name: "chimney-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "chimney-l"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "natural-bare_rock"
element {
@@ -46110,8 +46392,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46129,8 +46409,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46148,8 +46426,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46167,8 +46443,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -46894,8 +47168,6 @@ cont {
lines {
width: 4.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -46911,8 +47183,6 @@ cont {
lines {
width: 4.4
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -46927,16 +47197,12 @@ cont {
lines {
width: 5.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 5.4
color: 4473924
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -46960,16 +47226,12 @@ cont {
lines {
width: 6.8
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -46993,16 +47255,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -47026,16 +47284,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -47596,8 +47850,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47615,8 +47867,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47634,8 +47884,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47653,8 +47901,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -47871,8 +48117,6 @@ cont {
lines {
width: 4.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -47888,8 +48132,6 @@ cont {
lines {
width: 4.4
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
@@ -47904,16 +48146,12 @@ cont {
lines {
width: 5.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 5.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -47937,16 +48175,12 @@ cont {
lines {
width: 6.8
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -47970,16 +48204,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -48003,16 +48233,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1276
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1266
cap: BUTTCAP
}
@@ -54090,8 +54316,6 @@ cont {
lines {
width: 4.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -54107,8 +54331,6 @@ cont {
lines {
width: 4.4
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
@@ -54123,16 +54345,12 @@ cont {
lines {
width: 5.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 5.4
color: 4473924
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54156,16 +54374,12 @@ cont {
lines {
width: 6.8
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 7.2
color: 4473924
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54189,16 +54403,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -54222,16 +54432,12 @@ cont {
lines {
width: 8.0
color: 2236945
- dashdot {
- }
priority: 1078
cap: BUTTCAP
}
lines {
width: 8.4
color: 4473924
- dashdot {
- }
priority: 1068
cap: BUTTCAP
}
@@ -55989,7 +56195,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "sweets-m"
priority: 16594
min_distance: 10
}
@@ -56005,9 +56211,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -56021,7 +56227,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
min_distance: 10
}
@@ -56037,7 +56243,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "sweets-l"
priority: 16594
min_distance: 10
}
@@ -56793,7 +56999,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "erotic-m"
priority: 16594
min_distance: 10
}
@@ -56809,9 +57015,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -56825,7 +57031,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -56841,7 +57047,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -56994,7 +57200,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "funeral_directors-m"
priority: 16594
min_distance: 10
}
@@ -57010,9 +57216,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -57026,7 +57232,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
min_distance: 10
}
@@ -57042,7 +57248,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "funeral_directors-l"
priority: 16594
min_distance: 10
}
@@ -57964,7 +58170,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "media-m"
priority: 16594
min_distance: 10
}
@@ -57980,9 +58186,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -57996,7 +58202,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -58012,7 +58218,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -58031,7 +58237,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "music-m"
priority: 16594
min_distance: 10
}
@@ -58047,9 +58253,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58063,7 +58269,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
min_distance: 10
}
@@ -58079,7 +58285,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "music-l"
priority: 16594
min_distance: 10
}
@@ -58114,9 +58320,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58130,7 +58336,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
min_distance: 10
}
@@ -58146,7 +58352,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "newsagent-l"
priority: 16594
min_distance: 10
}
@@ -58300,7 +58506,7 @@ cont {
scale: 16
symbol {
name: "shop-m"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58309,14 +58515,14 @@ cont {
color: 5592405
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 17
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58325,14 +58531,14 @@ cont {
color: 5592405
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 18
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58341,14 +58547,14 @@ cont {
color: 5592405
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
element {
scale: 19
symbol {
name: "shop-l"
- priority: 16594
+ priority: 16623
min_distance: 10
}
caption {
@@ -58357,7 +58563,7 @@ cont {
color: 5592405
offset_y: 1
}
- priority: 15594
+ priority: 15623
}
}
}
@@ -58717,9 +58923,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58733,7 +58939,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
min_distance: 10
}
@@ -58749,7 +58955,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "stationery_shop-l"
priority: 16594
min_distance: 10
}
@@ -58835,7 +59041,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "erotic-m"
priority: 16594
min_distance: 10
}
@@ -58851,9 +59057,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -58867,7 +59073,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -58883,7 +59089,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "erotic-l"
priority: 16594
min_distance: 10
}
@@ -59304,7 +59510,7 @@ cont {
element {
scale: 16
symbol {
- name: "shop-m"
+ name: "media-m"
priority: 16594
min_distance: 10
}
@@ -59320,9 +59526,9 @@ cont {
element {
scale: 17
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
- min_distance: 10
+ min_distance: 24
}
caption {
primary {
@@ -59336,7 +59542,7 @@ cont {
element {
scale: 18
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -59352,7 +59558,7 @@ cont {
element {
scale: 19
symbol {
- name: "shop-l"
+ name: "media-l"
priority: 16594
min_distance: 10
}
@@ -62606,26 +62812,100 @@ cont {
}
cont {
name: "tourism-theme_park"
+ element {
+ scale: 14
+ symbol {
+ name: "theme_park-s"
+ priority: 16841
+ min_distance: 12
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "theme_park-m"
+ priority: 16841
+ min_distance: 36
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "theme_park-m"
+ priority: 16841
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 1
+ }
+ priority: 15841
+ }
+ }
element {
scale: 18
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
caption {
primary {
height: 11
color: 5592405
offset_y: 1
}
- priority: 15594
+ priority: 15841
}
}
element {
scale: 19
+ symbol {
+ name: "theme_park-l"
+ priority: 16841
+ min_distance: 24
+ }
caption {
primary {
height: 11
color: 5592405
offset_y: 1
}
- priority: 15594
+ priority: 15841
}
}
}
@@ -62733,26 +63013,70 @@ cont {
}
cont {
name: "tourism-wilderness_hut"
+ element {
+ scale: 16
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16752
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ stroke_color: 856756497
+ offset_y: 1
+ }
+ priority: 15752
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ min_distance: 16
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ stroke_color: 856756497
+ offset_y: 1
+ }
+ priority: 15752
+ }
+ }
element {
scale: 18
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ }
caption {
primary {
height: 11
color: 5592405
+ stroke_color: 856756497
offset_y: 1
}
- priority: 15594
+ priority: 15752
}
}
element {
scale: 19
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16752
+ }
caption {
primary {
height: 11
color: 5592405
+ stroke_color: 856756497
offset_y: 1
}
- priority: 15594
+ priority: 15752
}
}
}
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 3781a74e75..f80e2c9ab8 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 61c7cc7106..2aaf6809df 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -5674,8 +5674,6 @@ cont {
lines {
width: 6.75
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5705,8 +5703,6 @@ cont {
lines {
width: 8.2
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5736,8 +5732,6 @@ cont {
lines {
width: 12.05
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5766,8 +5760,6 @@ cont {
lines {
width: 18.2
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5796,8 +5788,6 @@ cont {
lines {
width: 28.7
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5826,8 +5816,6 @@ cont {
lines {
width: 39.0
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5967,16 +5955,12 @@ cont {
lines {
width: 10.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6000,8 +5984,6 @@ cont {
lines {
width: 6.75
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6014,16 +5996,12 @@ cont {
lines {
width: 10.5
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.3
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6047,8 +6025,6 @@ cont {
lines {
width: 8.2
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6061,16 +6037,12 @@ cont {
lines {
width: 13.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 13.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6094,8 +6066,6 @@ cont {
lines {
width: 12.05
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6107,16 +6077,12 @@ cont {
lines {
width: 19.7
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 20.5
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6140,8 +6106,6 @@ cont {
lines {
width: 18.2
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6153,16 +6117,12 @@ cont {
lines {
width: 33.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 35.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6186,8 +6146,6 @@ cont {
lines {
width: 28.7
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6199,16 +6157,12 @@ cont {
lines {
width: 54.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 56.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6232,8 +6186,6 @@ cont {
lines {
width: 39.0
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6245,16 +6197,12 @@ cont {
lines {
width: 74.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 76.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6732,8 +6680,6 @@ cont {
lines {
width: 4.27
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6763,8 +6709,6 @@ cont {
lines {
width: 6.6
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6794,8 +6738,6 @@ cont {
lines {
width: 9.55
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6824,8 +6766,6 @@ cont {
lines {
width: 15.0
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6854,8 +6794,6 @@ cont {
lines {
width: 22.3
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6884,8 +6822,6 @@ cont {
lines {
width: 28.5
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6973,8 +6909,6 @@ cont {
lines {
width: 4.27
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6987,16 +6921,12 @@ cont {
lines {
width: 6.74
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.54
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7020,8 +6950,6 @@ cont {
lines {
width: 6.6
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7034,16 +6962,12 @@ cont {
lines {
width: 11.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7067,8 +6991,6 @@ cont {
lines {
width: 9.55
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7080,16 +7002,12 @@ cont {
lines {
width: 15.9
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 16.7
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7113,8 +7031,6 @@ cont {
lines {
width: 15.0
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7126,16 +7042,12 @@ cont {
lines {
width: 27.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 29.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7159,8 +7071,6 @@ cont {
lines {
width: 22.3
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7172,16 +7082,12 @@ cont {
lines {
width: 42.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 44.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7205,8 +7111,6 @@ cont {
lines {
width: 28.5
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7218,16 +7122,12 @@ cont {
lines {
width: 54.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 56.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7908,8 +7808,6 @@ cont {
lines {
width: 4.2
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -7939,8 +7837,6 @@ cont {
lines {
width: 5.8
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -7970,8 +7866,6 @@ cont {
lines {
width: 8.8
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8000,8 +7894,6 @@ cont {
lines {
width: 15.8
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8030,8 +7922,6 @@ cont {
lines {
width: 25.2
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8060,8 +7950,6 @@ cont {
lines {
width: 32.6
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8208,8 +8096,6 @@ cont {
lines {
width: 4.2
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8222,16 +8108,12 @@ cont {
lines {
width: 7.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8255,8 +8137,6 @@ cont {
lines {
width: 5.8
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8269,16 +8149,12 @@ cont {
lines {
width: 9.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8302,8 +8178,6 @@ cont {
lines {
width: 8.8
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8315,16 +8189,12 @@ cont {
lines {
width: 14.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8348,8 +8218,6 @@ cont {
lines {
width: 15.8
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8361,16 +8229,12 @@ cont {
lines {
width: 29.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 31.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8394,8 +8258,6 @@ cont {
lines {
width: 25.2
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8407,16 +8269,12 @@ cont {
lines {
width: 48.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 50.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8440,8 +8298,6 @@ cont {
lines {
width: 32.6
color: 16118756
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8453,16 +8309,12 @@ cont {
lines {
width: 62.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 64.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8845,8 +8697,6 @@ cont {
lines {
width: 4.2
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -8876,8 +8726,6 @@ cont {
lines {
width: 5.8
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -8907,8 +8755,6 @@ cont {
lines {
width: 8.8
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -8937,8 +8783,6 @@ cont {
lines {
width: 15.8
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -8967,8 +8811,6 @@ cont {
lines {
width: 25.2
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -8997,8 +8839,6 @@ cont {
lines {
width: 32.6
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9074,8 +8914,6 @@ cont {
lines {
width: 4.2
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9088,16 +8926,12 @@ cont {
lines {
width: 7.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9121,8 +8955,6 @@ cont {
lines {
width: 5.8
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9135,16 +8967,12 @@ cont {
lines {
width: 9.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9168,8 +8996,6 @@ cont {
lines {
width: 8.8
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9181,16 +9007,12 @@ cont {
lines {
width: 14.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 15.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9214,8 +9036,6 @@ cont {
lines {
width: 15.8
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9227,16 +9047,12 @@ cont {
lines {
width: 29.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 31.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9260,8 +9076,6 @@ cont {
lines {
width: 25.2
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9273,16 +9087,12 @@ cont {
lines {
width: 48.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 50.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9306,8 +9116,6 @@ cont {
lines {
width: 32.6
color: 16118756
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9319,16 +9127,12 @@ cont {
lines {
width: 62.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 64.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9766,8 +9570,6 @@ cont {
lines {
width: 5.7
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -9797,8 +9599,6 @@ cont {
lines {
width: 8.1
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -9827,8 +9627,6 @@ cont {
lines {
width: 14.5
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -9857,8 +9655,6 @@ cont {
lines {
width: 18.8
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -9887,8 +9683,6 @@ cont {
lines {
width: 24.2
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10000,8 +9794,6 @@ cont {
lines {
width: 5.7
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10031,8 +9823,6 @@ cont {
lines {
width: 8.1
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10061,8 +9851,6 @@ cont {
lines {
width: 14.5
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10091,8 +9879,6 @@ cont {
lines {
width: 18.8
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10121,8 +9907,6 @@ cont {
lines {
width: 24.2
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10217,16 +10001,12 @@ cont {
lines {
width: 4.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 5.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10250,8 +10030,6 @@ cont {
lines {
width: 5.7
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10264,16 +10042,12 @@ cont {
lines {
width: 9.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.4
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10297,8 +10071,6 @@ cont {
lines {
width: 8.1
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10310,16 +10082,12 @@ cont {
lines {
width: 14.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 14.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10343,8 +10111,6 @@ cont {
lines {
width: 14.5
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10356,16 +10122,12 @@ cont {
lines {
width: 27.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 29.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10389,8 +10151,6 @@ cont {
lines {
width: 18.8
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10402,16 +10162,12 @@ cont {
lines {
width: 36.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 38.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10435,8 +10191,6 @@ cont {
lines {
width: 24.2
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10448,16 +10202,12 @@ cont {
lines {
width: 46.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 48.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10564,8 +10314,6 @@ cont {
lines {
width: 5.7
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -11169,8 +10917,6 @@ cont {
lines {
width: 3.9
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11200,8 +10946,6 @@ cont {
lines {
width: 5.6
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11231,8 +10975,6 @@ cont {
lines {
width: 8.1
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11261,8 +11003,6 @@ cont {
lines {
width: 12.3
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11291,8 +11031,6 @@ cont {
lines {
width: 18.2
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11321,8 +11059,6 @@ cont {
lines {
width: 26.6
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11437,8 +11173,6 @@ cont {
lines {
width: 3.9
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11451,16 +11185,12 @@ cont {
lines {
width: 6.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11484,8 +11214,6 @@ cont {
lines {
width: 5.6
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11498,16 +11226,12 @@ cont {
lines {
width: 9.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 9.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11531,8 +11255,6 @@ cont {
lines {
width: 8.1
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11544,16 +11266,12 @@ cont {
lines {
width: 13.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 13.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11577,8 +11295,6 @@ cont {
lines {
width: 12.3
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11590,16 +11306,12 @@ cont {
lines {
width: 22.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 24.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11623,8 +11335,6 @@ cont {
lines {
width: 18.2
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11636,16 +11346,12 @@ cont {
lines {
width: 34.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 36.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11669,8 +11375,6 @@ cont {
lines {
width: 26.6
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11682,16 +11386,12 @@ cont {
lines {
width: 50.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 52.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11801,8 +11501,6 @@ cont {
lines {
width: 3.9
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11832,8 +11530,6 @@ cont {
lines {
width: 5.6
color: 16118756
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11994,8 +11690,6 @@ cont {
lines {
width: 3.9
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12011,8 +11705,6 @@ cont {
lines {
width: 5.6
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12028,8 +11720,6 @@ cont {
lines {
width: 8.1
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12052,8 +11742,6 @@ cont {
lines {
width: 12.3
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12076,8 +11764,6 @@ cont {
lines {
width: 18.2
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12100,8 +11786,6 @@ cont {
lines {
width: 26.6
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12127,8 +11811,6 @@ cont {
lines {
width: 3.9
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12141,16 +11823,12 @@ cont {
lines {
width: 6.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12160,8 +11838,6 @@ cont {
lines {
width: 5.6
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12174,16 +11850,12 @@ cont {
lines {
width: 9.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 9.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12193,8 +11865,6 @@ cont {
lines {
width: 8.1
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12206,16 +11876,12 @@ cont {
lines {
width: 13.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 13.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12233,8 +11899,6 @@ cont {
lines {
width: 12.3
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12246,16 +11910,12 @@ cont {
lines {
width: 22.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 24.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12273,8 +11933,6 @@ cont {
lines {
width: 18.2
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12286,16 +11944,12 @@ cont {
lines {
width: 34.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 36.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12313,8 +11967,6 @@ cont {
lines {
width: 26.6
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12326,16 +11978,12 @@ cont {
lines {
width: 50.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 52.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12356,8 +12004,6 @@ cont {
lines {
width: 3.9
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12373,8 +12019,6 @@ cont {
lines {
width: 5.6
color: 16118756
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -13365,8 +13009,6 @@ cont {
lines {
width: 5.9
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13396,8 +13038,6 @@ cont {
lines {
width: 8.6
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13426,8 +13066,6 @@ cont {
lines {
width: 11.5
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13456,8 +13094,6 @@ cont {
lines {
width: 16.8
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13486,8 +13122,6 @@ cont {
lines {
width: 23.2
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13582,16 +13216,12 @@ cont {
lines {
width: 6.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.4
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -13615,8 +13245,6 @@ cont {
lines {
width: 5.9
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13629,16 +13257,12 @@ cont {
lines {
width: 10.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -13662,8 +13286,6 @@ cont {
lines {
width: 8.6
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13675,16 +13297,12 @@ cont {
lines {
width: 15.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 15.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -13708,8 +13326,6 @@ cont {
lines {
width: 11.5
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13721,16 +13337,12 @@ cont {
lines {
width: 21.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 23.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -13754,8 +13366,6 @@ cont {
lines {
width: 16.8
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13767,16 +13377,12 @@ cont {
lines {
width: 32.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 34.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -13800,8 +13406,6 @@ cont {
lines {
width: 23.2
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13813,16 +13417,12 @@ cont {
lines {
width: 44.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 46.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -13929,8 +13529,6 @@ cont {
lines {
width: 5.9
color: 16118756
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -14091,8 +13689,6 @@ cont {
lines {
width: 5.9
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14108,8 +13704,6 @@ cont {
lines {
width: 8.6
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14124,8 +13718,6 @@ cont {
lines {
width: 11.5
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14140,8 +13732,6 @@ cont {
lines {
width: 16.8
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14164,8 +13754,6 @@ cont {
lines {
width: 23.2
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14191,8 +13779,6 @@ cont {
lines {
width: 5.9
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14205,16 +13791,12 @@ cont {
lines {
width: 10.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14224,8 +13806,6 @@ cont {
lines {
width: 8.6
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14237,16 +13817,12 @@ cont {
lines {
width: 15.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 15.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14256,8 +13832,6 @@ cont {
lines {
width: 11.5
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14269,16 +13843,12 @@ cont {
lines {
width: 21.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 23.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14288,8 +13858,6 @@ cont {
lines {
width: 16.8
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14301,16 +13869,12 @@ cont {
lines {
width: 32.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 34.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14328,8 +13892,6 @@ cont {
lines {
width: 23.2
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14341,16 +13903,12 @@ cont {
lines {
width: 44.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 46.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14371,8 +13929,6 @@ cont {
lines {
width: 5.9
color: 16118756
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14681,8 +14237,6 @@ cont {
lines {
width: 6.75
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -14712,8 +14266,6 @@ cont {
lines {
width: 8.2
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -14743,8 +14295,6 @@ cont {
lines {
width: 12.05
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -14773,8 +14323,6 @@ cont {
lines {
width: 18.2
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -14803,8 +14351,6 @@ cont {
lines {
width: 28.7
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -14833,8 +14379,6 @@ cont {
lines {
width: 39.0
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -14974,16 +14518,12 @@ cont {
lines {
width: 10.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15007,8 +14547,6 @@ cont {
lines {
width: 6.75
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15021,16 +14559,12 @@ cont {
lines {
width: 10.5
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.3
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15054,8 +14588,6 @@ cont {
lines {
width: 8.2
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15068,16 +14600,12 @@ cont {
lines {
width: 13.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 13.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15101,8 +14629,6 @@ cont {
lines {
width: 12.05
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15114,16 +14640,12 @@ cont {
lines {
width: 19.7
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 20.5
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15147,8 +14669,6 @@ cont {
lines {
width: 18.2
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15160,16 +14680,12 @@ cont {
lines {
width: 33.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 35.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15193,8 +14709,6 @@ cont {
lines {
width: 28.7
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15206,16 +14720,12 @@ cont {
lines {
width: 54.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 56.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15239,8 +14749,6 @@ cont {
lines {
width: 39.0
color: 16118756
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15252,16 +14760,12 @@ cont {
lines {
width: 74.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 76.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15686,8 +15190,6 @@ cont {
lines {
width: 4.27
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -15717,8 +15219,6 @@ cont {
lines {
width: 6.6
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -15748,8 +15248,6 @@ cont {
lines {
width: 9.55
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -15778,8 +15276,6 @@ cont {
lines {
width: 15.0
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -15808,8 +15304,6 @@ cont {
lines {
width: 22.3
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -15838,8 +15332,6 @@ cont {
lines {
width: 28.5
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -15927,8 +15419,6 @@ cont {
lines {
width: 4.27
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -15941,16 +15431,12 @@ cont {
lines {
width: 6.74
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.54
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15974,8 +15460,6 @@ cont {
lines {
width: 6.6
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -15988,16 +15472,12 @@ cont {
lines {
width: 11.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16021,8 +15501,6 @@ cont {
lines {
width: 9.55
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16034,16 +15512,12 @@ cont {
lines {
width: 15.9
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 16.7
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16067,8 +15541,6 @@ cont {
lines {
width: 15.0
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16080,16 +15552,12 @@ cont {
lines {
width: 27.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 29.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16113,8 +15581,6 @@ cont {
lines {
width: 22.3
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16126,16 +15592,12 @@ cont {
lines {
width: 42.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 44.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16159,8 +15621,6 @@ cont {
lines {
width: 28.5
color: 16118756
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16172,16 +15632,12 @@ cont {
lines {
width: 54.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 56.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16736,16 +16192,12 @@ cont {
lines {
width: 3.9
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 4.7
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16769,16 +16221,12 @@ cont {
lines {
width: 7.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16801,16 +16249,12 @@ cont {
lines {
width: 14.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 14.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16833,16 +16277,12 @@ cont {
lines {
width: 21.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 23.2
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16865,16 +16305,12 @@ cont {
lines {
width: 30.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 32.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16897,16 +16333,12 @@ cont {
lines {
width: 34.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 36.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -29047,8 +28479,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -29066,8 +28496,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -29085,8 +28513,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -29104,8 +28530,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -29574,8 +28998,6 @@ cont {
lines {
width: 4.3
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
@@ -29591,8 +29013,6 @@ cont {
lines {
width: 5.6
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
@@ -29607,16 +29027,12 @@ cont {
lines {
width: 5.4
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 5.8
color: 8421504
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -29640,16 +29056,12 @@ cont {
lines {
width: 7.6
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 8.0
color: 8421504
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -29673,16 +29085,12 @@ cont {
lines {
width: 10.6
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 11.0
color: 8421504
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -29706,16 +29114,12 @@ cont {
lines {
width: 14.0
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 14.4
color: 8421504
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -30245,8 +29649,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -30264,8 +29666,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -30283,8 +29683,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -30302,8 +29700,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -30520,8 +29916,6 @@ cont {
lines {
width: 4.3
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
@@ -30537,8 +29931,6 @@ cont {
lines {
width: 5.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
@@ -30553,16 +29945,12 @@ cont {
lines {
width: 5.4
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 5.8
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -30586,16 +29974,12 @@ cont {
lines {
width: 7.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 8.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -30619,16 +30003,12 @@ cont {
lines {
width: 10.6
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.0
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -30652,16 +30032,12 @@ cont {
lines {
width: 14.0
color: 15066325
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 14.4
color: 8421504
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -37382,8 +36758,6 @@ cont {
lines {
width: 4.3
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
@@ -37399,8 +36773,6 @@ cont {
lines {
width: 5.6
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
@@ -37415,16 +36787,12 @@ cont {
lines {
width: 5.4
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 5.8
color: 8421504
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -37448,16 +36816,12 @@ cont {
lines {
width: 7.6
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 8.0
color: 8421504
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -37481,16 +36845,12 @@ cont {
lines {
width: 10.6
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 11.0
color: 8421504
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -37514,16 +36874,12 @@ cont {
lines {
width: 14.0
color: 15066325
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 14.4
color: 8421504
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 35f500ebea..d2daa68a74 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 8e01c064de..8bef24fba5 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -5678,8 +5678,6 @@ cont {
lines {
width: 6.75
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5711,8 +5709,6 @@ cont {
lines {
width: 8.2
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5744,8 +5740,6 @@ cont {
lines {
width: 12.05
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5776,8 +5770,6 @@ cont {
lines {
width: 18.2
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5808,8 +5800,6 @@ cont {
lines {
width: 28.7
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5840,8 +5830,6 @@ cont {
lines {
width: 39.0
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -5989,16 +5977,12 @@ cont {
lines {
width: 10.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6024,8 +6008,6 @@ cont {
lines {
width: 6.75
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6038,16 +6020,12 @@ cont {
lines {
width: 10.5
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.3
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6073,8 +6051,6 @@ cont {
lines {
width: 8.2
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6087,16 +6063,12 @@ cont {
lines {
width: 13.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 13.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6122,8 +6094,6 @@ cont {
lines {
width: 12.05
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6135,16 +6105,12 @@ cont {
lines {
width: 19.7
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 20.5
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6170,8 +6136,6 @@ cont {
lines {
width: 18.2
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6183,16 +6147,12 @@ cont {
lines {
width: 33.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 35.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6218,8 +6178,6 @@ cont {
lines {
width: 28.7
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6231,16 +6189,12 @@ cont {
lines {
width: 54.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 56.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6266,8 +6220,6 @@ cont {
lines {
width: 39.0
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -6279,16 +6231,12 @@ cont {
lines {
width: 74.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 76.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -6782,8 +6730,6 @@ cont {
lines {
width: 4.27
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6815,8 +6761,6 @@ cont {
lines {
width: 6.6
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6848,8 +6792,6 @@ cont {
lines {
width: 9.55
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6880,8 +6822,6 @@ cont {
lines {
width: 15.0
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6912,8 +6852,6 @@ cont {
lines {
width: 22.3
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -6944,8 +6882,6 @@ cont {
lines {
width: 28.5
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7037,8 +6973,6 @@ cont {
lines {
width: 4.27
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7051,16 +6985,12 @@ cont {
lines {
width: 6.74
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.54
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7086,8 +7016,6 @@ cont {
lines {
width: 6.6
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7100,16 +7028,12 @@ cont {
lines {
width: 11.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7135,8 +7059,6 @@ cont {
lines {
width: 9.55
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7148,16 +7070,12 @@ cont {
lines {
width: 15.9
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 16.7
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7183,8 +7101,6 @@ cont {
lines {
width: 15.0
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7196,16 +7112,12 @@ cont {
lines {
width: 27.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 29.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7231,8 +7143,6 @@ cont {
lines {
width: 22.3
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7244,16 +7154,12 @@ cont {
lines {
width: 42.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 44.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7279,8 +7185,6 @@ cont {
lines {
width: 28.5
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -7292,16 +7196,12 @@ cont {
lines {
width: 54.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 56.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -7999,8 +7899,6 @@ cont {
lines {
width: 4.2
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8032,8 +7930,6 @@ cont {
lines {
width: 5.8
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8065,8 +7961,6 @@ cont {
lines {
width: 8.8
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8097,8 +7991,6 @@ cont {
lines {
width: 15.8
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8129,8 +8021,6 @@ cont {
lines {
width: 25.2
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8161,8 +8051,6 @@ cont {
lines {
width: 32.6
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8319,8 +8207,6 @@ cont {
lines {
width: 4.2
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8333,16 +8219,12 @@ cont {
lines {
width: 7.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8368,8 +8250,6 @@ cont {
lines {
width: 5.8
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8382,16 +8262,12 @@ cont {
lines {
width: 9.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8417,8 +8293,6 @@ cont {
lines {
width: 8.8
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8430,16 +8304,12 @@ cont {
lines {
width: 14.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 15.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8465,8 +8335,6 @@ cont {
lines {
width: 15.8
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8478,16 +8346,12 @@ cont {
lines {
width: 29.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 31.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8513,8 +8377,6 @@ cont {
lines {
width: 25.2
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8526,16 +8388,12 @@ cont {
lines {
width: 48.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 50.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8561,8 +8419,6 @@ cont {
lines {
width: 32.6
color: 855309
- dashdot {
- }
priority: 1525
cap: BUTTCAP
}
@@ -8574,16 +8430,12 @@ cont {
lines {
width: 62.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 64.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -8982,8 +8834,6 @@ cont {
lines {
width: 4.2
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9015,8 +8865,6 @@ cont {
lines {
width: 5.8
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9048,8 +8896,6 @@ cont {
lines {
width: 8.8
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9080,8 +8926,6 @@ cont {
lines {
width: 15.8
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9112,8 +8956,6 @@ cont {
lines {
width: 25.2
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9144,8 +8986,6 @@ cont {
lines {
width: 32.6
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9223,8 +9063,6 @@ cont {
lines {
width: 4.2
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9237,16 +9075,12 @@ cont {
lines {
width: 7.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9272,8 +9106,6 @@ cont {
lines {
width: 5.8
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9286,16 +9118,12 @@ cont {
lines {
width: 9.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9321,8 +9149,6 @@ cont {
lines {
width: 8.8
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9334,16 +9160,12 @@ cont {
lines {
width: 14.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 15.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9369,8 +9191,6 @@ cont {
lines {
width: 15.8
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9382,16 +9202,12 @@ cont {
lines {
width: 29.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 31.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9417,8 +9233,6 @@ cont {
lines {
width: 25.2
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9430,16 +9244,12 @@ cont {
lines {
width: 48.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 50.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9465,8 +9275,6 @@ cont {
lines {
width: 32.6
color: 855309
- dashdot {
- }
priority: 1512
cap: BUTTCAP
}
@@ -9478,16 +9286,12 @@ cont {
lines {
width: 62.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 64.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -9939,8 +9743,6 @@ cont {
lines {
width: 5.7
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -9972,8 +9774,6 @@ cont {
lines {
width: 8.1
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10004,8 +9804,6 @@ cont {
lines {
width: 14.5
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10036,8 +9834,6 @@ cont {
lines {
width: 18.8
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10068,8 +9864,6 @@ cont {
lines {
width: 24.2
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10189,8 +9983,6 @@ cont {
lines {
width: 5.7
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10222,8 +10014,6 @@ cont {
lines {
width: 8.1
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10254,8 +10044,6 @@ cont {
lines {
width: 14.5
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10286,8 +10074,6 @@ cont {
lines {
width: 18.8
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10318,8 +10104,6 @@ cont {
lines {
width: 24.2
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10420,16 +10204,12 @@ cont {
lines {
width: 4.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 5.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10455,8 +10235,6 @@ cont {
lines {
width: 5.7
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10469,16 +10247,12 @@ cont {
lines {
width: 9.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.4
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10504,8 +10278,6 @@ cont {
lines {
width: 8.1
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10517,16 +10289,12 @@ cont {
lines {
width: 14.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 14.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10552,8 +10320,6 @@ cont {
lines {
width: 14.5
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10565,16 +10331,12 @@ cont {
lines {
width: 27.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 29.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10600,8 +10362,6 @@ cont {
lines {
width: 18.8
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10613,16 +10373,12 @@ cont {
lines {
width: 36.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 38.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10648,8 +10404,6 @@ cont {
lines {
width: 24.2
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -10661,16 +10415,12 @@ cont {
lines {
width: 46.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 48.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -10785,8 +10535,6 @@ cont {
lines {
width: 5.7
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -11400,8 +11148,6 @@ cont {
lines {
width: 3.9
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11433,8 +11179,6 @@ cont {
lines {
width: 5.6
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11466,8 +11210,6 @@ cont {
lines {
width: 8.1
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11498,8 +11240,6 @@ cont {
lines {
width: 12.3
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11530,8 +11270,6 @@ cont {
lines {
width: 18.2
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11562,8 +11300,6 @@ cont {
lines {
width: 26.6
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11684,8 +11420,6 @@ cont {
lines {
width: 3.9
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11698,16 +11432,12 @@ cont {
lines {
width: 6.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11733,8 +11463,6 @@ cont {
lines {
width: 5.6
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11747,16 +11475,12 @@ cont {
lines {
width: 9.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 9.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11782,8 +11506,6 @@ cont {
lines {
width: 8.1
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11795,16 +11517,12 @@ cont {
lines {
width: 13.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 13.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11830,8 +11548,6 @@ cont {
lines {
width: 12.3
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11843,16 +11559,12 @@ cont {
lines {
width: 22.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 24.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11878,8 +11590,6 @@ cont {
lines {
width: 18.2
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11891,16 +11601,12 @@ cont {
lines {
width: 34.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 36.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -11926,8 +11632,6 @@ cont {
lines {
width: 26.6
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -11939,16 +11643,12 @@ cont {
lines {
width: 50.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 52.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12064,8 +11764,6 @@ cont {
lines {
width: 3.9
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -12097,8 +11795,6 @@ cont {
lines {
width: 5.6
color: 855309
- dashdot {
- }
priority: 1499
cap: BUTTCAP
}
@@ -12265,8 +11961,6 @@ cont {
lines {
width: 3.9
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12282,8 +11976,6 @@ cont {
lines {
width: 5.6
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12299,8 +11991,6 @@ cont {
lines {
width: 8.1
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12323,8 +12013,6 @@ cont {
lines {
width: 12.3
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12347,8 +12035,6 @@ cont {
lines {
width: 18.2
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12371,8 +12057,6 @@ cont {
lines {
width: 26.6
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12398,8 +12082,6 @@ cont {
lines {
width: 3.9
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12412,16 +12094,12 @@ cont {
lines {
width: 6.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12431,8 +12109,6 @@ cont {
lines {
width: 5.6
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12445,16 +12121,12 @@ cont {
lines {
width: 9.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 9.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12464,8 +12136,6 @@ cont {
lines {
width: 8.1
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12477,16 +12147,12 @@ cont {
lines {
width: 13.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 13.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12504,8 +12170,6 @@ cont {
lines {
width: 12.3
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12517,16 +12181,12 @@ cont {
lines {
width: 22.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 24.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12544,8 +12204,6 @@ cont {
lines {
width: 18.2
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12557,16 +12215,12 @@ cont {
lines {
width: 34.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 36.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12584,8 +12238,6 @@ cont {
lines {
width: 26.6
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12597,16 +12249,12 @@ cont {
lines {
width: 50.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 52.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -12627,8 +12275,6 @@ cont {
lines {
width: 3.9
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -12644,8 +12290,6 @@ cont {
lines {
width: 5.6
color: 855309
- dashdot {
- }
priority: 1485
cap: BUTTCAP
}
@@ -13638,8 +13282,6 @@ cont {
lines {
width: 5.9
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13671,8 +13313,6 @@ cont {
lines {
width: 8.6
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13703,8 +13343,6 @@ cont {
lines {
width: 11.5
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13735,8 +13373,6 @@ cont {
lines {
width: 16.8
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13767,8 +13403,6 @@ cont {
lines {
width: 23.2
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13869,16 +13503,12 @@ cont {
lines {
width: 6.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.4
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -13904,8 +13534,6 @@ cont {
lines {
width: 5.9
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13918,16 +13546,12 @@ cont {
lines {
width: 10.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -13953,8 +13577,6 @@ cont {
lines {
width: 8.6
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -13966,16 +13588,12 @@ cont {
lines {
width: 15.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 15.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14001,8 +13619,6 @@ cont {
lines {
width: 11.5
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -14014,16 +13630,12 @@ cont {
lines {
width: 21.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 23.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14049,8 +13661,6 @@ cont {
lines {
width: 16.8
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -14062,16 +13672,12 @@ cont {
lines {
width: 32.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 34.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14097,8 +13703,6 @@ cont {
lines {
width: 23.2
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -14110,16 +13714,12 @@ cont {
lines {
width: 44.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 46.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14234,8 +13834,6 @@ cont {
lines {
width: 5.9
color: 855309
- dashdot {
- }
priority: 1472
cap: BUTTCAP
}
@@ -14402,8 +14000,6 @@ cont {
lines {
width: 5.9
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14419,8 +14015,6 @@ cont {
lines {
width: 8.6
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14435,8 +14029,6 @@ cont {
lines {
width: 11.5
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14451,8 +14043,6 @@ cont {
lines {
width: 16.8
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14475,8 +14065,6 @@ cont {
lines {
width: 23.2
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14502,8 +14090,6 @@ cont {
lines {
width: 5.9
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14516,16 +14102,12 @@ cont {
lines {
width: 10.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14535,8 +14117,6 @@ cont {
lines {
width: 8.6
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14548,16 +14128,12 @@ cont {
lines {
width: 15.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 15.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14567,8 +14143,6 @@ cont {
lines {
width: 11.5
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14580,16 +14154,12 @@ cont {
lines {
width: 21.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 23.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14599,8 +14169,6 @@ cont {
lines {
width: 16.8
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14612,16 +14180,12 @@ cont {
lines {
width: 32.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 34.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14639,8 +14203,6 @@ cont {
lines {
width: 23.2
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14652,16 +14214,12 @@ cont {
lines {
width: 44.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 46.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -14682,8 +14240,6 @@ cont {
lines {
width: 5.9
color: 855309
- dashdot {
- }
priority: 1459
cap: BUTTCAP
}
@@ -14996,8 +14552,6 @@ cont {
lines {
width: 6.75
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15029,8 +14583,6 @@ cont {
lines {
width: 8.2
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15062,8 +14614,6 @@ cont {
lines {
width: 12.05
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15094,8 +14644,6 @@ cont {
lines {
width: 18.2
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15126,8 +14674,6 @@ cont {
lines {
width: 28.7
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15158,8 +14704,6 @@ cont {
lines {
width: 39.0
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15307,16 +14851,12 @@ cont {
lines {
width: 10.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 10.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15342,8 +14882,6 @@ cont {
lines {
width: 6.75
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15356,16 +14894,12 @@ cont {
lines {
width: 10.5
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.3
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15391,8 +14925,6 @@ cont {
lines {
width: 8.2
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15405,16 +14937,12 @@ cont {
lines {
width: 13.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 13.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15440,8 +14968,6 @@ cont {
lines {
width: 12.05
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15453,16 +14979,12 @@ cont {
lines {
width: 19.7
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 20.5
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15488,8 +15010,6 @@ cont {
lines {
width: 18.2
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15501,16 +15021,12 @@ cont {
lines {
width: 33.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 35.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15536,8 +15052,6 @@ cont {
lines {
width: 28.7
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15549,16 +15063,12 @@ cont {
lines {
width: 54.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 56.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -15584,8 +15094,6 @@ cont {
lines {
width: 39.0
color: 855309
- dashdot {
- }
priority: 1551
cap: BUTTCAP
}
@@ -15597,16 +15105,12 @@ cont {
lines {
width: 74.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 76.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16047,8 +15551,6 @@ cont {
lines {
width: 4.27
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16080,8 +15582,6 @@ cont {
lines {
width: 6.6
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16113,8 +15613,6 @@ cont {
lines {
width: 9.55
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16145,8 +15643,6 @@ cont {
lines {
width: 15.0
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16177,8 +15673,6 @@ cont {
lines {
width: 22.3
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16209,8 +15703,6 @@ cont {
lines {
width: 28.5
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16302,8 +15794,6 @@ cont {
lines {
width: 4.27
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16316,16 +15806,12 @@ cont {
lines {
width: 6.74
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.54
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16351,8 +15837,6 @@ cont {
lines {
width: 6.6
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16365,16 +15849,12 @@ cont {
lines {
width: 11.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16400,8 +15880,6 @@ cont {
lines {
width: 9.55
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16413,16 +15891,12 @@ cont {
lines {
width: 15.9
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 16.7
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16448,8 +15922,6 @@ cont {
lines {
width: 15.0
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16461,16 +15933,12 @@ cont {
lines {
width: 27.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 29.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16496,8 +15964,6 @@ cont {
lines {
width: 22.3
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16509,16 +15975,12 @@ cont {
lines {
width: 42.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 44.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -16544,8 +16006,6 @@ cont {
lines {
width: 28.5
color: 855309
- dashdot {
- }
priority: 1538
cap: BUTTCAP
}
@@ -16557,16 +16017,12 @@ cont {
lines {
width: 54.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 56.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -17130,16 +16586,12 @@ cont {
lines {
width: 3.9
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 4.7
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -17163,16 +16615,12 @@ cont {
lines {
width: 7.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 7.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -17195,16 +16643,12 @@ cont {
lines {
width: 14.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 14.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -17227,16 +16671,12 @@ cont {
lines {
width: 21.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 23.2
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -17259,16 +16699,12 @@ cont {
lines {
width: 30.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 32.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -17291,16 +16727,12 @@ cont {
lines {
width: 34.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 36.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -29437,8 +28869,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -29456,8 +28886,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -29475,8 +28903,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -29494,8 +28920,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -29964,8 +29388,6 @@ cont {
lines {
width: 4.3
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
@@ -29981,8 +29403,6 @@ cont {
lines {
width: 5.6
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
@@ -29997,16 +29417,12 @@ cont {
lines {
width: 5.4
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 5.8
color: 855309
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -30030,16 +29446,12 @@ cont {
lines {
width: 7.6
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 8.0
color: 855309
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -30063,16 +29475,12 @@ cont {
lines {
width: 10.6
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 11.0
color: 855309
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -30096,16 +29504,12 @@ cont {
lines {
width: 14.0
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 14.4
color: 855309
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -30635,8 +30039,6 @@ cont {
}
lines {
width: 5.6
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -30654,8 +30056,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -30673,8 +30073,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -30692,8 +30090,6 @@ cont {
}
lines {
width: 6.0
- dashdot {
- }
priority: 999
cap: BUTTCAP
}
@@ -30910,8 +30306,6 @@ cont {
lines {
width: 4.3
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
@@ -30927,8 +30321,6 @@ cont {
lines {
width: 5.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
@@ -30943,16 +30335,12 @@ cont {
lines {
width: 5.4
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 5.8
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -30976,16 +30364,12 @@ cont {
lines {
width: 7.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 8.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -31009,16 +30393,12 @@ cont {
lines {
width: 10.6
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 11.0
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -31042,16 +30422,12 @@ cont {
lines {
width: 14.0
color: 1184274
- dashdot {
- }
priority: 1341
cap: BUTTCAP
}
lines {
width: 14.4
color: 855309
- dashdot {
- }
priority: 1327
cap: BUTTCAP
}
@@ -37772,8 +37148,6 @@ cont {
lines {
width: 4.3
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
@@ -37789,8 +37163,6 @@ cont {
lines {
width: 5.6
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
@@ -37805,16 +37177,12 @@ cont {
lines {
width: 5.4
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 5.8
color: 855309
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -37838,16 +37206,12 @@ cont {
lines {
width: 7.6
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 8.0
color: 855309
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -37871,16 +37235,12 @@ cont {
lines {
width: 10.6
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 11.0
color: 855309
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
@@ -37904,16 +37264,12 @@ cont {
lines {
width: 14.0
color: 1184274
- dashdot {
- }
priority: 1104
cap: BUTTCAP
}
lines {
width: 14.4
color: 855309
- dashdot {
- }
priority: 1091
cap: BUTTCAP
}
diff --git a/data/local_ads_symbols.txt b/data/local_ads_symbols.txt
index 7003cb31f6..66639fa266 100644
--- a/data/local_ads_symbols.txt
+++ b/data/local_ads_symbols.txt
@@ -62,6 +62,13 @@
06038_car_shop-l
06039_motorcycle_shop-l
06040_travel_agency_shop-l
+06041_stationery_shop-l
+06042_newsagent-l
+06043_ice_cream-l
+06044_funeral_directors-l
+06045_media-l
+06046_music-l
+06047_erotic-l
07001_atm-l
07002_bank-l
07003_banknote-l
@@ -91,6 +98,7 @@
09017_climbing-l
09018_gym-l
09019_equestrian-l
+09020_theme_park-l
10001_kindergarten-l
10002_school-l
10003_college-l
@@ -115,3 +123,4 @@
10032_cemetery-l
10033_beach-l
10034_dog_park-l
+10035_home-l
diff --git a/data/resources-6plus_clear/symbols-ad.png b/data/resources-6plus_clear/symbols-ad.png
index 17c2b35e7a..a3cafb864e 100644
Binary files a/data/resources-6plus_clear/symbols-ad.png and b/data/resources-6plus_clear/symbols-ad.png differ
diff --git a/data/resources-6plus_clear/symbols-ad.sdf b/data/resources-6plus_clear/symbols-ad.sdf
index 6ca3153b83..f4eb873b88 100644
--- a/data/resources-6plus_clear/symbols-ad.sdf
+++ b/data/resources-6plus_clear/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 954f0c4e86..e2302c860e 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 0506917373..4c8777c98a 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -177,469 +177,511 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_dark/symbols-ad.png b/data/resources-6plus_dark/symbols-ad.png
index eac73e3cad..4c319281c3 100644
Binary files a/data/resources-6plus_dark/symbols-ad.png and b/data/resources-6plus_dark/symbols-ad.png differ
diff --git a/data/resources-6plus_dark/symbols-ad.sdf b/data/resources-6plus_dark/symbols-ad.sdf
index 6ca3153b83..f4eb873b88 100644
--- a/data/resources-6plus_dark/symbols-ad.sdf
+++ b/data/resources-6plus_dark/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 648e37614b..2d36a95937 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 e4c0ec4e8f..98bcaef024 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -178,469 +178,511 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_clear/symbols-ad.png b/data/resources-hdpi_clear/symbols-ad.png
index 7e31cd6cea..d78a42f277 100644
Binary files a/data/resources-hdpi_clear/symbols-ad.png and b/data/resources-hdpi_clear/symbols-ad.png differ
diff --git a/data/resources-hdpi_clear/symbols-ad.sdf b/data/resources-hdpi_clear/symbols-ad.sdf
index 65a3c153c8..1675a01620 100644
--- a/data/resources-hdpi_clear/symbols-ad.sdf
+++ b/data/resources-hdpi_clear/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index 45eb10540b..bd46680634 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 8702ba2295..fe8fa91529 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -33,7 +33,7 @@
-
+
@@ -181,465 +181,507 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols-ad.png b/data/resources-hdpi_dark/symbols-ad.png
index faa11e571c..4fbcd421c6 100644
Binary files a/data/resources-hdpi_dark/symbols-ad.png and b/data/resources-hdpi_dark/symbols-ad.png differ
diff --git a/data/resources-hdpi_dark/symbols-ad.sdf b/data/resources-hdpi_dark/symbols-ad.sdf
index 65a3c153c8..1675a01620 100644
--- a/data/resources-hdpi_dark/symbols-ad.sdf
+++ b/data/resources-hdpi_dark/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 4c1d51cff4..e1d6325de6 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 3b9e4cb6fb..a069a1fc24 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -33,7 +33,7 @@
-
+
@@ -182,465 +182,507 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_clear/symbols-ad.png b/data/resources-mdpi_clear/symbols-ad.png
index 906ea4ce32..9161010340 100644
Binary files a/data/resources-mdpi_clear/symbols-ad.png and b/data/resources-mdpi_clear/symbols-ad.png differ
diff --git a/data/resources-mdpi_clear/symbols-ad.sdf b/data/resources-mdpi_clear/symbols-ad.sdf
index bd68769ab9..b8e38ccb16 100644
--- a/data/resources-mdpi_clear/symbols-ad.sdf
+++ b/data/resources-mdpi_clear/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 421dbb813f..0b4eaaa989 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 3b4b18365b..4b5ce8459a 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -33,7 +33,7 @@
-
+
@@ -181,465 +181,507 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols-ad.png b/data/resources-mdpi_dark/symbols-ad.png
index 0a9fcc3416..e90e6a8949 100644
Binary files a/data/resources-mdpi_dark/symbols-ad.png and b/data/resources-mdpi_dark/symbols-ad.png differ
diff --git a/data/resources-mdpi_dark/symbols-ad.sdf b/data/resources-mdpi_dark/symbols-ad.sdf
index bd68769ab9..b8e38ccb16 100644
--- a/data/resources-mdpi_dark/symbols-ad.sdf
+++ b/data/resources-mdpi_dark/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 1d2815e896..cc07a04a58 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 0d9169362e..6e6776a41b 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -33,7 +33,7 @@
-
+
@@ -182,465 +182,507 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_clear/symbols-ad.png b/data/resources-xhdpi_clear/symbols-ad.png
index dc701f4fb7..58d595e878 100644
Binary files a/data/resources-xhdpi_clear/symbols-ad.png and b/data/resources-xhdpi_clear/symbols-ad.png differ
diff --git a/data/resources-xhdpi_clear/symbols-ad.sdf b/data/resources-xhdpi_clear/symbols-ad.sdf
index 8a66fb2147..28596817ba 100644
--- a/data/resources-xhdpi_clear/symbols-ad.sdf
+++ b/data/resources-xhdpi_clear/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index 3ae5ae96d4..afb3888ed6 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 9233b35dc9..9cdb5b1b8e 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -33,7 +33,7 @@
-
+
@@ -181,465 +181,507 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols-ad.png b/data/resources-xhdpi_dark/symbols-ad.png
index 01ad02af46..40b3a51d07 100644
Binary files a/data/resources-xhdpi_dark/symbols-ad.png and b/data/resources-xhdpi_dark/symbols-ad.png differ
diff --git a/data/resources-xhdpi_dark/symbols-ad.sdf b/data/resources-xhdpi_dark/symbols-ad.sdf
index 8a66fb2147..28596817ba 100644
--- a/data/resources-xhdpi_dark/symbols-ad.sdf
+++ b/data/resources-xhdpi_dark/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index d21c39e4b5..4c16155571 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 e713ffa71a..95388bf41e 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -33,7 +33,7 @@
-
+
@@ -182,465 +182,507 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_clear/symbols-ad.png b/data/resources-xxhdpi_clear/symbols-ad.png
index 17c2b35e7a..a3cafb864e 100644
Binary files a/data/resources-xxhdpi_clear/symbols-ad.png and b/data/resources-xxhdpi_clear/symbols-ad.png differ
diff --git a/data/resources-xxhdpi_clear/symbols-ad.sdf b/data/resources-xxhdpi_clear/symbols-ad.sdf
index 6ca3153b83..f4eb873b88 100644
--- a/data/resources-xxhdpi_clear/symbols-ad.sdf
+++ b/data/resources-xxhdpi_clear/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 73409f8057..64adc1f094 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 41cdbf6819..6652b14a89 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -1,6 +1,6 @@
-
+
@@ -33,7 +33,7 @@
-
+
@@ -181,465 +181,507 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols-ad.png b/data/resources-xxhdpi_dark/symbols-ad.png
index eac73e3cad..4c319281c3 100644
Binary files a/data/resources-xxhdpi_dark/symbols-ad.png and b/data/resources-xxhdpi_dark/symbols-ad.png differ
diff --git a/data/resources-xxhdpi_dark/symbols-ad.sdf b/data/resources-xxhdpi_dark/symbols-ad.sdf
index 6ca3153b83..f4eb873b88 100644
--- a/data/resources-xxhdpi_dark/symbols-ad.sdf
+++ b/data/resources-xxhdpi_dark/symbols-ad.sdf
@@ -65,58 +65,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index fc6a459ba4..39b69f8efc 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 13222dfc25..20f44ff06b 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
-
+
@@ -33,7 +33,7 @@
-
+
@@ -182,465 +182,507 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+