Support function in geometries: #40
Open
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
- Issue : in some cases, the style.getGeometry() function would return a function rather than an object, causing issues when trying to set the geometry later in the code as we were calling geometry(undefined) instead of geometry(feature). - Fix : we check that the geometry is either an object, or a function which returns a non-null / non-undefined value, and we also use the function the geometry contains when it's not an Object.
gberaudo
reviewed
Oct 23, 2024
| // In some cases, the geometries are objects, in other cases they're features. | ||
| // We need to make sure that either the geometry is an object, or that the feature it contains returns | ||
| // a non-null / non-undefined value. | ||
| if (geometry && ((geometry instanceof Object && typeof geometry === 'object') || geometry(feature))) { |
There was a problem hiding this comment.
What about?
Suggested change
| if (geometry && ((geometry instanceof Object && typeof geometry === 'object') || geometry(feature))) { | |
| if (geometry && ((typeof geometry === 'object') || typeof geometry === 'function')) { |
There was a problem hiding this comment.
That would optimize a bit this check, but wouldn't ensure that the geometry the function returns is defined, which would cause issues a bit further. I would however mix them together like so :
if (geometry && ((typeof geometry === 'object' && geometry instanceof Object) || (typeof geometry === 'function' && geometry(feature)))
this would ensure that we ensure both that it is a function and that its result is defined.
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.
Issue : in some cases, the style.getGeometry() function would return a function rather than an object, causing issues when trying to set the geometry later in the code as we were calling geometry(undefined) instead of geometry(feature).
Fix : we check that the geometry is either an object, or a function which returns a non-null / non-undefined value, and we also use the function the geometry contains when it's not an Object.