Remove duplicate and inconsistent condition from water_lines_casing

This resolves gravitystorm#939
matthijsmelissen · Sep 22, 2014 · fc19903 · fc19903
1 parent 9478a1a
commit fc19903
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/project.mml b/project.mml
@@ -131,7 +131,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    AND (tunnel IS NULL OR tunnel != 'yes')\n) AS water_lines_casing", 
+        "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", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 

diff --git a/project.yaml b/project.yaml
@@ -156,7 +156,6 @@ Layer:
             CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel 
           FROM planet_osm_line
           WHERE waterway IN ('stream', 'drain', 'ditch')
-            AND (tunnel IS NULL OR tunnel != 'yes')
         ) AS water_lines_casing
     advanced: {}
   - id: "water-lines-low-zoom"