Address PR comments

Author: nvkelso

queries.yaml

@@ -808,13 +808,24 @@ post_process:
         - name
       where: >-
         (kind == 'sea' and zoom < 4) or
+        (kind == 'bay' and zoom < 5) or
+        (kind == 'fjord' and zoom < 5) or
+        (kind == 'strait' and zoom < 5) or
         (kind == 'lake' and zoom < 5) or
+        (kind == 'playa' and zoom < 6) or
+        (kind == 'reef' and zoom < 6) or
         (kind == 'river' and zoom <  12) or
+        (kind == 'riverbank' and zoom <  12) or
+        (kind == 'water' and zoom <  12) or
         (kind == 'canal' and zoom <  13) or
+        (kind == 'basin' and zoom <  13) or
+        (kind == 'dock' and zoom <  13) or
         (kind == 'dam' and zoom <  14) or
         (kind == 'stream' and zoom <  14) or
         (kind == 'ditch' and zoom <  15) or
         (kind == 'drain' and zoom <  15) or
+        (kind == 'swimming_pool' and zoom <  15) or
+        (kind == 'fountain' and zoom <  15) or
         (properties is not None and properties.get('is_tunnel') is True)
 
   - fn: vectordatasource.transform.handle_label_placement
@@ -863,40 +874,40 @@ post_process:
             (16,         None),
         ] if area >= area_threshold][0]
       where: >-
-        kind in ['lake','bay','water','riverbank','reservoir'] and label_placement
+        (properties is not None and properties.get('label_placement') is True)
 
   # now that we have the label points
   # drop most water properties at lower zooms
   # this is for lines and polygons
   - fn: vectordatasource.transform.drop_properties
     params:
       source_layer: water
-      start_zoom: 8
+      start_zoom: 0
       end_zoom: 15
+      geom_types: [LineString, MultiLineString, Polygon, MultiPolygon]
       properties:
         - id
         - area
+        - boundary
         - layer
         - wikidata_id
+        - osm_relation
         - kind_tile_rank
-        - label_placement
-      where: >-
-        geom_type in ('LineString', 'MultiLineString', 'Polygon', 'MultiPolygon')
 
   # now that we have the label points
   # drop water names at lower zooms for polys only
   - fn: vectordatasource.transform.drop_properties
     params:
       source_layer: water
-      start_zoom: 8
+      start_zoom: 0
       end_zoom: 15
+      geom_types: [Polygon, MultiPolygon]
       # short-hand for "name" property in the list below means all name-like
       # properties.
       all_name_variants: true
       properties:
         - name
-      where: >-
-        geom_type in ('Polygon', 'MultiPolygon')
+        - old_name
 
   - fn: vectordatasource.transform.handle_label_placement
     params: