Merge pull request #515 from mapzen/400-add-bay-water-features

Add bay water features

Author: rmarianski

data/functions.sql

@@ -417,7 +417,7 @@ RETURNS BOOLEAN AS $$
 BEGIN
     RETURN (
         waterway_val IN ('riverbank', 'dock')
-     OR natural_val IN ('water')
+     OR natural_val IN ('water', 'bay', 'strait', 'fjord')
      OR landuse_val IN ('basin', 'reservoir')
      OR amenity_val='swimming_pool'
      OR leisure_val='swimming_pool'

data/migrations/v0.8.0-polygon.sql

@@ -0,0 +1,8 @@
+CREATE INDEX new_planet_osm_polygon_water_geom_index ON planet_osm_polygon USING gist(way) WHERE mz_calculate_is_water("amenity", "landuse", "leisure", "natural", "waterway") = TRUE;
+
+BEGIN;
+
+DROP INDEX planet_osm_polygon_water_geom_index;
+ALTER INDEX new_planet_osm_polygon_water_geom_index RENAME TO planet_osm_polygon_water_geom_index;
+
+COMMIT;

queries.yaml

@@ -210,6 +210,12 @@ post_process:
       source_layer: water
       label_property_name: label_placement
       label_property_value: "yes"
+  - fn: TileStache.Goodies.VecTiles.transform.drop_features_where
+    params:
+      source_layer: water
+      start_zoom: 9
+      where: >-
+        'label_placement' not in properties and kind in ('bay', 'strait', 'fjord')
   - fn: TileStache.Goodies.VecTiles.transform.generate_address_points
     params:
       source_layer: buildings
@@ -234,9 +240,9 @@ post_process:
   - fn: TileStache.Goodies.VecTiles.transform.drop_features_where
     params:
       source_layer: landuse
-      property_name: mz_is_building
-      drop_property: true
-      geom_types: [Polygon, MultiPolygon]
+      start_zoom: 13
+      where: >-
+        properties.get('mz_is_building') is True
   - fn: TileStache.Goodies.VecTiles.transform.normalize_and_merge_duplicate_stations
     params:
       source_layer: pois

test/400-bay-water.py

@@ -0,0 +1,14 @@
+# osm_id: 43950409 name: San Pablo Bay
+assert_has_feature(
+    14, 2623, 6318, 'water',
+    { 'kind': 'bay', 'label_placement': 'yes' })
+
+# osm_id: 360566115 name: Byron strait
+assert_has_feature(
+    14, 15043, 8311, 'water',
+    { 'kind': 'strait', 'label_placement': 'yes' })
+
+# osm_id: -1451065 name: Horsens Fjord
+assert_has_feature(
+    14, 8645, 5114, 'water',
+    { 'kind': 'fjord', 'label_placement': 'yes' })