Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GeoJSON/JSONFG: do not recognize GeoJSON files with a featureType feature property as JSONFG #9950

Merged
merged 7 commits into from
May 21, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented May 16, 2024

Fixes #9946

@rouault rouault merged commit 15a1d5b into OSGeo:master May 21, 2024
35 checks passed
@rouault
Copy link
Member Author

rouault commented May 21, 2024

The backport to release/3.9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d1a7d21159... GDALIdentifyDriverEx(): transmit papszAllowedDrivers to Identify(),
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
[backport-9950-to-release/3.9 0ce42881e9] JSONFG identification: recognize more JSON-FG specification version
 Author: Even Rouault <[email protected]>
 Date: Thu May 16 15:54:13 2024 +0200
 1 file changed, 13 insertions(+), 6 deletions(-)
[backport-9950-to-release/3.9 92635eeaf6] Test opening a JSONFG file with just coordRefSys as a hint it is one
 Author: Even Rouault <[email protected]>
 Date: Thu May 16 16:23:40 2024 +0200
 2 files changed, 21 insertions(+)
 create mode 100644 autotest/ogr/data/jsonfg/crs_none_fc_mixed_feat_no_conformsTo.json
[backport-9950-to-release/3.9 da8afd0ec4] GeoJSON/JSONFG: do not recognize GeoJSON files with a featureType feature property as JSONFG
 Author: Even Rouault <[email protected]>
 Date: Thu May 16 15:43:09 2024 +0200
 3 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 autotest/ogr/data/geojson/featuretype.json
[backport-9950-to-release/3.9 a9995a950b] GeoJSON/JSONFG: make it possible with -if/papszAllowedDrivers to force opening a JSONFG file with the GeoJSON driver
 Author: Even Rouault <[email protected]>
 Date: Thu May 16 15:48:02 2024 +0200
 4 files changed, 46 insertions(+), 15 deletions(-)
Auto-merging gcore/gdaldriver.cpp
CONFLICT (content): Merge conflict in gcore/gdaldriver.cpp

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-release/3.9 release/3.9
# Navigate to the new working tree
cd .worktrees/backport-release/3.9
# Create a new branch
git switch --create backport-9950-to-release/3.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 17f4c30dbf3f5e2c59c0857ddd59839ba06b370e,b89aa342abcfe4333ae5eea9ce450621fb12b074,241ef936aff83ea91a2763c775b0a66612e0fd60,2ebbf7a17aa73e7c116a60dc3f85b4136ded3839,d1a7d21159a7c6a41f74cab5ab31c376ddd62056,66d2e2108452c3f7636c88fc76c9ead6716bbcf5,420da570d40f13b4fe7c383ca4e3bb7799c1f6b8
# Push it to GitHub
git push --set-upstream origin backport-9950-to-release/3.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.9

Then, create a pull request where the base branch is release/3.9 and the compare/head branch is backport-9950-to-release/3.9.

@rouault
Copy link
Member Author

rouault commented May 22, 2024

manual backport in #9982

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GeoJSON driver not accepting "featureType" property
1 participant