forked from organicmaps/organicmaps
[styles] Make areal water tunnels transparent and visible from z15
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Viktor Govako
parent
629e5bd715
commit
681eebf72e
4 changed files with 48 additions and 36 deletions
|
|
@ -386,13 +386,15 @@ area|z0-[natural=desert],
|
|||
|
||||
/* 6.WATER */
|
||||
|
||||
area|z0-[natural=water],
|
||||
area|z0-[natural=water][!tunnel],
|
||||
area|z0-[waterway=dock],
|
||||
area|z0-[waterway=riverbank],
|
||||
area|z0-[landuse=salt_pond],
|
||||
area|z12-[landuse=basin],
|
||||
area|z12-[landuse=reservoir],
|
||||
{fill-opacity: 1;}
|
||||
area|z15-[natural=water][tunnel],
|
||||
{fill-opacity: 0.15;}
|
||||
|
||||
area|z11-[natural=wetland],
|
||||
area|z11-[leisure=marina],
|
||||
|
|
@ -412,13 +414,14 @@ line|z13-[natural=strait],
|
|||
|
||||
/* 6.1 Area water(lake,pond etc.) */
|
||||
|
||||
area|z0-[natural=water],
|
||||
area|z0-[natural=water][!tunnel],
|
||||
area|z0-[landuse=salt_pond],
|
||||
area|z0-[waterway=dock],
|
||||
area|z0-[waterway=riverbank],
|
||||
area|z12-[landuse=basin],
|
||||
area|z12-[landuse=reservoir],
|
||||
area|z13-[leisure=swimming_pool],
|
||||
area|z15-[natural=water][tunnel],
|
||||
area|z16-[amenity=fountain],
|
||||
{fill-color: @water;}
|
||||
|
||||
|
|
|
|||
|
|
@ -529,7 +529,7 @@ node|z15-[natural=beach],
|
|||
node|z1-[place=ocean],
|
||||
node|z4-[place=sea],
|
||||
area|z10-[landuse=reservoir][bbox_area>=4000000],
|
||||
area|z10-[natural=water][bbox_area>=4000000],
|
||||
area|z10-[natural=water][!tunnel][bbox_area>=4000000],
|
||||
line|z11-[waterway=river],
|
||||
line|z11-[waterway=riverbank],
|
||||
line|z13-[waterway=stream],
|
||||
|
|
@ -537,13 +537,17 @@ line|z13-[waterway=canal],
|
|||
line|z13-[waterway=fish_pass],
|
||||
line|z13-[natural=strait],
|
||||
node|z14-[natural=strait],
|
||||
node|z14-[natural=water],
|
||||
node|z14-[natural=bay],
|
||||
area|z14-[natural=water],
|
||||
node|z16-[natural=wetland],
|
||||
area|z16-[natural=wetland],
|
||||
{text:name;text-color: @water_label;}
|
||||
|
||||
area|z10-[natural=water][!tunnel][bbox_area<4000000],
|
||||
{text:name;text-color: @water_label;}
|
||||
|
||||
area|z12-[landuse=reservoir][bbox_area<4000000],
|
||||
{text:name;text-color: @water_label;}
|
||||
|
||||
/*6.1 Area water(ocean,sea,lake,pond etc.)*/
|
||||
|
||||
node|z1-2[place=ocean]
|
||||
|
|
@ -558,25 +562,28 @@ node|z5-[place=ocean]
|
|||
node|z4-[place=sea]
|
||||
{font-size: 12;}
|
||||
|
||||
node|z14-15[natural=water],
|
||||
area|z10-[landuse=reservoir][bbox_area>=4000000],
|
||||
area|z10-13[natural=water][!tunnel][bbox_area>=4000000],
|
||||
{font-size: 9;}
|
||||
area|z12-[landuse=reservoir][bbox_area<4000000],
|
||||
area|z10-13[natural=water][!tunnel][bbox_area<4000000],
|
||||
{text: none;}
|
||||
|
||||
node|z14-15[natural=bay],
|
||||
node|z14-15[natural=strait],
|
||||
area|z14-15[natural=water]
|
||||
area|z14-15[natural=water][!tunnel][bbox_area>=4000000],
|
||||
{font-size: 10;}
|
||||
node|z16-[natural=water],
|
||||
area|z14-15[natural=water][!tunnel][bbox_area<4000000],
|
||||
{font-size: 10;}
|
||||
|
||||
node|z16-[natural=bay],
|
||||
node|z16-[natural=strait],
|
||||
node|z16-[natural=wetland],
|
||||
area|z16-[natural=water],
|
||||
area|z16-[natural=water][!tunnel][bbox_area>=4000000],
|
||||
area|z16-[natural=wetland],
|
||||
{font-size: 11;}
|
||||
|
||||
area|z10-[landuse=reservoir][bbox_area>=4000000],
|
||||
area|z10-[natural=water][bbox_area>=4000000],
|
||||
{font-size: 9;}
|
||||
area|z10-[landuse=reservoir][bbox_area<4000000],
|
||||
area|z10-[natural=water][bbox_area<4000000],
|
||||
{font-size: 0;} /*check*/
|
||||
area|z16-[natural=water][!tunnel][bbox_area<4000000],
|
||||
{font-size: 11;}
|
||||
|
||||
/* 6.2 Line water(river,canal etc.) Do not draw tunnel waterways */
|
||||
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@ area|z0-[natural=desert],
|
|||
|
||||
/* 6.WATER */
|
||||
|
||||
area|z0-[natural=water],
|
||||
area|z0-[natural=water][!tunnel],
|
||||
area|z0-[waterway=dock],
|
||||
area|z0-[waterway=riverbank],
|
||||
area|z0-[landuse=salt_pond],
|
||||
|
|
@ -361,7 +361,7 @@ line|z13-[natural=strait],
|
|||
|
||||
/* 6.1 Area water(lake,pond etc.) */
|
||||
|
||||
area|z0-[natural=water],
|
||||
area|z0-[natural=water][!tunnel],
|
||||
area|z0-[landuse=salt_pond],
|
||||
area|z0-[waterway=dock],
|
||||
area|z0-[waterway=riverbank],
|
||||
|
|
|
|||
|
|
@ -446,23 +446,22 @@ node|z17-[natural=beach]
|
|||
node|z1-[place=ocean],
|
||||
node|z4-[place=sea],
|
||||
area|z10-[landuse=reservoir][bbox_area>=4000000],
|
||||
area|z10-[natural=water][bbox_area>=80000000],
|
||||
area|z10-[natural=water][!tunnel][bbox_area>=4000000],
|
||||
line|z11-[waterway=river],
|
||||
line|z11-[waterway=riverbank],
|
||||
line|z13-[waterway=canal],
|
||||
line|z13-[natural=strait],
|
||||
node|z14-[natural=water][bbox_area>=1000000],
|
||||
node|z14-[natural=bay],
|
||||
node|z14-[natural=strait],
|
||||
area|z14-[natural=water][bbox_area>=1000000],
|
||||
node|z16-[natural=wetland],
|
||||
area|z16-[natural=wetland],
|
||||
{text:name;text-color: @water_label;}
|
||||
|
||||
/* Don't want to break current logic, but there are several strange moments here:
|
||||
- removing NODE rule "node|z14-[natural=water][bbox_area>=1000000]" breaks other rules.
|
||||
- z14-[natural=water], bbox_area=[1000000-4000000] range can stay without captions (see rules below).
|
||||
*/
|
||||
area|z10-[natural=water][!tunnel][bbox_area<4000000],
|
||||
{text:name;text-color: @water_label;}
|
||||
|
||||
area|z12-[landuse=reservoir][bbox_area<4000000],
|
||||
{text:name;text-color: @water_label;}
|
||||
|
||||
/*6.1 Area water(ocean,sea,lake,pond etc.)*/
|
||||
|
||||
|
|
@ -478,25 +477,28 @@ node|z5-[place=ocean]
|
|||
node|z4-[place=sea]
|
||||
{font-size: 12;}
|
||||
|
||||
node|z14-15[natural=water],
|
||||
area|z10-[landuse=reservoir][bbox_area>=4000000],
|
||||
area|z10-13[natural=water][!tunnel][bbox_area>=4000000],
|
||||
{font-size: 8.5;}
|
||||
area|z12-[landuse=reservoir][bbox_area<4000000],
|
||||
area|z10-13[natural=water][!tunnel][bbox_area<4000000],
|
||||
{text: none;}
|
||||
|
||||
node|z14-15[natural=bay],
|
||||
node|z14-15[natural=strait],
|
||||
area|z14-15[natural=water]
|
||||
area|z14-15[natural=water][!tunnel][bbox_area>=4000000],
|
||||
{font-size: 9.5;}
|
||||
node|z16-[natural=water],
|
||||
area|z14-15[natural=water][!tunnel][bbox_area<4000000],
|
||||
{font-size: 9.5;}
|
||||
|
||||
node|z16-[natural=bay],
|
||||
node|z16-[natural=strait],
|
||||
node|z16-[natural=wetland],
|
||||
area|z16-[natural=water],
|
||||
area|z16-[natural=water][!tunnel][bbox_area>=4000000],
|
||||
area|z16-[natural=wetland],
|
||||
{font-size: 10.5;}
|
||||
|
||||
area|z10-[landuse=reservoir][bbox_area>=4000000],
|
||||
area|z10-[natural=water][bbox_area>=4000000],
|
||||
{font-size: 8.5;}
|
||||
area|z10-[landuse=reservoir][bbox_area<4000000],
|
||||
area|z10-[natural=water][bbox_area<4000000],
|
||||
{font-size: 0;} /*check*/
|
||||
area|z16-[natural=water][!tunnel][bbox_area<4000000],
|
||||
{font-size: 10.5;}
|
||||
|
||||
/* 6.2 Line water(river,canal etc.) Do not draw tunnel waterways */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue