tyrel/advisory-circular
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added ICAO blocklist.

Browse Source 
See https://twitter.com/lemonodor/status/1275093309455691776
This commit is contained in:
John Wiseman 2020-06-22 10:27:28 -07:00
parent a62fd3964e
commit df8837600a
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/lemondronor/advisorycircular.cljs
View File

@ -119,6 +119,21 @@
result)))) result))))
;; Removes from adsbx API results any ICAOs that match a pattern in
;; the blocklist.
(defn remove-blocked-icaos [live-data blocklist]
(let [updated (let [blocklist-patterns (map #(re-pattern (str "(?i)" %)) blocklist)]
(update
live-data
:aircraft
(fn [aircraft]
(remove (fn [ac] (some #(re-find % (:icao ac))
blocklist-patterns))
aircraft))))]
updated))
;; Given a vector of position history, removes old entries. ;; Given a vector of position history, removes old entries.
(defn prune-history [history now config] (defn prune-history [history now config]
@ -784,14 +799,15 @@
(log-info "%s does not exist; creating empty one." history-db-path) (log-info "%s does not exist; creating empty one." history-db-path)
(write-history-db {} history-db-path)) (write-history-db {} history-db-path))
db (read-history-db history-db-path) db (read-history-db history-db-path)
data (get-adsbexchange-live-data api-data (get-adsbexchange-live-data
(merge (:adsbx config) (merge (:adsbx config)
{:lat (:lat config) {:lat (:lat config)
:lon (:lon config) :lon (:lon config)
:radius-nm (* (:radius-km config) 0.539957)})) :radius-nm (* (:radius-km config) 0.539957)}))
filtered-api-data (remove-blocked-icaos api-data (get config :icao-blocklist '()))
now (current-time) now (current-time)
[new-db potential-circles] (-> db [new-db potential-circles] (-> db
(update-history-db (:aircraft data) now config) (update-history-db (:aircraft filtered-api-data) now config)
(detect-circles now config))] (detect-circles now config))]
(p/do (p/do
(when potential-circles (when potential-circles