diff options
author | Yury Melnichek <melnichek@gmail.com> | 2015-07-13 21:37:43 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:55:33 +0300 |
commit | 200a539f0860dcb92f5a518b0723e9976a42fb1d (patch) | |
tree | ea1b5c1ef5c0476f7ad2363982943fbcfbec92cf /data | |
parent | 9dca86fc779eaa7317aae96e6c8bbda26477fa76 (diff) |
[styles] Update styles on z1-z9.
Diffstat (limited to 'data')
-rw-r--r-- | data/styles/include/base_boundaries.mapcss | 160 | ||||
-rw-r--r-- | data/styles/include/base_place.mapcss | 63 | ||||
-rw-r--r-- | data/styles/include/base_roads.mapcss | 44 | ||||
-rw-r--r-- | data/styles/style-dark/colors_dark.mapcss | 2 | ||||
-rw-r--r-- | data/styles/style-light/colors_light.mapcss | 10 |
5 files changed, 102 insertions, 177 deletions
diff --git a/data/styles/include/base_boundaries.mapcss b/data/styles/include/base_boundaries.mapcss index d71dbbc3eb..ed9d1fed2c 100644 --- a/data/styles/include/base_boundaries.mapcss +++ b/data/styles/include/base_boundaries.mapcss @@ -1,122 +1,68 @@ -line|z4[boundary=administrative][admin_level=2] +line|z1-[boundary=administrative][admin_level=2] { - color: @border_country_z4; - width: 1; z-index: 400; - dashes: 3.12,3.12; - linecap: butt; - -x-kot-layer: top; } -line|z5[boundary=administrative][admin_level=2] +line|z1-[boundary=administrative][admin_level=3] { - color: @border_country_z5; - width: 1; - z-index: 400; - dashes: 3.12,3.12; - linecap: butt; - -x-kot-layer: top; + z-index: 390; } -line|z5-8[boundary=administrative][admin_level=4]::d2p2, -line|z4-8[boundary=administrative][admin_level=4][border_type=state]::d3p2 +line|z1-[boundary=administrative][admin_level=4] { - color: @light_yellow; - width: 1; - z-index: 120; - -x-kot-layer: top; + z-index: 380; } -line|z4-[boundary=administrative][admin_level=3] + +line|z1-3[boundary=administrative][admin_level=2] { - color: @light_gray; - width: 1; - z-index: 123; - dashes: 1,1; - linecap: butt; - -x-kot-layer: top; + color: @border_country_z4; + width: 0.5; } -line|z6[boundary=administrative][admin_level=2]::d2p2 +line|z4[boundary=administrative][admin_level=2] { - color: @light_yellow; + color: @border_country_z4; width: 1; - z-index: 123; - -x-kot-layer: top; } -line|z6[boundary=administrative][border_type=state] +line|z4-5[boundary=administrative][admin_level=3], +line|z4-5[boundary=administrative][admin_level=4] { - color: @border_state; - width: 1; - z-index: 55; + color: @border_country_z4; + width: 0.75; + dashes: 2,2; } -line|z6-[boundary=administrative][admin_level=3]::d2p2 +line|z5[boundary=administrative][admin_level=2] { - color: @light_yellow; + color: @border_country_z5; width: 1; - z-index: 122; - -x-kot-layer: top; } line|z6[boundary=administrative][admin_level=2] { color: @border_country_z6; width: 1; - z-index: 124; - dashes: 3.12,3.12; - linecap: butt; - -x-kot-layer: top; } -line|z4-6[boundary=administrative][admin_level=4] +line|z6[boundary=administrative][admin_level=3], +line|z6[boundary=administrative][admin_level=4] { - color: @light_gray; - width: 0.2; - z-index: 121; - dashes: 0.3,0.6; - linecap: butt; - -x-kot-layer: top; + color: @border_country_z5; + width: 0.75; + dashes: 2,2; } line|z7[boundary=administrative][admin_level=2] { - color: @light_yellow; - width: 2.73; - z-index: 124; - -x-kot-layer: top; -} -line|z7-8[boundary=administrative][admin_level=4] -{ - color: @gray90; - width: 0.7; - z-index: 121; - dashes: 0.3,0.6; - linecap: butt; - -x-kot-layer: top; + color: @border_country_z6; + width: 1.5; } -line|z7[boundary=administrative][admin_level=2]::d2p2 +line|z8[boundary=administrative][admin_level=2] { - color: @border; + color: @border_country_z8; width: 2; - z-index: 125; - dashes: 5,5; - linecap: butt; - -x-kot-layer: top; } -line|z7[boundary=administrative][border_type=state] +line|z9[boundary=administrative][admin_level=2] { - color: @border_state; - width: 0.62; - z-index: 56; -} -line|z7[boundary=administrative][border_type=state]::d2p2 -{ - color: @border; - width: 0.12; - z-index: 57; - dashes: 0.62,0.12,0.12,0.12; - linecap: butt; -} -line|z8[boundary=administrative][border_type=state] -{ - color: @border_state; - width: 1.25; - z-index: 63; + color: @border_country_z9; + width: 2; } -line|z8-11[boundary=administrative][admin_level=2]::d2p2 + + +line|z10-11[boundary=administrative][admin_level=2]::d2p2 { color: @border; width: 2.34; @@ -125,51 +71,13 @@ line|z8-11[boundary=administrative][admin_level=2]::d2p2 linecap: butt; -x-kot-layer: top; } -line|z8[boundary=administrative][border_type=state]::d2p2 -{ - color: @border; - width: 0.25; - z-index: 64; - dashes: 1.25,0.25,0.25,0.25; - linecap: butt; - -x-kot-layer: top; -} -line|z8-11[boundary=administrative][admin_level=2] +line|z10-11[boundary=administrative][admin_level=2] { color: @light_yellow; width: 3.12; z-index: 124; -x-kot-layer: top; } -line|z9[boundary=administrative][admin_level=4]::d2p2 -{ - color: @light_yellow; - width: 1.2; - -x-kot-layer: top; -} -line|z9[boundary=administrative][admin_level=4] -{ - color: @gray90; - width: 1; - z-index: 12; - dashes: 0.3,0.6; - linecap: butt; - -x-kot-layer: top; -} -line|z9[boundary=administrative][border_type=state] -{ - color: @border_state; - width: 1; - z-index: 63; -} -line|z9[boundary=administrative][border_type=state]::d2p2 -{ - color: @border; - width: 0.5; - z-index: 64; - dashes: 2.5,0.5,0.5,0.5; - linecap: butt; -} line|z10-11[boundary=administrative][admin_level=4]::d2p2, { color: @light_yellow; diff --git a/data/styles/include/base_place.mapcss b/data/styles/include/base_place.mapcss index c98e8b3b41..c190751cc3 100644 --- a/data/styles/include/base_place.mapcss +++ b/data/styles/include/base_place.mapcss @@ -22,7 +22,7 @@ node|z3[place=country] { text: name; font-size: 12; - text-color: @dark_gray_40; + text-color: @continent_name; } area|z3[place=country]::int_name, node|z3[place=country]::int_name @@ -32,7 +32,7 @@ node|z3[place=country]::int_name text-color: @gray60; } -node|z4[place=city][capital?]::int_name +node|z4[place=city][capital=2]::int_name { font-size: 10; text-halo-radius: 2; @@ -42,14 +42,20 @@ node|z4[place=city][capital?]::int_name } node|z8[place=town] { + font-size: 10; + text: name; + text-color: @gray70; +} +node|z9[place=town] +{ font-size: 12; text-halo-radius: 2; text: name; - text-color: @dark_gray_40; + text-color: @gray60; text-halo-color: @light_yellow; } -node|z4[place=country], -node|z9[place=town] + +node|z4[place=country] { font-size: 14; text-halo-radius: 2; @@ -57,14 +63,7 @@ node|z9[place=town] text-color: @dark_gray_40; text-halo-color: @light_yellow; } -node|z4[place=state] -{ - text: name; - font-size: 11; - text-color: @state_name; - z-index: -10; -} -node|z4[place=city][capital?] +node|z4[place=city][capital=2] { font-size: 11; text-halo-radius: 2; @@ -82,7 +81,7 @@ node|z13-14[place=village]::int_name text-halo-color: @light_yellow; } -node|z5[place=city][capital?] +node|z5[place=city][capital=2] { font-size: 12; text-halo-radius: 2; @@ -90,7 +89,7 @@ node|z5[place=city][capital?] text-color: @gray50; text-halo-color: @light_yellow; } -node|z5[place=city][capital?]::int_name +node|z5[place=city][capital=2]::int_name { font-size: 11; text-halo-radius: 2; @@ -106,14 +105,6 @@ node|z5[place=country] text-color: @dark_gray_40; text-halo-color: @light_yellow; } -node|z5[place=city] -{ - font-size: 11; - text-halo-radius: 2; - text: name; - text-color: @gray60; - text-halo-color: @light_yellow; -} node|z5[place=state] { text: name; @@ -121,18 +112,10 @@ node|z5[place=state] text-color: @state_name; z-index: -10; } -node|z5[place=city]::int_name -{ - font-size: 10; - text-halo-radius: 2; - text: int_name; - text-color: @gray90; - text-halo-color: @light_yellow; -} node|z7-8[place=city]::int_name, node|z9[place=town]::int_name, node|z12-13[place=town]::int_name, -node|z6-9[place=city][capital?]::int_name +node|z6-9[place=city][capital=2]::int_name { font-size: 12; text-halo-radius: 2; @@ -140,7 +123,7 @@ node|z6-9[place=city][capital?]::int_name text-color: @gray; text-halo-color: @light_yellow; } -node|z6[place=city][capital?] +node|z6[place=city][capital=2] { font-size: 14; text-halo-radius: 2; @@ -234,7 +217,7 @@ node|z8-9[place=region], font-size: 12; text-color: @gray60; } -node|z8-9[place=city][capital?], +node|z8-9[place=city][capital=2], node|z16[place=locality], node|z16[place=neighbourhood], node|z16[place=isolated_dwelling], @@ -291,7 +274,7 @@ node|z9[place=county] node|z9-11[place=city]::int_name, node|z10-11[place=town]::int_name, node|z14[place=town]::int_name, -node|z10-11[place=city][capital?]::int_name +node|z10-11[place=city][capital=2]::int_name { font-size: 14; text-halo-radius: 2; @@ -316,7 +299,7 @@ node|z12[place=town] text-color: @gray50; text-halo-color: @light_yellow; } -node|z10-11[place=city][capital?] +node|z10-11[place=city][capital=2] { font-size: 18; text-halo-radius: 2; @@ -349,7 +332,7 @@ node|z12[place=city]::int_name text-color: @gray; } node|z13-15[place=city]::int_name, -node|z12[place=city][capital?]::int_name +node|z12[place=city][capital=2]::int_name { font-size: 16; text-halo-radius: 2; @@ -374,7 +357,7 @@ node|z13[place=town] text-color: @gray50; text-halo-color: @light_yellow; } -node|z12[place=city][capital?] +node|z12[place=city][capital=2] { font-size: 22; text-halo-radius: 2; @@ -390,7 +373,7 @@ node|z12[place=suburb] text-color: @gray90; z-index: 20; } -node|z13[place=city][capital?]::int_name +node|z13[place=city][capital=2]::int_name { font-size: 18; text-halo-radius: 2; @@ -411,7 +394,7 @@ area|z11-[place=village] { fill-color: @village_fill; } -node|z13[place=city][capital?] +node|z13[place=city][capital=2] { text: name; font-size: 24; diff --git a/data/styles/include/base_roads.mapcss b/data/styles/include/base_roads.mapcss index a4e3392c5d..b4543e901e 100644 --- a/data/styles/include/base_roads.mapcss +++ b/data/styles/include/base_roads.mapcss @@ -25,33 +25,63 @@ line|z7[highway=trunk] { color: @highway_trunk_z7; width: 1; + casing-width: 0; } line|z7[highway=motorway] { color: @highway_motorway_z7; width: 1; + casing-width: 0; } line|z8[highway=trunk] { color: @highway_trunk_z8; - width: 2; + width: 0.8; + casing-width: 0.2; } line|z8[highway=motorway] { color: @highway_motorway_z8; - width: 2; + width: 0.8; + casing-width: 0.2; +} +line|z8[highway=primary] +{ + color: @highway_primary; + width: 0.8; + casing-width: 0.2; } -line|z9-10[highway=trunk] +line|z9[highway=trunk] { color: @highway_trunk; - width: 2; + width: 1; + casing-width: 0.5; } line|z9[highway=motorway] { color: @highway_motorway; - width: 3; + width: 1; + casing-width: 0.5; +} +line|z9[highway=secondary] +{ + color: @highway_secondary; + width: 0.8; + casing-width: 0.6; +} +line|z9[highway=primary] +{ + color: @highway_primary; + width: 1; + casing-width: 0.5; +} + +line|z10[highway=trunk] +{ + color: @highway_trunk; + width: 2; } -line|z9-10[highway=secondary] +line|z10[highway=secondary] { color: @highway_secondary; width: 1; @@ -67,7 +97,7 @@ line|z10-12[highway=byway] width: 1; dashes: 4.5,3; } -line|z8-10[highway=primary] +line|z10[highway=primary] { color: @highway_primary; width: 1; diff --git a/data/styles/style-dark/colors_dark.mapcss b/data/styles/style-dark/colors_dark.mapcss index c5ad12bf55..5fb2d32311 100644 --- a/data/styles/style-dark/colors_dark.mapcss +++ b/data/styles/style-dark/colors_dark.mapcss @@ -12,6 +12,8 @@ @border_country_z4: #661; @border_country_z5: #721; @border_country_z6: #721; +@border_country_z8: #721; +@border_country_z9: #721; @border_state: red; @building_fill: #333; @comm_line: #0f7f0f; diff --git a/data/styles/style-light/colors_light.mapcss b/data/styles/style-light/colors_light.mapcss index 247a1d0957..470bc39a34 100644 --- a/data/styles/style-light/colors_light.mapcss +++ b/data/styles/style-light/colors_light.mapcss @@ -9,14 +9,16 @@ @alpine_hiking: blue; @beach: #eecc55; @border: #f9574b; -@border_country_z4: #ffa090; -@border_country_z5: #ff775b; -@border_country_z6: #d9775b; +@border_country_z4: #cdcdcd; +@border_country_z5: #bdbdbd; +@border_country_z6: #909090; +@border_country_z8: #808080; +@border_country_z9: #707070; @border_state: yellow; @building_fill: #cdcdb4; @comm_line: #f080f0; @conservation: #cfeca8; -@continent_name: #808078; +@continent_name: #707070; @country_name: #a0a090; @country_name_z7: #909080; @country_name_z8: #b0b0a0; |