Add bbox filter to water union queries

hanchao · Apr 8, 2015 · a889f26 · a889f26
1 parent fc8b459
commit a889f26
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 0 deletions.
diff --git a/queries/water-z0.pgsql b/queries/water-z0.pgsql
@@ -15,6 +15,8 @@ FROM
 
     FROM ne_110m_ocean
 
+    WHERE the_geom && !bbox!
+
     --
     -- Lakes
     --
@@ -30,4 +32,6 @@ FROM
 
     FROM ne_110m_lakes
 
+    WHERE the_geom && !bbox!
+
 ) AS water_areas
diff --git a/queries/water-z11.pgsql b/queries/water-z11.pgsql
@@ -15,6 +15,8 @@ FROM
 
     FROM water_polygons
 
+    WHERE the_geom && !bbox!
+
     --
     -- Other water areas
     --
@@ -33,6 +35,7 @@ FROM
     WHERE
         mz_calculate_is_water("waterway", "natural", "landuse") = TRUE
         AND way_area::bigint > 25600 -- 4px
+        AND way && !bbox!
 
     --
     -- Water line geometries
@@ -51,5 +54,6 @@ FROM
 
     WHERE
         waterway IN ('canal', 'river', 'stream')
+        AND way && !bbox!
 
 ) AS water_areas
diff --git a/queries/water-z12.pgsql b/queries/water-z12.pgsql
@@ -15,6 +15,8 @@ FROM
 
     FROM water_polygons
 
+    WHERE the_geom && !bbox!
+
     --
     -- Other water areas
     --
@@ -33,6 +35,7 @@ FROM
     WHERE
         mz_calculate_is_water("waterway", "natural", "landuse") = TRUE
         AND way_area::bigint > 6400 -- 4px
+        AND way && !bbox!
 
     --
     -- Water line geometries
@@ -51,5 +54,6 @@ FROM
 
     WHERE
         waterway IN ('canal', 'river', 'stream')
+        AND way && !bbox!
 
 ) AS water_areas
diff --git a/queries/water-z13.pgsql b/queries/water-z13.pgsql
@@ -15,6 +15,9 @@ FROM
 
     FROM water_polygons
 
+    WHERE the_geom && !bbox!
+
+
     --
     -- Other water areas
     --
@@ -33,6 +36,7 @@ FROM
     WHERE
         mz_calculate_is_water("waterway", "natural", "landuse") = TRUE
         AND way_area::bigint > 1600 -- 4px
+        AND way && !bbox!
 
     --
     -- Water line geometries
@@ -51,5 +55,6 @@ FROM
 
     WHERE
         waterway IN ('canal', 'dam', 'river', 'stream')
+        AND way && !bbox!
 
 ) AS water_areas
diff --git a/queries/water-z14.pgsql b/queries/water-z14.pgsql
@@ -15,6 +15,8 @@ FROM
 
     FROM water_polygons
 
+    WHERE the_geom && !bbox!
+
     --
     -- Other water areas
     --
@@ -33,6 +35,7 @@ FROM
     WHERE
         mz_calculate_is_water("waterway", "natural", "landuse") = TRUE
         AND way_area::bigint > 400 -- 4px
+        AND way && !bbox!
 
     --
     -- Water line geometries
@@ -51,5 +54,6 @@ FROM
 
     WHERE
         waterway IN ('canal', 'dam', 'river', 'stream')
+        AND way && !bbox!
 
 ) AS water_areas
diff --git a/queries/water-z15.pgsql b/queries/water-z15.pgsql
@@ -15,6 +15,8 @@ FROM
 
     FROM water_polygons
 
+    WHERE the_geom && !bbox!
+
     --
     -- Other water areas
     --
@@ -33,6 +35,7 @@ FROM
     WHERE
         mz_calculate_is_water("waterway", "natural", "landuse") = TRUE
         AND way_area::bigint > 100 -- 4px
+        AND way && !bbox!
 
     --
     -- Water line geometries
@@ -51,5 +54,6 @@ FROM
 
     WHERE
         waterway IN ('canal', 'dam', 'river', 'stream')
+        AND way && !bbox!
 
 ) AS water_areas
diff --git a/queries/water-z16.pgsql b/queries/water-z16.pgsql
@@ -15,6 +15,8 @@ FROM
 
     FROM water_polygons
 
+    WHERE the_geom && !bbox!
+
     --
     -- Other water areas
     --
@@ -32,6 +34,7 @@ FROM
 
     WHERE
         mz_calculate_is_water("waterway", "natural", "landuse") = TRUE
+        AND way && !bbox!
 
     --
     -- Water line geometries
@@ -50,5 +53,6 @@ FROM
 
     WHERE
         waterway IN ('canal', 'dam', 'ditch', 'drain', 'river', 'stream')
+        AND way && !bbox!
 
 ) AS water_areas
diff --git a/queries/water-z4.pgsql b/queries/water-z4.pgsql
@@ -15,6 +15,8 @@ FROM
 
     FROM ne_50m_ocean
 
+    WHERE the_geom && !bbox!
+
     --
     -- Lakes
     --
@@ -30,6 +32,8 @@ FROM
 
     FROM ne_50m_lakes
 
+    WHERE the_geom && !bbox!
+
     --
     -- Playas
     --
@@ -45,4 +49,6 @@ FROM
 
     FROM ne_50m_playas
 
+    WHERE the_geom && !bbox!
+
 ) AS water_areas
diff --git a/queries/water-z9.pgsql b/queries/water-z9.pgsql
@@ -15,6 +15,8 @@ FROM
 
     FROM water_polygons
 
+    WHERE the_geom && !bbox!
+
     --
     -- Other water areas
     --
@@ -33,6 +35,7 @@ FROM
     WHERE
         mz_calculate_is_water("waterway", "natural", "landuse") = TRUE
         AND way_area::bigint > 102400 -- 4px
+        AND way && !bbox!
 
     --
     -- Water line geometries
@@ -51,5 +54,6 @@ FROM
 
     WHERE
         waterway IN ('canal', 'river')
+        AND way && !bbox!
 
 ) AS water_areas