Add support for Degree Sign on input #2791
Conversation
This commit adds support in dsmtor() for a Degree Sign (U+00B0), encoded as UTF-8 (`\xc2\xb0`), as an alternative symbol to `D`/`d` to designate the degree unit. Fixes OSGeo#2712.
Per review feedback from @kbevers on pull OSGeo#2791.
In response to PR feedback from @rouault on pull OSGeo#2791, there was an unintentional fallthrough in the switch statement case for the degree sign. Replacing the 'switch' altogether removes the fallthrough risk, allows us to check for both bytes in the degree sign in the same test, and avoids the need to duplicate the code from the 'default' case in multiple branches.
Also remove the cast from the raw unsigned numeric byte value to 'char', instead just initialise the constexprs for the bytes as 'char'.
src/dmstor.cpp
Outdated
| double | ||
| dmstor(const char *is, char **rs) { | ||
| return dmstor_ctx( pj_get_default_ctx(), is, rs ); | ||
| } | ||
|
|
||
| double | ||
| dmstor_ctx(PJ_CONTEXT *ctx, const char *is, char **rs) { | ||
| int n, nl; | ||
| int n, nl, adv; |
There was a problem hiding this comment.
it would be better to move the declaration of the variable with its initialization at line 68
There was a problem hiding this comment.
Agreed, thanks @rouault I've updated my branch today with this change.
|
Another consideration is to also accept the single-byte encoding for the degree symbol deg = "\N{DEGREE SIGN}"
print(deg) # °
print(deg.encode("utf-8")) # b'\xc2\xb0'
print(deg.encode("cp1252")) # b'\xb0'This single byte sequence has the same meaning for: cp1250, cp1251, cp1252, cp1253, cp1254, cp1255, cp1256, cp1257, cp1258, iso8859_1, iso8859_2, iso8859_3, iso8859_7, iso8859_8, iso8859_9, iso8859_10, iso8859_13, iso8859_15, iso8859_16, koi8_t, kz1048, latin_1, mbcs, ptcp154, and others. There are other byte sequences for the degree symbol using other encodings, but they are less common or obsolete. |
|
Thanks @mwtoews I am comfortable to include it, given how many encodings we can cover with |
Per PR feedback on pull OSGeo#2791
This byte is the degree symbol in many widely used single-byte encodings, including ISO 8859 parts 1-4, 7-10, 13, 15, 16, and several Windows code pages. With this change, there are now two accepted encodings for the degree symbol in dmstor: - `\xc2\xb0` (UTF-8) - `\xb0` (various single-byte encodings) Per PR feedback on pull OSGeo#2791.
Add support for Degree Sign on input (OSGeo#2791)
This PR adds support in dsmtor() for a Degree Sign (U+00B0), encoded
as UTF-8 (
\xc2\xb0), as an alternative symbol toD/dto designatethe degree unit.
No encodings other than UTF-8 are supported.
I had previously suggested in #2712 that I was willing to take a swing at this, for UTF-8 only, and nobody jumped in to dissuade me, so here goes.
I also correct a typo in a code comment and some fix some rogue whitespace on the way past.
I have added a test to test/unit/gie_self_test, but I wasn't able to run a clean red/green on the new test, due to an unrelated failure earlier in the same test block (line 411, currently failing on 'master'). My new test does pass if I comment out those failing tests. As an aside, it would probably be a good idea to break this block up into smaller units that can run independently of each other.
As for the documentation, I have tweaked one of the examples in the
cs2csdocs to demonstrate use of the degrees sign, but I didn't see anywhere in the docs that we give a general description of allowed DMS formats. If I've missed it, or there is anywhere else in the docs that should be updated for this change, please let me know. It's my first time offering a PR to this project so please do be gentle.Cheers,
Brendan
Fixes #2712.
docs/source/*.rstfor new API