Skip to content

Commit

Permalink
Re-added display of [man_made=pipeline](https://taginfo.openstreetmap…
Browse files Browse the repository at this point in the history
….org/tags/man_made=pipeline#overview)

which had been accidentally removed.
Also show utility aerial pipeline markers.
  • Loading branch information
Andy Townsend committed Nov 23, 2024
1 parent 19f66df commit 1c4e24c
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 3 deletions.
6 changes: 3 additions & 3 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
],
"Datasource": {
"type": "postgis",
"table": " (select way,waterway,lock,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel, 'no' as bridge\n from planet_osm_line\n where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','intstream','intriver')\n and (bridge is null or bridge not in ('yes','aqueduct','levee'))\n order by z_order\n ) as water_lines",
"table": " (select way,waterway,lock,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel, 'no' as bridge\n from planet_osm_line\n where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','pipeline','intstream','intriver')\n and (bridge is null or bridge not in ('yes','aqueduct','levee'))\n order by z_order\n ) as water_lines",
"extent": "-20037508,-20037508,20037508,20037508",
"key_field": "",
"geometry_field": "way",
Expand Down Expand Up @@ -873,7 +873,7 @@
],
"Datasource": {
"type": "postgis",
"table": "(select way,waterway,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel, 'yes' as bridge from planet_osm_line where waterway in ('river','canal','derelict_canal','stream','drain','ditch','intstream','intriver') and bridge in ('yes','aqueduct','levee') order by z_order) as waterway_bridges",
"table": "(select way,waterway,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel, 'yes' as bridge from planet_osm_line where waterway in ('river','canal','derelict_canal','stream','drain','ditch','pipeline','intstream','intriver') and bridge in ('yes','aqueduct','levee') order by z_order) as waterway_bridges",
"extent": "-20037508,-20037508,20037508,20037508",
"key_field": "",
"geometry_field": "way",
Expand Down Expand Up @@ -1680,7 +1680,7 @@
],
"Datasource": {
"type": "postgis",
"table": " (select way,waterway,lock,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel\n from planet_osm_line\n where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','intstream','intriver')\n order by z_order\n ) as water_lines_text",
"table": " (select way,waterway,lock,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel\n from planet_osm_line\n where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','pipeline','intstream','intriver')\n order by z_order\n ) as water_lines_text",
"extent": "-20037508,-20037508,20037508,20037508",
"key_field": "",
"geometry_field": "way",
Expand Down
22 changes: 22 additions & 0 deletions water.mss
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,18 @@
line-dasharray: 32,64;
}
}
[waterway = 'pipeline'][zoom >= 15] {
line-color: #9900cc;
line-width: 0.3;
[bridge = 'yes'] {
bridgecasing/line-color: black;
bridgecasing/line-join: round;
bridgecasing/line-width: 3;
bridgeglow/line-color: white;
bridgeglow/line-join: round;
bridgeglow/line-width: 2;
}
}
}

#water-lines-text {
Expand Down Expand Up @@ -586,6 +598,16 @@
[zoom >= 20] { text-size: 18; }
}

[waterway = 'pipeline'][zoom >= 15] {
text-name: "[name]";
text-size: 10;
text-fill: #9900cc;
text-face-name: @oblique-fonts;
text-placement: line;
text-spacing: 600;
text-halo-radius: 1;
}

[waterway = 'weir'][zoom >= 15] {
text-name: "[name]";
text-size: 10;
Expand Down

0 comments on commit 1c4e24c

Please sign in to comment.