From 041c07e78276c5bca16fe5525f78b2aa203a894e Mon Sep 17 00:00:00 2001 From: John Wiseman Date: Fri, 3 Jan 2020 16:52:12 -0800 Subject: [PATCH] Forgot to use the new SQB record. --- src/main/lemondronor/circlebot.cljs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/lemondronor/circlebot.cljs b/src/main/lemondronor/circlebot.cljs index 293762e..7aa6115 100644 --- a/src/main/lemondronor/circlebot.cljs +++ b/src/main/lemondronor/circlebot.cljs @@ -28,8 +28,7 @@ (log-info "%s: basestation.sqb: %s" icao (js->clj record :keywordize-keys true)) (-> record (js->clj :keywordize-keys true) - (set/rename-keys {:Registration :registration :Type :type :RegisteredOwners :registered-owners})) - (js->clj record :keywordize-keys true))) + (set/rename-keys {:Registration :registration :Type :type :RegisteredOwners :registered-owners})))) (defn parse-adsbexchange-ac-element [e] @@ -332,7 +331,8 @@ (let [rev-props (:properties reverse) nearby (:properties (first nearby)) wiki-nearby (:properties (first wiki-nearby)) - info (cond-> (-> ac (dissoc :history :type) + info (cond-> (-> ac + (dissoc :history :type) (merge rev-props) (merge-adsbx-sqb sqb)) (:military? ac)