Skip to content

Commit 1c4e24c

Browse files
author
Andy Townsend
committed
which had been accidentally removed. Also show utility aerial pipeline markers.
1 parent 19f66df commit 1c4e24c

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

project.mml

+3-3
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
],
222222
"Datasource": {
223223
"type": "postgis",
224-
"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",
224+
"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",
225225
"extent": "-20037508,-20037508,20037508,20037508",
226226
"key_field": "",
227227
"geometry_field": "way",
@@ -873,7 +873,7 @@
873873
],
874874
"Datasource": {
875875
"type": "postgis",
876-
"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",
876+
"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",
877877
"extent": "-20037508,-20037508,20037508,20037508",
878878
"key_field": "",
879879
"geometry_field": "way",
@@ -1680,7 +1680,7 @@
16801680
],
16811681
"Datasource": {
16821682
"type": "postgis",
1683-
"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",
1683+
"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",
16841684
"extent": "-20037508,-20037508,20037508,20037508",
16851685
"key_field": "",
16861686
"geometry_field": "way",

water.mss

+22
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,18 @@
502502
line-dasharray: 32,64;
503503
}
504504
}
505+
[waterway = 'pipeline'][zoom >= 15] {
506+
line-color: #9900cc;
507+
line-width: 0.3;
508+
[bridge = 'yes'] {
509+
bridgecasing/line-color: black;
510+
bridgecasing/line-join: round;
511+
bridgecasing/line-width: 3;
512+
bridgeglow/line-color: white;
513+
bridgeglow/line-join: round;
514+
bridgeglow/line-width: 2;
515+
}
516+
}
505517
}
506518

507519
#water-lines-text {
@@ -586,6 +598,16 @@
586598
[zoom >= 20] { text-size: 18; }
587599
}
588600

601+
[waterway = 'pipeline'][zoom >= 15] {
602+
text-name: "[name]";
603+
text-size: 10;
604+
text-fill: #9900cc;
605+
text-face-name: @oblique-fonts;
606+
text-placement: line;
607+
text-spacing: 600;
608+
text-halo-radius: 1;
609+
}
610+
589611
[waterway = 'weir'][zoom >= 15] {
590612
text-name: "[name]";
591613
text-size: 10;

0 commit comments

Comments
 (0)