Fixed nocturnal filter when using location settings.

Mattk70 · Feb 25, 2024 · 4e1ed0a · 4e1ed0a
1 parent c85fcc5
commit 4e1ed0a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Help/settings.html b/Help/settings.html
@@ -105,6 +105,13 @@
             Larger values lead to faster processing, especially on long files.
         </td>
     </tr>
+    <tr>
+        <th>Enable analysis completion notifications</th>
+        <td>
+            This is useful if you would like to run Chirpity analysis in the background, 
+            or with the window minimised. A system alert will notify you when the analysis completes.
+        </td>
+    </tr>
     <tr>
         <td colspan="2" class="text-center text-bg-light"><h5>Location</h5></td>
     </tr>

diff --git a/js/listWorker.js b/js/listWorker.js
@@ -244,18 +244,17 @@ class Model {
                     if (NOCTURNAL.has(item)) includedIDs.push(i);
                 }
             } else {
-                // BirdNET nocturnal bird filter
-                const additionalIDs = [];
                 // Get list of IDs of birds that call through the night or all the time. Exclude non-avian classes
                 for (let i = 0; i < this.labels.length; i++) {
                     const item = this.labels[i];
                     if (ACTIVITY_INDEX[item]  !== 1 && BIRDNET_NOT_BIRDS.indexOf(item) < 0) includedIDs.push(i);     
                 }
-                if (localBirdsOnly){ // placeholder for condition
+                if (localBirdsOnly){
+                    const additionalIDs = includedIDs;
                     // Now get list of local birds
                     const local_ids = await this.setList({lat,lon,week, listType:'location', useWeek, threshold})
                     // Create a list of indices that appear in both lists
-                    includedIDs = includedIDs.filter(id => local_ids.included.includes(id));
+                    includedIDs = additionalIDs.filter(id => local_ids[0].included.includes(id));
                 }
             } 
         } else if (listType === 'custom'){

diff --git a/js/ui.js b/js/ui.js
@@ -31,10 +31,10 @@ const p = window.module.p;
 const SunCalc = window.module.SunCalc;
 const uuidv4 = window.module.uuidv4;
 const os = window.module.os;
-/// Set up communication channel between UI and worker window
 
 let worker;
 
+/// Set up communication channel between UI and worker window
 const establishMessageChannel =
 new Promise((resolve) => {
     window.onmessage = (event) => {