Fix overlay heuristic for GeometryCollections with empty elements #1229
+160
−108
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
dbaston
reviewed
Jan 15, 2025
| } | ||
|
|
||
| void | ||
| extractELements(const Geometry* g, std::vector<std::unique_ptr<Geometry>>& v) |
There was a problem hiding this comment.
Suggested change
| extractELements(const Geometry* g, std::vector<std::unique_ptr<Geometry>>& v) | |
| extractElements(const Geometry* g, std::vector<std::unique_ptr<Geometry>>& v) |
Comment on lines
+60
to
+61
| const GeometryCollection* coll; | ||
| if (nullptr != (coll = dynamic_cast<const GeometryCollection*>(g))) { |
There was a problem hiding this comment.
Suggested change
| const GeometryCollection* coll; | |
| if (nullptr != (coll = dynamic_cast<const GeometryCollection*>(g))) { | |
| if (const auto* coll = dynamic_cast<const GeometryCollection*>(g))) { |
Comment on lines
+164
to
+165
| default: // only OverlayNG::INTERSECTION | ||
| return s0.doIntersection(s1); |
There was a problem hiding this comment.
Suggested change
| default: // only OverlayNG::INTERSECTION | |
| return s0.doIntersection(s1); | |
| case OverlayNG::INTERSECTION: | |
| return s0.doIntersection(s1); | |
| default: | |
| throw util::IllegalArgumentException("Invalid opcode"); |
| @@ -178,6 +178,17 @@ tolower(std::string& str) | |||
| ); | |||
| } | |||
|
|
|||
| void | |||
| toupper(std::string& str) | |||
There was a problem hiding this comment.
Already implemented in geos/util/string.h
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.
This fixes the behaviour of the "combine disjoint" overlay heuristic for GeometryCollections containing empty elements (which are now removed).
Fixes #1224
(Note: part of #1224 requires #1136 to be fixed as well).
The PR also:
HeuristicOverlay(moving code fromGeometry)HeuristicOverlaycodeHeuristicOverlayXMLTesterto correctly handle operation A & B argument switching