Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 14 additions & 15 deletions pygeoapi_plugins/provider/mvt_postgresql.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ def __init__(self, provider_def):
func.ST_GeometryType(geom_column).label('geom_type')
).first() # type: ignore
self.tile_limit_order = (
func.random() if 'point' in geom_type.lower()
func.random()
if 'point' in geom_type.lower()
else ST_Area(Box2D(geom_column)).desc()
)
# Maximum tile size (in MB)
Expand Down Expand Up @@ -172,7 +173,8 @@ def get_tiles(
envelope = self.get_envelope(z, y, x, tileset_schema.tileMatrixSet)
envelope_srid = get_srid(tileset_schema.crs)
mvt_cte = self._get_mvt_cte(
envelope, envelope_srid, z, self.tile_limit)
envelope, envelope_srid, z, self.tile_limit
)
mvt_query = select(ST_AsMVT(mvt_cte, self.layer))

# Log the compiled query
Expand All @@ -197,22 +199,19 @@ def get_tiles(
)

matched = session.query(func.count(mvt_cte)).scalar()
i_size = int(
matched - matched * (self.tile_size / result_size)
)
new_limit = int(matched * (self.tile_size / result_size))

while self.tile_size < result_size:
matched -= i_size
new_mvt_cte = self._get_mvt_cte(
envelope, envelope_srid, z, matched)
new_mvt_cte = self._get_mvt_cte(
envelope, envelope_srid, z, new_limit
)

new_mvt_query = select(ST_AsMVT(new_mvt_cte, self.layer))
new_result = session.execute(new_mvt_query).scalar()
if new_result is None:
return
new_mvt_query = select(ST_AsMVT(new_mvt_cte, self.layer))
new_result = session.execute(new_mvt_query).scalar()
if new_result is None:
return

result_bytes = bytes(new_result)
result_size = len(result_bytes)
result_bytes = bytes(new_result)
result_size = len(result_bytes)

LOGGER.debug(f'Returning tile of size: {human_size(result_size)}')
return result_bytes
Expand Down
2 changes: 1 addition & 1 deletion tests/test_mvt_postgresql_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ def test_tile_size(config):
y=y,
)
assert tile is not None
assert len(tile) == pytest.approx(0.05 * 1024 * 1024, 0.1)
assert len(tile) == pytest.approx(0.05 * 1024 * 1024, 0.25)


def test_tile_simplify(config):
Expand Down
Loading