Merge pull request #43 from Juanlu001/minor-fixes

Minor fixes

README.rst

@@ -80,23 +80,12 @@ Simplified creation of predictor from TLE lines:
         velocity_ecef=(-2.4601788971676903, -0.47182217472755117, 7.167517631852518),
         error_estimate=None)
 
-`WSTLESource` needs the tle.satellogic.com service to be working. We are doing changes to have it public available.
-
 Currently you have available these sources
 ------------------------------------------
 
 - Memorytlesource: in memory storage.
 - EtcTLESource: a uniq TLE is stored in `/etc/latest_tle`
-- WSTLESource: It source is using the `TLE API. <http://tle.satellogics.com/api/tle/>`_
-
-
-About HighAccuracyTLEPredictor 
-------------------------------
-
-The default 'predictor' code is tunned to low CPU usage. (IE: a Satellite computer). The 
-error estimation is ~20 seconds. If you need more than that you can use the *HighAccuracyTLEPredictor*  
-passing `precise=True` to `get_predictor()`. 
-
+- WSTLESource: It reads a REST API currently used inside Satellogic. We are are working to make it publicly available.
 
 How to contribute
 -----------------

orbit_predictor/accuratepredictor.py

@@ -4,7 +4,8 @@
 from .predictors.accurate import HighAccuracyTLEPredictor, ONE_SECOND
 
 warnings.warn(
-    "Use `from orbit_predictor.predictors import HighAccuracyTLEPredictor` instead",
+    "Use `from orbit_predictor.predictors import TLEPredictor` instead, "
+    "this module will be removed in the future",
     FutureWarning,
 )
 

orbit_predictor/angles.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # MIT License
 #
 # Copyright (c) 2017 Satellogic SA

orbit_predictor/keplerian.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # MIT License
 #
 # Copyright (c) 2017 Satellogic SA
@@ -25,6 +24,7 @@
 # https://github.com/poliastro/poliastro/blob/1d2f3ca/src/poliastro/twobody/classical.py
 # https://github.com/poliastro/poliastro/blob/1d2f3ca/src/poliastro/twobody/rv.py
 # Copyright (c) 2012-2017 Juan Luis Cano Rodríguez, MIT license
+
 from math import cos, sin, sqrt
 
 import numpy as np

orbit_predictor/locations.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import datetime
+import datetime as dt
 import importlib
 from math import asin, cos, degrees, radians, sin, sqrt
 import os
@@ -31,7 +31,7 @@
 LIGHT_SPEED_KMS = 299792.458
 
 
-class Location(object):
+class Location:
     def __init__(self, name, latitude_deg, longitude_deg, elevation_m):
         self.name = name
         self.latitude_deg = latitude_deg

orbit_predictor/predictors/__init__.py

@@ -1,4 +1,5 @@
-from orbit_predictor.predictors.base import Position, PredictedPass  # noqa
-from orbit_predictor.exceptions import NotReachable  # noqa
-from orbit_predictor.predictors.tle import TLEPredictor  # noqa
-from orbit_predictor.predictors.accurate import HighAccuracyTLEPredictor  # noqa
+from orbit_predictor.predictors.base import Position, PredictedPass
+from orbit_predictor.exceptions import NotReachable
+from orbit_predictor.predictors.tle import TLEPredictor
+
+__all__ = ["Position", "PredictedPass", "NotReachable", "TLEPredictor"]

orbit_predictor/predictors/accurate.py

@@ -43,7 +43,7 @@
 Some stuff won't be trivial to understand, but comments and fixes are welcome
 
 """
-import datetime
+import datetime as dt
 from functools import lru_cache
 
 from sgp4 import ext, model
@@ -56,8 +56,6 @@
 
 from .base import CartesianPredictor, logger
 
-ONE_SECOND = datetime.timedelta(seconds=1)
-
 # Hack Zone be warned
 
 
@@ -85,7 +83,7 @@ class HighAccuracyTLEPredictor(CartesianPredictor):
 
     @reify
     def tle(self):
-        return self.source.get_tle(self.sate_id, datetime.datetime.utcnow())
+        return self.source.get_tle(self.sate_id, dt.datetime.utcnow())
 
     @reify
     def propagator(self):

orbit_predictor/predictors/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # MIT License
 #
 # Copyright (c) 2017 Satellogic SA
@@ -36,7 +35,8 @@
     reify,
     vector_diff,
     vector_norm,
-    gstime_from_datetime)
+    gstime_from_datetime
+)
 
 logger = logging.getLogger(__name__)
 
@@ -55,7 +55,7 @@ def position_llh(self):
         return coordinate_systems.ecef_to_llh(self.position_ecef)
 
 
-class PredictedPass(object):
+class PredictedPass:
     def __init__(self, location, sate_id,
                  max_elevation_deg,
                  aos, los, duration_s,
@@ -101,9 +101,9 @@ def off_nadir_deg(self):
         location ``target`` in a common frame, off-nadir angle ``off_nadir_angle``
         is given by:
             t2b = sate_pos - target
-            cos(off_nadir_angle) =     (target  · t2b)     # Vectorial dot product
-                                    _____________________
-                                    || target || || t2b||
+            cos(off_nadir_angle) =     (sate_pos  · t2b)     # Vectorial dot product
+                                    _______________________
+                                    || sate_pos || || t2b||
 
         Sign for the rotation is calculated this way
 
@@ -130,7 +130,7 @@ def off_nadir_deg(self):
         return degrees(angle) * sign
 
 
-class Predictor(object):
+class Predictor:
 
     def __init__(self, sate_id, source):
         self.sate_id = sate_id
@@ -199,7 +199,7 @@ class GPSPredictor(Predictor):
     pass
 
 
-class LocationPredictor(object):
+class LocationPredictor:
     """Predicts passes over a given location
     Exposes an iterable interface
     """

orbit_predictor/predictors/keplerian.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # MIT License
 #
 # Copyright (c) 2017 Satellogic SA
@@ -21,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import datetime
+import datetime as dt
 from math import degrees, radians, sqrt
 
 import numpy as np

orbit_predictor/predictors/numerical.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # MIT License
 #
 # Copyright (c) 2017 Satellogic SA

orbit_predictor/sources.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # MIT License
 #
 # Copyright (c) 2017 Satellogic SA
@@ -23,35 +22,29 @@
 
 import logging
 from collections import defaultdict, namedtuple
+import warnings
 
 import requests
+from urllib import parse as urlparse
+from urllib.parse import urlencode
 
 from sgp4.earth_gravity import wgs84
 from sgp4.io import twoline2rv
 
-from orbit_predictor.accuratepredictor import HighAccuracyTLEPredictor
 from orbit_predictor.predictors import TLEPredictor
 
-try:
-    from urllib import parse as urlparse
-    from urllib.parse import urlencode
-except ImportError:
-    # pytyhon2 support.
-    import urlparse  # NOQA
-    from urllib import urlencode  # NOQA
-
 logger = logging.getLogger(__name__)
 
 TLE = namedtuple('TLE',
                  ['sate_id', 'lines', 'date'])
 
 
-class GPSSource(object):
+class GPSSource:
     def get_position_ecef(self, sate_id, when_utc):
         raise NotImplementedError("You have to implement it.")
 
 
-class TLESource(object):
+class TLESource:
 
     def add_tle(self, sate_id, tle, epoch):
         raise NotImplementedError("You have to implement it.")
@@ -64,10 +57,14 @@ def get_tle(self, sate_id, date):
         lines = self._get_tle(sate_id, date)
         return TLE(sate_id=sate_id, date=date, lines=lines)
 
-    def get_predictor(self, sate_id, precise=False):
+    def get_predictor(self, sate_id, precise=True):
         """Return a Predictor instance using the current storage."""
-        if precise:
-            return HighAccuracyTLEPredictor(sate_id, self)
+        if not precise:
+            warnings.warn(
+                "There is no `precise=False` predictor anymore "
+                "and the parameter will be removed in the future",
+                FutureWarning,
+            )
 
         return TLEPredictor(sate_id, self)
 

orbit_predictor/utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # MIT License
 #
 # Copyright (c) 2017 Satellogic SA
@@ -23,7 +22,7 @@
 
 import functools
 from collections import namedtuple
-from datetime import datetime
+import datetime as dt
 from math import asin, atan2, cos, degrees, floor, radians, sin, sqrt, modf
 
 import numpy as np
@@ -232,7 +231,7 @@ def sun_azimuth_elevation(latitude_deg, longitude_deg, when=None):
     :returns: an ``AzimuthElevation`` namedtuple
     """
     if when is None:
-        when = datetime.utcnow()
+        when = dt.datetime.utcnow()
 
     utc_time_tuple = when.timetuple()
     utc_time_list = list(utc_time_tuple[:6])
@@ -339,7 +338,7 @@ def mean_motion(sma_km):
     return sqrt(wgs84.mu / sma_km ** 3)  # rad / s
 
 
-class reify(object):
+class reify:
     """
     Use as a class method decorator.  It operates almost exactly like the
     Python ``@property`` decorator, but it puts the result of the method it