Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle GenericXMLElement in FilterUtils.getGeometryValue() #1101

Merged

Conversation

lgoltz
Copy link
Contributor

@lgoltz lgoltz commented Nov 17, 2020

Fixes #1100

@tfr42 tfr42 added the bug error issue and bug (fix) label Nov 27, 2020
@lgoltz
Copy link
Contributor Author

lgoltz commented Dec 10, 2020

Verified by user.

@@ -58,6 +61,14 @@ public static Geometry getGeometryValue( TypedObjectNode node ) {
geom = (Geometry) node;
} else if ( node instanceof Property && ( (Property) node ).getValue() instanceof Geometry ) {
geom = (Geometry) ( (Property) node ).getValue();
} else if ( node instanceof GenericXMLElement ) {
GenericXMLElement xml = (GenericXMLElement) node;
if ( xml.getChildren() != null && !xml.getChildren().isEmpty() ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If GenericXMLElement is a collection type, it would be preferable that the size of the collection is also checked for exactly one element.

@stephanr stephanr merged commit 20f8d90 into deegree:master Jan 29, 2021
Copy link
Member

@tfr42 tfr42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved by TMC

@tfr42 tfr42 added this to the 3.4.15 milestone Feb 1, 2021
@lgoltz lgoltz deleted the enhanceParsingOfGeometryProperty-6824 branch December 8, 2022 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug error issue and bug (fix)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

IsSurface with XPathExpression fails
3 participants