Add support for geo_shape represented as Well-Known Text (WKT) #3377
Conversation
This file contains hidden or 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
This commit moves the geo_shape queries into the Test project. Missed in the Tests refactoring
This commit adds support for Well-Known Text (WKT) representations of geo_shape. The extent of the implementation is only as far as is required by the WKT support in Elasticsearch. Deserialize from WKT to IGeoShape types. The format from which the shape is deserialized is assigned to an internal format property on the concrete implementations of GeoShape as the intention is not to expose this as a property on the IGeoShape interface. The format is assigned to the instance so that the IGeoShape instance is serialized to the same format if indexed again. GeoWKTReader is a simple tokenizer implementation for the purposes of parsing only WKT concepts that are supported by Elasticsearch. GeoShapeConverter now implements WriteJson because the original format of IGeoShape now needs to be taken into account when serializing. Add tests for roundtrip serialization of WKT. Closes #3256
codebrain
approved these changes
Aug 27, 2018
| throw new NotSupportedException(); | ||
| // IGeometryCollection needs to be handled separately because it does not | ||
| // implement IGeoShape, and can't because it would be a binary breaking change. | ||
| // This is fixed in next major release. |
There was a problem hiding this comment.
Maybe put something like "Fixed in 7.0" that way when we search in the code for TODOs in 7.0 we can find this.
| var radius = shape["radius"]; | ||
| return ParseCircleGeoShape(shape, serializer, radius); | ||
| case "envelope": | ||
| case GeoShapeType.Circle: |
| @@ -7,7 +7,7 @@ | |||
| <NoWarn>$(NoWarn);xUnit1013</NoWarn> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" /> | |||
| <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" /> | |||
This commit adds additional unit tests for reading and writing shapes in WKT.
|
Wicked! |
|
I see what you did there @Mpdreamz 😄 |
Closed
Mpdreamz
pushed a commit
that referenced
this pull request
Sep 3, 2018
* Add support for well known text (wkt) to geo bounding box queries * Move geo_shape queries into Tests project This commit moves the geo_shape queries into the Test project. Missed in the Tests refactoring * Add support for Z values to GeoCoordinate * Add support for WKT geo shapes This commit adds support for Well-Known Text (WKT) representations of geo_shape. The extent of the implementation is only as far as is required by the WKT support in Elasticsearch. Deserialize from WKT to IGeoShape types. The format from which the shape is deserialized is assigned to an internal format property on the concrete implementations of GeoShape as the intention is not to expose this as a property on the IGeoShape interface. The format is assigned to the instance so that the IGeoShape instance is serialized to the same format if indexed again. GeoWKTReader is a simple tokenizer implementation for the purposes of parsing only WKT concepts that are supported by Elasticsearch. GeoShapeConverter now implements WriteJson because the original format of IGeoShape now needs to be taken into account when serializing. Add tests for roundtrip serialization of WKT. Closes #3256
Mpdreamz
pushed a commit
that referenced
this pull request
Sep 3, 2018
* Add support for well known text (wkt) to geo bounding box queries * Move geo_shape queries into Tests project This commit moves the geo_shape queries into the Test project. Missed in the Tests refactoring * Add support for Z values to GeoCoordinate * Add support for WKT geo shapes This commit adds support for Well-Known Text (WKT) representations of geo_shape. The extent of the implementation is only as far as is required by the WKT support in Elasticsearch. Deserialize from WKT to IGeoShape types. The format from which the shape is deserialized is assigned to an internal format property on the concrete implementations of GeoShape as the intention is not to expose this as a property on the IGeoShape interface. The format is assigned to the instance so that the IGeoShape instance is serialized to the same format if indexed again. GeoWKTReader is a simple tokenizer implementation for the purposes of parsing only WKT concepts that are supported by Elasticsearch. GeoShapeConverter now implements WriteJson because the original format of IGeoShape now needs to be taken into account when serializing. Add tests for roundtrip serialization of WKT. Closes #3256
russcam
added a commit
that referenced
this pull request
Sep 12, 2018
* Add support for well known text (wkt) to geo bounding box queries * Move geo_shape queries into Tests project This commit moves the geo_shape queries into the Test project. Missed in the Tests refactoring * Add support for Z values to GeoCoordinate * Add support for WKT geo shapes This commit adds support for Well-Known Text (WKT) representations of geo_shape. The extent of the implementation is only as far as is required by the WKT support in Elasticsearch. Deserialize from WKT to IGeoShape types. The format from which the shape is deserialized is assigned to an internal format property on the concrete implementations of GeoShape as the intention is not to expose this as a property on the IGeoShape interface. The format is assigned to the instance so that the IGeoShape instance is serialized to the same format if indexed again. GeoWKTReader is a simple tokenizer implementation for the purposes of parsing only WKT concepts that are supported by Elasticsearch. GeoShapeConverter now implements WriteJson because the original format of IGeoShape now needs to be taken into account when serializing. Add tests for roundtrip serialization of WKT. Closes #3256 (cherry picked from commit f31b087) Includes line ending sensitive unit test from 0d0afdb
russcam
added a commit
that referenced
this pull request
Sep 12, 2018
* Add support for well known text (wkt) to geo bounding box queries * Move geo_shape queries into Tests project This commit moves the geo_shape queries into the Test project. Missed in the Tests refactoring * Add support for Z values to GeoCoordinate * Add support for WKT geo shapes This commit adds support for Well-Known Text (WKT) representations of geo_shape. The extent of the implementation is only as far as is required by the WKT support in Elasticsearch. Deserialize from WKT to IGeoShape types. The format from which the shape is deserialized is assigned to an internal format property on the concrete implementations of GeoShape as the intention is not to expose this as a property on the IGeoShape interface. The format is assigned to the instance so that the IGeoShape instance is serialized to the same format if indexed again. GeoWKTReader is a simple tokenizer implementation for the purposes of parsing only WKT concepts that are supported by Elasticsearch. GeoShapeConverter now implements WriteJson because the original format of IGeoShape now needs to be taken into account when serializing. Add tests for roundtrip serialization of WKT. Closes #3256 (cherry picked from commit f31b087) Includes line ending sensitive unit test from 0d0afdb
Mpdreamz
pushed a commit
that referenced
this pull request
Sep 14, 2018
#3401) * Add support for well known text (wkt) to geo bounding box queries * Move geo_shape queries into Tests project This commit moves the geo_shape queries into the Test project. Missed in the Tests refactoring * Add support for Z values to GeoCoordinate * Add support for WKT geo shapes This commit adds support for Well-Known Text (WKT) representations of geo_shape. The extent of the implementation is only as far as is required by the WKT support in Elasticsearch. Deserialize from WKT to IGeoShape types. The format from which the shape is deserialized is assigned to an internal format property on the concrete implementations of GeoShape as the intention is not to expose this as a property on the IGeoShape interface. The format is assigned to the instance so that the IGeoShape instance is serialized to the same format if indexed again. GeoWKTReader is a simple tokenizer implementation for the purposes of parsing only WKT concepts that are supported by Elasticsearch. GeoShapeConverter now implements WriteJson because the original format of IGeoShape now needs to be taken into account when serializing. Add tests for roundtrip serialization of WKT. Closes #3256 (cherry picked from commit f31b087) Includes line ending sensitive unit test from 0d0afdb
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 PR adds support for Well-Known Text (WKT) representations
of
geo_shapetypes. The extent of the implementation is only as far as isrequired by the WKT support in Elasticsearch.
GeoCoordinateIGeoShapetypes. The format from whichthe shape is deserialized is assigned to an internal format property
on the concrete implementations of GeoShape as the intention is
not to expose this as a property on the IGeoShape interface. The format
is assigned to the instance so that the IGeoShape instance is
serialized to the same format if indexed again.
GeoWKTReaderis a simple tokenizer implementationfor the purposes of parsing only WKT concepts that are supported
by Elasticsearch.
GeoShapeConverternow implementsWriteJson()because theoriginal format of IGeoShape now needs to be taken into account
when serializing.
Closes #3256