Skip to content

Implement expire of points in its own code #2423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2025
Merged

Implement expire of points in its own code #2423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/expire-tiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,22 @@ void expire_tiles_t::from_point_list(geom::point_list_t const &list,
void expire_tiles_t::from_geometry(geom::point_t const &geom,
expire_config_t const &expire_config)
{
geom::box_t const box = geom::envelope(geom);
from_bbox(box, expire_config);
auto const tilec = coords_to_tile(geom);

auto const ymin =
std::max(0U, static_cast<uint32_t>(tilec.y() - expire_config.buffer));

auto const ymax =
std::min(m_map_width - 1U,
static_cast<uint32_t>(tilec.y() + expire_config.buffer));

for (int x = static_cast<int>(tilec.x() - expire_config.buffer);
x <= static_cast<int>(tilec.x() + expire_config.buffer); ++x) {
uint32_t const norm_x = normalise_tile_x_coord(x);
for (uint32_t y = ymin; y <= ymax; ++y) {
expire_tile(norm_x, y);
}
}
}

void expire_tiles_t::from_geometry(geom::linestring_t const &geom,
Expand Down
6 changes: 4 additions & 2 deletions tests/test-expire-tiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,10 @@ TEST_CASE("simple expire z10 bounds 1023, 0", "[NoDB]")
expire_config_t{});

auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
CHECK(tiles.size() == 1);
CHECK(tiles.size() == 2);

auto itr = tiles.cbegin();
CHECK(*(itr++) == tile_t(10, 0, 0));
CHECK(*(itr++) == tile_t(10, 1023, 0));
}

Expand All @@ -205,9 +206,10 @@ TEST_CASE("simple expire z10 bounds 1023, 1023", "[NoDB]")
expire_config_t{});

auto const tiles = get_tiles_ordered(&et, minzoom, maxzoom);
CHECK(tiles.size() == 1);
CHECK(tiles.size() == 2);

auto itr = tiles.cbegin();
CHECK(*(itr++) == tile_t(10, 0, 1023));
CHECK(*(itr++) == tile_t(10, 1023, 1023));
}

Expand Down