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

[styles] Regenerate for housenumbers

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-09-11 15:54:00 +03:00 • committed by Viktor Govako
parent 2c94f03718
commit b4ff239fc7
11 changed files with 360 additions and 192 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.

72
data/drules_proto.txt
View file

@ -5936,23 +5936,6 @@ cont {
}
cont {
name: "amenity-loading_dock"
element {
scale: 18
symbol {
name: "entrance-s"
priority: -10000
}
caption {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
is_optional: true
}
priority: -10000
}
}
element {
scale: 19
symbol {
@ -5963,7 +5946,6 @@ cont {
primary {
height: 10
color: 4473924
offset_x: 1
offset_y: 1
is_optional: true
}
@ -13882,7 +13864,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13897,7 +13879,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13912,7 +13894,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13927,7 +13909,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 200
priority: -9970
}
}
}
@ -15293,15 +15275,12 @@ cont {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 6381914
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -10000
@ -15310,23 +15289,6 @@ cont {
}
cont {
name: "entrance-exit"
element {
scale: 18
symbol {
name: "exit-s"
priority: -10000
}
caption {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
is_optional: true
}
priority: -10000
}
}
element {
scale: 19
symbol {
@ -15337,15 +15299,12 @@ cont {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 6381914
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -10000
@ -15364,8 +15323,12 @@ cont {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 6381914
is_optional: true
}
priority: -9780
@ -15381,15 +15344,12 @@ cont {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 6381914
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -9780

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

72
data/drules_proto_clear.txt
View file

@ -5902,23 +5902,6 @@ cont {
}
cont {
name: "amenity-loading_dock"
element {
scale: 18
symbol {
name: "entrance-s"
priority: -10000
}
caption {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
is_optional: true
}
priority: -10000
}
}
element {
scale: 19
symbol {
@ -5929,7 +5912,6 @@ cont {
primary {
height: 10
color: 4473924
offset_x: 1
offset_y: 1
is_optional: true
}
@ -13740,7 +13722,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13755,7 +13737,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13770,7 +13752,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13785,7 +13767,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 200
priority: -9970
}
}
}
@ -15151,15 +15133,12 @@ cont {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 6381914
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -10000
@ -15168,23 +15147,6 @@ cont {
}
cont {
name: "entrance-exit"
element {
scale: 18
symbol {
name: "exit-s"
priority: -10000
}
caption {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
is_optional: true
}
priority: -10000
}
}
element {
scale: 19
symbol {
@ -15195,15 +15157,12 @@ cont {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 6381914
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -10000
@ -15222,8 +15181,12 @@ cont {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 6381914
is_optional: true
}
priority: -9780
@ -15239,15 +15202,12 @@ cont {
primary {
height: 10
color: 6381914
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 6381914
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -9780

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

72
data/drules_proto_dark.txt
View file

@ -5902,23 +5902,6 @@ cont {
}
cont {
name: "amenity-loading_dock"
element {
scale: 18
symbol {
name: "entrance-s"
priority: -10000
}
caption {
primary {
height: 10
color: 5592405
offset_x: 1
text: "ref"
is_optional: true
}
priority: -10000
}
}
element {
scale: 19
symbol {
@ -5929,7 +5912,6 @@ cont {
primary {
height: 10
color: 5592405
offset_x: 1
offset_y: 1
is_optional: true
}
@ -13740,7 +13722,7 @@ cont {
color: 5263440
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13755,7 +13737,7 @@ cont {
color: 5263440
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13770,7 +13752,7 @@ cont {
color: 5263440
offset_y: 1
}
priority: 200
priority: -9970
}
}
element {
@ -13785,7 +13767,7 @@ cont {
color: 5263440
offset_y: 1
}
priority: 200
priority: -9970
}
}
}
@ -15151,15 +15133,12 @@ cont {
primary {
height: 10
color: 5592405
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 5592405
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -10000
@ -15168,23 +15147,6 @@ cont {
}
cont {
name: "entrance-exit"
element {
scale: 18
symbol {
name: "exit-s"
priority: -10000
}
caption {
primary {
height: 10
color: 5592405
offset_x: 1
text: "ref"
is_optional: true
}
priority: -10000
}
}
element {
scale: 19
symbol {
@ -15195,15 +15157,12 @@ cont {
primary {
height: 10
color: 5592405
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 5592405
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -10000
@ -15222,8 +15181,12 @@ cont {
primary {
height: 10
color: 5592405
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 5592405
is_optional: true
}
priority: -9780
@ -15239,15 +15202,12 @@ cont {
primary {
height: 10
color: 5592405
offset_x: 1
text: "ref"
offset_y: 1
is_optional: true
}
secondary {
height: 10
height: 8
color: 5592405
offset_y: 10
text: "addr:flats"
is_optional: true
}
priority: -9780

BIN
data/drules_proto_vehicle_clear.bin
View file

Binary file not shown.

164
data/drules_proto_vehicle_clear.txt
View file

@ -1689,6 +1689,25 @@ cont {
}
}
}
cont {
name: "amenity-loading_dock"
element {
scale: 19
symbol {
name: "entrance-s"
priority: -10000
}
caption {
primary {
height: 13
color: 6381914
offset_y: 1
is_optional: true
}
priority: -10000
}
}
}
cont {
name: "amenity-motorcycle_parking"
element {
@ -6010,7 +6029,11 @@ cont {
primary {
height: 13
color: 6381914
text: "addr:housenumber"
}
secondary {
height: 12
color: 6381914
offset_y: 1
}
priority: 50
}
@ -6029,7 +6052,11 @@ cont {
primary {
height: 14
color: 6381914
text: "addr:housenumber"
}
secondary {
height: 13
color: 6381914
offset_y: 1
}
priority: 50
}
@ -6049,7 +6076,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 30
priority: 150
}
}
element {
@ -6064,7 +6091,7 @@ cont {
color: 6645086
offset_y: 1
}
priority: 30
priority: 150
}
}
}
@ -6117,7 +6144,11 @@ cont {
primary {
height: 13
color: 6381914
text: "addr:housenumber"
}
secondary {
height: 12
color: 6381914
offset_y: 1
}
priority: 30
}
@ -6136,7 +6167,11 @@ cont {
primary {
height: 14
color: 6381914
text: "addr:housenumber"
}
secondary {
height: 13
color: 6381914
offset_y: 1
}
priority: 30
}
@ -6191,7 +6226,11 @@ cont {
primary {
height: 13
color: 6381914
text: "addr:housenumber"
}
secondary {
height: 12
color: 6381914
offset_y: 1
}
priority: 50
}
@ -6210,7 +6249,11 @@ cont {
primary {
height: 14
color: 6381914
text: "addr:housenumber"
}
secondary {
height: 13
color: 6381914
offset_y: 1
}
priority: 50
}
@ -6265,7 +6308,11 @@ cont {
primary {
height: 13
color: 6381914
text: "addr:housenumber"
}
secondary {
height: 12
color: 6381914
offset_y: 1
}
priority: 550
}
@ -6284,7 +6331,11 @@ cont {
primary {
height: 14
color: 6381914
text: "addr:housenumber"
}
secondary {
height: 13
color: 6381914
offset_y: 1
}
priority: 550
}
@ -6337,6 +6388,99 @@ cont {
}
}
}
cont {
name: "entrance"
element {
scale: 19
symbol {
name: "entrance-s"
priority: -10000
}
caption {
primary {
height: 13
color: 6381914
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 6381914
is_optional: true
}
priority: -10000
}
}
}
cont {
name: "entrance-exit"
element {
scale: 19
symbol {
name: "exit-s"
priority: -10000
}
caption {
primary {
height: 13
color: 6381914
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 6381914
is_optional: true
}
priority: -10000
}
}
}
cont {
name: "entrance-main"
element {
scale: 18
symbol {
name: "main_entrance-s"
priority: 20
}
caption {
primary {
height: 13
color: 6381914
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 6381914
is_optional: true
}
priority: -9980
}
}
element {
scale: 19
symbol {
name: "main_entrance-s"
priority: 20
}
caption {
primary {
height: 13
color: 6381914
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 6381914
is_optional: true
}
priority: -9980
}
}
}
cont {
name: "highway-bridleway"
element {

BIN
data/drules_proto_vehicle_dark.bin
View file

Binary file not shown.

164
data/drules_proto_vehicle_dark.txt
View file

@ -1689,6 +1689,25 @@ cont {
}
}
}
cont {
name: "amenity-loading_dock"
element {
scale: 19
symbol {
name: "entrance-s"
priority: -10000
}
caption {
primary {
height: 13
color: 7566195
offset_y: 1
is_optional: true
}
priority: -10000
}
}
}
cont {
name: "amenity-motorcycle_parking"
element {
@ -6010,7 +6029,11 @@ cont {
primary {
height: 13
color: 7566195
text: "addr:housenumber"
}
secondary {
height: 12
color: 7566195
offset_y: 1
}
priority: 50
}
@ -6029,7 +6052,11 @@ cont {
primary {
height: 14
color: 7566195
text: "addr:housenumber"
}
secondary {
height: 13
color: 7566195
offset_y: 1
}
priority: 50
}
@ -6049,7 +6076,7 @@ cont {
color: 7105644
offset_y: 1
}
priority: 30
priority: 150
}
}
element {
@ -6064,7 +6091,7 @@ cont {
color: 7105644
offset_y: 1
}
priority: 30
priority: 150
}
}
}
@ -6117,7 +6144,11 @@ cont {
primary {
height: 13
color: 7566195
text: "addr:housenumber"
}
secondary {
height: 12
color: 7566195
offset_y: 1
}
priority: 30
}
@ -6136,7 +6167,11 @@ cont {
primary {
height: 14
color: 7566195
text: "addr:housenumber"
}
secondary {
height: 13
color: 7566195
offset_y: 1
}
priority: 30
}
@ -6191,7 +6226,11 @@ cont {
primary {
height: 13
color: 7566195
text: "addr:housenumber"
}
secondary {
height: 12
color: 7566195
offset_y: 1
}
priority: 50
}
@ -6210,7 +6249,11 @@ cont {
primary {
height: 14
color: 7566195
text: "addr:housenumber"
}
secondary {
height: 13
color: 7566195
offset_y: 1
}
priority: 50
}
@ -6265,7 +6308,11 @@ cont {
primary {
height: 13
color: 7566195
text: "addr:housenumber"
}
secondary {
height: 12
color: 7566195
offset_y: 1
}
priority: 550
}
@ -6284,7 +6331,11 @@ cont {
primary {
height: 14
color: 7566195
text: "addr:housenumber"
}
secondary {
height: 13
color: 7566195
offset_y: 1
}
priority: 550
}
@ -6337,6 +6388,99 @@ cont {
}
}
}
cont {
name: "entrance"
element {
scale: 19
symbol {
name: "entrance-s"
priority: -10000
}
caption {
primary {
height: 13
color: 7566195
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 7566195
is_optional: true
}
priority: -10000
}
}
}
cont {
name: "entrance-exit"
element {
scale: 19
symbol {
name: "exit-s"
priority: -10000
}
caption {
primary {
height: 13
color: 7566195
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 7566195
is_optional: true
}
priority: -10000
}
}
}
cont {
name: "entrance-main"
element {
scale: 18
symbol {
name: "main_entrance-s"
priority: 20
}
caption {
primary {
height: 13
color: 7566195
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 7566195
is_optional: true
}
priority: -9980
}
}
element {
scale: 19
symbol {
name: "main_entrance-s"
priority: 20
}
caption {
primary {
height: 13
color: 7566195
offset_y: 1
is_optional: true
}
secondary {
height: 8
color: 7566195
is_optional: true
}
priority: -9980
}
}
}
cont {
name: "highway-bridleway"
element {

8
data/visibility.txt
View file

@ -80,7 +80,7 @@ world 00000000000000000000 +
kindergarten 00000000000000000000 -
language_school 00000000000000000000 -
library 00000000000000000000 -
loading_dock 00000000000000000000 -
loading_dock 00000000000000000001 -
marketplace 00000000000000000000 -
money_transfer 00000000000000000000 -
motorcycle_parking 00000000000000000111 -
@ -368,9 +368,9 @@ world 00000000000000000000 +
fire_hydrant 00000000000000000000 -
phone 00000000000000000000 -
{}
entrance 00000000000000000000 +
exit 00000000000000000000 -
main 00000000000000000000 -
entrance 00000000000000000001 +
exit 00000000000000000001 -
main 00000000000000000011 -
{}
healthcare 00000000000000000000 +
alternative 00000000000000000000 -