Changes between Version 5 and Version 6 of Styles/Waterways


Ignore:
Timestamp:
2023-10-08T04:16:06+02:00 (2 years ago)
Author:
pierzen
Comment:

optimize rendering at various zoom levels

Legend:

Unmodified
Added
Removed
Modified

  • Styles/Waterways

    v5 v6  
    77#!style type="mapcss"
    88meta {
    9   title: "waterways";
    10   version: "1.[[revision]]_[[date]]";
    11   description: "Colors waterways features and caracteristics  and flags typology errors with red triangles (ie  disconnected segments, transition from river to stream). Styling of Waterways and natural features characteristics (ie. tunnel, bridge, intermitent) looks alike OSM Carto Style.";
    12   icon: "waterways.png";
    13   author: "Pierre Béland";
    14   watch-modified: true;
     9  title:"waterways";
     10  version:"1.[[revision]]_[[date]]";
     11  description:"Colors waterways features and caracteristics  and flags typology errors with red triangles (ie  disconnected segments, transition from river to stream). Styling of Waterways and natural features characteristics (ie. tunnel, bridge, intermitent) looks alike OSM Carto Style.";
     12  icon:"waterways.png";
     13  author:"Pierre Béland";
     14  watch-modified:true;
    1515}
    1616
    1717
    1818canvas {
    19     fill-color: #ffffea;
    20 }
    21 
    22 
    23 way  {z-index:1; width:0; casing-width: color:none;  casing-color: none; opacity:0.0;}
     19    fill-color:#ffffea;
     20}
     21
     22
     23way  {z-index:1; width:0; casing-width:color:none;  casing-color:none; opacity:0.0;}
    2424
    2525 node {
    2626   z-index:1; symbol:size:0;
    27    symbol-stroke-color: none;
    28    symbol-fill-color: none;
     27   symbol-stroke-color:none;
     28   symbol-fill-color:none;
    2929    opacity:0.0;
    3030    symbol-stroke-opacity:0.0;
    … …  
    3737   casing-width:0;    width:0;    opacity:0;    casing-opacity:0;}
    3838way[waterway=stream], way[waterway=drain], way[waterway=ditch], way[waterway=wadi], way[waterway=yes]  {   
    39    set .waterway_sd;    color: blue;    casing-color: white;    casing-width:1;    width:6;    opacity:0.5;    casing-opacity:0.3;}
     39   set .waterway_sd;    color:blue;    casing-color:white;    casing-width:1;    width:6;    opacity:0.5;    casing-opacity:0.3;}
    4040
    4141
    4242relation[natural=water],
    4343area[natural=water]:closed {
    44    z-index:1; color: #c2d5f0; width: 2; fill-color: #c2d5f0;   
    45 fill-opacity: 0.4;
     44   z-index:1; color:#c2d5f0; width:2; fill-color:#c2d5f0;   
     45fill-opacity:0.4;
    4646}
    4747relation[natural=water],
    … …  
    5050   set .water_area;
    5151   color:#c2d5f0; width:0; opacity:0;
    52    fill-color:#c2d5f0; fill-opacity: 0.3;
     52   fill-color:#c2d5f0; fill-opacity:0.3;
    5353   casing-color:none; casing-width:0; casing-opacity:0;}
    5454relation[natural=wetland], way[natural=wetland]:closed {
    5555   set .wetland_area;
    5656   color:#c2d5f0; width:0; opacity:1.0;
    57    fill-opacity: 1;
     57   fill-opacity:1;
    5858   fill-image:natural_wetland.png;
    5959   casing-width:0; casing-color:none; casing-opacity:0;
    … …  
    6262   set .shoal_area;
    6363   color:#FFFFD8; width:0; opacity:1.0;
    64    fill-opacity: 1;
     64   fill-opacity:1;
    6565   fill-image:natural_shoal.png;
    6666}
    … …  
    8080{set .waterway_sd_node_deb;}
    8181way[waterway=stream] >[index=-1] node, way[waterway=drain] >[index=-1] node, way[waterway=ditch] >[index=-1] node, way[waterway=wadi] >[index=-1] node, way[waterway=yes] >[index=-1] node {   
    82    set .waterway_sd_node_end;     symbol-shape: pentagon;       symbol-size: 6;                 symbol-stroke-color: cyan;      symbol-fill-color: red;         symbol-stroke-width: 2;         symbol-stroke-opacity:0.6;}
     82   set .waterway_sd_node_end;     symbol-shape:pentagon;        symbol-size:6;          symbol-stroke-color:cyan;       symbol-fill-color:red;  symbol-stroke-width:2;  symbol-stroke-opacity:0.6;}
    8383way[waterway=stream] >[index<-1] node, way[waterway=drain] >[index<-1] node, way[waterway=ditch] >[index<-1] node, way[waterway=wadi] >[index<-1] node, way[waterway=yes] >[index<-1] node
    8484{ set .waterway_sd_node_nend;}
    … …  
    9494{set .waterway_rc_node_deb;}
    9595way[waterway=river] >[index=-1] node, way[waterway=canal] >[index=-1] node, way[waterway=fairway] >[index=-1] node {   
    96    set .waterway_rc_node_end;     symbol-shape: pentagon;       symbol-size: 6;                 symbol-stroke-color: cyan;      symbol-fill-color: red;         symbol-stroke-width: 2;         symbol-stroke-opacity:0.6; }
    97 way[waterway=river] >[index=-1] node {   
     96   set .waterway_rc_node_end; symbol-shape:pentagon; symbol-size:6; symbol-stroke-color:cyan;   symbol-fill-color:red; symbol-stroke-width:2; symbol-stroke-opacity:0.6; }
     97way[waterway=river] >[index=-1]  node {   
    9898   set .waterway_river_node_end;}
    9999
    … …  
    113113area.natural_way > node, way.natural_way > node
    114114{set .natural_node;
    115    z-index: 1; symbol:size:0;
     115   z-index:1; symbol:size:0;
    116116   symbol-stroke-color:#c2d5f0;
    117    symbol-fill-color: none;
     117   symbol-fill-color:none;
    118118    opacity:0.0;
    119119    symbol-stroke-opacity:0.0;
    … …  
    124124
    125125way[waterway=river] {   
    126    z-index:10; color:blue;   casing-color: blue;}
     126   z-index:10; color:blue;   casing-color:blue;}
    127127way.waterway_pressurised  {   
    128    z-index:10; color:blue;   casing-color: #FFFF66;}
    129 way[waterway=drain] {z-index:5; color: #3434ff; width: 1; }
    130 way[waterway=fairway] {z-index:10; color:blue; casing-color:white;}
     128   z-index:10; color:blue;   casing-color:#FFFF66;}
     129way[waterway=drain] {z-index:5; color:#3434ff; width:1; }
     130way[waterway=fairway] {z-index:10; color:blue; casing-color:#ffffb3;}
    131131
    132132way[place=island],
    133133way[place=islet] {
    134    z-index:2; color: #c2d5f0; width: 2; fill-color: white;fill-opacity: 0.2; opacity:1;}
    135 
    136 way|z7-[waterway=dam]!:closed {
    137    z-index: 16; color: black; width: 6; opacity:0.8; casing-width:6; casing-color: #c2d5f0; casing-opacity: 0.6;
    138 }
    139 relation|z7-[waterway=dam] > way:closed, area|z7-[waterway=dam]:closed {
    140    z-index: 16; color: black; width: 2; fill-color: #222222; fill-opacity: 0.4;}
     134   z-index:2; color:#c2d5f0; width:2; fill-color:white;fill-opacity:0.2; opacity:1;}
     135
     136way|z6-10[waterway=dam]!:closed {
     137   z-index:16; color:black; width:4; opacity:0.4; casing-width:4; casing-color:#c2d5f0; casing-opacity:0.4;
     138}
     139way|z11-[waterway=dam]!:closed {
     140   z-index:16; color:black; width:6; opacity:0.8; casing-width:6; casing-color:#c2d5f0; casing-opacity:0.6;
     141}
     142relation|z6-10[waterway=dam] > way:closed, area|z6-10[waterway=dam]:closed {
     143   z-index:16; color:black; width:1; fill-color:#222222; fill-opacity:0.3;}
     144relation|z11-[waterway=dam] > way:closed, area|z11-[waterway=dam]:closed {
     145   z-index:16; color:black; width:2; fill-color:#222222; fill-opacity:0.4;}
    141146way|z1-6[waterway=weir] {
    142    z-index: 16; color: black; width: 2; opacity:0.5; }
     147   z-index:16; color:black; width:2; opacity:0.5; }
    143148
    144149way|z7-[waterway=weir] {
    145    z-index: 16; color: black; width: 4; opacity:1; casing-width:6; casing-color: #c2d5f0; casing-opacity:0.7; dashes: 32, 12;}
     150   z-index:16; color:black; width:4; opacity:1; casing-width:6; casing-color:#c2d5f0; casing-opacity:0.7; dashes:32, 12;}
    146151
    147152/* ways styles by zoom-level */
    … …  
    150155   z-index:1; width:1; color:#c2d5f0;  casing-width:; casing-color:none; opacity:0.8; casing-opacity:0; }
    151156
    152 way|z11-.natural_way
     157way|z12-15.natural_way
    153158{
    154    z-index: 1; casing-width:0;    width:3; color:#c2d5f0;   opacity:0.8; }
     159   z-index:1; casing-width:0;    width:2; color:#98b9e6;   opacity:0.8; }
     160way|z16-.natural_way
     161{
     162   z-index:1; casing-width:0;    width:3; color:#6f9ddc;   opacity:0.8; }
     163   
    155164area.wetland_area {
    156165   z-index:2;
    … …  
    160169
    161170way|z1-13.waterway_sd {z-index:5; casing-width:1.3;   width:0.7;}
    162 way|z14-15.waterway_sd {z-index: 5; casing-width:1.3;   width:3.3; opacity:1.0}
    163 way|z16-.waterway_sd {z-index: 5; casing-width:1.3;   width:3.3; opacity:1.0}
    164 way|z1-13.waterway_rc {z-index:10; casing-width:0.7;  width:2; opacity:1;}
    165 way|z14-15.waterway_rc {z-index:10; casing-width:2;   width:2.5;}
    166 way|z16-.waterway_rc {z-index:10; casing-width:2;   width:2.5;}
    167 way|z16-[waterway=fairway] {z-index:10; casing-width:2;  width:2.5;  color:blue;   casing-color: white;}
     171way|z14-15.waterway_sd {z-index:5; casing-width:1.3;   width:3.3; opacity:1.0}
     172way|z16-.waterway_sd {z-index:5; casing-width:1.3;   width:3.3; opacity:1.0}
     173way|z1-13.waterway_rc {z-index:10; casing-width:0.5;  width:0.5; opacity:1;}
     174way|z14-15.waterway_rc {z-index:10; casing-width:1.7;   width:1.7; opacity:1; casing-opacity:1;}
     175way|z16-.waterway_rc {z-index:10; casing-width:2;   width:2.5; opacity:1; casing-opacity:1;}
     176
     177way|z1-13[waterway=fairway] {z-index:10; casing-width:0.5;  width:1; opacity:1;}
     178way|z14-15[waterway=fairway] {z-index:10; casing-width:0.5;   width:0.7; opacity:1; casing-opacity:1;}
     179way|z14-[waterway=fairway] {z-index:10; casing-width:4;  width:2.5; color:blue;  casing-color:#b3b3ff; opacity:1; casing-opacity:1;}
    168180
    169181way|z6-10[waterway=canal]  {
    170         z-index:10; width:2; color:white; opacity:1;
     182        z-index:10; width:1; color:white; opacity:1;
     183        casing-color:blue; casing-width:1;casing-opacity:1;
     184        dashes:22, 8, 22;
     185}
     186way|z11-13[waterway=canal]  {
     187        z-index:10; width:3; color:white; opacity:1;
    171188        casing-color:blue; casing-width:1.5;casing-opacity:1;
    172         dashes: 22, 8, 22;
    173 }
    174 way|z11-[waterway=canal]  {
     189        dashes:22, 8, 22;
     190}
     191way|z14-[waterway=canal]  {
    175192        z-index:10; width:4; color:white; opacity:1;
    176193        casing-color:blue; casing-width:3;casing-opacity:1;
    177         dashes: 22, 8, 22;
     194        dashes:22, 8, 22;
    178195}
    179196       
    180197way[waterway=canal][lock]  {   
    181         z-index: 10; dashes: 6,12;}
     198        z-index:10; dashes:6,12;}
    182199way[waterway=lock_gate]  {   
    183         z-index: 10; dashes: 6,12;
     200        z-index:10; dashes:6,12;
    184201   color:orange;
    185    casing-color: blue;
     202   casing-color:blue;
    186203   casing-width:3;
    187    width: 8;}
     204   width:8;}
    188205
    189206way[tunnel][tunnel!=no][tunnel!=abandoned]  {
    … …  
    193210   set .way_bridge;
    194211}
    195 way[tunnel=abandoned], way[bridge=abandoned], way[tunnel][abandoned=yes], way[bridge][abandoned=yes], way[waterway=pressurised][substance=water][abandoned=yes], way[tunnel][substance=water][abandoned=yes], way[man_made=pipeline][substance=water][abandoned=yes] {
     212way[tunnel=abandoned], way[bridge=abandoned], way[waterway=canal][abandoned=yes], way[tunnel][abandoned=yes], way[bridge][abandoned=yes], way[waterway=pressurised][substance=water][abandoned=yes], way[tunnel][substance=water][abandoned=yes], way[man_made=pipeline][substance=water][abandoned=yes] {
    196213   set .way_abandoned;
    197214}
    … …  
    204221
    205222way|z6-.waterway_pressurised  {
    206    z-index:16; width:5; color: #6680ff; opacity:1; casing-color: #ffccff; casing-width:4; casing-opacity:1; }
     223   z-index:16; width:5; color:#6680ff; opacity:1; casing-color:#ffccff; casing-width:4; casing-opacity:1; }
    207224way|z6-13.waterways[tunnel],
    208225way|z6-13.waterway_pressurised[location=underground],
    209226way|z6-13.waterway_pressurised[tunnel] {
    210     left-casing-offset: eval(-(prop("width")+(8)));
     227   z-index:10; left-casing-offset:eval(-(prop("width")+(8)));
    211228   left-casing-color:blue; left-casing-width:2;  left-casing-dashes:28,8; left-casing-opacity:0.8;
    212    right-casing-offset: eval(-(prop("width")+(8)));
     229   right-casing-offset:eval(-(prop("width")+(8)));
    213230   right-casing-color:blue; right-casing-width:2; right-casing-dashes:28,8; right-casing-opacity:0.8;
    214231}
    … …  
    216233way|z14-.waterway_pressurised[location=underground],
    217234way|z14-.waterway_pressurised[tunnel] {
    218    left-casing-offset: -15;   left-casing-color:blue; left-casing-width:3;  left-casing-dashes:28,8; left-casing-opacity:0.5;
    219    right-casing-offset: -15; right-casing-color:blue; right-casing-width:3; right-casing-dashes:28,8; right-casing-opacity:0.5;
     235   z-index:10; left-casing-offset:eval(-(prop("width")+(13)));   left-casing-color:blue; left-casing-width:3;  left-casing-dashes:28,8; left-casing-opacity:0.5;
     236   right-casing-offset:eval(-(prop("width")+(13))); right-casing-color:blue; right-casing-width:3; right-casing-dashes:28,8; right-casing-opacity:0.5;
    220237}
    221238way|z6-13.waterways.way_bridge,
    222239way|z6-13.waterway_pressurised.way_bridge {   
    223    z-index:21; left-casing-offset: -12;   left-casing-color:black; left-casing-width:2; left-casing-opacity:0.8;
    224    right-casing-offset: -12; right-casing-color:black; right-casing-width:2; right-casing-opacity:0.8;
     240   z-index:21;
     241   left-casing-offset:eval(-(prop("width")+(8)));
     242   left-casing-color:black; left-casing-width:2; left-casing-opacity:0.8;
     243   right-casing-offset:eval(-(prop("width")+(8)));
     244   right-casing-color:black; right-casing-width:2; right-casing-opacity:0.8;
    225245}
    226246way|z14-.waterways.way_bridge,
    227247way|z14-.waterway_pressurised.way_bridge {   
    228    z-index:21; left-casing-offset: -15;   left-casing-color:black; left-casing-width:3; left-casing-opacity:0.8;
    229    right-casing-offset: -15; right-casing-color:black; right-casing-width:3; right-casing-opacity:0.8;
     248   z-index:21;  left-casing-offset:eval(-(prop("width")+(16))); left-casing-color:black; left-casing-width:3; left-casing-opacity:0.8;
     249   right-casing-offset:eval(-(prop("width")+(16))); right-casing-color:black; right-casing-width:3; right-casing-opacity:0.8;
     250}
     251
     252way|z6-[natural=water][water=canal][tunnel]{
     253   z-index:2; width:2; color:white; casing-color:blue; casing-dashes:28,8;opacity:0.6; casing-opacity:1;
     254}
     255way|z6-[natural=water][water=canal][bridge=aqueduct]{
     256   z-index:20; width:2; color:black; opacity:0.6;
     257}
     258way|z14-[waterway=rapids] {   
     259   color:blue;
     260   casing-color:white;    casing-width:2;    width:7;    opacity:0.5;    casing-opacity:0.3;    dashes:6,12,6;}
     261
     262/* way attributes applied at the end  */
     263
     264area[natural=water].area_intermittent:closed, area[waterway=dock][dock=drydock]:closed {
     265   z-index:1; color:#c2d5f0; width:2;
     266   fill-color:#ffffaa;  fill-image:natural_intermittent.png;
     267   opacity:1; fill-opacity:1;
     268}
     269way|z6-10.waterways.way_intermittent {
     270   z-index:10;
     271   left-casing-offset:-2;   left-casing-color:blue; left-casing-width:8;  left-casing-dashes:5,5; left-casing-opacity:0.3;
     272   right-casing-offset:-2; right-casing-color:blue; right-casing-width:8; right-casing-dashes:5,5; right-casing-opacity:0.3;
     273}
     274way|z11-13.waterways.way_intermittent {
     275   z-index:10; left-casing-offset:-2;   left-casing-color:blue; left-casing-width:8;  left-casing-dashes:5,5; left-casing-opacity:0.3;
     276   right-casing-offset:-2; right-casing-color:blue; right-casing-width:8; right-casing-dashes:5,5; right-casing-opacity:0.3;
     277}
     278way|z14-.waterways.way_intermittent {
     279   z-index:10; left-casing-offset:-2;   left-casing-color:blue; left-casing-width:10;  left-casing-dashes:5,5; left-casing-opacity:0.3;
     280   right-casing-offset:-2; right-casing-color:blue; right-casing-width:10; right-casing-dashes:5,5; right-casing-opacity:0.3;
    230281}
    231282
    232283way|z6-.way_abandoned {
    233284   z-index:21;
    234    left-casing-offset: eval(-(prop("width")+(8)));
    235    left-casing-color:red; left-casing-width:4;  left-casing-dashes:28,8; left-casing-opacity:0.6;
    236    right-casing-offset: eval(-(prop("width")+(8)));
    237    right-casing-color:red; right-casing-width:4; right-casing-dashes:28,8; right-casing-opacity:0.6;
    238 }
    239 
    240 way|z6-[natural=water][water=canal][tunnel]{
    241    z-index:2; width:2; color:white; casing-color:blue; casing-dashes:28,8;opacity:0.6; casing-opacity:1;
    242 }
    243 way|z6-[natural=water][water=canal][bridge=aqueduct]{
    244    z-index:20; width:2; color:black; opacity:0.6;
    245 }
    246 way|z14-[waterway=rapids] {   
    247    color: blue;
    248    casing-color: white;    casing-width:2;    width:7;    opacity:0.5;    casing-opacity:0.3;    dashes: 6,12,6;}
    249 
    250 /* way attributes applied at the end  */
    251 
    252 area[natural=water].area_intermittent:closed, area[waterway=dock][dock=drydock]:closed {
    253    z-index:1; color: #c2d5f0; width: 2;
    254    fill-color:#ffffaa;  fill-image:natural_intermittent.png;
    255    opacity:1; fill-opacity: 1;
    256 }
    257 way|z6-10.waterways.way_intermittent {
    258    z-index:10;
    259    left-casing-offset: -2;   left-casing-color:blue; left-casing-width:8;  left-casing-dashes:5,5; left-casing-opacity:0.3;
    260    right-casing-offset: -2; right-casing-color:blue; right-casing-width:8; right-casing-dashes:5,5; right-casing-opacity:0.3;
    261 }
    262 way|z11-.waterways.way_intermittent {
    263    z-index:10; left-casing-offset: -2;   left-casing-color:blue; left-casing-width:10;  left-casing-dashes:5,5; left-casing-opacity:0.3;
    264    right-casing-offset: -2; right-casing-color:blue; right-casing-width:10; right-casing-dashes:5,5; right-casing-opacity:0.3;
     285   left-casing-offset:eval(-(prop("width")+(8)));
     286   left-casing-color:red; left-casing-width:4;  left-casing-dashes:4,3; left-casing-opacity:0.6;
     287   right-casing-offset:eval(-(prop("width")+(8)));
     288   right-casing-color:red; right-casing-width:4; right-casing-dashes:4,3; right-casing-opacity:0.6;
    265289}
    266290
    267291/* Nodes styles  */
    268292
    269 node|z1-14 {
    270     z-index: 1; symbol-fill-color: none;
    271     symbol-stroke-color: #808080;
    272     symbol-shape: square;
     293node|z1-11 {
     294    z-index:1; symbol-fill-color:none;
     295    symbol-stroke-color:#808080;
     296    symbol-shape:square;
    273297        width:0;
    274         symbol-size: 0;
     298        symbol-size:0;
    275299        symbol-stroke-width:0 ;
    276     fill-opacity:0.0;
     300    symbol-fill-opacity:0.0;
    277301        symbol-stroke-opacity:0;
    278302}
    279303
    280304node|z12-14 {
    281     z-index: 1; symbol-shape: square;
    282         symbol-size: 1;         
    283     symbol-stroke-color: #3434ff;
    284         symbol-fill-color: white;
    285         symbol-stroke-width: 0.9;
     305    z-index:1; symbol-shape:square;
     306        symbol-size:1; 
     307    symbol-stroke-color:#3434ff;
     308        symbol-fill-color:#ffff66;
     309        symbol-fill-opacity:0.4;
     310        symbol-stroke-width:0.9;
    286311        symbol-stroke-opacity:0.5;
    287312}
    288 node|z15- {
    289     z-index: 1; symbol-shape: square; symbol-size: 6;   
     313node|z15-16 {
     314    z-index:1; symbol-shape:square; symbol-size:6;     
    290315        opacity:1;
    291     symbol-stroke-color: #4d4dff;
    292         symbol-fill-color: #e6fffa;
    293         symbol-fill-opacity:1;
    294         symbol-stroke-width: 2;
    295         symbol-stroke-opacity:0.7;
    296 }
    297 node|z16- {
    298     z-index: 1; symbol-shape: square; symbol-size: 8;   
     316    symbol-stroke-color:#3434ff;
     317        symbol-fill-color:#ffff66;
     318        symbol-fill-opacity:0.8;
     319        symbol-stroke-width:2;
     320        symbol-stroke-opacity:0.5;
     321}
     322node|z17- {
     323    z-index:1; symbol-shape:square; symbol-size:9;     
    299324        opacity:1;
    300     symbol-stroke-color: #4d4dff;
    301         symbol-fill-color: #e6fffa;
    302         symbol-fill-opacity:1;
    303         symbol-stroke-width: 2;
    304         symbol-stroke-opacity:1;
    305 }
    306 node|z6-9[waterway=dam] {
    307   z-index: 10;
    308   symbol-size:10;
    309   symbol-shape: circle;
    310   symbol-stroke-color: #333333;
    311   symbol-stroke-width: 2;
    312   symbol-fill-color: #adadad;
     325    symbol-stroke-color:#333333;
     326        symbol-fill-color:#ffff3399;
     327        symbol-fill-opacity:0.8;
     328        symbol-stroke-width:2.5;
     329        symbol-stroke-opacity:0.6;
     330}
     331node|z8-13[waterway=dam] {
     332  z-index:10;
     333  symbol-size:5;
     334  symbol-shape:circle;
     335  symbol-stroke-color:#333333;
     336  symbol-stroke-width:1;
     337  symbol-fill-color:#adadad;
     338  symbol-stroke-opacity:0.6;
     339  symbol-fill-opacity:1;
     340}
     341node|z14-16[waterway=dam] {
     342  z-index:10;
     343  symbol-size:14;
     344  symbol-shape:circle;
     345  symbol-stroke-color:#333333;
     346  symbol-stroke-width:1.5;
     347  symbol-fill-color:#adadad;
     348  symbol-stroke-opacity:0.6;
     349  symbol-fill-opacity:1;
     350}
     351node|z17-[waterway=dam] {
     352  z-index:10;
     353  symbol-size:22;
     354  symbol-shape:circle;
     355  symbol-stroke-color:#333333;
     356  symbol-stroke-width:2;
     357  symbol-fill-color:#adadad;
    313358  symbol-stroke-opacity:1;
    314359  symbol-fill-opacity:1;
    315360}
    316 node|z10-[waterway=dam] {
    317   z-index: 10;
    318   symbol-size:30;
    319   symbol-shape: circle;
    320   symbol-stroke-color: #333333;
    321   symbol-stroke-width: 2;
    322   symbol-fill-color: #adadad;
    323   symbol-stroke-opacity:1;
    324   symbol-fill-opacity:1;
    325 }
    326 node|z6-9[waterway=weir] {
    327   z-index: 10;
    328   symbol-size:10;
    329   symbol-shape: circle;
    330   symbol-shape: circle;
    331   symbol-stroke-color: #333333;
    332   symbol-stroke-width: 2;
    333   symbol-fill-color: #6f9ddc;
     361node|z6-10[waterway=weir] {
     362  z-index:10;
     363  symbol-size:8;
     364  symbol-shape:circle;
     365  symbol-stroke-color:#333333;
     366  symbol-stroke-width:1;
     367  symbol-fill-color:#6f9ddc;
    334368  symbol-stroke-opacity:1;
    335369  symbol-fill-opacity:0.4;
    336370}
    337 node|z10-[waterway=weir] {
    338   z-index: 10;
    339   symbol-size:30;
    340   symbol-shape: circle;
    341   symbol-stroke-color: #333333;
    342   symbol-stroke-width: 2;
    343   symbol-fill-color: #6f9ddc;
     371node|z11-12[waterway=weir] {
     372  z-index:10;
     373  symbol-size:11;
     374  symbol-shape:circle;
     375  symbol-stroke-color:#333333;
     376  symbol-stroke-width:1.5;
     377  symbol-fill-color:#6f9ddc;
     378  symbol-stroke-opacity:0.6;
     379  symbol-fill-opacity:0.4;
     380}
     381node|z13-[waterway=weir] {
     382  z-index:10;
     383  symbol-size:20;
     384  symbol-shape:circle;
     385  symbol-stroke-color:#333333;
     386  symbol-stroke-width:2;
     387  symbol-fill-color:#6f9ddc;
    344388  symbol-stroke-opacity:1;
    345389  symbol-fill-opacity:0.4;
    346390}
    347391
     392node|z11-13.waterways_node_deb
     393{
     394  z-index:10; symbol-shape:square;
     395  symbol-size:4;
     396  symbol-fill-color:#cc00cc;
     397  symbol-fill-opacity:0.8;
     398  symbol-stroke-color:#00ffff;
     399  symbol-stroke-width:0.5;
     400  symbol-stroke-opacity:1;}
     401node|z14-16.waterways_node_deb
     402{
     403  z-index:10; symbol-shape:square;
     404  symbol-size:9;
     405  symbol-fill-color:#cc00cc;
     406  symbol-fill-opacity:1;
     407  symbol-stroke-color:#00ffff;
     408  symbol-stroke-width:1.5;
     409  symbol-stroke-opacity:1;}
     410node|z17-.waterways_node_deb
     411{
     412  z-index:10; symbol-shape:square;
     413  symbol-size:16;
     414  symbol-fill-color:#cc00cc;
     415  symbol-fill-opacity:1;
     416  symbol-stroke-color:#00ffff;
     417  symbol-stroke-width:1.5;
     418  symbol-stroke-opacity:1;}
     419
    348420way[waterway=canal] > node|z16- {   
    349   z-index: 10; symbol-size:10;
    350   symbol-shape: circle;
    351   symbol-fill-color: white;
    352   symbol-fill-opacity: 1.0;
    353   symbol-stroke-width: 2;
    354   symbol-stroke-color: red;}
    355 node|z9-[waterway=lock_gate] {   
    356   z-index: 11; symbol-shape: circle;
    357   symbol-size:24;
    358   symbol-stroke-color: navy;
    359   symbol-stroke-width: 8;
    360   symbol-fill-color: red;
     421  z-index:10; symbol-size:10;
     422  symbol-shape:circle;
     423  symbol-fill-color:white;
     424  symbol-fill-opacity:1.0;
     425  symbol-stroke-width:2;
     426  symbol-stroke-color:red;}
     427node|z11-12[waterway=lock_gate] {   
     428  z-index:11; symbol-shape:circle;
     429  symbol-size:11;
     430  symbol-stroke-color:navy;
     431  symbol-stroke-width:4;
     432  symbol-fill-color:red;
     433  symbol-fill-opacity:0.8; symbol-stroke-opacity:0.8;
     434}
     435node|z13-[waterway=lock_gate] {   
     436  z-index:21; symbol-shape:circle;
     437  symbol-size:20;
     438  symbol-stroke-color:navy;
     439  symbol-stroke-width:7;
     440  symbol-fill-color:red;
    361441  symbol-fill-opacity:0.8; symbol-stroke-opacity:0.8;
    362442}
    … …  
    371451node.waterways_node_end.natural_node,
    372452node.waterways_node_end!.waterway_node_nend {
    373     z-index:15; symbol-shape: triangle; opacity:1; symbol-size: 25; symbol-stroke-color: red; symbol-fill-color: red; symbol-stroke-width: 5; symbol-stroke-opacity:0.3; }
     453    z-index:15; symbol-shape:triangle;  opacity:1; symbol-size:25; symbol-stroke-color:red; symbol-fill-color:red; symbol-stroke-width:5; symbol-stroke-opacity:0.3; }
    374454
    375455node.waterways_node_end.natural_node!.waterways_node_deb
    376456{
    377   z-index: 15; symbol-shape: triangle;
     457  z-index:15; symbol-shape:triangle;
    378458  simbol-size:22;
    379459  symbol-fill-color:red;
    380460  symbol-fill-opacity:1;
    381   symbol-stroke-color: #00ffff;
    382   symbol-stroke-width: 0.6;
     461  symbol-stroke-color:#00ffff;
     462  symbol-stroke-width:0.6;
    383463  symbol-stroke-opacity:1;}
    384464
    385465*/
    386466node.waterways_node_end!:connection {
    387   z-index: 15; symbol-shape: triangle;
    388   symbol-fill-color: red;
    389   symbol-fill-opacity:1;
    390   symbol-stroke-color: #00ffff;
    391   symbol-stroke-width: 1;
     467  z-index:15; symbol-shape:triangle;
     468  symbol-fill-color:red;
     469  symbol-fill-opacity:0;
     470  symbol-stroke-color:#00ffff;
     471  symbol-stroke-width:1;
    392472  symbol-stroke-opacity:0;
    393473}
    394 node|z1-7.waterways_node_end!:connection {
    395    z-index:15; symbol-size:4;
    396 }
    397 node|z8-13.waterways_node_end!:connection {
    398    z-index:15; symbol-size:18;
     474node|z1-10.waterways_node_end!:connection {
     475   z-index:15; symbol-size:6; symbol-fill-opacity:0.3;
     476}
     477node|z11-13.waterways_node_end!:connection {
     478   z-index:15; symbol-size:10; symbol-fill-opacity:0.6;
    399479}
    400480node|z14-.waterways_node_end!:connection {
    401    z-index:15; symbol-size:28;
     481   z-index:15; symbol-size:26; symbol-fill-opacity:0.7;
    402482   symbol-stroke-opacity:0.6;
    403483}
    404484
    405 node|z8-12.waterways_node_deb
    406 {
    407   z-index: 1; symbol-shape: square;
    408   symbol-size:7;
    409   symbol-fill-color: #cc00cc;
    410   symbol-fill-opacity:1;
    411   symbol-stroke-color: #00ffff;
    412   symbol-stroke-width: 0.5;
    413   symbol-stroke-opacity:1;}
    414 node|z13-.waterways_node_deb
    415 {
    416   z-index: 1; symbol-shape: square;
    417   symbol-size:9;
    418   symbol-fill-color:white;
    419   symbol-fill-opacity:1;
    420   symbol-stroke-color: #cc00cc;
    421   symbol-stroke-width: 4;
    422   symbol-stroke-opacity:1;}
    423485node.waterway_river_node_end.waterway_sd_node_nend {
    424   z-index: 15; symbol-shape: triangle;
    425   symbol-size:33;
    426   symbol-fill-color: red;
    427   symbol-fill-opacity:1;
    428   symbol-stroke-color: #00ffff;
    429   symbol-stroke-width: 1;
     486  z-index:15; symbol-shape:triangle;
     487  symbol-size:0;
     488  symbol-fill-color:red;
     489  symbol-fill-opacity:0.3;
     490  symbol-stroke-color:#00ffff;
     491  symbol-stroke-width:1;
    430492  symbol-stroke-opacity:0;
    431493}
    432 node|z1-7.waterway_river_node_end.waterway_sd_node_nend {
    433    z-index: 15; symbol-size:5; opacity:1;}
    434 node|z8-13.waterway_river_node_end.waterway_sd_node_nend {
    435    z-index: 15; symbol-size:20; opacity:1; symbol-stroke-opacity:1;}
     494node|z1-10.waterway_river_node_end.waterway_sd_node_nend {
     495   z-index:15; symbol-size:4; symbol-fill-opacity:0.3;}
     496node|z11-13.waterway_river_node_end.waterway_sd_node_nend {
     497   z-index:15; symbol-size:10; symbol-fill-opacity:0.3; symbol-stroke-opacity:0.6;}
    436498node|z14-.waterway_river_node_end.waterway_sd_node_nend {
    437    z-index:15; symbol-size:26;  opacity:1; symbol-stroke-width: 3; symbol-stroke-opacity: 0.6;}
     499   z-index:15; symbol-size:28;  symbol-fill-opacity:0.7; symbol-stroke-width:3; symbol-stroke-opacity:0.6;}
    438500
    439501/* ways-nodes selected */
    440502
    441503way:selected {
    442    z-index: 15; width:15;  casing-width:3; color:red;
     504   z-index:15; width:15;  casing-width:3; color:red;
    443505}
    444506node|z14-:connection:selected {
    445   z-index: 15; symbol-stroke-color: crimson;
    446   symbol-stroke-width: 5;
    447   symbol-fill-color: yellow;
     507  z-index:15; symbol-stroke-color:crimson;
     508  symbol-stroke-width:5;
     509  symbol-fill-color:yellow;
    448510}
    449511node|z1-13.natural_node_connection {
    450         z-index: 1; symbol-size:0;
     512        z-index:1; symbol-size:0;
    451513        symbol-stroke-width:0;
    452         symbol-stroke-color: none;
    453         symbol-fill-color: none;
     514        symbol-stroke-color:none;
     515        symbol-fill-color:none;
    454516}
    455517node|z14-.natural_node_connection {
    456         z-index: 1; symbol-size:10;
     518        z-index:1; symbol-size:10;
    457519        symbol-stroke-width:2;
    458520}