diff --git a/data/activities.py b/data/activities.py index ebf4986..8e4b2fe 100644 --- a/data/activities.py +++ b/data/activities.py @@ -10,7 +10,7 @@ ACTIVITIES: dict[ActivityName, Activity] = { refs_globally_unique=False, # 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. - comment_names=["CONTEST"], + comment_names=["CONTEST", "TEST"], icon="fa-trophy", alerts_possible=True, ), @@ -150,9 +150,9 @@ ACTIVITIES: dict[ActivityName, Activity] = { description="Islands on the Air", sig_type=ActivityType.ADVENTURE, has_refs=True, - refs_globally_unique=False, + refs_globally_unique=True, 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"], icon="fa-book-atlas", ), @@ -163,7 +163,7 @@ ACTIVITIES: dict[ActivityName, Activity] = { has_refs=True, refs_globally_unique=False, 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=[], 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- # 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. - ref_regex=r"([DE]|FEA)[\- ]\d{4}(\.\d)?", + ref_regex=r"(?:[DE]|FEA)[\- ]\d{4}(?:\.\d)?", comment_names=["FEA"], icon="fa-house-flood-water", region_flag="🇪🇸", diff --git a/templates/add_spot.html b/templates/add_spot.html index c5446e1..1b8667c 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 f917cd8..a3891e8 100644 --- a/templates/alerts.html +++ b/templates/alerts.html @@ -85,7 +85,7 @@ - + diff --git a/templates/bands.html b/templates/bands.html index b5b6843..bc418a9 100644 --- a/templates/bands.html +++ b/templates/bands.html @@ -76,8 +76,8 @@ - - + + diff --git a/templates/base.html b/templates/base.html index f118e2f..c35dad4 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 c5ba915..1de54f0 100644 --- a/templates/conditions.html +++ b/templates/conditions.html @@ -284,7 +284,7 @@
- + diff --git a/templates/map.html b/templates/map.html index 3c5c810..28a1775 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 3c4ae23..5b3aa22 100644 --- a/templates/spots.html +++ b/templates/spots.html @@ -125,8 +125,8 @@ - - + + diff --git a/templates/status.html b/templates/status.html index 2e54358..42b1a8f 100644 --- a/templates/status.html +++ b/templates/status.html @@ -96,7 +96,7 @@ - +