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

Use in API and utilities WKT2_2019 instead of WKT2_2018 (fixes #1578) #1585

Merged
merged 1 commit into from Sep 8, 2019

Conversation

rouault
Copy link
Member

@rouault rouault commented Sep 4, 2019

  • C API: PJ_GUESSED_WKT2_2019 is added, PJ_GUESSED_WKT2_2018 aliased to it
  • C API: PJ_WKT2_2019[_SIMPLIFIED] is added, PJ_WKT2_2018[_SIMPLIFIED] alias to it
  • C++ API: similarly for WKTFormatter::Convention::WKT2_2019[_SIMPLIFIED]
    Those above changes should be fully backward API and ABI compatible.

projinfo changes:

  • accept WKT2_2019 as value for -o switch. WKT2_2018 is still accepted (undocumented)
  • output now uses 'WKT2_2019 string:', so might break scripts that would rely on that.

Other internal code references to WKT2_2018 changes to WKT2_2019, included
in tests.

@rouault rouault force-pushed the replace_2018_by_2019 branch 2 times, most recently from c4f9657 to aac151c Compare Sep 5, 2019
@@ -244,7 +246,7 @@ Output:
PROJ.4 string:
+proj=longlat +datum=WGS84 +no_defs +type=crs

WKT2_2018 string:
WKT2_2019 string:
Copy link
Member

@kbevers kbevers Sep 6, 2019

Choose a reason for hiding this comment

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

I wonder, is that the correct describtion? I seem to remember also seeing WKT2:2019 in many places. Does the standard say anything about the correct form of the name?

Copy link
Member Author

@rouault rouault Sep 6, 2019

Choose a reason for hiding this comment

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

Does the standard say anything about the correct form of the name?

Good question. I'm not sure. The doc is there http://docs.opengeospatial.org/is/18-010r7/18-010r7.html and is referenced from https://www.opengeospatial.org/standards/wkt-crs . So it could be "WKT CRS 2.0" (because WKT2:2015 was "WKT CRS 1.0" ...), which would be super confusing. A better name could be "ISO 19162:2019" but that's probably too many figures for people to remember... I wouldn't mind changing to "WKT2:2019"

Copy link
Member

@kbevers kbevers Sep 6, 2019

Choose a reason for hiding this comment

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

Okay, it's not a big deal, i just wondered. We use ISO19111:2019 to mark that we are talking about the 2019 version of the standard, so WKT2:2019 would follow the same pattern. Incidentally I also think it looks better than WKT2_2019 but that is just my personal preference.

Copy link
Member Author

@rouault rouault Sep 6, 2019

Choose a reason for hiding this comment

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

ok, just changed to WKT2:2019 (and WKT2:2015, WKT1:GDAL, WKT1:ESRI for consistency)

Copy link
Member

@kbevers kbevers Sep 7, 2019

Choose a reason for hiding this comment

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

Did you forget to push the change? The line above is still "WKT2_2019" as well as most occurrences below.

Copy link
Member Author

@rouault rouault Sep 8, 2019

Choose a reason for hiding this comment

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

ah, I didn't indeed change the .rst files. Now fixed. I've also changed the usage message of projinfo to use WKT2:2019. The utilty still accepts colon, underscore or dash as separator as it did before

…1518)

- C API: PJ_GUESSED_WKT2_2019 is added, PJ_GUESSED_WKT2_2018 aliased to it
- C API: PJ_WKT2_2019[_SIMPLIFIED] is added, PJ_WKT2_2018[_SIMPLIFIED] alias to it
- C++ API: similarly for WKTFormatter::Convention::WKT2_2019[_SIMPLIFIED]
Those above changes should be fully backward API and ABI compatible.

projinfo changes:
- accept WKT2_2019 as value for -o switch. WKT2_2018 is still accepted (undocumented)
- output now uses 'WKT2_2019 string:', so might break scripts that would rely on that.

Other internal code references to WKT2_2018 changes to WKT2_2019, included
in tests.
@kbevers kbevers changed the title Use in API and utilities WKT2_2019 instead of WKT2_2018 (fixes #1518) Use in API and utilities WKT2_2019 instead of WKT2_2018 (fixes #1578) Sep 8, 2019
@kbevers kbevers merged commit 051a983 into OSGeo:master Sep 8, 2019
4 checks passed
@kbevers kbevers added this to the 7.0.0 milestone Sep 8, 2019
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.

None yet

2 participants