forked from organicmaps/organicmaps-tmp
[styles] Make water areas foreground and above linear waterways
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Viktor Govako
parent
238e38496a
commit
063761d86f
4 changed files with 98 additions and 86 deletions
|
|
@ -33,6 +33,27 @@
|
|||
area[natural=coastline]
|
||||
{z-index: -10;}
|
||||
|
||||
line[waterway=river],
|
||||
line[waterway=riverbank],
|
||||
line[waterway=stream],
|
||||
line[waterway=canal],
|
||||
line[waterway=ditch],
|
||||
line[waterway=drain],
|
||||
line[natural=strait],
|
||||
{z-index: 1;}
|
||||
|
||||
/*
|
||||
Foreground area water should be above linear water (e.g. rivers)
|
||||
and below hatching fills, dams, piers.
|
||||
*/
|
||||
area[natural=water],
|
||||
area[waterway=dock],
|
||||
area[waterway=riverbank],
|
||||
area[landuse=salt_pond],
|
||||
area[landuse=basin],
|
||||
area[landuse=reservoir],
|
||||
{fill-position: foreground; z-index: 1;}
|
||||
|
||||
/* These are foreground areas with semi-transparent hardcoded hatching-style fills.
|
||||
They are rendered over all other background areas only.
|
||||
And we want lines to be rendered above them, hence minimum z-index.
|
||||
|
|
@ -40,7 +61,17 @@ area[natural=coastline]
|
|||
area[leisure=nature_reserve],
|
||||
area[boundary=national_park],
|
||||
area[landuse=military],
|
||||
{z-index: 0;}
|
||||
{fill-position: foreground; z-index: 2;}
|
||||
|
||||
/* Foreground areas which should be above water and hatching fills. */
|
||||
area[waterway=dam],
|
||||
line[waterway=dam],
|
||||
area[man_made=pier],
|
||||
area[man_made=breakwater],
|
||||
line[man_made=pier],
|
||||
line[man_made=breakwater],
|
||||
{fill-position: foreground; z-index: 3;}
|
||||
|
||||
|
||||
area[natural=land],
|
||||
area[place=islet]
|
||||
|
|
@ -110,7 +141,6 @@ line[isoline=zero],
|
|||
|
||||
area[natural=wetland],
|
||||
area[leisure=marina],
|
||||
line[waterway=stream][intermittent=yes]
|
||||
{z-index: 43;}
|
||||
|
||||
area[amenity=parking],
|
||||
|
|
@ -136,36 +166,16 @@ area[natural=heath]
|
|||
area[natural=scrub]
|
||||
{z-index: 47;}
|
||||
|
||||
line[waterway=river],
|
||||
line[waterway=riverbank],
|
||||
line[waterway=stream],
|
||||
line[waterway=canal],
|
||||
line[natural=strait],
|
||||
line[waterway=ditch],
|
||||
line[barrier=ditch],
|
||||
line[waterway=drain],
|
||||
{z-index: 50;}
|
||||
|
||||
area[natural=water],
|
||||
area[waterway=dock],
|
||||
area[waterway=riverbank],
|
||||
area[landuse=salt_pond],
|
||||
area[landuse=basin],
|
||||
area[landuse=reservoir],
|
||||
area[leisure=swimming_pool],
|
||||
area[amenity=fountain],
|
||||
{z-index: 100;}
|
||||
|
||||
area[waterway=dam],
|
||||
line[waterway=dam],
|
||||
line[waterway=weir],
|
||||
node[waterway=lock_gate],
|
||||
{z-index: 110;}
|
||||
|
||||
area[man_made=pier],
|
||||
area[man_made=breakwater],
|
||||
line[man_made=pier],
|
||||
line[man_made=breakwater],
|
||||
line[man_made=cutline]
|
||||
{z-index: 120;}
|
||||
|
||||
|
|
@ -374,13 +384,15 @@ area|z0-[natural=desert],
|
|||
/* 6.WATER */
|
||||
|
||||
area|z0-[natural=water],
|
||||
area|z0-[landuse=salt_pond],
|
||||
area|z0-[waterway=dock],
|
||||
area|z0-[waterway=riverbank],
|
||||
area|z11-[natural=wetland],
|
||||
area|z11-[leisure=marina],
|
||||
area|z0-[landuse=salt_pond],
|
||||
area|z12-[landuse=basin],
|
||||
area|z12-[landuse=reservoir],
|
||||
{fill-opacity: 1;}
|
||||
|
||||
area|z11-[natural=wetland],
|
||||
area|z11-[leisure=marina],
|
||||
area|z13-[leisure=swimming_pool],
|
||||
area|z16-[amenity=fountain],
|
||||
{fill-position: background; fill-opacity: 1;}
|
||||
|
|
@ -388,10 +400,11 @@ area|z16-[amenity=fountain],
|
|||
line|z10-[waterway=river],
|
||||
line|z10-[waterway=riverbank],
|
||||
line|z13-[waterway=stream],
|
||||
line|z13-[waterway=stream][intermittent=yes],
|
||||
line|z13-[waterway=canal],
|
||||
line|z17-[waterway=ditch],
|
||||
line|z17-[waterway=drain],
|
||||
line|z13-[natural=strait],
|
||||
{opacity: 1; color: @river; -x-me-line-priority: 1005;}
|
||||
{opacity: 1; color: @river;}
|
||||
|
||||
/* 6.1 Area water(lake,pond etc.) */
|
||||
|
||||
|
|
@ -606,7 +619,7 @@ area|z15-[amenity=parking]
|
|||
|
||||
area|z12-[man_made=pier],
|
||||
area|z12-[man_made=breakwater],
|
||||
{fill-position: background; fill-opacity: 1; fill-color: @background;}
|
||||
{fill-opacity: 1; fill-color: @background;}
|
||||
|
||||
line|z14-[man_made=pier],
|
||||
line|z14-[man_made=breakwater],
|
||||
|
|
@ -693,9 +706,6 @@ area|z18-[waterway=dam],
|
|||
area|z18-[landuse=garages],
|
||||
{fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;}
|
||||
|
||||
area|z14-[waterway=dam],
|
||||
{fill-position: background;}
|
||||
|
||||
|
||||
/* 8.3 Barriers, cliffs */
|
||||
|
||||
|
|
|
|||
|
|
@ -55,11 +55,6 @@ node[place=continent]
|
|||
{z-index: 999;}
|
||||
|
||||
node[place=country],
|
||||
line[man_made=pier],
|
||||
line[man_made=breakwater],
|
||||
node[man_made=pier],
|
||||
node[man_made=breakwater],
|
||||
line[waterway=dam],
|
||||
line[waterway=weir],
|
||||
node[waterway=weir],
|
||||
{z-index: 1000;}
|
||||
|
|
@ -94,13 +89,6 @@ node[place=ocean],
|
|||
node[place=sea]
|
||||
{z-index: 3000;}
|
||||
|
||||
line[waterway=river],
|
||||
line[waterway=riverbank],
|
||||
line[waterway=stream],
|
||||
line[waterway=canal],
|
||||
line[natural=strait],
|
||||
line[waterway],
|
||||
{z-index: 10000;}
|
||||
|
||||
/* 2.CONTINENTS */
|
||||
|
||||
|
|
@ -529,6 +517,14 @@ node|z15-[natural=beach],
|
|||
|
||||
/* 6.WATER */
|
||||
|
||||
[waterway=river],
|
||||
[waterway=riverbank],
|
||||
[waterway=stream],
|
||||
[waterway=canal],
|
||||
[natural=strait],
|
||||
[waterway=dam],
|
||||
{-x-me-text-priority: 16950;}
|
||||
|
||||
node|z1-[place=ocean],
|
||||
node|z4-[place=sea],
|
||||
area|z10-[landuse=reservoir][bbox_area>=4000000],
|
||||
|
|
@ -541,7 +537,6 @@ line|z13-[natural=strait],
|
|||
node|z14-[natural=strait],
|
||||
node|z14-[natural=water],
|
||||
node|z14-[natural=bay],
|
||||
node|z14-[natural=strait],
|
||||
area|z14-[natural=water],
|
||||
node|z16-[natural=wetland],
|
||||
area|z16-[natural=wetland],
|
||||
|
|
@ -677,15 +672,13 @@ area|z15-[waterway=dam],
|
|||
line|z15-[waterway=dam],
|
||||
line|z15-[waterway=weir],
|
||||
node|z15-[waterway=weir]
|
||||
{text: name;font-size: 10;text-color:@poi_label;fill-opacity: 1;}
|
||||
|
||||
area|z17-[man_made=pier],
|
||||
area|z17-[man_made=breakwater],
|
||||
line|z17-[man_made=pier],
|
||||
line|z17-[man_made=breakwater],
|
||||
node|z17-[man_made=pier],
|
||||
node|z17-[man_made=breakwater]
|
||||
{text: name;font-size: 10;text-color:@poi_label;fill-opacity: 1;-x-me-area-priority:16000;}
|
||||
{text: name;font-size: 10;text-color:@poi_label;fill-opacity: 1;}
|
||||
|
||||
/* 8.2 Building */
|
||||
area|z16[building],
|
||||
|
|
|
|||
|
|
@ -31,6 +31,37 @@
|
|||
area[natural=coastline]
|
||||
{z-index: -10;}
|
||||
|
||||
line[waterway=river],
|
||||
line[waterway=riverbank],
|
||||
line[waterway=stream],
|
||||
line[waterway=canal],
|
||||
line[waterway=ditch],
|
||||
line[waterway=drain],
|
||||
line[natural=strait],
|
||||
{z-index: 1;}
|
||||
|
||||
/*
|
||||
Foreground area water should be above linear water (e.g. rivers)
|
||||
and below dams, piers.
|
||||
*/
|
||||
area[natural=water],
|
||||
area[waterway=dock],
|
||||
area[waterway=riverbank],
|
||||
area[landuse=salt_pond],
|
||||
area[landuse=basin],
|
||||
area[landuse=reservoir],
|
||||
{fill-position: foreground; z-index: 1;}
|
||||
|
||||
/* Foreground areas which should be above water. */
|
||||
area[waterway=dam],
|
||||
line[waterway=dam],
|
||||
area[man_made=pier],
|
||||
area[man_made=breakwater],
|
||||
line[man_made=pier],
|
||||
line[man_made=breakwater],
|
||||
{fill-position: foreground; z-index: 3;}
|
||||
|
||||
|
||||
area[natural=land],
|
||||
area[place=islet]
|
||||
{z-index: 0;}
|
||||
|
|
@ -104,38 +135,18 @@ area[natural=heath]
|
|||
{z-index: 45;}
|
||||
|
||||
area[natural=wetland],
|
||||
line[waterway=stream][intermittent=yes]
|
||||
{z-index: 49;}
|
||||
|
||||
line[waterway=river],
|
||||
line[waterway=riverbank],
|
||||
line[waterway=stream],
|
||||
line[waterway=canal],
|
||||
line[natural=strait],
|
||||
line[waterway=ditch],
|
||||
line[barrier=ditch],
|
||||
line[waterway=drain],
|
||||
{z-index: 50;}
|
||||
|
||||
area[natural=water],
|
||||
area[waterway=dock],
|
||||
area[waterway=riverbank],
|
||||
area[landuse=salt_pond],
|
||||
area[landuse=basin],
|
||||
area[landuse=reservoir],
|
||||
area[leisure=swimming_pool],
|
||||
{z-index: 100;}
|
||||
|
||||
area[waterway=dam],
|
||||
line[waterway=dam],
|
||||
line[waterway=weir],
|
||||
node[waterway=lock_gate],
|
||||
{z-index: 110;}
|
||||
|
||||
area[man_made=pier],
|
||||
area[man_made=breakwater],
|
||||
line[man_made=pier],
|
||||
line[man_made=breakwater],
|
||||
line[man_made=cutline]
|
||||
{z-index: 120;}
|
||||
|
||||
|
|
@ -320,20 +331,25 @@ area|z0-[natural=desert],
|
|||
/* 6.WATER */
|
||||
|
||||
area|z0-[natural=water],
|
||||
area|z0-[landuse=salt_pond],
|
||||
area|z0-[waterway=dock],
|
||||
area|z0-[waterway=riverbank],
|
||||
area|z11-[natural=wetland],
|
||||
area|z0-[landuse=salt_pond],
|
||||
area|z12-[landuse=basin],
|
||||
area|z12-[landuse=reservoir],
|
||||
{fill-opacity: 1;}
|
||||
|
||||
area|z11-[natural=wetland],
|
||||
area|z13-[leisure=swimming_pool],
|
||||
{fill-position: background; fill-opacity: 1;}
|
||||
|
||||
line|z10-[waterway=river],
|
||||
line|z10-[waterway=riverbank],
|
||||
line|z13-[waterway=stream],
|
||||
line|z13-[waterway=canal],
|
||||
line|z17-[waterway=ditch],
|
||||
line|z17-[waterway=drain],
|
||||
line|z13-[natural=strait],
|
||||
{opacity: 1;color: @river;}
|
||||
{opacity: 1; color: @river;}
|
||||
|
||||
/* 6.1 Area water(lake,pond etc.) */
|
||||
|
||||
|
|
@ -515,7 +531,7 @@ area|z17-[amenity=parking_space]
|
|||
|
||||
area|z13-[man_made=pier],
|
||||
area|z13-[man_made=breakwater],
|
||||
{fill-position: background; fill-opacity: 0.7; fill-color: @background;}
|
||||
{fill-opacity: 0.7; fill-color: @background;}
|
||||
|
||||
line|z15-[man_made=pier],
|
||||
line|z15-[man_made=breakwater],
|
||||
|
|
@ -575,9 +591,6 @@ area|z16-[waterway=dam],
|
|||
area|z16-[landuse=garages],
|
||||
{fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;}
|
||||
|
||||
area|z15-[waterway=dam],
|
||||
{fill-position: background;}
|
||||
|
||||
|
||||
/* 8.3 Barriers, cliffs */
|
||||
|
||||
|
|
|
|||
|
|
@ -50,11 +50,6 @@ node[place=continent]
|
|||
{z-index: 999;}
|
||||
|
||||
node[place=country],
|
||||
line[man_made=pier],
|
||||
line[man_made=breakwater],
|
||||
node[man_made=pier],
|
||||
node[man_made=breakwater],
|
||||
line[waterway=dam],
|
||||
line[waterway=weir],
|
||||
node[waterway=weir],
|
||||
area[landuse=military],
|
||||
|
|
@ -92,13 +87,6 @@ node[place=ocean],
|
|||
node[place=sea]
|
||||
{z-index: 3000;}
|
||||
|
||||
line[waterway=river],
|
||||
line[waterway=riverbank],
|
||||
line[waterway=canal],
|
||||
line[natural=strait],
|
||||
line[waterway],
|
||||
{z-index: 4500;}
|
||||
|
||||
/* 2.CONTINENTS */
|
||||
|
||||
*[place]
|
||||
|
|
@ -447,6 +435,14 @@ node|z17-[natural=beach]
|
|||
|
||||
/* 6.WATER */
|
||||
|
||||
[waterway=river],
|
||||
[waterway=riverbank],
|
||||
[waterway=stream],
|
||||
[waterway=canal],
|
||||
[natural=strait],
|
||||
[waterway=dam],
|
||||
{-x-me-text-priority: 16950;}
|
||||
|
||||
node|z1-[place=ocean],
|
||||
node|z4-[place=sea],
|
||||
area|z10-[landuse=reservoir][bbox_area>=4000000],
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue