Merge branch 'main' of https://github.com/QCaudron/repeater_roundabout

QCaudron · Dec 7, 2024 · 640368f · 640368f
2 parents 13e85bb + 293dbed
commit 640368f
Show file tree

Hide file tree

Showing 10 changed files with 225 additions and 200 deletions.
diff --git a/assets/programming_files/all_rr_frequencies.csv b/assets/programming_files/all_rr_frequencies.csv
@@ -184,3 +184,4 @@ RR#,Callsign,Output (MHz),Offset (MHz),Tone (Hz),RepeaterBook ID,Location,Mode,G
 183,N7WRR,147.360,+0.6,,366,Stensgar Mtn.,FM,Kamiak Butte Amateur Repeater Association,https://kbara.org/,53,48.18139,-117.98917
 184,N7WRQ,147.380,+0.6,100.0,78,Mica Peak,FM,Kamiak Butte Amateur Repeater Association,https://kbara.org/,53,47.57495,-117.08113
 185,KC7SNN,147.000,-0.6,100.0,68,Mt. Harrison,FM,Magic Valley Amateur Radio Club,https://www.k7mva.org/,16,42.32580185,-113.65599823
+186,WR7VHF,146.880,-0.6,123.0,283,Spokane,FM,Inland Empire VHF Radio Amateurs,https://www.vhfclub.org/,53,47.57889938,-117.29599762
diff --git a/assets/programming_files/rr_frequencies.csv b/assets/programming_files/rr_frequencies.csv
@@ -184,3 +184,4 @@ Location,Name,Frequency,Duplex,Offset,Tone,rToneFreq,cToneFreq,DtcsCode,DtcsPola
 183,N7WRR,147.360,+,0.600000,Tone,,88.5,023,NN,FM,5.00,,N7WRR - 147.360,,,,
 184,N7WRQ,147.380,+,0.600000,Tone,100.0,88.5,023,NN,FM,5.00,,N7WRQ - 147.380,,,,
 185,KC7SNN,147.000,-,0.600000,Tone,100.0,88.5,023,NN,FM,5.00,,KC7SNN - 147.000,,,,
+186,WR7VHF,146.880,-,0.600000,Tone,123.0,88.5,023,NN,FM,5.00,,WR7VHF - 146.880,,,,
diff --git a/assets/repeaters.json b/assets/repeaters.json
@@ -3328,5 +3328,23 @@
         "Website":"https:\/\/www.k7mva.org\/",
         "Exclude":null,
         "RepeaterBook State ID":"16"
+    },
+    {
+        "Callsign":"WR7VHF",
+        "Output (MHz)":"146.880",
+        "Offset (MHz)":"-0.6",
+        "Tone (Hz)":"123.0",
+        "Coordinates":[
+            47.57889938,
+            -117.29599762
+        ],
+        "RepeaterBook ID":"283",
+        "Group Name":"IEVHFRA",
+        "Location":"Spokane",
+        "Mode":"FM",
+        "Long Name":"Inland Empire VHF Radio Amateurs",
+        "Website":"https:\/\/www.vhfclub.org\/",
+        "Exclude":null,
+        "RepeaterBook State ID":"53"
     }
 ]
diff --git a/assets/templates/rules.md b/assets/templates/rules.md
@@ -73,7 +73,7 @@ Can I stay on the same repeater the whole contest ?
 : Yes ! You can "run a repeater", like running a frequency during an HF contest. You can make contacts with different people, helping them activate that repeater. Some folk will move between machines, and some will stay put. A strategy that mixes the two will probably win out, in terms of points.
 
 Can I arrange a contact beforehand ?
-: Yes, skeds are perfectly okay ! Arranging your QSO beforehand is perfectly fine. We have a [Discord system](https://discord.gg/BBpbESxSCm) that's a great place to arrange a sked, or see who's around to find you on a repeater.
+: Yes, skeds are perfectly okay ! Arranging your QSO beforehand is perfectly fine. We have a [Discord system](https://discord.com/invite/mqkD4fTjrn) that's a great place to arrange a sked, or see who's around to find you on a repeater.
 
 Can I use Echolink, Allstar, or IRLP ?
 : Not this year. To keep things simple, we are going FM-only.

diff --git a/demo_map.html b/demo_map.html
@@ -162,6 +162,7 @@
 L.marker([48.1813900000, -117.9891700000], {icon: L.divIcon({className: 'custom-icon', html: "<div class='icon-label'>183</div>", iconSize: [25, 25]}) }).bindPopup('RR# 183 - N7WRR (147.360)<br>').addTo(map);
 L.marker([47.5749500000, -117.0811300000], {icon: L.divIcon({className: 'custom-icon', html: "<div class='icon-label'>184</div>", iconSize: [25, 25]}) }).bindPopup('RR# 184 - N7WRQ (147.380)<br>').addTo(map);
 L.marker([42.3258018500, -113.6559982300], {icon: L.divIcon({className: 'custom-icon', html: "<div class='icon-label'>185</div>", iconSize: [25, 25]}) }).bindPopup('RR# 185 - KC7SNN (147.000)<br>').addTo(map);
+L.marker([47.5788993800, -117.2959976200], {icon: L.divIcon({className: 'custom-icon', html: "<div class='icon-label'>186</div>", iconSize: [25, 25]}) }).bindPopup('RR# 186 - WR7VHF (146.880)<br>').addTo(map);
     </script>
 
 

diff --git a/index.md b/index.md
diff --git a/map.md b/map.md
@@ -158,5 +158,6 @@ L.marker([46.7323989900, -117.0000000000], {icon: L.divIcon({className: 'custom-
 L.marker([48.1813900000, -117.9891700000], {icon: L.divIcon({className: 'custom-icon', html: "<div class='icon-label'>183</div>", iconSize: [25, 25]}) }).bindPopup('RR# 183 - N7WRR (147.360)<br>').addTo(map);
 L.marker([47.5749500000, -117.0811300000], {icon: L.divIcon({className: 'custom-icon', html: "<div class='icon-label'>184</div>", iconSize: [25, 25]}) }).bindPopup('RR# 184 - N7WRQ (147.380)<br>').addTo(map);
 L.marker([42.3258018500, -113.6559982300], {icon: L.divIcon({className: 'custom-icon', html: "<div class='icon-label'>185</div>", iconSize: [25, 25]}) }).bindPopup('RR# 185 - KC7SNN (147.000)<br>').addTo(map);
+L.marker([47.5788993800, -117.2959976200], {icon: L.divIcon({className: 'custom-icon', html: "<div class='icon-label'>186</div>", iconSize: [25, 25]}) }).bindPopup('RR# 186 - WR7VHF (146.880)<br>').addTo(map);
 
 </script>
diff --git a/repeaters.md b/repeaters.md
@@ -205,6 +205,7 @@ Get started by [programming your radio](/files), and check out the repeaters' lo
 | 183   | KBARA          | N7WRR      | Stensgar Mtn.      |        147.360 |           +0.6 |             |
 | 184   | KBARA          | N7WRQ      | Mica Peak          |        147.380 |           +0.6 |       100.0 |
 | 185   | Magic Valley   | KC7SNN     | Mt. Harrison       |        147.000 |           -0.6 |       100.0 |
+| 186   | IEVHFRA        | WR7VHF     | Spokane            |        146.880 |           -0.6 |       123.0 |
 
 ---
 
@@ -246,6 +247,9 @@ HARC
 ICARC
 : [Island County Amateur Radio Club](https://www.w7avm.org/)
 
+IEVHFRA
+: [Inland Empire VHF Radio Amateurs](https://www.vhfclub.org/)
+
 JCARC
 : [Jefferson County Amateur Radio Club](https://w7jcr.wordpress.com/)
 

diff --git a/rules.md b/rules.md
@@ -8,7 +8,7 @@ subtitle: How to play in the Repeater Roundabout.
 
 # Repeaters
 
-Only these [185 participating repeaters from 69 radio groups](/repeaters) are eligible for scoring points in the Repeater Roundabout. Please stick to these repeaters; we don't want to annoy anyone who did not want to bring the contest to their repeater.
+Only these [186 participating repeaters from 70 radio groups](/repeaters) are eligible for scoring points in the Repeater Roundabout. Please stick to these repeaters; we don't want to annoy anyone who did not want to bring the contest to their repeater.
 
 Please ensure that there is no ongoing activity on a repeater (such as a net) before you call for contacts. Please ensure you leave some space for others to user the repeater; some of these are used for emergency communications, and we don't want to interfere with that.
 
@@ -73,7 +73,7 @@ Can I stay on the same repeater the whole contest ?
 : Yes ! You can "run a repeater", like running a frequency during an HF contest. You can make contacts with different people, helping them activate that repeater. Some folk will move between machines, and some will stay put. A strategy that mixes the two will probably win out, in terms of points.
 
 Can I arrange a contact beforehand ?
-: Yes, skeds are perfectly okay ! Arranging your QSO beforehand is perfectly fine. We have a [Discord system](https://discord.gg/BBpbESxSCm) that's a great place to arrange a sked, or see who's around to find you on a repeater.
+: Yes, skeds are perfectly okay ! Arranging your QSO beforehand is perfectly fine. We have a [Discord system](https://discord.com/invite/mqkD4fTjrn) that's a great place to arrange a sked, or see who's around to find you on a repeater.
 
 Can I use Echolink, Allstar, or IRLP ?
 : Not this year. To keep things simple, we are going FM-only.

diff --git a/scripts/update.py b/scripts/update.py
@@ -6,7 +6,6 @@
 from typing import Union
 
 import pandas as pd
-import numpy
 import requests
 
 from markdown_files import (
@@ -224,13 +223,13 @@ def generate_repeater_df(args: Union[argparse.Namespace, SimpleNamespace]) -> pd
 
     # Initialize records missing state id fields to WA (53).
     if 'RepeaterBook State ID' not in df.columns:
-        df['RepeaterBook State ID'] = numpy.NaN
+        df['RepeaterBook State ID'] = None
 
     def init_state_id(row):
         if pd.notna(row['RepeaterBook State ID']):
             return row['RepeaterBook State ID']
         if pd.isna(row['RepeaterBook ID']):
-            return numpy.NaN
+            return None
         return '53'
     df['RepeaterBook State ID'] = df.apply(init_state_id, axis=1)