Skip to content

Commit 776046b

Browse files
authored
Merge pull request #87 from semuconsulting/RC-1.1.10
RC 1.1.10
2 parents cd9b408 + 123146e commit 776046b

File tree

10 files changed

+24
-351
lines changed

10 files changed

+24
-351
lines changed

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[Parsing](#parsing) |
77
[Generating](#generating) |
88
[Serializing](#serializing) |
9+
[Utilities](#utilities) |
910
[Examples](#examples) |
1011
[Extensibility](#extensibility) |
1112
[Command Line Utility](#cli) |
@@ -254,6 +255,16 @@ serialOut.write(output)
254255
b'\xd3\x00\x13>\xd0\x00\x03\x8aX\xd9I<\x87/4\x10\x9d\x07\xd6\xafH Z\xd7\xf7'
255256
```
256257

258+
---
259+
## <a name="utilities">Utility Methods</a>
260+
261+
`pyrtcm` provides a number of utility methods (via the `pynmeagps` library), including:
262+
263+
- `ecef2llh` - converts ECEF (X, Y, Z) coordinates to geodetic (lat, lon, ellipsoidal height) coordinates
264+
- `llh2ecef` - converts geodetic (lat, lon, ellipsoidal height) coordinates to ECEF (X, Y, Z) coordinates
265+
266+
See [Sphinx documentation](https://www.semuconsulting.com/pynmeagps/pynmeagps.html#module-pynmeagps.nmeahelpers) for details.
267+
257268
---
258269
## <a name="examples">Examples</a>
259270

RELEASE_NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# pyrtcm Release Notes
22

3+
### RELEASE 1.1.10
4+
5+
1. Add dependency on `pypnmeagps` for `SocketWrapper` class (*previously duplicated here*) and utility methods e.g. `ecef2llh` and `llh2ecef`.
6+
37
### RELEASE 1.1.9
48

59
FIXES:

docs/pyrtcm.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ pyrtcm.rtcmtypes\_get\_msm module
7676
:undoc-members:
7777
:show-inheritance:
7878

79-
pyrtcm.socketwrapper module
80-
---------------------------
81-
82-
.. automodule:: pyrtcm.socketwrapper
83-
:members:
84-
:undoc-members:
85-
:show-inheritance:
86-
8779
Module contents
8880
---------------
8981

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ classifiers = [
3333
"Topic :: Scientific/Engineering :: GIS",
3434
]
3535

36-
dependencies = []
36+
dependencies = ["pynmeagps >= 1.0.56"]
3737

3838
[project.urls]
3939
homepage = "https://github.com/semuconsulting/pyrtcm"
@@ -99,7 +99,7 @@ disable = """
9999

100100
[tool.pytest.ini_options]
101101
minversion = "7.0"
102-
addopts = "--cov --cov-report html --cov-fail-under 98"
102+
addopts = "--cov --cov-report html --cov-fail-under 99"
103103
pythonpath = ["src"]
104104

105105
[tool.coverage.run]
@@ -109,7 +109,7 @@ source = ["src"]
109109
source = ["src"]
110110

111111
[tool.coverage.report]
112-
fail_under = 98
112+
fail_under = 99
113113

114114
[tool.coverage.html]
115115
directory = "htmlcov"

src/pyrtcm/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
:license: BSD 3-Clause
77
"""
88

9+
from pynmeagps import SocketWrapper, ecef2llh, llh2ecef
10+
911
from pyrtcm._version import __version__
1012
from pyrtcm.exceptions import (
1113
ParameterError,
@@ -21,6 +23,5 @@
2123
from pyrtcm.rtcmtypes_get import *
2224
from pyrtcm.rtcmtypes_get_igs import *
2325
from pyrtcm.rtcmtypes_get_msm import *
24-
from pyrtcm.socketwrapper import SocketWrapper
2526

2627
version = __version__ # pylint: disable=invalid-name

src/pyrtcm/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
:license: BSD 3-Clause
99
"""
1010

11-
__version__ = "1.1.9"
11+
__version__ = "1.1.10"

src/pyrtcm/rtcmreader.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
from logging import getLogger
2828
from socket import socket
2929

30+
from pynmeagps import SocketWrapper
31+
3032
from pyrtcm.exceptions import (
3133
RTCMMessageError,
3234
RTCMParseError,
@@ -41,7 +43,6 @@
4143
ERR_RAISE,
4244
VALCKSUM,
4345
)
44-
from pyrtcm.socketwrapper import SocketWrapper
4546

4647

4748
class RTCMReader:

src/pyrtcm/rtcmtypes_get.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
:license: BSD 3-Clause
5656
"""
5757

58-
# pylint: disable=too-many-lines
58+
# pylint: disable=too-many-lines, line-too-long
5959

6060
from pyrtcm.rtcmtypes_core import NHARMCOEFFC, NHARMCOEFFS, NRES
6161

src/pyrtcm/socketwrapper.py

Lines changed: 0 additions & 199 deletions
This file was deleted.

0 commit comments

Comments
 (0)