Changes between Version 3 and Version 4 of Styles/Waterways


Ignore:
Timestamp:
2023-10-05T15:33:22+02:00 (2 years ago)
Author:
pierzen
Comment:

Major Revision - Simplification of features caracteristics (bridge, tunnel, intermitent, etc) rendering and new features

Legend:

Unmodified
Added
Removed
Modified

  • Styles/Waterways

    v3 v4  
    11Colors waterways and flags various typology errors with red triangles (ie  disconnected segments, opposite direction, transition from river to stream)
    22
    3 [[Image(waterways_guide.png)]]
     3[[Image(waterways-guide.png)]]
    44
    55
    … …  
    99  title: "waterways";
    1010  version: "1.[[revision]]_[[date]]";
    11   description: "Colors waterways and flags various typology errors with red triangles (ie  disconnected segments, transition from river to stream).";
     11  description: "Colors waterways features and caracteristics  and flags typology errors with red triangles (ie  disconnected segments, transition from river to stream).";
    1212  icon: "waterways.png";
    1313  author: "Pierre Béland";
    … …  
    3636way[waterway=rapids]  {   
    3737   casing-width:0;    width:0;    opacity:0;    casing-opacity:0;}
    38 way[waterway=stream], way[waterway=drain], way[waterway=ditch], way[waterway=yes]  {   
     38way[waterway=stream], way[waterway=drain], way[waterway=ditch], way[waterway=wadi], way[waterway=yes]  {   
    3939   set .waterway_sd;    color: blue;    casing-color: white;    casing-width:1;    width:6;    opacity:0.5;    casing-opacity:0.3;}
    4040
    … …  
    5252   fill-color:#c2d5f0; fill-opacity: 0.3;
    5353   casing-color:none; casing-width:0; casing-opacity:0;}
    54 way[natural=wetland]:closed, way[natural=shoal]:closed {
     54relation[natural=wetland], way[natural=wetland]:closed {
    5555   set .wetland_area;
    5656   color:#c2d5f0; width:0; opacity:1.0;
    5757   fill-opacity: 1;
    58    fill-image:waterways_wetland.png;
     58   fill-image:natural_wetland.png;
    5959   casing-width:0; casing-color:none; casing-opacity:0;
     60}
     61relation[natural=shoal], way[natural=shoal]:closed {
     62   set .shoal_area;
     63   color:#FFFFD8; width:0; opacity:1.0;
     64   fill-opacity: 1;
     65   fill-image:natural_shoal.png;
    6066}
    6167relation[natural=water] > way,
    … …  
    6975   z-index:3; color:#c2d5f0; width:2; opacity:0;
    7076   casing-color:none; casing-width:0; casing-opacity:0;}
    71 way[waterway=stream] > node, way[waterway=drain] > node, way[waterway=ditch] > node
     77way[waterway=stream] > node, way[waterway=drain] > node, way[waterway=ditch] > node, way[waterway=wadi] > node, way[waterway=yes] > node
    7278{set .waterway_sd_node;}
    73 way[waterway=stream] >[index=1] node, way[waterway=drain] >[index=1] node, way[waterway=ditch] >[index=1] node 
     79way[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
    7480{set .waterway_sd_node_deb;}
    75 way[waterway=stream] >[index=-1] node, way[waterway=drain] >[index=-1] node, way[waterway=ditch] >[index=-1] node {   
     81way[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 {   
    7682   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;}
    77 way[waterway=stream] >[index<-1] node, way[waterway=drain] >[index<-1] node, way[waterway=ditch] >[index<-1] node
     83way[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
    7884{ set .waterway_sd_node_nend;}
    7985way[waterway=river], way[waterway=canal], way[waterway=fairway] {
    8086   set .waterway_rc;    casing-width:0.8;    width:12; }
     87
     88way[waterway=pressurised][substance=water], way[tunnel][substance=water], way[man_made=pipeline][substance=water] {
     89   set .waterway_pressurised;    casing-width:0.8;    width:12; }
     90
    8191way[waterway=river] > node, way[waterway=canal] > node, way[waterway=fairway] > node {   
    8292   set .waterway_rc_node;}
    … …  
    8595way[waterway=river] >[index=-1] node, way[waterway=canal] >[index=-1] node, way[waterway=fairway] >[index=-1] node {   
    8696   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 {   
     98   set .waterway_river_node_end;}
     99
    87100way[waterway=river] >[index<-1] node, way[waterway=canal] >[index<-1] node, way[waterway=fairway] >[index<-1] node  {   
    88101   set .waterway_rc_node_nend;}
    … …  
    110123/* ways and nodes  - distinct waterways  */   
    111124
    112 way[waterway=river]  {   
     125way[waterway=river] {   
    113126   z-index:10; color:blue;   casing-color: blue;}
     127way.waterway_pressurised  {   
     128   z-index:10; color:blue;   casing-color: #FFFF66;}
    114129way[waterway=drain] {z-index:5; color: #3434ff; width: 1; }
    115130way[waterway=fairway] {z-index:10; color:blue; casing-color:white;}
    … …  
    152167way|z16-[waterway=fairway] {z-index:10; casing-width:2;  width:2.5;  color:blue;   casing-color: white;}
    153168
    154 way[waterway=canal]  {
     169way|z6-10[waterway=canal]  {
     170        z-index:10; width:2; color:white; opacity:1;
     171        casing-color:blue; casing-width:1.5;casing-opacity:1;
     172        dashes: 22, 8, 22;
     173}
     174way|z11-[waterway=canal]  {
    155175        z-index:10; width:4; color:white; opacity:1;
    156176        casing-color:blue; casing-width:3;casing-opacity:1;
    … …  
    166186   casing-width:3;
    167187   width: 8;}
    168    
    169 way|z6-.waterway_sd[tunnel]  {
    170    z-index:17; width:6; color:white;  dashes:3,3,3,3; opacity:0.5; left-casing-color:blue; left-casing-width:3; left-casing-opacity:1; right-casing-color:blue; right-casing-width:3; right-casing-opacity:1; casing-color:blue; casing-width:3; casing-opacity:1;
    171 }
    172 way|z6-.waterway_rc[tunnel]  {
    173    z-index:16; width:10; color:white;  dashes:2,2,2,2; casing-color:blue; casing-width:3; casing-opacity:0.8; opacity:1; left-casing-color:blue; left-casing-width:3; left-color:white; left-dashes:12,2,12,2; left-casing-opacity:1; right-casing-color:blue; right-casing-width:3; right-casing-opacity:1;
    174 }
    175 
     188
     189way[tunnel][tunnel!=no][tunnel!=abandoned]  {
     190   set .way_tunnel;
     191}
     192way[bridge][bridge!=no] {
     193   set .way_bridge;
     194}
     195way[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] {
     196   set .way_abandoned;
     197}
     198way[intermittent][intermittent!=no], way[waterway=wadi] {
     199   set .way_intermittent;
     200}
     201area[intermittent][intermittent!=no] {
     202   set .area_intermittent;
     203}
     204
     205way|z6-.waterway_pressurised  {
     206   z-index:16; width:5; color: #6680ff; opacity:1; casing-color: #ffccff; casing-width:4; casing-opacity:1; }
     207way|z6-13.waterways[tunnel],
     208way|z6-13.waterway_pressurised[location=underground],
     209way|z6-13.waterway_pressurised[tunnel] {
     210    left-casing-offset: eval(-(prop("width")+(8)));
     211   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)));
     213   right-casing-color:blue; right-casing-width:2; right-casing-dashes:28,8; right-casing-opacity:0.8;
     214}
     215way|z14-.waterways[tunnel],
     216way|z14-.waterway_pressurised[location=underground],
     217way|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;
     220}
     221way|z6-13.waterways.way_bridge,
     222way|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;
     225}
     226way|z14-.waterways.way_bridge,
     227way|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;
     230}
     231
     232way|z6-.way_abandoned {
     233   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
     240way|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}
     243way|z6-[natural=water][water=canal][bridge=aqueduct]{
     244   z-index:20; width:2; color:black; opacity:0.6;
     245}
    176246way|z14-[waterway=rapids] {   
    177247   color: blue;
    … …  
    180250/* way attributes applied at the end  */
    181251
    182 area[natural=water][intermittent=yes]:closed, area[waterway=dock][dock=drydock]:closed {
     252area[natural=water].area_intermittent:closed, area[waterway=dock][dock=drydock]:closed {
    183253   z-index:1; color: #c2d5f0; width: 2;
    184    fill-color:#ffffaa;  fill-image:waterways_intermittent.png;
     254   fill-color:#ffffaa;  fill-image:natural_intermittent.png;
    185255   opacity:1; fill-opacity: 1;
    186 }   
    187 way.waterways[intermittent=yes] {
    188    z-index:10; width:8; dashes: 42,3; color:yellow; casing-color:blue; opacity: 0.7; casing-opacity:1; left-casing-color:blue; left-casing-width:3; left-casing-opacity:1; right-casing-color:blue; right-casing-width:3; right-casing-opacity:1; casing-color:blue;}
     256}
     257way|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}
     262way|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;
     265}
    189266
    190267/* Nodes styles  */
    … …  
    251328}
    252329
    253 /* connected - disconnected nodes styles */
    254  
    255 /* waterways_node_end  */
    256 node.natural_node {
    257    z-index:45; symbol-shape: triangle;
    258    symbol-size:4; opacity:1;
    259    symbol-stroke-color: red;
    260    symbol-stroke-opacity:0.6;
    261 }
    262 
     330/* flags  */
     331
     332way|z6-[waterway=yes]  {
     333        z-index:5; color:red; opacity:0.9;casing-color:white;
     334}
    263335
    264336/* flag end-node on natural way - not working properly
    … …  
    266338node.waterways_node_end!.waterway_node_nend {
    267339    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; }
     340
     341node.waterways_node_end.natural_node!.waterways_node_deb
     342{
     343  z-index: 15; symbol-shape: triangle;
     344  simbol-size:22;
     345  symbol-fill-color:red;
     346  symbol-fill-opacity:1;
     347  symbol-stroke-color: #00ffff;
     348  symbol-stroke-width: 0.6;
     349  symbol-stroke-opacity:1;}
     350
    268351*/
    269352node.waterways_node_end!:connection {
    … …  
    285368   symbol-stroke-opacity:0.6;
    286369}
    287 node.waterway_rc_node_end.waterway_sd_node_nend {
    288   z-index: 15; symbol-shape: triangle;
    289   symbol-fill-color: red;
    290   symbol-fill-opacity:1;
    291   symbol-stroke-color: #00ffff;
    292   symbol-stroke-width: 1;
    293   symbol-stroke-opacity:0;
    294 }
    295 node|z1-7.waterway_rc_node_end.waterway_sd_node_nend {
    296    z-index: 15; symbol-size:5; opacity:1;}
    297 node|z8-13.waterway_rc_node_end.waterway_sd_node_nend {
    298    z-index: 15; symbol-size:20; opacity:1; symbol-stroke-opacity:1;}
    299 node|z14-.waterway_rc_node_end.waterway_sd_node_nend {
    300    z-index:15; symbol-size:26;  opacity:1; symbol-stroke-width: 3; symbol-stroke-opacity: 0.6;}
    301 
    302 /* flag waterway end node on natural way */
    303370
    304371node|z8-12.waterways_node_deb
    … …  
    306373  z-index: 1; symbol-shape: square;
    307374  symbol-size:7;
    308   symbol-fill-color: purple;
     375  symbol-fill-color: #cc00cc;
    309376  symbol-fill-opacity:1;
    310377  symbol-stroke-color: #00ffff;
    … …  
    317384  symbol-fill-color:white;
    318385  symbol-fill-opacity:1;
    319   symbol-stroke-color: purple;
     386  symbol-stroke-color: #cc00cc;
    320387  symbol-stroke-width: 4;
    321388  symbol-stroke-opacity:1;}
    322 node.waterways_node_end.natural_node!.waterways_node_deb
    323 {
     389node.waterway_river_node_end.waterway_sd_node_nend {
    324390  z-index: 15; symbol-shape: triangle;
    325   simbol-size:22;
    326   symbol-fill-color:red;
     391  symbol-size:33;
     392  symbol-fill-color: red;
    327393  symbol-fill-opacity:1;
    328394  symbol-stroke-color: #00ffff;
    329   symbol-stroke-width: 0.6;
    330   symbol-stroke-opacity:1;}
     395  symbol-stroke-width: 1;
     396  symbol-stroke-opacity:0;
     397}
     398node|z1-7.waterway_river_node_end.waterway_sd_node_nend {
     399   z-index: 15; symbol-size:5; opacity:1;}
     400node|z8-13.waterway_river_node_end.waterway_sd_node_nend {
     401   z-index: 15; symbol-size:20; opacity:1; symbol-stroke-opacity:1;}
     402node|z14-.waterway_river_node_end.waterway_sd_node_nend {
     403   z-index:15; symbol-size:26;  opacity:1; symbol-stroke-width: 3; symbol-stroke-opacity: 0.6;}
    331404
    332405/* ways-nodes selected */