Skip to content

Commit 422dcd8

Browse files
committed
Commit for version 1.60, includes new features for showing routes and handling various map projections
1 parent 4972ec3 commit 422dcd8

File tree

4 files changed

+77
-40
lines changed

4 files changed

+77
-40
lines changed

README.md

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Name:
22

3-
Moving Lines, version 1.56
3+
Moving Lines, version 1.60
44

55
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1478125.svg)](https://doi.org/10.5281/zenodo.1478125)
66

@@ -33,6 +33,7 @@ Takes advantage of clickable map for creating a flight plan, and already existin
3333
```
3434
conda config --add channels conda-forge
3535
```
36+
for ensuring that you only use conda-forge, without breaching licensing issues with anaconda default channels, please look at: [https://conda-forge.org/docs/user/transitioning_from_defaults/]
3637
3738
3) Go through and accept the install of the required packages
3839
4) at the command line, start the lines software by typing `ml`
@@ -50,11 +51,11 @@ Takes advantage of clickable map for creating a flight plan, and already existin
5051
5152
*or*
5253
## For python installs:
53-
1) `pip install movinglines`
54+
1) `pip install movinglines` (or the conda method descried above)
5455
2) at a command line, start the moving lines software by typing `ml`
5556
5657
# Quick Start:
57-
1) Select the mapping profile (defaults to ORACLES), can change the map boundaries, take-off time, utc offset
58+
1) Select the mapping profile (defaults to most recent campaign), can change the map boundaries, take-off time, utc offset, projection
5859
2) wait about 30seconds
5960
3) Enter date of planned flight in dialog in format yyyy-mm-dd
6061
4) wait for map to initialize and excel to load
@@ -72,7 +73,7 @@ Takes advantage of clickable map for creating a flight plan, and already existin
7273
*or*
7374
7475
1) Press the 'add' button next to 'points:'
75-
2) Follow the dialog
76+
2) Follow the dialog *tip: use the 'between 2 points' for easy adding*
7677
*or*
7778
7879
1) add a flight module with the button 'flt_module'
@@ -116,9 +117,22 @@ Takes advantage of clickable map for creating a flight plan, and already existin
116117
3) New flight path will have different color
117118
118119
## Adding figures and model maps:
119-
1) select add WMS
120-
2) choose which website to load the web map service. For MSS select that one which has the corresponding title
120+
1) select 'WMS layer' for widely availabel layers.
121+
*or*
122+
1) select 'MSS models' or 'MSS Profile' to use bespoke map layers. MSS Profile loads the vertical profile.
123+
124+
2) choose which website to load the web map service (from the WMS.txt or MSS.txt file).
121125
3) follow dialogs for selecting the right times, layer, level, etc.
126+
127+
## Edding any image
128+
1) Select the image add buttons (Froecast from Bocachica, trajectory image, image, or Tropical tidbit). For general images select 'image button'
129+
2) Select the image file
130+
3) if prompts, select the most appropriate image style, if not then use the 'manual' selection and follow those prompts to indicate projection and image file corners.
131+
4) wait a few moments for image to appear, if not use the 'image' button. Not all image files are compatible, however most .png work.
132+
133+
## Adding image corner definition for easier future loading.
134+
1) open the file 'image_corners.json'.
135+
2) this json file contains, list of named images, with the corner of the image file in a list (lower-left latitude, lower-left longitude, upper-right latitude, upper-right longitude), or in a dict-like with projection information.
122136
123137
## Adding platform default information:
124138
1) locate the platform.txt file.
@@ -230,7 +244,6 @@ Takes advantage of clickable map for creating a flight plan, and already existin
230244
# Known Bugs:
231245
232246
- Sometime slow starting up, especiallly when excel is not open
233-
- Adding figures when not in platecaree / cylindrical / mercator projections is buggy
234247
235248
# Modification History:
236249
@@ -349,6 +362,30 @@ Takes advantage of clickable map for creating a flight plan, and already existin
349362
Modified: Samuel LeBlanc, v1.54, 2024-08-04, Pituffik, Greenland
350363
- Bug fix to table removed extra lines
351364
- change kml generation to be named waypoints
365+
Modified: Samuel LeBlanc, v1.54, Pituffik, Greenland
366+
- Bug fix to table removed extra lines
367+
- change kml generation to be named waypoints
368+
- added feature to change day when loading previous file.
369+
Modified: Samuel LeBlanc, v1.55, Pituffik, Greenland + Santa Cruz, CA
370+
- Added fix to coloring of the for_pilots file, and formatting.
371+
- added an ER2 specific file format.
372+
- Added longer timeout for mss profile
373+
- Added ability to add magnetic heading indicator to pilot formats, with magnetic declination in profiles.txt
374+
Modified: Samuel LeBlanc, v1.56, NASA Langley Research Center, Virginia
375+
- Added 2 bespoke NURTURE flight modules.
376+
- Added modifications to zeroth longitude of the North Polar Stereo.
377+
- Slight modifications to turn bank angles for G3.
378+
- setup files for NURTURE 2026.
379+
Modified: Samuel LeBlanc, v1.60, 2025-10-01 (first day of a government shutdown) Santa Cruz, CA
380+
- bug fix for plotting in multiple different projections, while keeping the great circle lines.
381+
- New feature - North Atlantic and Pacific-Oceanic routes, based on flightplandb API.
382+
- New feature - modified the image_corners.json file format to handle different types of projections from input images.
383+
- Bug fixes to MSS Profile init time checking.
384+
- Added projection handling in MSS models.
385+
- Updated the labels.txt for arctic locations that may be important to NURTURE.
386+
- Added an initial try at a parameterized NASA 777 flight characteristics.
387+
- Changed defaults of NURTURE projection to lamber azimuthal equal area.
388+
352389
353390
# To cite:
354391

movinglines/labels.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,4 +250,4 @@ CYYT,-52.7519,47.6186,^c
250250
CYGL,-77.6947,53.6262,^c
251251
CYWG,-97.2364,49.9097,^c
252252
CYOD,-110.2790,54.4050,^c
253-
253+
CYRT,-92.1026,62.8100,^c

movinglines/sat.tle

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
# TLEs retrieved from www.space-track.org
22
# Copy from https://www.space-track.org/basicspacedata/query/class/tle_latest/NORAD_CAT_ID/58928U,25544U,25994U,27424U,28376U,29107U,29108U,37849U,42063U,40697U,43613U,59908U,59881U/EPOCH/%3Enow-10/ORDINAL/1/orderby/EPOCH%20desc/limit/14/format/3le/metadata/false
3-
# Auto-updated from celestrak on: 2025-09-25
3+
# Auto-updated from celestrak on: 2025-10-01
44
0 PREFIRE-2
5-
1 59881U 24099A 25268.13162443 .00007117 00000+0 34943-3 0 9993
6-
2 59881 97.4378 123.6477 0014318 56.0218 304.2374 15.18293581 73871
5+
1 59881U 24099A 25274.52424243 .00009675 00000+0 47224-3 0 9999
6+
2 59881 97.4376 129.9346 0013931 36.1552 324.0621 15.18402993 74845
77
0 PREFIRE-1
8-
1 59965U 24108A 25267.98575429 .00009522 00000+0 44540-3 0 9997
9-
2 59965 97.5041 57.9806 0013461 89.2909 270.9868 15.19896788 72257
8+
1 59965U 24108A 25274.37154220 .00014660 00000+0 68034-3 0 9993
9+
2 59965 97.5046 64.3315 0013376 69.1382 291.1284 15.20058400 73224
1010
0 CLOUDSAT
11-
1 29107U 06016A 25268.25774779 .00002722 00000+0 32196-3 0 9999
12-
2 29107 98.4212 285.5735 0006675 105.2691 254.9261 14.85529031 35162
11+
1 29107U 06016A 25274.52185104 .00003961 00000+0 46471-3 0 9991
12+
2 29107 98.4215 292.1971 0006752 89.3716 270.8271 14.85567608 36090
1313
0 AQUA
14-
1 27424U 02022A 25268.17751743 .00002224 00000+0 45815-3 0 9998
15-
2 27424 98.3897 227.8510 0002073 83.4319 12.1813 14.61509687244553
14+
1 27424U 02022A 25274.53846181 .00003330 00000+0 68055-3 0 9996
15+
2 27424 98.3903 234.3033 0002083 77.5495 346.3435 14.61545153245487
1616
0 SENTINEL 2B
17-
1 42063U 17013A 25268.31240355 .00000311 00000+0 13528-3 0 9999
18-
2 42063 98.5706 341.8902 0001089 88.4135 271.7173 14.30814037446762
17+
1 42063U 17013A 25274.46625551 .00000390 00000+0 16561-3 0 9994
18+
2 42063 98.5699 347.9567 0001062 89.9154 270.2150 14.30819049447640
1919
0 NPP
20-
1 37849U 11061A 25268.31358560 .00000209 00000+0 12019-3 0 9990
21-
2 37849 98.7633 206.4126 0001990 44.2181 315.9154 14.19520218720863
20+
1 37849U 11061A 25274.51634304 .00000296 00000+0 16142-3 0 9999
21+
2 37849 98.7643 212.5511 0001770 34.2261 325.9029 14.19523947721746
2222
0 TERRA
23-
1 25994U 99068A 25268.24357685 .00000967 00000+0 20712-3 0 9990
24-
2 25994 97.9872 322.7567 0002301 22.4471 49.6023 14.60812256370921
23+
1 25994U 99068A 25274.47389218 .00001303 00000+0 27579-3 0 9992
24+
2 25994 97.9862 328.7666 0001851 5.7072 51.6865 14.60827412371834
2525
0 SENTINEL 2A
26-
1 40697U 15028A 25268.24965097 .00000308 00000+0 13398-3 0 9994
27-
2 40697 98.5704 341.8927 0001126 96.0627 264.0684 14.30817110535846
26+
1 40697U 15028A 25274.47342863 .00000414 00000+0 17473-3 0 9992
27+
2 40697 98.5697 348.0279 0001179 96.4236 263.7082 14.30815644536731
2828
0 ISS (ZARYA)
29-
1 25544U 98067A 25268.18031108 .00023151 00000+0 40291-3 0 9995
30-
2 25544 51.6335 171.4428 0004261 17.1558 342.9575 15.50657957530678
29+
1 25544U 98067A 25274.49975208 .00018288 00000+0 33242-3 0 9997
30+
2 25544 51.6325 140.1428 0001055 183.8834 176.2147 15.49589290531650
3131
0 CALIPSO
32-
1 29108U 06016B 25268.26491090 .00002912 00000+0 51133-3 0 9996
33-
2 29108 98.4529 269.9589 0001735 75.5089 284.6308 14.68496429 34165
32+
1 29108U 06016B 25274.53346904 .00004197 00000+0 73233-3 0 9998
33+
2 29108 98.4535 276.4360 0001624 72.6088 287.5293 14.68536573 35088
3434
0 ICESAT-2
35-
1 43613U 18070A 25268.22708004 .00023092 00000+0 83584-3 0 9995
36-
2 43613 91.9982 219.5684 0006622 115.6645 244.5289 15.28316073391997
35+
1 43613U 18070A 25274.44760257 .00028550 00000+0 10346-2 0 9993
36+
2 43613 91.9982 221.2426 0007924 113.5930 246.6152 15.28246942392946
3737
0 EARTHCARE
38-
1 59908U 24101A 25268.33601031 .00022630 00000+0 31491-3 0 9992
39-
2 59908 97.0260 33.4317 0001083 101.6356 258.5022 15.56969639 75355
38+
1 59908U 24101A 25274.50550603 .00027633 00000+0 38437-3 0 9991
39+
2 59908 97.0254 39.5095 0001224 104.1879 255.9513 15.56943470 76311
4040
0 AURA
41-
1 28376U 04026A 25268.22494958 .00002321 00000+0 48661-3 0 9999
42-
2 28376 98.3039 218.1615 0001722 78.8043 281.3351 14.60649412127523
41+
1 28376U 04026A 25274.45868117 .00003352 00000+0 69780-3 0 9993
42+
2 28376 98.3043 224.4121 0001718 74.7792 285.3598 14.60683519128435
4343
0 PACE
44-
1 58928U 24025A 25268.26332714 .00001212 00000+0 23411-3 0 9995
45-
2 58928 98.0726 198.8461 0002906 39.8243 320.3173 14.65166389 87136
44+
1 58928U 24025A 25274.40961328 .00001575 00000+0 30154-3 0 9991
45+
2 58928 98.0732 204.8815 0002592 27.9549 332.1793 14.65184961 88037
4646
0 CRYOSAT-2
47-
1 36508U 10013A 25268.29093135 .00000499 00000+0 12324-3 0 9998
48-
2 36508 92.0202 213.1937 0002784 90.6197 269.5330 14.51913957819649
47+
1 36508U 10013A 25274.49372287 .00000559 00000+0 13814-3 0 9997
48+
2 36508 92.0212 214.6912 0002772 89.2103 270.9422 14.51907900820547
4949
#0 PACE-old
5050
#1 58928U 24025A 24100.57665687 .00000790 00000-0 15511-3 0 9994
5151
#2 58928 98.0915 33.2046 0001579 103.8916 256.2463 14.65355610 8972

movinglines/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = 'v1.56'
1+
__version__ = 'v1.60'

0 commit comments

Comments
 (0)