Fix SVG symbol sizing when width and height are with physical units #7054
Conversation
This file contains 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
…x, in, cm, mm, pt, pc) will get size from the viewBox if present. so a symbol like this: ```svg <svg xmlns="http://www.w3.org/2000/svg" width="5.5mm" height="5.5mm" viewBox="0 0 15 15">..</svg> ``` will get sized according to the viewBox. But 5.5mm is 20px, so the symbol will end up cropped on the map. This patch will test if the symbol has intrinsic size and use rsvg_handle_get_intrinsic_size_in_pixels to get the pixel size.
|
The build test fails because it uses Ubuntu 20.04 with rsvg 2.48. It's worth reading the docs for It's not necessary to test the symbol for having a width and height any longer, because it will always have them (it a geometry property of the svg symbol) |
|
@mapcentia - thanks for the pull request. #if LIBRSVG_CHECK_VERSION(2, 46, 0)
|
|
@geographika Yes. I'll try to setup a build environment based on 20.04. |
The matrix of conditionals around SVG size extraction has been refactored in mapcairo.c. With this change, the symbols' height and width are better handled depending on the presence of width and height attributes, their units, and the viewBox. The conditions now account for newest LIBRSVG versions and fallback for older ones.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
SVG symbols having width and height attributes with physical units (px, in, cm, mm, pt, pc) will get sized from the viewBox if present. so a symbol like this:
will get sized according to the viewBox. But 5.5mm is 20px, so the symbol will end up cropped on the map.
This patch will test if the symbol has intrinsic size and use rsvg_handle_get_intrinsic_size_in_pixels to get the pixel size and size the symbol from that.