mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-09-20 14:27:42 +00:00
Merge remote-tracking branch 'origin/main'
# Conflicts: # core/constants.py # pyproject.toml # templates/add_spot.html # templates/alerts.html # templates/bands.html # templates/base.html # templates/conditions.html # templates/map.html # templates/spots.html # templates/status.html
This commit is contained in:
@@ -98,7 +98,7 @@
|
||||
<p>Between the various data sources, the following Special Interest Groups (SIGs) are supported: Parks on the Air
|
||||
(POTA), Summits on the Air (SOTA), Worldwide Flora & Fauna (WWFF), Global Mountain Activity (GMA), Worldwide
|
||||
Bunkers on the Air (WWBOTA), HuMPs Excluding Marilyns Award (HEMA), Islands on the Air (IOTA), Mills on the Air
|
||||
(MOTA), the Amateur Radio Lighthouse Socirty (ARLHS), International Lighthouse Lightship Weekend (ILLW), Silos
|
||||
(MOTA), the Amateur Radio Lighthouse Society (ARLHS), International Lighthouse Lightship Weekend (ILLW), Silos
|
||||
on the Air (SIOTA), World Castles Award (WCA), New Zealand on the Air (ZLOTA), Keith Roget Memorial National
|
||||
Parks Award (KRMNPA), South Australia National Parks and Conservation Parks Award (SANPCPA), Wainwrights on the
|
||||
Air (WOTA), Beaches on the Air (BOTA), Lagos y Lagunas On the Air (LLOTA), Towers on the Air (WWTOTA), Tiles on
|
||||
@@ -171,10 +171,6 @@
|
||||
section, Privacy, for details of how these are handled. If you are looking at the map and see lots of spots in
|
||||
the geographic centre of countries, allowing these lookups will help. For QRZ.com a paid account is required to
|
||||
look up operator locations.</p>
|
||||
<p>IOTA in particular causes a mapping problem, firstly that there is no official set of geodata beyond the names of
|
||||
islands. We also have no way of telling whether priority should be given to IOTA reference or e.g. QRZ lookup,
|
||||
for example for a G callsign in EU-005 Great Britain the QRZ home address is probably more accurate, but in
|
||||
EU-002 Aaland islands, it's more likely a DXpedition and the IOTA would be more accurate.</p>
|
||||
<h2 id="privacy" class="mt-4">Privacy</h2>
|
||||
<p>Spothole collects no data about you on a permanent basis. All spots and alerts are "timed out" and deleted from
|
||||
the system after a set interval, which by default is one hour for spots and one week for alerts.</p>
|
||||
@@ -182,11 +178,13 @@
|
||||
filters. They are also stored in your browser's local storage, so that your preferences are remembered between
|
||||
sessions.</p>
|
||||
<p>The data you provide can optionally include your login credentials for QRZ.com and HamQTH. You can provide these
|
||||
in the "Data" menu of most pages. If you do, Spothole will augment the data it produces with lookups from these
|
||||
in the "Your Data" menu of most pages. If you do, Spothole will augment the data it produces with lookups from these
|
||||
services, which can for example provide more accurate markers on the map tab, and operator names when you mouse
|
||||
over a DX callsign. Spothole will still work fine if you don't provide these. The values you enter are sent to
|
||||
Spothole via HTTPS so are protected in transit, though of course you do have to trust Spothole with this
|
||||
sensitive data in order to use this feature.</p>
|
||||
<p>Any data you send as part of a query, such as your QRZ or HamQTH credentials, is used only for the lifetime of that
|
||||
query and is not saved anywhere apart from your own device.</p>
|
||||
<p>Spothole uses no trackers, no ads, and no cookies.</p>
|
||||
{% if len(web_ui_options["support_button_html"]) > 0 %}
|
||||
<p><strong>Caveat: </strong> The owner of this server has chosen to inject their own content into the "spots" page.
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/add-spot.js?v=1787928232"></script>
|
||||
<script src="/static/js/add-spot.js?v=1787928385"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-add-spot").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/alerts.js?v=1787928232"></script>
|
||||
<script src="/static/js/alerts.js?v=1787928385"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-alerts").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -76,8 +76,8 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1787928232"></script>
|
||||
<script src="/static/js/bands.js?v=1787928232"></script>
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1787928385"></script>
|
||||
<script src="/static/js/bands.js?v=1787928385"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-bands").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
{% extends "skeleton.html" %}
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/css/style.css?v=1787928232" type="text/css">
|
||||
<link rel="stylesheet" href="/static/css/style.css?v=1787928385" type="text/css">
|
||||
<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
|
||||
<link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
|
||||
<link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
|
||||
@@ -15,10 +15,10 @@
|
||||
window.fetchEventSource = fetchEventSource;
|
||||
</script>
|
||||
|
||||
<script src="/static/js/utils.js?v=1787928232"></script>
|
||||
<script src="/static/js/ui-ham.js?v=1787928232"></script>
|
||||
<script src="/static/js/geo.js?v=1787928232"></script>
|
||||
<script src="/static/js/common.js?v=1787928232"></script>
|
||||
<script src="/static/js/utils.js?v=1787928385"></script>
|
||||
<script src="/static/js/ui-ham.js?v=1787928385"></script>
|
||||
<script src="/static/js/geo.js?v=1787928385"></script>
|
||||
<script src="/static/js/common.js?v=1787928385"></script>
|
||||
{% end %}
|
||||
{% block body %}
|
||||
<div class="container">
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
oninput="filtersUpdated();" style="width: 5em; display: inline-block;">
|
||||
{% for a in web_ui_options["max_spot_age"] %}
|
||||
<option value="{{a*60}}" {% if web_ui_options[
|
||||
"max_spot_age_default"] == a*60 %}selected{% end %}>{{a}}</option>
|
||||
"max_spot_age_default"] == a %}selected{% end %}>{{a}}</option>
|
||||
{% end %}
|
||||
</select>
|
||||
minutes
|
||||
|
||||
@@ -284,7 +284,7 @@
|
||||
</div>
|
||||
|
||||
<script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
|
||||
<script src="/static/js/conditions.js?v=1787928232"></script>
|
||||
<script src="/static/js/conditions.js?v=1787928385"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-conditions").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
+3
-2
@@ -109,11 +109,12 @@
|
||||
<script src="/static/vendor/js/leaflet-cqzones.js"></script>
|
||||
<script src="/static/vendor/js/leaflet-workedallbritainireland.js" type="module"></script>
|
||||
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1787928232"></script>
|
||||
<script>
|
||||
const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
|
||||
</script>
|
||||
<script src="/static/js/map.js?v=1787928232"></script>
|
||||
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1787928384"></script>
|
||||
<script src="/static/js/map.js?v=1787928384"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-map").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -113,8 +113,8 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1787928232"></script>
|
||||
<script src="/static/js/spots.js?v=1787928232"></script>
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1787928384"></script>
|
||||
<script src="/static/js/spots.js?v=1787928384"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-spots").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="/static/js/status.js?v=1787928232"></script>
|
||||
<script src="/static/js/status.js?v=1787928385"></script>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$("#nav-link-status").addClass("active");
|
||||
|
||||
Reference in New Issue
Block a user