Skip to content

Refactor to be more pythonic #7

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.

Sign up for GitHub

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

Open
sposs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor to be more pythonic #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 92 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# Created by .ignore support plugin (hsz.mobi)
### Python template
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# IPython Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# dotenv
.env

# virtualenv
venv/
ENV/

# Spyder project settings
.spyderproject

# Rope project settings
.ropeproject

4 changes: 2 additions & 2 deletions geomag/MANIFEST.in → MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include geomag/*.COF
exclude geomag/.svn
include geomag/*.COF
exclude geomag/.svn
10 changes: 5 additions & 5 deletions geomag/README.txt → README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Magnetic variation/declination
------------------------------
Calculates magnetic variation/declination for any latitude/longitude/altitude,
for any date. Uses the NOAA National Geophysical Data Center, epoch 2015 data.
Magnetic variation/declination
------------------------------

Calculates magnetic variation/declination for any latitude/longitude/altitude,
for any date. Uses the NOAA National Geophysical Data Center, epoch 2015 data.
0 geomag/geomag/WMM.COF → geomag/WMM.COF
View file
Open in desktop
File renamed without changes.
186 changes: 93 additions & 93 deletions geomag/geomag/WMM2010.COF → geomag/WMM2010.COF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
2010.0 WMM-2010 11/20/2009
1 0 -29496.6 0.0 11.6 0.0
1 1 -1586.3 4944.4 16.5 -25.9
2 0 -2396.6 0.0 -12.1 0.0
2 1 3026.1 -2707.7 -4.4 -22.5
2 2 1668.6 -576.1 1.9 -11.8
3 0 1340.1 0.0 0.4 0.0
3 1 -2326.2 -160.2 -4.1 7.3
3 2 1231.9 251.9 -2.9 -3.9
3 3 634.0 -536.6 -7.7 -2.6
4 0 912.6 0.0 -1.8 0.0
4 1 808.9 286.4 2.3 1.1
4 2 166.7 -211.2 -8.7 2.7
4 3 -357.1 164.3 4.6 3.9
4 4 89.4 -309.1 -2.1 -0.8
5 0 -230.9 0.0 -1.0 0.0
5 1 357.2 44.6 0.6 0.4
5 2 200.3 188.9 -1.8 1.8
5 3 -141.1 -118.2 -1.0 1.2
5 4 -163.0 0.0 0.9 4.0
5 5 -7.8 100.9 1.0 -0.6
6 0 72.8 0.0 -0.2 0.0
6 1 68.6 -20.8 -0.2 -0.2
6 2 76.0 44.1 -0.1 -2.1
6 3 -141.4 61.5 2.0 -0.4
6 4 -22.8 -66.3 -1.7 -0.6
6 5 13.2 3.1 -0.3 0.5
6 6 -77.9 55.0 1.7 0.9
7 0 80.5 0.0 0.1 0.0
7 1 -75.1 -57.9 -0.1 0.7
7 2 -4.7 -21.1 -0.6 0.3
7 3 45.3 6.5 1.3 -0.1
7 4 13.9 24.9 0.4 -0.1
7 5 10.4 7.0 0.3 -0.8
7 6 1.7 -27.7 -0.7 -0.3
7 7 4.9 -3.3 0.6 0.3
8 0 24.4 0.0 -0.1 0.0
8 1 8.1 11.0 0.1 -0.1
8 2 -14.5 -20.0 -0.6 0.2
8 3 -5.6 11.9 0.2 0.4
8 4 -19.3 -17.4 -0.2 0.4
8 5 11.5 16.7 0.3 0.1
8 6 10.9 7.0 0.3 -0.1
8 7 -14.1 -10.8 -0.6 0.4
8 8 -3.7 1.7 0.2 0.3
9 0 5.4 0.0 -0.0 0.0
9 1 9.4 -20.5 -0.1 -0.0
9 2 3.4 11.5 0.0 -0.2
9 3 -5.2 12.8 0.3 0.0
9 4 3.1 -7.2 -0.4 -0.1
9 5 -12.4 -7.4 -0.3 0.1
9 6 -0.7 8.0 0.1 -0.0
9 7 8.4 2.1 -0.1 -0.2
9 8 -8.5 -6.1 -0.4 0.3
9 9 -10.1 7.0 -0.2 0.2
10 0 -2.0 0.0 0.0 0.0
10 1 -6.3 2.8 -0.0 0.1
10 2 0.9 -0.1 -0.1 -0.1
10 3 -1.1 4.7 0.2 0.0
10 4 -0.2 4.4 -0.0 -0.1
10 5 2.5 -7.2 -0.1 -0.1
10 6 -0.3 -1.0 -0.2 -0.0
10 7 2.2 -3.9 0.0 -0.1
10 8 3.1 -2.0 -0.1 -0.2
10 9 -1.0 -2.0 -0.2 0.0
10 10 -2.8 -8.3 -0.2 -0.1
11 0 3.0 0.0 0.0 0.0
11 1 -1.5 0.2 0.0 -0.0
11 2 -2.1 1.7 -0.0 0.1
11 3 1.7 -0.6 0.1 0.0
11 4 -0.5 -1.8 -0.0 0.1
11 5 0.5 0.9 0.0 0.0
11 6 -0.8 -0.4 -0.0 0.1
11 7 0.4 -2.5 -0.0 0.0
11 8 1.8 -1.3 -0.0 -0.1
11 9 0.1 -2.1 0.0 -0.1
11 10 0.7 -1.9 -0.1 -0.0
11 11 3.8 -1.8 -0.0 -0.1
12 0 -2.2 0.0 -0.0 0.0
12 1 -0.2 -0.9 0.0 -0.0
12 2 0.3 0.3 0.1 0.0
12 3 1.0 2.1 0.1 -0.0
12 4 -0.6 -2.5 -0.1 0.0
12 5 0.9 0.5 -0.0 -0.0
12 6 -0.1 0.6 0.0 0.1
12 7 0.5 -0.0 0.0 0.0
12 8 -0.4 0.1 -0.0 0.0
12 9 -0.4 0.3 0.0 -0.0
12 10 0.2 -0.9 0.0 -0.0
12 11 -0.8 -0.2 -0.1 0.0
12 12 0.0 0.9 0.1 0.0
999999999999999999999999999999999999999999999999
999999999999999999999999999999999999999999999999
2010.0 WMM-2010 11/20/2009
1 0 -29496.6 0.0 11.6 0.0
1 1 -1586.3 4944.4 16.5 -25.9
2 0 -2396.6 0.0 -12.1 0.0
2 1 3026.1 -2707.7 -4.4 -22.5
2 2 1668.6 -576.1 1.9 -11.8
3 0 1340.1 0.0 0.4 0.0
3 1 -2326.2 -160.2 -4.1 7.3
3 2 1231.9 251.9 -2.9 -3.9
3 3 634.0 -536.6 -7.7 -2.6
4 0 912.6 0.0 -1.8 0.0
4 1 808.9 286.4 2.3 1.1
4 2 166.7 -211.2 -8.7 2.7
4 3 -357.1 164.3 4.6 3.9
4 4 89.4 -309.1 -2.1 -0.8
5 0 -230.9 0.0 -1.0 0.0
5 1 357.2 44.6 0.6 0.4
5 2 200.3 188.9 -1.8 1.8
5 3 -141.1 -118.2 -1.0 1.2
5 4 -163.0 0.0 0.9 4.0
5 5 -7.8 100.9 1.0 -0.6
6 0 72.8 0.0 -0.2 0.0
6 1 68.6 -20.8 -0.2 -0.2
6 2 76.0 44.1 -0.1 -2.1
6 3 -141.4 61.5 2.0 -0.4
6 4 -22.8 -66.3 -1.7 -0.6
6 5 13.2 3.1 -0.3 0.5
6 6 -77.9 55.0 1.7 0.9
7 0 80.5 0.0 0.1 0.0
7 1 -75.1 -57.9 -0.1 0.7
7 2 -4.7 -21.1 -0.6 0.3
7 3 45.3 6.5 1.3 -0.1
7 4 13.9 24.9 0.4 -0.1
7 5 10.4 7.0 0.3 -0.8
7 6 1.7 -27.7 -0.7 -0.3
7 7 4.9 -3.3 0.6 0.3
8 0 24.4 0.0 -0.1 0.0
8 1 8.1 11.0 0.1 -0.1
8 2 -14.5 -20.0 -0.6 0.2
8 3 -5.6 11.9 0.2 0.4
8 4 -19.3 -17.4 -0.2 0.4
8 5 11.5 16.7 0.3 0.1
8 6 10.9 7.0 0.3 -0.1
8 7 -14.1 -10.8 -0.6 0.4
8 8 -3.7 1.7 0.2 0.3
9 0 5.4 0.0 -0.0 0.0
9 1 9.4 -20.5 -0.1 -0.0
9 2 3.4 11.5 0.0 -0.2
9 3 -5.2 12.8 0.3 0.0
9 4 3.1 -7.2 -0.4 -0.1
9 5 -12.4 -7.4 -0.3 0.1
9 6 -0.7 8.0 0.1 -0.0
9 7 8.4 2.1 -0.1 -0.2
9 8 -8.5 -6.1 -0.4 0.3
9 9 -10.1 7.0 -0.2 0.2
10 0 -2.0 0.0 0.0 0.0
10 1 -6.3 2.8 -0.0 0.1
10 2 0.9 -0.1 -0.1 -0.1
10 3 -1.1 4.7 0.2 0.0
10 4 -0.2 4.4 -0.0 -0.1
10 5 2.5 -7.2 -0.1 -0.1
10 6 -0.3 -1.0 -0.2 -0.0
10 7 2.2 -3.9 0.0 -0.1
10 8 3.1 -2.0 -0.1 -0.2
10 9 -1.0 -2.0 -0.2 0.0
10 10 -2.8 -8.3 -0.2 -0.1
11 0 3.0 0.0 0.0 0.0
11 1 -1.5 0.2 0.0 -0.0
11 2 -2.1 1.7 -0.0 0.1
11 3 1.7 -0.6 0.1 0.0
11 4 -0.5 -1.8 -0.0 0.1
11 5 0.5 0.9 0.0 0.0
11 6 -0.8 -0.4 -0.0 0.1
11 7 0.4 -2.5 -0.0 0.0
11 8 1.8 -1.3 -0.0 -0.1
11 9 0.1 -2.1 0.0 -0.1
11 10 0.7 -1.9 -0.1 -0.0
11 11 3.8 -1.8 -0.0 -0.1
12 0 -2.2 0.0 -0.0 0.0
12 1 -0.2 -0.9 0.0 -0.0
12 2 0.3 0.3 0.1 0.0
12 3 1.0 2.1 0.1 -0.0
12 4 -0.6 -2.5 -0.1 0.0
12 5 0.9 0.5 -0.0 -0.0
12 6 -0.1 0.6 0.0 0.1
12 7 0.5 -0.0 0.0 0.0
12 8 -0.4 0.1 -0.0 0.0
12 9 -0.4 0.3 0.0 -0.0
12 10 0.2 -0.9 0.0 -0.0
12 11 -0.8 -0.2 -0.1 0.0
12 12 0.0 0.9 0.1 0.0
999999999999999999999999999999999999999999999999
999999999999999999999999999999999999999999999999
74 changes: 38 additions & 36 deletions geomag/geomag/__init__.py → geomag/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
"""geomag package
by Christopher Weiss cmweiss@gmail.com

Adapted from the geomagc software and World Magnetic Model of the NOAA
Satellite and Information Service, National Geophysical Data Center
http://www.ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml

Suggestions for improvements are appreciated.

USAGE:
>>> import geomag
>>> geomag.declination(80,0)
-3.382344140520556
"""

from . import geomag

__singleton__ = geomag.GeoMag()

def declination(*args, **kargs):
"""Calculate magnetic declination in degrees
dlat = latitude in degrees
dlon = longitude in degrees
h = altitude in feet, default=0
time = date for computing declination, default=today
"""
mag = __singleton__.GeoMag(*args, **kargs)
return mag.dec

def mag_heading(hdg, *args, **kargs):
"""Calculates the magnetic heading from a true heading.
hdg = true heading in degrees
All other parameters are the same as declination.
"""
dec = declination(*args, **kargs)
return (hdg - dec + 360.0) % 360
"""geomag package
by Christopher Weiss cmweiss@gmail.com

Adapted from the geomagc software and World Magnetic Model of the NOAA
Satellite and Information Service, National Geophysical Data Center
http://www.ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml

Suggestions for improvements are appreciated.

USAGE:
>>> import geomag
>>> geomag.declination(80,0)
-3.382344140520556
"""

from geomag import *

__singleton__ = GeoMag()


def declination(*args, **kargs):
"""Calculate magnetic declination in degrees
dlat = latitude in degrees
dlon = longitude in degrees
h = altitude in feet, default=0
time = date for computing declination, default=today
"""
mag = __singleton__.GeoMag(*args, **kargs)
return mag.dec


def mag_heading(hdg, *args, **kargs):
"""Calculates the magnetic heading from a true heading.
hdg = true heading in degrees
All other parameters are the same as declination.
"""
dec = declination(*args, **kargs)
return (hdg - dec + 360.0) % 360
Loading