Skip to content

[GH-1973] Upgrade to GeoTools 33#1967

Merged
jiayuasu merged 10 commits into
apache:masterfrom
jesspav:geo33
Jun 5, 2025
Merged

[GH-1973] Upgrade to GeoTools 33#1967
jiayuasu merged 10 commits into
apache:masterfrom
jesspav:geo33

Conversation

@jesspav
Copy link
Copy Markdown
Collaborator

@jesspav jesspav commented Jun 3, 2025

Did you read the Contributor Guide?

Is this PR related to a ticket?

  • Yes, and the PR name follows the format [GH-1973] Upgrade to GeoTools 33.

What changes were proposed in this PR?

  • Updated pom files to use geotools 33
  • Updated APIs and imports to align with changes in geotools
  • Couple of small test changes were needed to adjust to new APIs and checks:
    • Adjusted checks on spheroid buffer to allow for slight algorithmic differences
    • Couple of minor changes needed such as adding an SRID
    • Pulling in out of range point in a test that started failing due to a Transverse_Mercator

How was this patch tested?

  • GitHub workflows ran all necessary tests

Did this PR include necessary documentation updates?

  • No, this PR does not affect any public API so no need to change the documentation.

@jesspav jesspav changed the title Upgrade to geotools33 [Work in progress] Upgrade to geotools33 Jun 3, 2025
@github-actions github-actions Bot removed the sedona-r label Jun 4, 2025
@jesspav jesspav changed the title [Work in progress] Upgrade to geotools33 [GH-1973] Upgrade to GeoTools 33 Jun 4, 2025
@jesspav jesspav marked this pull request as ready for review June 4, 2025 17:41
@jesspav jesspav requested a review from jiayuasu as a code owner June 4, 2025 17:41
@jesspav
Copy link
Copy Markdown
Collaborator Author

jesspav commented Jun 4, 2025

Note: This PR includes upgrading the download of geotools-wrapper during the pyflink .github workflow with geotools 31 since this was the most up to date version available and the workflow looks to be passing now. PR for creating a geotools 33 version is our for review .

Comment thread .github/workflows/pyflink.yml Outdated
<sedona.scope>compile</sedona.scope>
<geotools.scope>compile</geotools.scope>

<geotools.version>28.2</geotools.version>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Let's not change the example project since it relies on a released version of Sedona

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Makes sense. Will revert. Thanks.

Comment thread examples/spark-sql/pom.xml Outdated
Comment thread .github/workflows/r.yml Outdated
hadoop: [3]
scala: [2.12.15]
r: [oldrel, release]
r: [oldrel]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why do you remove the release?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I copied it from an old PR with the geo33 change I was following. I will revert.

@jiayuasu jiayuasu added this to the sedona-1.8.0 milestone Jun 5, 2025
Comment thread .github/workflows/docker-build.yml Outdated
@jesspav
Copy link
Copy Markdown
Collaborator Author

jesspav commented Jun 5, 2025

Docker build is failing because of "-rc1" that was added to the new 33.1 geo wrapper name. Do we need that?

@jiayuasu
Copy link
Copy Markdown
Member

jiayuasu commented Jun 5, 2025

Oh right please add rc1 to the docker build. 1.8.0 is a big change so I intentionally put rc1 in geo tools-wrapper in case we need to update something.

@jiayuasu jiayuasu linked an issue Jun 5, 2025 that may be closed by this pull request
@jiayuasu jiayuasu merged commit 7a004ef into apache:master Jun 5, 2025
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upgrade to GeoTools 33

2 participants