remove leftover from background line for intermittent waterways and f…

…ix bridge drawing order, fixes gravitystorm#2633 (cherry picked from commit 102fb19)
giggls · May 24, 2017 · fb37fc4 · fb37fc4
1 parent 5f31c3d
commit fb37fc4
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/water.mss b/water.mss
@@ -103,10 +103,6 @@
       background/line-cap: round;
       background/line-join: round;
     }
-    water/line-color: @water-color;
-    water/line-width: 2;
-    water/line-cap: round;
-    water/line-join: round;
 
     [bridge = 'yes'] {
       [zoom >= 14] {
@@ -119,6 +115,11 @@
       }
     }
 
+    water/line-color: @water-color;
+    water/line-width: 2;
+    water/line-cap: round;
+    water/line-join: round;
+
     [intermittent = 'yes'],
     [waterway = 'wadi'] {
       [bridge = 'yes'][zoom >= 14] {
@@ -192,9 +193,6 @@
         water/line-cap: butt;
         water/line-join: round;
         water/line-clip: false;
-        background/line-cap: butt;
-        background/line-join: round;
-        background/line-clip: false;
       }
 
       [waterway = 'stream'][zoom >= 15] {