Fix: Always disable expiry if maxzoom==0#2424
Merged
lonvia merged 1 commit intoosm2pgsql-dev:masterfrom Oct 28, 2025
Merged
Conversation
lonvia
reviewed
Oct 27, 2025
| | 11 | | ||
| Then table osm2pgsql_test_expire contains exactly | ||
| | zoom | x | y | | ||
| | 0 | 0 | 0 | |
Collaborator
There was a problem hiding this comment.
Can you adapt the name of the feature in the first line of this file?
maxzoom==0 is the default setting and it is documented to means that there is no expire. That's what the enabled() function checks. But disabling this in from_bbox() only disabled the expire for that case, not for linestrings. Better to do this check in the function that's called from outside the expire code: from_geometry(). We also need to fix some tests that were using maxzoom==0 by changing their setting to use maxzoom==1.
joto
force-pushed
the
fix-expire-maxzoom0
branch
from
2ed422f to
be86625
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
maxzoom==0 is the default setting and it is documented to means that there is no expire. That's what the enabled() function checks.
But disabling this in from_bbox() only disabled the expire for that case, not for linestrings. Better to do this check in the function that's called from outside the expire code: from_geometry().
We also need to fix some tests that were using maxzoom==0 by changing their setting to use maxzoom==1.