Produce an empty layout result for svg without width or height attributes #69
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
samanpwbb
approved these changes
Nov 9, 2019
| @@ -117,6 +117,8 @@ function generateLayoutInternal(options, callback) { | |||
| } | |||
| mapnik.Image.fromSVGBytes(img.svg, mapnikOpts, function(err, image) { | |||
| if (err && err.message.match(/image created from svg must be \d+ pixels or fewer on each side/) && options.removeOversizedIcons) return callback(null, null); | |||
| // Produce a null result if no width or height attributes. The error message from mapnik has a typo "then"; account for potential future fix to "than". | |||
| if (err && err.message.match(/image created from svg must have a width and height greater (then|than) zero/)) return callback(null, null); | |||
There was a problem hiding this comment.
wow well done anticipating a fix for then|than 💀 – this typo has been haunting mapnik users forever.
package.json
Outdated
| @@ -1,6 +1,6 @@ | |||
| { | |||
| "name": "@mapbox/spritezero", | |||
| "version": "6.1.1", | |||
| "version": "6.1.2-dev", | |||
| "main": "index.js", | |||
| "description": "small opinionated sprites", | |||
| "author": "Tom MacWright", | |||
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.
If an input SVG is missing
widthorheightattributes,mapnik.fromSVGByteswill result in an error, which in turn makesgenerateLayoutandgenerateImagefail.This PR adds error-handling logic for this situation to instead callback with a
nullresult, allowing the other layout sprite or image result to still be produced with the remaining "good" SVGs.This is essentially an addendum to #62.
cc @aparlato @samanpwbb