Forgot to use the new SQB record.

This commit is contained in:
John Wiseman 2020-01-03 16:52:12 -08:00
parent 4183048c3c
commit 041c07e782

View File

@ -28,8 +28,7 @@
(log-info "%s: basestation.sqb: %s" icao (js->clj record :keywordize-keys true)) (log-info "%s: basestation.sqb: %s" icao (js->clj record :keywordize-keys true))
(-> record (-> record
(js->clj :keywordize-keys true) (js->clj :keywordize-keys true)
(set/rename-keys {:Registration :registration :Type :type :RegisteredOwners :registered-owners})) (set/rename-keys {:Registration :registration :Type :type :RegisteredOwners :registered-owners}))))
(js->clj record :keywordize-keys true)))
(defn parse-adsbexchange-ac-element [e] (defn parse-adsbexchange-ac-element [e]
@ -332,7 +331,8 @@
(let [rev-props (:properties reverse) (let [rev-props (:properties reverse)
nearby (:properties (first nearby)) nearby (:properties (first nearby))
wiki-nearby (:properties (first wiki-nearby)) wiki-nearby (:properties (first wiki-nearby))
info (cond-> (-> ac (dissoc :history :type) info (cond-> (-> ac
(dissoc :history :type)
(merge rev-props) (merge rev-props)
(merge-adsbx-sqb sqb)) (merge-adsbx-sqb sqb))
(:military? ac) (:military? ac)