encoding/wkt: fix handling of collections with empty elements #184
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
|
Thanks for doing this! I think you want to do the same to the MULTI* types, e.g MULTIPOINT (EMPTY, EMPTY) |
|
Seems so, thanks for the tip - will amend the PR. |
erikgrinaker
changed the title
otan
reviewed
Aug 30, 2020
encoding/wkt/decode.go
Outdated
| func readCoordsDim1(l geom.Layout, wkt string) ([]geom.Coord, string, error) { | ||
| isEmpty := strings.HasSuffix(wkt, tEmpty) | ||
| if isEmpty { | ||
| func readCoordsDim1(l geom.Layout, wkt string, allowEmpty bool) ([]geom.Coord, string, error) { |
There was a problem hiding this comment.
nit: i think allowEmpty is a bit misleading, as we allow empty just below here. maybe allowEmptyCoordinatesInBraceContents or something?
There was a problem hiding this comment.
Sure, renamed it allowEmptyCoordsInBrace
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.
WKT encoding of collections with empty elements resulted in empty collections. Consider the following geometry:
Which resulted in the following encoding:
While the correct encoding is:
The same was true for all multi-types.
This also fixes decoding of the corresponding WKT. The decoder is rather brittle, but the test cases pass at least.