diff --git a/network/base/forms.py b/network/base/forms.py
index f6e0443..0dedc8c 100644
--- a/network/base/forms.py
+++ b/network/base/forms.py
@@ -7,5 +7,6 @@ class StationForm(forms.ModelForm):
class Meta:
model = Station
fields = ['name', 'image', 'alt',
- 'lat', 'lng', 'qthlocator', 'antenna', 'active']
+ 'lat', 'lng', 'qthlocator',
+ 'horizon', 'antenna', 'active']
image = forms.ImageField(required=False)
diff --git a/network/base/migrations/0004_station_horizon.py b/network/base/migrations/0004_station_horizon.py
new file mode 100644
index 0000000..e8772f7
--- /dev/null
+++ b/network/base/migrations/0004_station_horizon.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-03-19 00:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('base', '0003_auto_20160119_1856'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='station',
+ name='horizon',
+ field=models.PositiveIntegerField(default=10, help_text=b'In degrees above 0'),
+ ),
+ ]
diff --git a/network/base/models.py b/network/base/models.py
index 6e20072..73308bb 100644
--- a/network/base/models.py
+++ b/network/base/models.py
@@ -57,6 +57,7 @@ class Station(models.Model):
created = models.DateTimeField(auto_now_add=True)
active = models.BooleanField(default=False)
last_seen = models.DateTimeField(null=True, blank=True)
+ horizon = models.PositiveIntegerField(help_text='In degrees above 0', default=10)
class Meta:
ordering = ['-active', '-last_seen']
diff --git a/network/base/views.py b/network/base/views.py
index bf5439e..b2589c4 100644
--- a/network/base/views.py
+++ b/network/base/views.py
@@ -213,49 +213,54 @@ def prediction_windows(request, sat_id, start_date, end_date):
}
break
- if ephem.Date(tr).datetime() < end_date:
- if ephem.Date(ts).datetime() > end_date:
- ts = end_date
- keep_digging = False
- else:
- time_start_new = ephem.Date(ts).datetime() + timedelta(minutes=1)
- observer.date = time_start_new.strftime("%Y-%m-%d %H:%M:%S.%f")
+ # no match if the sat will not rise above the configured min horizon
+ elevation = format(math.degrees(altt), '.0f')
+ if float(elevation) >= station.horizon:
+ if ephem.Date(tr).datetime() < end_date:
+ if ephem.Date(ts).datetime() > end_date:
+ ts = end_date
+ keep_digging = False
+ else:
+ time_start_new = ephem.Date(ts).datetime() + timedelta(minutes=1)
+ observer.date = time_start_new.strftime("%Y-%m-%d %H:%M:%S.%f")
- # Adjust or discard window if overlaps exist
- window_start = make_aware(ephem.Date(tr).datetime(), utc)
- window_end = make_aware(ephem.Date(ts).datetime(), utc)
- window = _resolve_overlaps(station, window_start, window_end)
- if window:
- if not station_match:
- station_windows = {
- 'id': station.id,
- 'name': station.name,
- 'window': []
- }
- station_match = True
- window_start = window[0]
- window_end = window[1]
- station_windows['window'].append(
- {
- 'start': window_start.strftime("%Y-%m-%d %H:%M:%S.%f"),
- 'end': window_end.strftime("%Y-%m-%d %H:%M:%S.%f"),
- 'az_start': azr
- })
- # In case our window was split in two
- try:
- window_start = window[2]
- window_end = window[3]
+ # Adjust or discard window if overlaps exist
+ window_start = make_aware(ephem.Date(tr).datetime(), utc)
+ window_end = make_aware(ephem.Date(ts).datetime(), utc)
+ window = _resolve_overlaps(station, window_start, window_end)
+ if window:
+ if not station_match:
+ station_windows = {
+ 'id': station.id,
+ 'name': station.name,
+ 'window': []
+ }
+ station_match = True
+ window_start = window[0]
+ window_end = window[1]
station_windows['window'].append(
{
'start': window_start.strftime("%Y-%m-%d %H:%M:%S.%f"),
'end': window_end.strftime("%Y-%m-%d %H:%M:%S.%f"),
'az_start': azr
})
- except:
- pass
-
+ # In case our window was split in two
+ try:
+ window_start = window[2]
+ window_end = window[3]
+ station_windows['window'].append(
+ {
+ 'start': window_start.strftime("%Y-%m-%d %H:%M:%S.%f"),
+ 'end': window_end.strftime("%Y-%m-%d %H:%M:%S.%f"),
+ 'az_start': azr
+ })
+ except:
+ pass
+ else:
+ # window start outside of window bounds
+ break
else:
- # window start outside of window bounds
+ # did not rise above user configured horizon
break
if station_match:
@@ -370,9 +375,9 @@ def station_view(request, id):
azimuth = format(math.degrees(azr), '.0f')
passid += 1
- # show only if >= 10 degrees and in next 6 hours
+ # show only if >= configured horizon and in next 6 hours
if tr < ephem.date(datetime.today() + timedelta(hours=6)):
- if float(elevation) >= 10:
+ if float(elevation) >= station.horizon:
sat_pass = {'passid': passid,
'mytime': str(observer.date),
'debug': observer.next_pass(sat_ephem),
diff --git a/network/templates/base/station_view.html b/network/templates/base/station_view.html
index 15f6117..a5b3f8d 100644
--- a/network/templates/base/station_view.html
+++ b/network/templates/base/station_view.html
@@ -73,6 +73,12 @@
{{ station.alt }} m
+
+ Min Horizon
+
+ {{ station.horizon }}°
+
+
Creation Date
+