On a ship page, warns when a ship is actively hidden

diff --git a/bin/djais/views.py b/bin/djais/views.py
index dfb6158564f59b7607712205c6c1cf7d43675920..98ba0ca1685cce744ed6f08cbc67e2ea9005e555 100644 (file)
--- a/bin/djais/views.py
+++ b/bin/djais/views.py
@@ -33,7 +33,7 @@ from ais.common import COUNTRIES_MID, Nmea, NmeaFeeder, strmmsi_to_mmsi, SHIP_TY
 from ais.ntools import datetime_to_timestamp, clean_ais_charset, clean_latitude, clean_longitude, LatLonFormatError
 from ais.inputs.common import is_id4_active
 from ais.inputs.stats import STATS_DIR
-from ais.inputs.config import peers_get_config
+from ais.inputs.config import peers_get_config, get_hidden_mmsi
 from ais import jobrunner
 from ais.djais.widgets import *
 
@@ -358,7 +358,8 @@ def vessel(request, strmmsi):
     nmea = Nmea.new_from_lastinfo(strmmsi)
     #if not nmea.timestamp_1 and not nmea.timestamp_5:
     #    raise Http404
-    return render_to_response('vessel.html', {'nmea': nmea, 'form': HistoryForm()}, RequestContext(request))
+    is_hidden = mmsi in get_hidden_mmsi()
+    return render_to_response('vessel.html', {'nmea': nmea, 'is_hidden': is_hidden, 'form': HistoryForm()}, RequestContext(request))
 
 
 class VesselManualInputForm(forms.Form):

diff --git a/www_templates/vessel.html b/www_templates/vessel.html
index 033cfb56d473587a8edecb79d7d0b99e5df6f66e..1e5ba3bf0bc67b8f75baf230d9d1379f3384c6bc 100644 (file)
--- a/www_templates/vessel.html
+++ b/www_templates/vessel.html
@@ -43,7 +43,10 @@ Destination: {{ nmea.get_destination }}<br>
 ETA: {{ nmea.get_eta_str }}<br>
 <br>
 Sources: position by {{ nmea.get_source_1_str }}, voyage by {{ nmea.get_source_5_str }}<br>
-
+{% if is_hidden %}
+<br>
+That ship is hidden and the system is set up not to share her position with other ais web sites and peers.<br>
+{% endif %}
 <br>
 <br>
 <a href=lastpos class=button>Position in google earth</a>