Make buffer_cfg work for meta tile build #401
Conversation
…_feature_layers bounds
| line=bounds, | ||
| point=bounds, | ||
| ) | ||
| query_bounds_pad_fn = layer_datum['query_bounds_pad_fn'] |
There was a problem hiding this comment.
This function is already a part of every layer_datum:
tilequeue/tilequeue/command.py
Line 542 in 52a62be
| @@ -724,9 +724,11 @@ def _add_feature(source, feature): | |||
|
|
|||
| return source_features.iteritems() | |||
|
|
|||
| def __call__(self, zoom, unpadded_bounds): | |||
| def __call__(self, zoom, bounds): | |||
There was a problem hiding this comment.
it is not always unpadded_bounds any more, that's why we renamed it
| @@ -735,25 +737,27 @@ def __call__(self, zoom, unpadded_bounds): | |||
| # loaded? | |||
| assert zoom <= self.tile_pyramid.max_z | |||
| assert zoom >= self.tile_pyramid.z | |||
| assert bbox.within(self.tile_pyramid.bbox()) | |||
| # assert bbox.within(self.tile_pyramid.bbox()) | |||
There was a problem hiding this comment.
Can this be deleted?
for this one I think probably leave it there so that we know there might be some verification we can do somewhere else.
There was a problem hiding this comment.
I think we can probably do this the opposite way - self.tile_pyramid.bbox should be within bbox, right, but the opposite might not be true...?
| @@ -735,25 +737,27 @@ def __call__(self, zoom, unpadded_bounds): | |||
| # loaded? | |||
| assert zoom <= self.tile_pyramid.max_z | |||
| assert zoom >= self.tile_pyramid.z | |||
| assert bbox.within(self.tile_pyramid.bbox()) | |||
| # assert bbox.within(self.tile_pyramid.bbox()) | |||
There was a problem hiding this comment.
| # assert bbox.within(self.tile_pyramid.bbox()) | |
| assert self.tile_pyramid_bbox().within(bbox) |
| cut_coords_by_zoom = calculate_cut_coords_by_zoom( | ||
| self.coord, self.metatile_zoom, self.cfg_tile_sizes, self.max_zoom) | ||
| feature_layers_by_zoom = {} | ||
|
|
||
| for nominal_zoom, _ in cut_coords_by_zoom.items(): | ||
| source_rows = self.fetch_fn(nominal_zoom, unpadded_bounds) | ||
| source_rows = self.fetch_fn(nominal_zoom, self.max_padded_bounds) |
There was a problem hiding this comment.
@iandees this is the part 1 of the change, basically fetch everything inside a bbox that is the largest of the numbers in the various per-layer and per-geometry buffer configs
| line=bounds, | ||
| point=bounds, | ||
| ) | ||
| query_bounds_pad_fn = layer_datum['query_bounds_pad_fn'] |
There was a problem hiding this comment.
@iandees this is part 2 of the change. Rather than just using the unpadded_bounds passed in, use the query_bounds_pad_fn attached to the layer datum to create an appropriately padded bbox.
| @@ -97,6 +97,31 @@ def calc_buffered_bounds( | |||
| return bounds | |||
|
|
|||
|
|
|||
| def calc_max_padded_bounds(bounds, meters_per_pixel_dim, buffer_cfg): | |||
There was a problem hiding this comment.
this is a stupid function that just finds the biggest number in the buffer config and makes a bounding box expanded by that much
The
buffer_cfgexists but it doesn't work correctly, this change makes the config wired in the stack.