AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] Regenerate for outdoors-specific POIs

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2024-02-14 10:21:12 +02:00 • committed by Viktor Govako
parent 9de6995514
commit a9b1693beb
13 changed files with 1078 additions and 1944 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto.bin
View file

Binary file not shown.

872
data/drules_proto.txt
View file

File diff suppressed because it is too large Load diff

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

817
data/drules_proto_clear.txt
View file

File diff suppressed because it is too large Load diff

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

817
data/drules_proto_dark.txt
View file

File diff suppressed because it is too large Load diff

BIN
data/drules_proto_outdoors_clear.bin
View file

Binary file not shown.

209
data/drules_proto_outdoors_clear.txt
View file

@ -15864,7 +15864,7 @@ cont {
}
caption {
primary {
height: 10
height: 11
color: 6967599
stroke_color: 872415231
}
@ -15879,7 +15879,7 @@ cont {
}
caption {
primary {
height: 10
height: 11
color: 6967599
stroke_color: 872415231
}
@ -15894,7 +15894,7 @@ cont {
}
caption {
primary {
height: 10
height: 11
color: 6967599
stroke_color: 872415231
}
@ -15909,7 +15909,7 @@ cont {
}
caption {
primary {
height: 10
height: 11
color: 6967599
stroke_color: 872415231
}
@ -16339,7 +16339,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -16373,7 +16372,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -16417,6 +16416,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -16563,7 +16563,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -16589,7 +16588,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -16625,6 +16624,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -16751,7 +16751,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -16785,7 +16784,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -16829,6 +16828,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -16975,7 +16975,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17001,7 +17000,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17037,6 +17036,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -17159,7 +17159,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17185,7 +17184,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17221,6 +17220,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -17343,7 +17343,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17369,7 +17368,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17405,6 +17404,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -17527,7 +17527,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17553,7 +17552,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17589,6 +17588,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -17711,7 +17711,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17737,7 +17736,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17773,6 +17772,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -49118,7 +49118,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 4800
min_distance: 12
}
apply_if: "name"
}
@ -49137,15 +49136,14 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 12
}
caption {
primary {
height: 10
height: 11
color: 3832097
stroke_color: 872415231
stroke_color: 452984831
offset_y: 1
is_optional: true
}
@ -49168,7 +49166,7 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 8
}
@ -49176,7 +49174,7 @@ cont {
primary {
height: 11
color: 3832097
stroke_color: 872415231
stroke_color: 452984831
offset_y: 1
is_optional: true
}
@ -49205,7 +49203,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 3832097
stroke_color: 452984831
offset_y: 1
@ -49236,7 +49234,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 3832097
stroke_color: 452984831
offset_y: 1
@ -49451,7 +49449,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 4800
min_distance: 12
}
apply_if: "name"
}
@ -49470,15 +49467,14 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 12
}
caption {
primary {
height: 10
height: 11
color: 3832097
stroke_color: 872415231
stroke_color: 452984831
offset_y: 1
is_optional: true
}
@ -49501,7 +49497,7 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 8
}
@ -49509,7 +49505,7 @@ cont {
primary {
height: 11
color: 3832097
stroke_color: 872415231
stroke_color: 452984831
offset_y: 1
is_optional: true
}
@ -49538,7 +49534,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 3832097
stroke_color: 452984831
offset_y: 1
@ -49569,7 +49565,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 3832097
stroke_color: 452984831
offset_y: 1
@ -49784,7 +49780,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 4800
min_distance: 12
}
apply_if: "name"
}
@ -49803,15 +49798,14 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 12
}
caption {
primary {
height: 10
height: 11
color: 3832097
stroke_color: 872415231
stroke_color: 452984831
offset_y: 1
is_optional: true
}
@ -49834,7 +49828,7 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 8
}
@ -49842,7 +49836,7 @@ cont {
primary {
height: 11
color: 3832097
stroke_color: 872415231
stroke_color: 452984831
offset_y: 1
is_optional: true
}
@ -49871,7 +49865,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 3832097
stroke_color: 452984831
offset_y: 1
@ -49902,7 +49896,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 3832097
stroke_color: 452984831
offset_y: 1
@ -50117,7 +50111,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 4800
min_distance: 12
}
apply_if: "name"
}
@ -50136,15 +50129,14 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 12
}
caption {
primary {
height: 10
height: 11
color: 3832097
stroke_color: 872415231
stroke_color: 452984831
offset_y: 1
is_optional: true
}
@ -50167,7 +50159,7 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 8
}
@ -50175,7 +50167,7 @@ cont {
primary {
height: 11
color: 3832097
stroke_color: 872415231
stroke_color: 452984831
offset_y: 1
is_optional: true
}
@ -50204,7 +50196,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 3832097
stroke_color: 452984831
offset_y: 1
@ -50235,7 +50227,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 3832097
stroke_color: 452984831
offset_y: 1
@ -53579,7 +53571,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -53613,7 +53604,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -53657,6 +53648,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -53803,7 +53795,6 @@ cont {
symbol {
name: "outdoor_seating-m"
priority: 450
min_distance: 10
}
}
element {
@ -53811,7 +53802,6 @@ cont {
symbol {
name: "outdoor_seating-m"
priority: 450
min_distance: 10
}
}
element {
@ -53819,7 +53809,6 @@ cont {
symbol {
name: "outdoor_seating-m"
priority: 450
min_distance: 10
}
}
}
@ -55017,7 +55006,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -55034,7 +55022,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -55051,7 +55038,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -55068,7 +55054,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -55085,7 +55070,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -59449,7 +59433,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59466,7 +59449,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59483,7 +59465,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59500,7 +59481,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59517,7 +59497,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59534,7 +59513,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59551,7 +59529,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59860,16 +59837,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 4650
min_distance: 24
}
caption {
primary {
height: 10
color: 4473924
offset_y: 6
is_optional: true
}
priority: -5350
}
}
element {
@ -59877,7 +59844,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59894,7 +59860,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59911,7 +59876,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59928,7 +59892,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59945,7 +59908,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59962,7 +59924,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60395,6 +60356,15 @@ cont {
name: "peakt-s"
priority: 2850
}
caption {
primary {
height: 12
color: 4473924
offset_y: 1
is_optional: true
}
priority: -7150
}
}
element {
scale: 18
@ -60402,6 +60372,15 @@ cont {
name: "peakt-s"
priority: 2850
}
caption {
primary {
height: 12
color: 4473924
offset_y: 1
is_optional: true
}
priority: -7150
}
}
element {
scale: 19
@ -60409,6 +60388,15 @@ cont {
name: "peakt-s"
priority: 2850
}
caption {
primary {
height: 12
color: 4473924
offset_y: 1
is_optional: true
}
priority: -7150
}
}
element {
scale: 20
@ -60416,6 +60404,15 @@ cont {
name: "peakt-s"
priority: 2850
}
caption {
primary {
height: 12
color: 4473924
offset_y: 1
is_optional: true
}
priority: -7150
}
}
}
cont {
@ -60618,7 +60615,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60635,7 +60631,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60652,7 +60647,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60669,7 +60663,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60686,7 +60679,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60703,7 +60695,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60720,7 +60711,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60895,15 +60885,6 @@ cont {
name: "volcano-s"
priority: 5400
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
is_optional: true
}
priority: -4600
}
}
element {
scale: 11
@ -60911,15 +60892,6 @@ cont {
name: "volcano-s"
priority: 5400
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
is_optional: true
}
priority: -4600
}
}
element {
scale: 12
@ -60927,15 +60899,6 @@ cont {
name: "volcano-s"
priority: 5400
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
is_optional: true
}
priority: -4600
}
}
element {
scale: 13

BIN
data/drules_proto_outdoors_dark.bin
View file

Binary file not shown.

209
data/drules_proto_outdoors_dark.txt
View file

@ -15864,7 +15864,7 @@ cont {
}
caption {
primary {
height: 10
height: 11
color: 6967599
stroke_color: 856032768
}
@ -15879,7 +15879,7 @@ cont {
}
caption {
primary {
height: 10
height: 11
color: 6967599
stroke_color: 856032768
}
@ -15894,7 +15894,7 @@ cont {
}
caption {
primary {
height: 10
height: 11
color: 6967599
stroke_color: 856032768
}
@ -15909,7 +15909,7 @@ cont {
}
caption {
primary {
height: 10
height: 11
color: 6967599
stroke_color: 856032768
}
@ -16339,7 +16339,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -16373,7 +16372,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -16417,6 +16416,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -16563,7 +16563,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -16589,7 +16588,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -16625,6 +16624,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -16751,7 +16751,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -16785,7 +16784,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -16829,6 +16828,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -16975,7 +16975,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17001,7 +17000,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17037,6 +17036,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -17159,7 +17159,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17185,7 +17184,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17221,6 +17220,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -17343,7 +17343,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17369,7 +17368,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17405,6 +17404,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -17527,7 +17527,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17553,7 +17552,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17589,6 +17588,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -17711,7 +17711,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -17737,7 +17736,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -17773,6 +17772,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -49382,7 +49382,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 4800
min_distance: 12
}
apply_if: "name"
}
@ -49401,15 +49400,14 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 12
}
caption {
primary {
height: 10
height: 11
color: 2836760
stroke_color: 856032768
stroke_color: 436602368
offset_y: 1
is_optional: true
}
@ -49432,7 +49430,7 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 8
}
@ -49440,7 +49438,7 @@ cont {
primary {
height: 11
color: 2836760
stroke_color: 856032768
stroke_color: 436602368
offset_y: 1
is_optional: true
}
@ -49469,7 +49467,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 2836760
stroke_color: 436602368
offset_y: 1
@ -49500,7 +49498,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 2836760
stroke_color: 436602368
offset_y: 1
@ -49715,7 +49713,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 4800
min_distance: 12
}
apply_if: "name"
}
@ -49734,15 +49731,14 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 12
}
caption {
primary {
height: 10
height: 11
color: 2836760
stroke_color: 856032768
stroke_color: 436602368
offset_y: 1
is_optional: true
}
@ -49765,7 +49761,7 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 8
}
@ -49773,7 +49769,7 @@ cont {
primary {
height: 11
color: 2836760
stroke_color: 856032768
stroke_color: 436602368
offset_y: 1
is_optional: true
}
@ -49802,7 +49798,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 2836760
stroke_color: 436602368
offset_y: 1
@ -49833,7 +49829,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 2836760
stroke_color: 436602368
offset_y: 1
@ -50048,7 +50044,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 4800
min_distance: 12
}
apply_if: "name"
}
@ -50067,15 +50062,14 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 12
}
caption {
primary {
height: 10
height: 11
color: 2836760
stroke_color: 856032768
stroke_color: 436602368
offset_y: 1
is_optional: true
}
@ -50098,7 +50092,7 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 8
}
@ -50106,7 +50100,7 @@ cont {
primary {
height: 11
color: 2836760
stroke_color: 856032768
stroke_color: 436602368
offset_y: 1
is_optional: true
}
@ -50135,7 +50129,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 2836760
stroke_color: 436602368
offset_y: 1
@ -50166,7 +50160,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 2836760
stroke_color: 436602368
offset_y: 1
@ -50381,7 +50375,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 4800
min_distance: 12
}
apply_if: "name"
}
@ -50400,15 +50393,14 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 12
}
caption {
primary {
height: 10
height: 11
color: 2836760
stroke_color: 856032768
stroke_color: 436602368
offset_y: 1
is_optional: true
}
@ -50431,7 +50423,7 @@ cont {
priority: -1940
}
symbol {
name: "nparkf-outline-s"
name: "nparkf-outline-m"
priority: 4800
min_distance: 8
}
@ -50439,7 +50431,7 @@ cont {
primary {
height: 11
color: 2836760
stroke_color: 856032768
stroke_color: 436602368
offset_y: 1
is_optional: true
}
@ -50468,7 +50460,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 2836760
stroke_color: 436602368
offset_y: 1
@ -50499,7 +50491,7 @@ cont {
}
caption {
primary {
height: 12
height: 11
color: 2836760
stroke_color: 436602368
offset_y: 1
@ -53843,7 +53835,6 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
}
}
element {
@ -53877,7 +53868,7 @@ cont {
symbol {
name: "nparkf-outline-s"
priority: 6700
min_distance: 20
min_distance: 12
}
caption {
primary {
@ -53921,6 +53912,7 @@ cont {
symbol {
name: "nparkf-outline-m"
priority: 6700
min_distance: 12
}
caption {
primary {
@ -54067,7 +54059,6 @@ cont {
symbol {
name: "outdoor_seating-m"
priority: 450
min_distance: 10
}
}
element {
@ -54075,7 +54066,6 @@ cont {
symbol {
name: "outdoor_seating-m"
priority: 450
min_distance: 10
}
}
element {
@ -54083,7 +54073,6 @@ cont {
symbol {
name: "outdoor_seating-m"
priority: 450
min_distance: 10
}
}
}
@ -55281,7 +55270,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -55298,7 +55286,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -55315,7 +55302,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -55332,7 +55318,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -55349,7 +55334,6 @@ cont {
symbol {
name: "picnic_table-m"
priority: 1200
min_distance: 10
}
caption {
primary {
@ -59695,7 +59679,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59712,7 +59695,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59729,7 +59711,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59746,7 +59727,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59763,7 +59743,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59780,7 +59759,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -59797,7 +59775,6 @@ cont {
symbol {
name: "geyser-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60106,16 +60083,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 4650
min_distance: 24
}
caption {
primary {
height: 10
color: 9211020
offset_y: 6
is_optional: true
}
priority: -5350
}
}
element {
@ -60123,7 +60090,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60140,7 +60106,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60157,7 +60122,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60174,7 +60138,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60191,7 +60154,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60208,7 +60170,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60621,6 +60582,15 @@ cont {
name: "peakt-s"
priority: 2850
}
caption {
primary {
height: 12
color: 9211020
offset_y: 1
is_optional: true
}
priority: -7150
}
}
element {
scale: 18
@ -60628,6 +60598,15 @@ cont {
name: "peakt-s"
priority: 2850
}
caption {
primary {
height: 12
color: 9211020
offset_y: 1
is_optional: true
}
priority: -7150
}
}
element {
scale: 19
@ -60635,6 +60614,15 @@ cont {
name: "peakt-s"
priority: 2850
}
caption {
primary {
height: 12
color: 9211020
offset_y: 1
is_optional: true
}
priority: -7150
}
}
element {
scale: 20
@ -60642,6 +60630,15 @@ cont {
name: "peakt-s"
priority: 2850
}
caption {
primary {
height: 12
color: 9211020
offset_y: 1
is_optional: true
}
priority: -7150
}
}
}
cont {
@ -60844,7 +60841,6 @@ cont {
symbol {
name: "drinking-water-s"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60861,7 +60857,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60878,7 +60873,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60895,7 +60889,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60912,7 +60905,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60929,7 +60921,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -60946,7 +60937,6 @@ cont {
symbol {
name: "drinking-water-m"
priority: 4650
min_distance: 24
}
caption {
primary {
@ -61121,15 +61111,6 @@ cont {
name: "volcano-s"
priority: 5400
}
caption {
primary {
height: 10
color: 9211020
offset_y: 1
is_optional: true
}
priority: -4600
}
}
element {
scale: 11
@ -61137,15 +61118,6 @@ cont {
name: "volcano-s"
priority: 5400
}
caption {
primary {
height: 10
color: 9211020
offset_y: 1
is_optional: true
}
priority: -4600
}
}
element {
scale: 12
@ -61153,15 +61125,6 @@ cont {
name: "volcano-s"
priority: 5400
}
caption {
primary {
height: 10
color: 9211020
offset_y: 1
is_optional: true
}
priority: -4600
}
}
element {
scale: 13

8
data/styles/clear/include/priorities_1_BG-by-size.prio.txt
View file

@ -126,10 +126,10 @@ leisure-park-permissive # area z10- (also has icon z
leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-)
=== 70
landuse-forest # area z10- (also has icon z12-, caption(optional) z13-)
landuse-forest-coniferous # area z10- (also has icon z12-, caption(optional) z13-)
landuse-forest-deciduous # area z10- (also has icon z12-, caption(optional) z13-)
landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z13-)
landuse-forest # area z10- (also has icon z13-, caption(optional) z14-)
landuse-forest-coniferous # area z10- (also has icon z13-, caption(optional) z14-)
landuse-forest-deciduous # area z10- (also has icon z13-, caption(optional) z14-)
landuse-forest-mixed # area z10- (also has icon z13-, caption(optional) z14-)
=== 60
landuse-churchyard # area z15-

77
data/styles/clear/include/priorities_4_overlays.prio.txt
View file

@ -282,7 +282,7 @@ highway-primary_link-tunnel # pathtext z11- (also has sh
barrier-border_control # icon z14- (also has caption(optional) z14-)
railway-halt # icon z13- (also has caption(optional) z13-)
tourism-alpine_hut # icon z13- (also has caption(optional) z13-)
waterway-waterfall # icon z11- (also has caption(optional) z11-)
waterway-waterfall # icon z13- (also has caption(optional) z14-)
=== 5800
place-hamlet # caption z13-
@ -300,8 +300,8 @@ highway-secondary-tunnel # pathtext z10- (also has sh
=== 5600
man_made-lighthouse # icon z14- (also has caption(optional) z14-)
natural-peak # icon z12- (also has caption(optional) z13-)
natural-volcano # icon z10- (also has caption(optional) z10-)
natural-peak # icon z13- (also has caption(optional) z13-)
natural-volcano # icon z12- (also has caption(optional) z13-)
=== 5400
amenity-theatre # icon z14- (also has caption(optional) z14-)
@ -324,23 +324,23 @@ leisure-stadium # icon z13- (also has captio
leisure-marina # icon z16- (also has caption(optional) z16-)
leisure-park # icon z14- (also has caption(optional) z14-, area z10-)
leisure-park-permissive # icon z14- (also has caption(optional) z14-, area z10-)
mountain_pass # icon z14- (also has caption(optional) z14-)
mountain_pass # icon z14- (also has caption(optional) z15-)
place-square # caption z16-
=== 5050
tourism-viewpoint # icon z14- (also has caption(optional) z14-)
=== 4950
landuse-forest # icon z12- (also has caption(optional) z13-, area z10-)
landuse-forest-coniferous # icon z12- (also has caption(optional) z13-, area z10-)
landuse-forest-deciduous # icon z12- (also has caption(optional) z13-, area z10-)
landuse-forest-mixed # icon z12- (also has caption(optional) z13-, area z10-)
landuse-forest # icon z13- (also has caption(optional) z14-, area z10-)
landuse-forest-coniferous # icon z13- (also has caption(optional) z14-, area z10-)
landuse-forest-deciduous # icon z13- (also has caption(optional) z14-, area z10-)
landuse-forest-mixed # icon z13- (also has caption(optional) z14-, area z10-)
=== 4800
natural-cave_entrance # icon z12- (also has caption(optional) z12-)
natural-cave_entrance # icon z14- (also has caption(optional) z15-)
natural-geyser # icon z14- (also has caption(optional) z14-)
natural-hot_spring # icon z14- (also has caption(optional) z14-)
natural-spring # icon z14- (also has caption(optional) z14-)
natural-hot_spring # icon z14- (also has caption(optional) z15-)
natural-spring # icon z14- (also has caption(optional) z15-)
=== 4650
natural-saddle # icon z15- (also has caption(optional) z16-)
@ -405,7 +405,7 @@ tourism-wilderness_hut # icon z16- (also has captio
=== 3900
highway-rest_area # icon z15- (also has caption(optional) z15-)
tourism-camp_site # icon z15- (also has caption(optional) z15-)
tourism-camp_site # icon z16- (also has caption(optional) z16-)
tourism-caravan_site # icon z16- (also has caption(optional) z16-)
tourism-chalet # icon z16- (also has caption(optional) z16-)
=== 3800
@ -534,7 +534,7 @@ railway-tram_stop # icon z14- (also has captio
highway-bus_stop # icon z16- (also has caption(optional) z17-)
=== 3600
amenity-drinking_water # icon z16- (also has caption(optional) z19-)
amenity-drinking_water # icon z16- (also has caption(optional) z18-)
=== 3500
isoline-step_1000 # pathtext z11- (also has line z11-)
@ -586,7 +586,7 @@ highway-unclassified-bridge # pathtext z13- (also has li
highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-)
=== 3100
amenity-water_point # icon z16- (also has caption(optional) z19-)
amenity-water_point # icon z16- (also has caption(optional) z18-)
highway-raceway # pathtext z16- (also has line z14-)
historic-aircraft # icon z16- (also has caption(optional) z16-)
historic-locomotive # icon z16- (also has caption(optional) z16-)
@ -597,8 +597,8 @@ historic-wreck # icon z16- (also has captio
landuse-allotments # caption z15- (also has area z12-)
landuse-cemetery # icon z15- (also has caption(optional) z15-, area z14-)
landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z14-)
man_made-water_tap # icon z16-
man_made-water_well # icon z16-
man_made-water_tap # icon z16- (also has caption(optional) z18-)
man_made-water_well # icon z16- (also has caption(optional) z18-)
man_made-windmill # icon z16- (also has caption(optional) z16-)
=== 3050
@ -683,7 +683,7 @@ waterway-weir # pathtext z15- (also has li
=== 2900
highway-ford # icon z16- and pathtext z16- (also has line z13-)
natural-rock # icon z16-
natural-rock # icon z17- (also has caption(optional) z17-)
=== 2850
highway-bridleway # pathtext z15- (also has line z14-)
@ -989,7 +989,7 @@ tourism-artwork-architecture # icon z15- (also has captio
tourism-artwork-painting # icon z15- (also has caption(optional) z15-)
=== 1550
amenity-shelter # icon z16- (also has caption(optional) z16-)
amenity-shelter # icon z17- (also has caption(optional) z17-)
leisure-fitness_station # icon z17- (also has caption(optional) z17-)
leisure-playground # icon z17- (also has caption(optional) z17-, area z16-)
=== 1500
@ -1051,7 +1051,7 @@ amenity-vending_machine-fuel # icon z18- (also has captio
amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-)
amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-)
highway-elevator # icon z17-
leisure-picnic_table # icon z16- (also has caption(optional) z16-)
leisure-picnic_table # icon z17- (also has caption(optional) z17-)
=== 1200
isoline-step_10 # pathtext z17- (also has line z15-)
@ -1151,7 +1151,7 @@ leisure-outdoor_seating # icon z18-
man_made-mast # icon z16-
man_made-silo # icon z16- (also has caption(optional) z18-)
man_made-storage_tank # icon z16- (also has caption(optional) z18-)
power-tower # icon z16-
power-tower # icon z19-
=== 450
amenity-parking # icon z16- (also has caption(optional) z18-, area z15-)
@ -1407,12 +1407,12 @@ leisure-swimming_pool-private # icon z17- (also has captio
# barrier-border_control # caption(optional) z14- (also has icon z14-)
# railway-halt # caption(optional) z13- (also has icon z13-)
# tourism-alpine_hut # caption(optional) z13- (also has icon z13-)
# waterway-waterfall # caption(optional) z11- (also has icon z11-)
# waterway-waterfall # caption(optional) z14- (also has icon z13-)
# === -4200
# man_made-lighthouse # caption(optional) z14- (also has icon z14-)
# natural-peak # caption(optional) z13- (also has icon z12-)
# natural-volcano # caption(optional) z10- (also has icon z10-)
# natural-peak # caption(optional) z13- (also has icon z13-)
# natural-volcano # caption(optional) z13- (also has icon z12-)
# === -4600
# amenity-theatre # caption(optional) z14- (also has icon z14-)
@ -1435,22 +1435,22 @@ leisure-swimming_pool-private # icon z17- (also has captio
# leisure-marina # caption(optional) z16- (also has icon z16-)
# leisure-park # caption(optional) z14- (also has icon z14-, area z10-)
# leisure-park-permissive # caption(optional) z14- (also has icon z14-, area z10-)
# mountain_pass # caption(optional) z14- (also has icon z14-)
# mountain_pass # caption(optional) z15- (also has icon z14-)
# === -4950
# tourism-viewpoint # caption(optional) z14- (also has icon z14-)
# === -5050
# landuse-forest # caption(optional) z13- (also has icon z12-, area z10-)
# landuse-forest-coniferous # caption(optional) z13- (also has icon z12-, area z10-)
# landuse-forest-deciduous # caption(optional) z13- (also has icon z12-, area z10-)
# landuse-forest-mixed # caption(optional) z13- (also has icon z12-, area z10-)
# landuse-forest # caption(optional) z14- (also has icon z13-, area z10-)
# landuse-forest-coniferous # caption(optional) z14- (also has icon z13-, area z10-)
# landuse-forest-deciduous # caption(optional) z14- (also has icon z13-, area z10-)
# landuse-forest-mixed # caption(optional) z14- (also has icon z13-, area z10-)
# === -5200
# natural-cave_entrance # caption(optional) z12- (also has icon z12-)
# natural-cave_entrance # caption(optional) z15- (also has icon z14-)
# natural-geyser # caption(optional) z14- (also has icon z14-)
# natural-hot_spring # caption(optional) z14- (also has icon z14-)
# natural-spring # caption(optional) z14- (also has icon z14-)
# natural-hot_spring # caption(optional) z15- (also has icon z14-)
# natural-spring # caption(optional) z15- (also has icon z14-)
# === -5350
# natural-saddle # caption(optional) z16- (also has icon z15-)
@ -1514,7 +1514,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -6100
# highway-rest_area # caption(optional) z15- (also has icon z15-)
# tourism-camp_site # caption(optional) z15- (also has icon z15-)
# tourism-camp_site # caption(optional) z16- (also has icon z16-)
# tourism-caravan_site # caption(optional) z16- (also has icon z16-)
# tourism-chalet # caption(optional) z16- (also has icon z16-)
# === -6200
@ -1643,7 +1643,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# highway-bus_stop # caption(optional) z17- (also has icon z16-)
# === -6400
# amenity-drinking_water # caption(optional) z19- (also has icon z16-)
# amenity-drinking_water # caption(optional) z18- (also has icon z16-)
# === -6500
# leisure-beach_resort # caption(optional) z16- (also has icon z16-, area z10-)
@ -1652,7 +1652,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# shop-supermarket # caption(optional) z16- (also has icon z16-)
# === -6800
# amenity-water_point # caption(optional) z19- (also has icon z16-)
# amenity-water_point # caption(optional) z18- (also has icon z16-)
# historic-aircraft # caption(optional) z16- (also has icon z16-)
# historic-locomotive # caption(optional) z16- (also has icon z16-)
# historic-mine # caption(optional) z15- (also has icon z15-)
@ -1661,9 +1661,14 @@ leisure-swimming_pool-private # icon z17- (also has captio
# historic-wreck # caption(optional) z16- (also has icon z16-)
# landuse-cemetery # caption(optional) z15- (also has icon z15-, area z14-)
# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z14-)
# man_made-water_tap # caption(optional) z18- (also has icon z16-)
# man_made-water_well # caption(optional) z18- (also has icon z16-)
# man_made-windmill # caption(optional) z16- (also has icon z16-)
# === -6950
# natural-rock # caption(optional) z17- (also has icon z17-)
# === -7150
# amenity-townhall # caption(optional) z16- (also has icon z16-)
# tourism-hotel # caption(optional) z16- (also has icon z16-)
# tourism-resort # caption(optional) z16- (also has icon z16-)
@ -1888,7 +1893,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-artwork-painting # caption(optional) z15- (also has icon z15-)
# === -8450
# amenity-shelter # caption(optional) z16- (also has icon z16-)
# amenity-shelter # caption(optional) z17- (also has icon z17-)
# leisure-fitness_station # caption(optional) z17- (also has icon z17-)
# leisure-playground # caption(optional) z17- (also has icon z17-, area z16-)
# === -8500
@ -1946,7 +1951,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-)
# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-)
# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-)
# leisure-picnic_table # caption(optional) z16- (also has icon z16-)
# leisure-picnic_table # caption(optional) z17- (also has icon z17-)
# === -8800
# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z14-)

13
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -301,7 +301,7 @@ highway-secondary-tunnel # pathtext z10- (also has sh
man_made-lighthouse # icon z11- (also has caption(optional) z14-)
natural-peak # icon z10- (also has caption(optional) z11-)
natural-volcano # icon z10- (also has caption(optional) z10-)
natural-volcano # icon z10- (also has caption(optional) z13-)
=== 5400
amenity-theatre # icon z14- (also has caption(optional) z14-)
@ -339,7 +339,7 @@ landuse-forest-mixed # icon z12- (also has captio
natural-cave_entrance # icon z10- (also has caption(optional) z11-)
natural-geyser # icon z10- (also has caption(optional) z12-)
natural-hot_spring # icon z12- (also has caption(optional) z14-)
natural-hot_spring # icon z12- (also has caption(optional) z15-)
natural-spring # icon z12- (also has caption(optional) z14-)
=== 4650
@ -683,7 +683,7 @@ waterway-weir # pathtext z15- (also has li
=== 2900
highway-ford # icon z14- and pathtext z16- (also has line z13-)
natural-rock # icon z14-
natural-rock # icon z14- (also has caption(optional) z17-)
=== 2850
highway-bridleway # pathtext z13- (also has line z11-)
@ -1412,7 +1412,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# man_made-lighthouse # caption(optional) z14- (also has icon z11-)
# natural-peak # caption(optional) z11- (also has icon z10-)
# natural-volcano # caption(optional) z10- (also has icon z10-)
# natural-volcano # caption(optional) z13- (also has icon z10-)
# === -4600
# amenity-theatre # caption(optional) z14- (also has icon z14-)
@ -1449,7 +1449,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# natural-cave_entrance # caption(optional) z11- (also has icon z10-)
# natural-geyser # caption(optional) z12- (also has icon z10-)
# natural-hot_spring # caption(optional) z14- (also has icon z12-)
# natural-hot_spring # caption(optional) z15- (also has icon z12-)
# natural-spring # caption(optional) z14- (also has icon z12-)
# === -5350
@ -1666,6 +1666,9 @@ leisure-swimming_pool-private # icon z17- (also has captio
# man_made-windmill # caption(optional) z16- (also has icon z16-)
# === -6950
# natural-rock # caption(optional) z17- (also has icon z14-)
# === -7150
# amenity-townhall # caption(optional) z16- (also has icon z16-)
# tourism-hotel # caption(optional) z16- (also has icon z16-)
# tourism-resort # caption(optional) z16- (also has icon z16-)