Special rendering for intermittent waterways - fixes #805

Includes change to wadi rendering.
gravitystorm · Jan 14, 2015 · 511e1d3 · 511e1d3
1 parent c25d605
commit 511e1d3
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 22 deletions.
diff --git a/project.mml b/project.mml
@@ -154,7 +154,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT\n    way, waterway,\n    CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel\n  FROM planet_osm_line\n  WHERE waterway IN ('stream', 'drain', 'ditch')\n) AS water_lines_casing", 
+        "table": "(SELECT \n    way, waterway, intermittent,\n    CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel \n  FROM planet_osm_line\n  WHERE waterway IN ('stream', 'drain', 'ditch')\n) AS water_lines_casing", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -246,7 +246,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT\n    way, waterway, lock, name,\n    CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel,\n    'no' AS bridge\n  FROM planet_osm_line\n  WHERE waterway IN ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')\n    AND (bridge IS NULL OR bridge NOT IN ('yes', 'aqueduct'))\n  ORDER BY z_order\n) AS water_lines", 
+        "table": "(SELECT \n    way, waterway, lock, name, intermittent,\n    CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel, \n    'no' AS bridge\n  FROM planet_osm_line\n  WHERE waterway IN ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')\n    AND (bridge IS NULL OR bridge NOT IN ('yes', 'aqueduct'))\n  ORDER BY z_order\n) AS water_lines", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -846,7 +846,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "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', 'wadi') AND bridge IN ('yes', 'aqueduct') ORDER BY z_order) AS waterway_bridges", 
+        "table": "(SELECT way, waterway, name, intermittent, 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', 'wadi') AND bridge IN ('yes', 'aqueduct') ORDER BY z_order) AS waterway_bridges", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1630,7 +1630,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "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', 'wadi')\n        AND (tunnel IS NULL or tunnel != 'culvert')\n       ORDER BY z_order\n      ) AS water_lines_text", 
+        "table": "      (SELECT way, waterway, lock, name, intermittent, 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', 'wadi')\n        AND (tunnel IS NULL or tunnel != 'culvert')\n       ORDER BY z_order\n      ) AS water_lines_text", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 

diff --git a/project.yaml b/project.yaml
@@ -179,9 +179,9 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |-
-        (SELECT
-            way, waterway,
-            CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel
+        (SELECT 
+            way, waterway, intermittent,
+            CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel 
           FROM planet_osm_line
           WHERE waterway IN ('stream', 'drain', 'ditch')
         ) AS water_lines_casing
@@ -242,9 +242,9 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |-
-        (SELECT
-            way, waterway, lock, name,
-            CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel,
+        (SELECT 
+            way, waterway, lock, name, intermittent,
+            CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel, 
             'no' AS bridge
           FROM planet_osm_line
           WHERE waterway IN ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')
@@ -906,7 +906,7 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |2-
-        (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', 'wadi') AND bridge IN ('yes', 'aqueduct') ORDER BY z_order) AS waterway_bridges
+        (SELECT way, waterway, name, intermittent, 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', 'wadi') AND bridge IN ('yes', 'aqueduct') ORDER BY z_order) AS waterway_bridges
     advanced: {}
   - id: "bridges"
     name: "bridges"
@@ -1506,7 +1506,7 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |2-
-              (SELECT way, waterway, lock, name, CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel
+              (SELECT way, waterway, lock, name, intermittent, CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel
               FROM planet_osm_line
               WHERE waterway IN ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')
                 AND (tunnel IS NULL or tunnel != 'culvert')

diff --git a/water.mss b/water.mss
@@ -81,6 +81,12 @@
         [waterway = 'stream'][zoom >= 15] {
           line-width: 3.5;
         }
+        [intermittent = 'yes'] {
+          line-dasharray: 4,3;
+          line-cap: butt;
+          line-join: round;
+          line-clip: false;
+        }
       }
     }
   }
@@ -103,17 +109,9 @@
     line-cap: round;
   }
 
-  [waterway = 'wadi'][zoom >= 13] {
-    line-color: @water-color;
-    line-width: 1;
-    line-dasharray: 4,4;
-    line-cap: round;
-    line-join: round;
-    [zoom >= 16] { line-width: 2; }
-  }
-
   [waterway = 'canal'][zoom >= 12],
-  [waterway = 'river'][zoom >= 12] {
+  [waterway = 'river'][zoom >= 12],
+  [waterway = 'wadi'][zoom >= 13] {
     [bridge = 'yes'] {
       [zoom >= 14] {
         bridgecasing/line-color: black;
@@ -124,6 +122,21 @@
         [zoom >= 18] { bridgecasing/line-width: 13; }
       }
     }
+    [intermittent = 'yes'],
+    [waterway = 'wadi'] {
+      [bridge = 'yes'][zoom >= 14] {
+        bridgefill/line-color: white;
+        bridgefill/line-join: round;
+        bridgefill/line-width: 4;
+        [zoom >= 15] { bridgefill/line-width: 5; }
+        [zoom >= 17] { bridgefill/line-width: 9; }
+        [zoom >= 18] { bridgefill/line-width: 11; }
+      }
+      line-dasharray: 4,3;
+      line-cap: butt;
+      line-join: round;
+      line-clip: false;
+    }
     line-color: @water-color;
     line-width: 2;
     [zoom >= 13] { line-width: 3; }
@@ -162,6 +175,12 @@
           [waterway = 'stream'][zoom >= 15] { bridgeglow/line-width: 3; }
         }
       }
+      [intermittent = 'yes'] {
+        line-dasharray: 4,3;
+        line-cap: butt;
+        line-join: round;
+        line-clip: false;
+      }
       line-width: 2;
       line-color: @water-color;
       [waterway = 'stream'][zoom >= 15] {