diff --git a/Default.style/points.mapcss b/Default.style/points.mapcss index 8f64de3..60e6949 100644 --- a/Default.style/points.mapcss +++ b/Default.style/points.mapcss @@ -10,8 +10,16 @@ node,area { font-stroke-width: 1pt; font-stroke-color: @color_label_stroke; + node[place=continent] { + |z1-2 { + text: eval(locTag('name')); + text-color: @color_name_text; + details-enabled: 0; + } + } + [place=country] { - |z2-8 { + |z3-8 { text: eval(locTag('name')); text-color: @color_name_text; font-size: 16; @@ -20,11 +28,14 @@ node,area { text-priority: 10; text-big-padding: true; } - |z2-4 { + |z3-4 { font-size:12; font-weight: normal; text-big-padding: false; } + |z2-3 { + font-size:10; + } } [boundary=administrative] { @@ -130,7 +141,7 @@ node,area { text: eval(locTag('name')); text-color: @color_water_text; text-priority: 5; - font-size:16; + font-size:12; font-stroke-width:2pt; font-stroke-color: @color_water; } @@ -258,7 +269,7 @@ node,area { node|z17-[entrance][!indoor] { icon-image: "poi_circle_small.svg"; icon-tint: @color_entrance_text; - + text-priority: -5; details-enabled: 0; @@ -266,7 +277,7 @@ node,area { [entrance=main] { icon-scale: 0.85; } - + |z18-{ icon-image: "poi_entrance.svg"; icon-scale: 0.8; @@ -280,7 +291,7 @@ node,area { font-size: 9; details-enabled: 1; } - + [ref] { text: eval( tag('ref') ); text-color: @color_entrance_text; @@ -734,7 +745,7 @@ node,area { text-color: @color_text_offices; } } - + |z16-( [amenity=college], [amenity=school], @@ -1055,7 +1066,7 @@ node,area { node|z16-[highway=bus_stop] { icon-image:"poi_bus.svg"; icon-tint: @color_icon_transport; - + text: eval(locTag('name')); text-color: @color_text_transport; } @@ -1063,7 +1074,7 @@ node,area { node|z17-[railway=tram_stop] { icon-image:"poi_tram.svg"; icon-tint: @color_icon_transport; - + text: eval(locTag('name')); text-color: @color_text_transport; } @@ -1085,7 +1096,7 @@ node,area { text-priority: 7; } } - + |z14-[railway=station][transport=subway], |z14-[railway=station][station=subway], |z15-[railway=station], @@ -1121,10 +1132,10 @@ node,area { font-size: 8; text-color: @color_label_text; font-stroke-color: @color_footway_area; - + details-enabled: 0; text-priority: 1; - + |z16-{ font-size: 9; } @@ -1156,7 +1167,7 @@ node,area { icon-image:"poi_gate.svg"; icon-scale: 0.75; icon-tint: @color_icon_tint; - + details-enabled: 0; text-priority: -1; } @@ -1164,7 +1175,7 @@ node,area { node|z17-[barrier=lift_gate] { icon-image:"poi_lift_gate.svg"; icon-tint: @color_icon_tint; - + details-enabled: 0; text-priority: -1; } diff --git a/Default.style/polygons.mapcss b/Default.style/polygons.mapcss index d416348..34a818e 100644 --- a/Default.style/polygons.mapcss +++ b/Default.style/polygons.mapcss @@ -12,7 +12,7 @@ area { [boundary=administrative] { // country boundaries - [admin_level=2] { + |z3-[admin_level=2] { z-index: 4; width: eval( zlinear(13, 1pt,2pt,3pt )); color: @color_boundary_country; @@ -90,7 +90,7 @@ area { fill-color: @color_landuse_commercial; } } - + // generalized buildings |z11-12[landuse=residential]{ z-index: -14; @@ -119,7 +119,7 @@ area { z-index: -14; fill-color: @color_sand; } - + [landuse=quarry] { z-index: -14; fill-color: @color_quarry; @@ -139,7 +139,7 @@ area { fill-color: @color_nature_reserve; } } - + @if SubStyle != Car |z10-[leisure=nature_reserve] { color: @color_national_park; @@ -150,7 +150,7 @@ area { width: 2pt; } @endif - + |z13-{ // заросли кустов [natural=scrub] { @@ -251,9 +251,9 @@ area { fill-color: @color_landuse_parking; } } - + // -10 - + |z9-[natural=glacier] { fill-color: @color_glacier; z-index:-10; @@ -268,7 +268,7 @@ area { fill-color: @color_water; } } - + [natural=wetland] { |z9-12 { fill-color: @color_wetland;