diff --git a/providers/sigrefdata/dme.py b/providers/sigrefdata/dme.py index 315061b..c6a8350 100644 --- a/providers/sigrefdata/dme.py +++ b/providers/sigrefdata/dme.py @@ -53,7 +53,7 @@ class DME(LocalFileSIGRefDataProvider): # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest # of the data in this case - if self._stop: + if self._stop_event.is_set(): break # Very short pause. This will extend the time to handle sig refs by a few seconds but will ensure some time diff --git a/providers/sigrefdata/toilets.py b/providers/sigrefdata/toilets.py index ca98bce..7542ad5 100644 --- a/providers/sigrefdata/toilets.py +++ b/providers/sigrefdata/toilets.py @@ -35,7 +35,7 @@ class Toilets(LocalFileSIGRefDataProvider): # Bail out if a stop has been requested, i.e. the program is shutting down - no need to parse the rest # of the data in this case - if self._stop: + if self._stop_event.is_set(): break return new_data diff --git a/templates/add_spot.html b/templates/add_spot.html index 8c82ead..0217616 100644 --- a/templates/add_spot.html +++ b/templates/add_spot.html @@ -77,7 +77,7 @@ - + diff --git a/templates/alerts.html b/templates/alerts.html index 8f273b1..1e3ebc6 100644 --- a/templates/alerts.html +++ b/templates/alerts.html @@ -83,7 +83,7 @@ - + diff --git a/templates/bands.html b/templates/bands.html index 93a9b9a..91debb0 100644 --- a/templates/bands.html +++ b/templates/bands.html @@ -76,8 +76,8 @@ - - + + diff --git a/templates/base.html b/templates/base.html index 5ed9f5b..8d3388f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,6 @@ {% extends "skeleton.html" %} {% block head_extra %} - + @@ -16,10 +16,10 @@ window.fetchEventSource = fetchEventSource; - - - - + + + + {% end %} {% block body %}
diff --git a/templates/conditions.html b/templates/conditions.html index ac538de..b887c39 100644 --- a/templates/conditions.html +++ b/templates/conditions.html @@ -284,7 +284,7 @@
- + diff --git a/templates/map.html b/templates/map.html index cb3f0a4..21a3e6d 100644 --- a/templates/map.html +++ b/templates/map.html @@ -113,8 +113,8 @@ const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}"; - - + + diff --git a/templates/spots.html b/templates/spots.html index d7da28c..d086db7 100644 --- a/templates/spots.html +++ b/templates/spots.html @@ -125,8 +125,8 @@ - - + + diff --git a/templates/status.html b/templates/status.html index 335fb10..dc42455 100644 --- a/templates/status.html +++ b/templates/status.html @@ -96,7 +96,7 @@ - +