[styles] circles, darker footways

This commit is contained in:
Darafei Praliaskouski 2013-09-15 19:16:09 +03:00 committed by Alex Zolotarev
parent 4dec83839b
commit cd2c9cc224
6 changed files with 910 additions and 847 deletions

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -9575,12 +9575,6 @@ cont {
name: "highway-bus_stop"
element {
scale: 16
lines {
width: 0.6
color: 0xBB9944
priority: 31
cap: BUTTCAP
}
symbol {
name: "bus-mini"
priority: 16031
@ -9603,42 +9597,69 @@ cont {
}
element {
scale: 17
lines {
width: 0.6
color: 0xBB9944
priority: 31
cap: BUTTCAP
}
symbol {
name: "bus"
priority: 16031
}
caption {
secondary {
height: 10
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
primary {
height: 11
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
priority: 15031
}
}
element {
scale: 18
lines {
width: 0.6
color: 0xBB9944
priority: 31
cap: BUTTCAP
}
symbol {
name: "bus"
priority: 16031
}
caption {
secondary {
height: 10
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
primary {
height: 11
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
priority: 15031
}
}
element {
scale: 19
lines {
width: 0.6
color: 0xBB9944
priority: 31
cap: BUTTCAP
}
symbol {
name: "bus"
priority: 16031
}
caption {
secondary {
height: 10
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
primary {
height: 11
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
priority: 15031
}
}
}
cont {
@ -51983,6 +52004,12 @@ cont {
priority: 16000
}
caption {
secondary {
height: 12
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
primary {
height: 12
color: 0x3355DD
@ -51999,6 +52026,12 @@ cont {
priority: 16000
}
caption {
secondary {
height: 12
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
primary {
height: 12
color: 0x3355DD
@ -52015,6 +52048,12 @@ cont {
priority: 16000
}
caption {
secondary {
height: 12
color: 0x3355DD
stroke_color: 0xFFFFFF
offset_y: 10
}
primary {
height: 12
color: 0x3355DD

View file

@ -27,11 +27,6 @@ way::* {
icon-height: 16;
}
*::int_name
{
text-offset: 20;
}
node::* {
text-anchor-vertical: top;
}
@ -67,7 +62,7 @@ area[natural],
area[leisure],
area[place],
area[aeroway],
area[tourism][tourism!=attraction],
area[tourism],
{
fill-position: background;
}
@ -84,7 +79,8 @@ line[highway=track],
line[highway=path],
line[highway=steps],
line[highway=cycleway],
line[highway=construction]
line[highway=construction],
line[highway=bus_stop]
{
casing-width: 0;
}
@ -2547,7 +2543,7 @@ line|z15-16[man_made=cutline]
}
line|z15[highway=footway]
{
color: #e;
color: #d;
width: 1;
}
line|z15[highway=path]
@ -3392,6 +3388,7 @@ node|z15[railway=tram_stop]
text-color: #3050d8;
text-offset: 10;
}
area|z15-[amenity=fuel],
node|z15-[amenity=fuel]
{
@ -3449,8 +3446,8 @@ line|z15[railway=funicular]::d1p3
width: 0.5;
z-index: 410;
}
node|z17-[highway=bus_stop],
node|z16[railway=tram_stop]
*|z17-[highway=bus_stop],
*|z16[railway=tram_stop]
{
font-size: 11;
text-halo-radius: 2;
@ -4931,13 +4928,13 @@ line|z17[highway=footway]::d1p2
{
width: 4;
z-index: 692;
color: #e;
color: #d;
linecap: butt;
dashes: 1,3;
}
line|z17-[highway=footway]
{
color: #e;
color: #d;
width: 5;
}
@ -4945,7 +4942,7 @@ line|z18[highway=footway]::d1p2
{
width: 8;
z-index: 692;
color: #e;
color: #d;
linecap: butt;
dashes: 1,3;
}
@ -4960,7 +4957,7 @@ line|z19-[highway=footway]::d1p2
{
width: 16;
z-index: 692;
color: #e;
color: #d;
linecap: butt;
dashes: 1,4;
}
@ -6323,9 +6320,22 @@ node[amenity!=bench][natural!=tree][!barrier][railway!=subway_entrance][!power][
area[amenity!=bench][natural!=tree][!barrier][railway!=subway_entrance][!power][natural!=peak]
{
symbol-shape: eval(cond(prop("icon-image"), "circle", ""));
symbol-size: 12;
symbol-size: 13;
symbol-fill-color: #f;
}
node|z14[railway=station][transport=subway]
{
symbol-size: 11;
}
node|z13[railway=station][transport=subway]
{
symbol-size: 10;
}
node|z12[railway=station][transport=subway]
{
symbol-size: 9;
}
*[highway]{color: white; text-color: black; text-halo-color: #f}
area[area:highway]{fill-color: white}
@ -6334,7 +6344,7 @@ area[area:highway]{fill-color: white}
*[highway=pedestrian],
*[highway=cycleway]
{
color: #e;
color: #d;
}
*[highway][area?]
@ -6348,5 +6358,5 @@ area|z15-[area:highway=pedestrian],
area|z15-[area:highway=path],
area|z15-[area:highway=steps]
{
fill-color: #e;
fill-color: #d;
}

View file

@ -82,7 +82,8 @@ line[highway=track],
line[highway=path],
line[highway=steps],
line[highway=cycleway],
line[highway=construction]
line[highway=construction],
line[highway=bus_stop]
{
casing-width: 0;
}
@ -3233,6 +3234,16 @@ node|z17-[railway=tram_stop]
text-offset: 10;
text-halo-color: white;
}
area|z17-[railway=tram_stop]::int_name,
node|z17-[railway=tram_stop]::int_name
{
font-size: 12;
text-halo-radius: 2;
text: int_name;
text-color: #3050d8;
text-offset: 10;
text-halo-color: white;
}
line|z15[boundary=administrative][admin_level=7]
{
color: #f9574b;
@ -3870,8 +3881,8 @@ area|z15-[highway=pedestrian][area?]
{
fill-color: #f0f0f0;
}
node|z17-[highway=bus_stop],
node|z16[railway=tram_stop]
*|z17-[highway=bus_stop],
*|z16[railway=tram_stop]
{
font-size: 11;
text-halo-radius: 2;
@ -3881,8 +3892,8 @@ node|z16[railway=tram_stop]
text-halo-color: white;
z-index: 20;
}
node|z17-[highway=bus_stop]::int_name,
node|z16[railway=tram_stop]::int_name
*|z17-[highway=bus_stop]::int_name,
*|z16[railway=tram_stop]::int_name
{
font-size: 10;
text-halo-radius: 2;