Add parser to read TLEs from Multi Mission Administrative Messages #78

pnuu · 2021-04-22T06:37:24Z

This PR adds a parser that can read TLE data from MMAM XML files.

Tests added
Tests passed
Passes flake8 pyorbital
Fully documented

codecov · 2021-04-22T06:40:37Z

Codecov Report

Merging #78 (89d6935) into main (6b7e685) will increase coverage by 1.01%.
The diff coverage is 93.82%.

@@            Coverage Diff             @@
##             main      #78      +/-   ##
==========================================
+ Coverage   85.31%   86.32%   +1.01%     
==========================================
  Files          13       13              
  Lines        1893     1967      +74     
==========================================
+ Hits         1615     1698      +83     
+ Misses        278      269       -9

Flag	Coverage Δ
unittests	`86.32% <93.82%> (+1.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pyorbital/tlefile.py	`91.03% <89.90%> (+3.61%)`	⬆️
pyorbital/tests/test_tlefile.py	`97.83% <100.00%> (+0.39%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b7e685...89d6935. Read the comment docs.

mraspaud

Could you add the new xml reading to the TLE class?

ghost · 2021-05-20T14:05:29Z

DeepCode's analysis on #89d693 found:

ℹ️ 1 minor issue. 👇
✔️ 1 issue was fixed.

Top issues

Description	Example fixes
The call to next should be guarded with a try/except block Occurrences: tlefile.py:296 tlefile.py:297 tlefile.py:301	🔧 Example fixes

👉 View analysis in DeepCode’s Dashboard | Configure the bot

pnuu · 2021-05-20T15:22:07Z

I'll be ignoring the Deepcode warning about using next() without an optional default value.

…pyorbital into feature-tle-admin-messages

mraspaud

Thanks for adding MMAM functionality and taking the time to refactor!

I think the tests are missing the case of passing the MMAM to the TLE class instance directly, right?
Otherwise, a few comments inline

mraspaud · 2021-05-21T09:29:39Z

pyorbital/tlefile.py

+            platform = ' '.join(parts[:-1])
+            num = parts[-1]


This doesn't work I think, examples from http://celestrak.com/NORAD/elements/weather.txt :
DMSP 5D-3 F16 (USA 172)
EWS-G1 (GOES 13)
I'm not saying it was working better before though...

It will. The parts[-1] is the platform number defined in platforms.txt.

mraspaud · 2021-05-21T09:34:30Z

pyorbital/tlefile.py

+    return [Tle('', tle_file=io.StringIO(tle)) for tle in
+            _get_tles_from_uris(item, open_func, platform='', only_first=False)]


why the call to StringIO here? isn't open_func taking care of that?

That was the only way of distinguishing between a filename str and data already read from the XML file as str in _get_uris_and_open_func(). Suggestions for a better way are wellcome.

mraspaud · 2021-05-21T09:35:11Z

pyorbital/tlefile.py

+    return "\n".join(data)
+
+
+def _grouper(n, iterable, fillvalue=None):


The function name could be improved, maybe matching the docstring more?

Will do. The naming was taken from itertools examples.

pyorbital/tlefile.py

…pyorbital into feature-tle-admin-messages

pnuu · 2021-05-21T10:16:38Z

I think the tests are missing the case of passing the MMAM to the TLE class instance directly, right?

Like this one? 😁

pyorbital/pyorbital/tests/test_tlefile.py

Lines 120 to 130 in 89d6935

    
           def test_from_mmam_xml(self): 
        
               """Test reading from an MMAM XML file.""" 
        
               from tempfile import TemporaryDirectory 
        
               save_dir = TemporaryDirectory() 
        
               with save_dir: 
        
                   fname = os.path.join(save_dir.name, '20210420_Metop-B_ADMIN_MESSAGE_NO_127.xml') 
        
                   with open(fname, 'w') as fid: 
        
                       fid.write(tle_xml) 
        
                   tle = Tle("", tle_file=fname) 
        
               self.check_example(tle)

mraspaud · 2021-05-21T10:23:22Z

Ah, sorry, missed it!

pnuu added 6 commits April 22, 2021 08:37

Move filename collection to a function

4e2a412

Add a parser for Eumetsat XML admin messages

0078c4a

Add an example for reading TLEs from XML admin messages

f827e19

Fix config access key name

a73299c

Test reading XML admin messages

1a52ab1

Fix PEP8 errors

337e731

pnuu added the enhancement label Apr 22, 2021

pnuu requested review from mraspaud and adybbroe April 22, 2021 06:37

pnuu self-assigned this Apr 22, 2021

pnuu and others added 2 commits April 22, 2021 09:45

Fix codefactor issues

b8065b3

Update references for master to main

91794a6

pnuu assigned mraspaud May 17, 2021

mraspaud reviewed May 19, 2021

View reviewed changes

pnuu added 10 commits May 19, 2021 13:56

Move MMAM reading and parsing to functions

1705fa0

Refactor Tle class

869fc65

Refactor reading MMAM files

c93ce21

Move MMAM parsing to Tle class

9160df2

Use Tle class to parse tle files in Downloader

a765b7b

Use Tle class to parse plain downloaded TLEs in Downloader

9972c1b

Remove obsolete parser function

e906692

Make grouper a private function

71f7b43

Remove Python 2 compatibility things

bb54805

Fix style warnings

5a6913b

Add a function to parse Tle objects for Downloader

87366c3

pnuu and others added 19 commits May 21, 2021 08:50

Test reading XML admin messages

c788699

Fix PEP8 errors

2e76dbc

Fix codefactor issues

f35c3fd

Move MMAM reading and parsing to functions

bdc2259

Refactor Tle class

958050f

Refactor reading MMAM files

945ffa2

Move MMAM parsing to Tle class

a798da4

Use Tle class to parse tle files in Downloader

f29fea3

Use Tle class to parse plain downloaded TLEs in Downloader

164cf25

Remove obsolete parser function

0cdf3d6

Make grouper a private function

41c2972

Remove Python 2 compatibility things

dad10a9

Fix style warnings

b81b3f6

Add a function to parse Tle objects for Downloader

313fdea

Split and refactor Downloader tests

f8c885b

Add a test for reading MMAM directly with Tle class

cf33a29

Fix reading MMAM directly with Tle class

a2649aa

Merge branch 'feature-tle-admin-messages' of https://github.com/pnuu/…

887fbe4

…pyorbital into feature-tle-admin-messages

Fixing style errors.

774e3bb

mraspaud reviewed May 21, 2021

View reviewed changes

pnuu added 3 commits May 21, 2021 13:12

Rename iterable chunking

6d9c286

Rename function collecting filenames

3debf10

Merge branch 'feature-tle-admin-messages' of https://github.com/pnuu/…

89d6935

…pyorbital into feature-tle-admin-messages

pnuu merged commit cbe67e2 into pytroll:main Nov 29, 2021

pnuu deleted the feature-tle-admin-messages branch November 29, 2021 11:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add parser to read TLEs from Multi Mission Administrative Messages #78

Add parser to read TLEs from Multi Mission Administrative Messages #78

pnuu commented Apr 22, 2021 •

edited

Loading

codecov bot commented Apr 22, 2021 •

edited

Loading

mraspaud left a comment

ghost commented May 20, 2021 •

edited by ghost

Loading

pnuu commented May 20, 2021

mraspaud left a comment

mraspaud May 21, 2021

pnuu May 21, 2021

mraspaud May 21, 2021

pnuu May 21, 2021

mraspaud May 21, 2021

pnuu May 21, 2021

pnuu May 21, 2021

pnuu commented May 21, 2021

mraspaud commented May 21, 2021

		return [Tle('', tle_file=io.StringIO(tle)) for tle in
		_get_tles_from_uris(item, open_func, platform='', only_first=False)]

		return "\n".join(data)


		def _grouper(n, iterable, fillvalue=None):

Add parser to read TLEs from Multi Mission Administrative Messages #78

Add parser to read TLEs from Multi Mission Administrative Messages #78

Conversation

pnuu commented Apr 22, 2021 • edited Loading

codecov bot commented Apr 22, 2021 • edited Loading

Codecov Report

mraspaud left a comment

Choose a reason for hiding this comment

ghost commented May 20, 2021 • edited by ghost Loading

DeepCode's analysis on #89d693 found:

Top issues

👉 View analysis in DeepCode’s Dashboard | Configure the bot

pnuu commented May 20, 2021

mraspaud left a comment

Choose a reason for hiding this comment

mraspaud May 21, 2021

Choose a reason for hiding this comment

pnuu May 21, 2021

Choose a reason for hiding this comment

mraspaud May 21, 2021

Choose a reason for hiding this comment

pnuu May 21, 2021

Choose a reason for hiding this comment

mraspaud May 21, 2021

Choose a reason for hiding this comment

pnuu May 21, 2021

Choose a reason for hiding this comment

pnuu May 21, 2021

Choose a reason for hiding this comment

pnuu commented May 21, 2021

mraspaud commented May 21, 2021

pnuu commented Apr 22, 2021 •

edited

Loading

codecov bot commented Apr 22, 2021 •

edited

Loading

ghost commented May 20, 2021 •

edited by ghost

Loading