Merge pull request #19 from azfv/master

Enforce extending to the same position type only
vatpac-technology · May 1, 2024 · 7bddbbb · 7bddbbb
2 parents 395e91a + c384e98
commit 7bddbbb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/TODO.md b/TODO.md
@@ -148,4 +148,4 @@ Sector -> Volumes(VolumeName)
 Volumes.xml
 Meta -> Line
 Volume(Name) -> Boundaries(Name)
-Volume(ARA) -> Boundaries(ARAFURA)
+Volume(ARA) -> Boundaries(ARAFURA)
diff --git a/atc.js b/atc.js
@@ -247,7 +247,7 @@ export async function getOnlineControllers(){
            return;
         }
         // Check if they are controller for the right region.
-        if (!sectors.some(sector => sector.Callsign == controller.callsign.toUpperCase())) 
+        if (!sectors.some(sector => sector.Callsign == controller.callsign.toUpperCase()))
         {
             return;
         }
@@ -298,9 +298,9 @@ export async function getOnlinePositions() {
         if (activeFrequencies.length <= 1) return;
         // 
         activeFrequencies.forEach(function(activeFrequency) {
-            // Get all the sectors that use that frequency (but only CTR).
+            // Get all the sectors that use that frequency (but only the same position type as the primary position).
             var frequencySectors = sectors.filter(sector => sector.Frequency == activeFrequency
-                && sector.Callsign.toUpperCase().includes("CTR"));
+                && sector.volumes.length > 0 && sector.Callsign.toUpperCase().endsWith(onlineController.callsign.toUpperCase().slice(-3)));
             // If nothing found, continue.
             if (!frequencySectors) return;
             var extendedSector;
@@ -350,4 +350,4 @@ function getDistanceInKm(sector1, sector2) {
 
 function deg2rad(deg) {
     return deg * (Math.PI/180)
-}
+}