w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2026-09-20 14:27:42 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Improve some activity detection

Browse Source
This commit is contained in:
Ian Renton
2026-09-20 10:32:53 +01:00
parent 190c9f6cef
commit 6f96e0ede1
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/activities.py
+5 -5
View File
@@ -10,7 +10,7 @@ ACTIVITIES: dict[ActivityName, Activity] = {
refs_globally_unique=False, refs_globally_unique=False,
# No sensible way to determine *which* contest, but if we set comment_names=["CONTEST"] then at least # No sensible way to determine *which* contest, but if we set comment_names=["CONTEST"] then at least
# any spots with "contest" in the comment will get allocated to this activity. # any spots with "contest" in the comment will get allocated to this activity.
comment_names=["CONTEST"], comment_names=["CONTEST", "TEST"],
icon="fa-trophy", icon="fa-trophy",
alerts_possible=True, alerts_possible=True,
), ),
@@ -150,9 +150,9 @@ ACTIVITIES: dict[ActivityName, Activity] = {
description="Islands on the Air", description="Islands on the Air",
sig_type=ActivityType.ADVENTURE, sig_type=ActivityType.ADVENTURE,
has_refs=True, has_refs=True,
refs_globally_unique=False, refs_globally_unique=True,
ref_type=ActivityRefType.ISLAND, ref_type=ActivityRefType.ISLAND,
ref_regex=r"[A-Z]{2}\-\d{3}", ref_regex=r"(?:AF|AN|AS|EU|NA|OC|SA)\-\d{3}",
comment_names=["IOTA"], comment_names=["IOTA"],
icon="fa-book-atlas", icon="fa-book-atlas",
), ),
@@ -163,7 +163,7 @@ ACTIVITIES: dict[ActivityName, Activity] = {
has_refs=True, has_refs=True,
refs_globally_unique=False, refs_globally_unique=False,
ref_type=ActivityRefType.ISLAND, ref_type=ActivityRefType.ISLAND,
ref_regex=r"(([A-Z]{2}\-\d{3})|([A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}))", ref_regex=r"(?:(?:[A-Z]{2}\-\d{3})|(?:[A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}))",
comment_names=[], comment_names=[],
icon="fa-person-hiking", icon="fa-person-hiking",
), ),
@@ -386,7 +386,7 @@ ACTIVITIES: dict[ActivityName, Activity] = {
# FEA references are technically [DE]\-\d{4}(\.\d)? but spotters always seem to miss out the D- or E- # FEA references are technically [DE]\-\d{4}(\.\d)? but spotters always seem to miss out the D- or E-
# prefix and just use FEA-1234 or FEA 1234, so allow for that. The FEA activity ref data provider adds both # prefix and just use FEA-1234 or FEA 1234, so allow for that. The FEA activity ref data provider adds both
# forms to the database. # forms to the database.
ref_regex=r"([DE]|FEA)[\- ]\d{4}(\.\d)?", ref_regex=r"(?:[DE]|FEA)[\- ]\d{4}(?:\.\d)?",
comment_names=["FEA"], comment_names=["FEA"],
icon="fa-house-flood-water", icon="fa-house-flood-water",
region_flag="🇪🇸", region_flag="🇪🇸",
templates/add_spot.html
+1 -1
View File
@@ -77,7 +77,7 @@
</div> </div>
<script src="/static/js/add-spot.js?v=1789896308"></script> <script src="/static/js/add-spot.js?v=1789896773"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-add-spot").addClass("active"); $("#nav-link-add-spot").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
templates/alerts.html
+1 -1
View File
@@ -85,7 +85,7 @@
</div> </div>
<script src="/static/js/alerts.js?v=1789896308"></script> <script src="/static/js/alerts.js?v=1789896773"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-alerts").addClass("active"); $("#nav-link-alerts").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
templates/bands.html
+2 -2
View File
@@ -76,8 +76,8 @@
</div> </div>
<script src="/static/js/spotsbandsandmap.js?v=1789896308"></script> <script src="/static/js/spotsbandsandmap.js?v=1789896773"></script>
<script src="/static/js/bands.js?v=1789896308"></script> <script src="/static/js/bands.js?v=1789896773"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-bands").addClass("active"); $("#nav-link-bands").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
templates/base.html
+5 -5
View File
@@ -1,6 +1,6 @@
{% extends "skeleton.html" %} {% extends "skeleton.html" %}
{% block head_extra %} {% block head_extra %}
<link rel="stylesheet" href="/static/css/style.css?v=1789896308" type="text/css"> <link rel="stylesheet" href="/static/css/style.css?v=1789896773" type="text/css">
<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet"> <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/fontawesome-6.7.2.min.css" rel="stylesheet">
<link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet"> <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
window.fetchEventSource = fetchEventSource; window.fetchEventSource = fetchEventSource;
</script> </script>
<script src="/static/js/utils.js?v=1789896308"></script> <script src="/static/js/utils.js?v=1789896773"></script>
<script src="/static/js/ui-ham.js?v=1789896308"></script> <script src="/static/js/ui-ham.js?v=1789896773"></script>
<script src="/static/js/geo.js?v=1789896308"></script> <script src="/static/js/geo.js?v=1789896773"></script>
<script src="/static/js/common.js?v=1789896308"></script> <script src="/static/js/common.js?v=1789896773"></script>
{% end %} {% end %}
{% block body %} {% block body %}
<div class="container"> <div class="container">
templates/conditions.html
+1 -1
View File
@@ -284,7 +284,7 @@
</div> </div>
<script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script> <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
<script src="/static/js/conditions.js?v=1789896308"></script> <script src="/static/js/conditions.js?v=1789896773"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active"); $("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
templates/map.html
+2 -2
View File
@@ -113,8 +113,8 @@
const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}"; const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
</script> </script>
<script src="/static/js/spotsbandsandmap.js?v=1789896308"></script> <script src="/static/js/spotsbandsandmap.js?v=1789896773"></script>
<script src="/static/js/map.js?v=1789896308"></script> <script src="/static/js/map.js?v=1789896773"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-map").addClass("active"); $("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
templates/spots.html
+2 -2
View File
@@ -125,8 +125,8 @@
</div> </div>
<script src="/static/js/spotsbandsandmap.js?v=1789896308"></script> <script src="/static/js/spotsbandsandmap.js?v=1789896773"></script>
<script src="/static/js/spots.js?v=1789896308"></script> <script src="/static/js/spots.js?v=1789896773"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-spots").addClass("active"); $("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
templates/status.html
+1 -1
View File
@@ -96,7 +96,7 @@
</div> </div>
</div> </div>
<script src="/static/js/status.js?v=1789896308"></script> <script src="/static/js/status.js?v=1789896773"></script>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("#nav-link-status").addClass("active"); $("#nav-link-status").addClass("active");