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

[style] building|address back to rendering

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-05-06 01:42:01 +03:00 • committed by Alex Zolotarev
parent 0925d8ca78
commit 3f74214947
4 changed files with 64 additions and 12 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.

55
data/drules_proto.txt
View file

@ -7513,6 +7513,10 @@ cont {
element {
scale: 17
caption {
secondary {
height: 11
color: 0x404040
}
primary {
height: 11
color: 0x404040
@ -7527,6 +7531,10 @@ cont {
element {
scale: 18
caption {
secondary {
height: 11
color: 0x404040
}
primary {
height: 11
color: 0x404040
@ -7541,6 +7549,10 @@ cont {
element {
scale: 19
caption {
secondary {
height: 11
color: 0x404040
}
primary {
height: 11
color: 0x404040
@ -7553,6 +7565,49 @@ cont {
}
}
}
cont {
name: "building-address"
element {
scale: 16
caption {
primary {
height: 10
color: 0x808070
}
priority: 15000
}
}
element {
scale: 17
caption {
primary {
height: 11
color: 0x404040
}
priority: 15000
}
}
element {
scale: 18
caption {
primary {
height: 11
color: 0x404040
}
priority: 15000
}
}
element {
scale: 19
caption {
primary {
height: 11
color: 0x404040
}
priority: 15000
}
}
}
cont {
name: "communication-line"
element {

2
data/mapcss-mapping.csv
View file

@ -735,7 +735,7 @@ tourism|guest_house;[tourism=guest_house];;name;int_name;734;
tourism|motel;[tourism=motel];;name;int_name;735;
boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_type=state];;name;int_name;736;
place|state|USA;[place=state][addr:country=US];;name;int_name;737;
building|address;[addr:housenumber][!shop][!amenity][!office];;addr:housenumber;name;738;
building|address;[addr:housenumber][addr:street][!shop][!amenity][!office];;addr:housenumber;name;738;
amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739;
highway|bridleway|dike;[highway=bridleway][dike?];x;name;int_name;740;highway|track
highway|bridleway|dyke;[highway=bridleway][dyke?];x;name;int_name;741;highway|track

1 building [building] addr:housenumber name 1
735 tourism|motel [tourism=motel] name int_name 735
736 boundary|administrative|4|state [boundary=administrative][admin_level=4][border_type=state] name int_name 736
737 place|state|USA [place=state][addr:country=US] name int_name 737
738 building|address [addr:housenumber][!shop][!amenity][!office] [addr:housenumber][addr:street][!shop][!amenity][!office] addr:housenumber name 738
739 amenity|parking|no-access [amenity=parking][access=no] name int_name 739
740 highway|bridleway|dike [highway=bridleway][dike?] x name int_name 740 highway|track
741 highway|bridleway|dyke [highway=bridleway][dyke?] x name int_name 741 highway|track

19
data/normal.mapcss
View file

@ -2951,7 +2951,9 @@ line|z15[boundary=administrative][admin_level=2]::d2p2
dashes: 12,12;
}
area|z16[building],
node|z16[building]
node|z16[building],
area|z16[addr:housenumber][addr:street],
node|z16[addr:housenumber][addr:street]
{
text: "addr:housenumber";
font-size: 10;
@ -4942,13 +4944,6 @@ line|z16[railway=siding]::d1p2
width: 1.2;
z-index: 640;
}
area|z16[building=address],
node|z16[building=address]
{
text: "addr:housenumber";
font-size: 11;
text-color: #808070;
}
area|z17-[amenity=drinking_water],
node|z17-[amenity=drinking_water]
{
@ -5686,7 +5681,9 @@ line|z17-[boundary=administrative][type=nation]::d2p2
dashes: 12,12;
}
area|z17-[building],
node|z17-[building]
node|z17-[building],
area|z17-[addr:housenumber][addr:street],
node|z17-[addr:housenumber][addr:street]
{
text: "addr:housenumber";
font-size: 11;
@ -6501,8 +6498,8 @@ line|z17-[boundary=administrative][border_type=state]
width: 2;
dashes: 12,4,4,4;
}
area|z17-[building],
node|z17-[building]
area|z17-[building]::int_name,
node|z17-[building]::int_name
{
text: int_name;
font-size: 11;