Switch from 'grid_width' to 'grid_width_meters'

Author: iandees

queries.yaml

@@ -1052,7 +1052,7 @@ post_process:
       end_zoom: 9
       items_matching: { kind: locality }
       max_items: 1
-      grid_width: 52181.0113
+      grid_width_meters: 52181.0113
       sorting_keys:
         - { sort_key: 'min_zoom', reverse: False }
         - { sort_key: 'collision_rank', reverse: False }
@@ -1065,7 +1065,7 @@ post_process:
       end_zoom: 10
       items_matching: { kind: locality }
       max_items: 1
-      grid_width: 26090.5056
+      grid_width_meters: 26090.5056
       sorting_keys:
         - { sort_key: 'min_zoom', reverse: False }
         - { sort_key: 'collision_rank', reverse: False }
@@ -1078,7 +1078,7 @@ post_process:
       end_zoom: 11
       items_matching: { kind: locality }
       max_items: 1
-      grid_width: 13045.2528
+      grid_width_meters: 13045.2528
       sorting_keys:
         - { sort_key: 'min_zoom', reverse: False }
         - { sort_key: 'collision_rank', reverse: False }
@@ -1091,7 +1091,7 @@ post_process:
       end_zoom: 12
       items_matching: { kind: locality }
       max_items: 1
-      grid_width: 6522.1264
+      grid_width_meters: 6522.1264
       sorting_keys:
         - { sort_key: 'min_zoom', reverse: False }
         - { sort_key: 'collision_rank', reverse: False }
@@ -1104,7 +1104,7 @@ post_process:
       end_zoom: 13
       items_matching: { kind: locality }
       max_items: 1
-      grid_width: 3261.0632
+      grid_width_meters: 3261.0632
       sorting_keys:
         - { sort_key: 'min_zoom', reverse: False }
         - { sort_key: 'collision_rank', reverse: False }

vectordatasource/transform.py

@@ -3122,9 +3122,10 @@ def keep_n_features_gridded(ctx):
     pairs in `items_matching` into a grid, then keep the
     first `max_items` features in each grid cell.
 
-    The grid is created by dividing the bounds into buckets.
-    The `grid_width` and `grid_height` params specify the
-    width and height (in projected units) of each bucket.
+    The grid is created by dividing the bounds into cells.
+    The `grid_width_meters` and `grid_height_meters` params
+    specify the width and height (in mercator meters) of
+    each grid cell.
 
     NOTE: This only works with point features and will
     pass through non-point features untouched.
@@ -3141,9 +3142,10 @@ def keep_n_features_gridded(ctx):
     end_zoom = ctx.params.get('end_zoom')
     items_matching = ctx.params.get('items_matching')
     max_items = ctx.params.get('max_items')
-    grid_width = ctx.params.get('grid_width')
-    # if grid_height is not specified, use grid_width for grid_height
-    grid_height = ctx.params.get('grid_height') or grid_width
+    grid_width = ctx.params.get('grid_width_meters')
+    # if grid_height_meters is not specified, use grid_width_meters
+    # for grid_height_meters
+    grid_height = ctx.params.get('grid_height_meters') or grid_width
     sorting_keys = ctx.params.get('sorting_keys')
 
     # leaving items_matching, grid_size, or max_items as None (or zero)