Skip to content

Support of GeoJson Point for GeoPoint field#4597

Merged
dblock merged 9 commits intoopensearch-project:mainfrom
heemin32:geojson
Oct 19, 2022
Merged

Support of GeoJson Point for GeoPoint field#4597
dblock merged 9 commits intoopensearch-project:mainfrom
heemin32:geojson

Conversation

@heemin32
Copy link
Copy Markdown
Contributor

@heemin32 heemin32 commented Sep 26, 2022

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim heemin@amazon.com

Description

Supports GeoJson Point type in GeoPoint field

Issues Resolved

opensearch-project/geospatial#152

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

Comment thread server/src/main/java/org/opensearch/common/geo/GeoPoint.java
Comment thread server/src/main/java/org/opensearch/common/geo/GeoUtils.java Outdated
Comment thread server/src/test/java/org/opensearch/common/geo/PointParserTests.java Outdated
Comment thread server/src/test/java/org/opensearch/common/geo/PointParserTests.java Outdated
@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

Comment thread server/src/test/java/org/opensearch/common/geo/PointParserTests.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/GeoUtils.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/GeoUtils.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
Comment thread server/src/test/java/org/opensearch/common/geo/PointParserTests.java Outdated
Comment thread server/src/test/java/org/opensearch/common/geo/PointParserTests.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/GeoPoint.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
Comment thread server/src/main/java/org/opensearch/common/geo/PointParser.java Outdated
@heemin32
Copy link
Copy Markdown
Contributor Author

heemin32 commented Oct 3, 2022

Will raise another commit with more unit tests in GeoPointFieldMapperTests.

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@heemin32 heemin32 requested review from nknize and removed request for VijayanB October 13, 2022 17:46
@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

Copy link
Copy Markdown
Contributor

@nknize nknize left a comment

Choose a reason for hiding this comment

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

LGTM! Thx!

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@dblock dblock merged commit a282d39 into opensearch-project:main Oct 19, 2022
@dblock dblock added the backport 2.x Backport to 2.x branch label Oct 19, 2022
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-4597-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a282d399225247226d5abc3e3cd903462c973877
# Push it to GitHub
git push --set-upstream origin backport/backport-4597-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-4597-to-2.x.

@dblock
Copy link
Copy Markdown
Member

dblock commented Oct 19, 2022

@heemin32 will need a manual backport to 2.x if you want this in a 2.x release

heemin32 added a commit to heemin32/OpenSearch that referenced this pull request Oct 19, 2022
* Support of GeoJson Point for GeoPoint field

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit a282d39)
heemin32 added a commit to heemin32/OpenSearch that referenced this pull request Oct 19, 2022
* Support of GeoJson Point for GeoPoint field

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit a282d39)
@heemin32
Copy link
Copy Markdown
Contributor Author

@heemin32 will need a manual backport to 2.x if you want this in a 2.x release

Created backport PR. #4842

heemin32 added a commit to heemin32/OpenSearch that referenced this pull request Oct 20, 2022
* Support of GeoJson Point for GeoPoint field

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit a282d39)
heemin32 added a commit to heemin32/OpenSearch that referenced this pull request Oct 21, 2022
* Support of GeoJson Point for GeoPoint field

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit a282d39)
heemin32 added a commit to heemin32/OpenSearch that referenced this pull request Oct 21, 2022
* Support of GeoJson Point for GeoPoint field

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit a282d39)
andrross pushed a commit that referenced this pull request Oct 21, 2022
)

* Support of GeoJson Point for GeoPoint field (#4597)

* Support of GeoJson Point for GeoPoint field

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit a282d39)

* Run geojson yaml test for 2.4 and above only

Signed-off-by: Heemin Kim <heemin@amazon.com>

Signed-off-by: Heemin Kim <heemin@amazon.com>
@heemin32 heemin32 deleted the geojson branch October 24, 2022 22:08
snuyanzin pushed a commit to snuyanzin/OpenSearch that referenced this pull request Oct 28, 2022
* Support of GeoJson Point for GeoPoint field

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim <heemin@amazon.com>

* Refactored code based on comments

Signed-off-by: Heemin Kim <heemin@amazon.com>

* Add unit tests for GeoJson support

Signed-off-by: Heemin Kim <heemin@amazon.com>

* Resolve comments

* Remove negation expression
* Ignore case for GeoJson Point type to be consistent with geo_shape parsing

Signed-off-by: Heemin Kim <heemin@amazon.com>

* Added yaml test for geopoint

Signed-off-by: Heemin Kim <heemin@amazon.com>

Signed-off-by: Heemin Kim <heemin@amazon.com>
ashking94 pushed a commit to ashking94/OpenSearch that referenced this pull request Nov 7, 2022
* Support of GeoJson Point for GeoPoint field

See opensearch-project/geospatial#152

Signed-off-by: Heemin Kim <heemin@amazon.com>

* Refactored code based on comments

Signed-off-by: Heemin Kim <heemin@amazon.com>

* Add unit tests for GeoJson support

Signed-off-by: Heemin Kim <heemin@amazon.com>

* Resolve comments

* Remove negation expression
* Ignore case for GeoJson Point type to be consistent with geo_shape parsing

Signed-off-by: Heemin Kim <heemin@amazon.com>

* Added yaml test for geopoint

Signed-off-by: Heemin Kim <heemin@amazon.com>

Signed-off-by: Heemin Kim <heemin@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x Backport to 2.x branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants