Use basestation.sqb for backup registration info.

This commit is contained in:
John Wiseman 2019-12-31 13:45:14 -08:00
parent 3c7d1c25f6
commit 61cc57fe4f

View File

@ -277,6 +277,7 @@
[(str "[{registration}|{registration}, {type|a-an},|{militaryregistration}, a military aircraft,|" [(str "[{registration}|{registration}, {type|a-an},|{militaryregistration}, a military aircraft,|"
"{militaryregistration}, a military {type},|" "{militaryregistration}, a military {type},|"
"Aircraft with unknown registration, ICAO {icao}|" "Aircraft with unknown registration, ICAO {icao}|"
"{type} with unknown registration, ICAO {icao}"
"Military aircraft with unknown registration, ICAO {militaryicao}] " "Military aircraft with unknown registration, ICAO {militaryicao}] "
"?:[(callsign {callsign}) ]" "?:[(callsign {callsign}) ]"
"is circling over [{neighbourhood}, {locality}|{neighbourhood}, {county}|{locality}] " "is circling over [{neighbourhood}, {locality}|{neighbourhood}, {county}|{locality}] "
@ -314,6 +315,8 @@
info (cond-> (-> ac (dissoc :history :type) (merge rev-props)) info (cond-> (-> ac (dissoc :history :type) (merge rev-props))
(:Type sqb) (:Type sqb)
(assoc :type (:Type sqb)) (assoc :type (:Type sqb))
(as-> rec (and (nil? (:registration rec)) (:Registration sqb)))
(assoc :registration (:Registration sqb))
(:military? ac) (:military? ac)
(-> (assoc :militaryregistration (:registration ac) (-> (assoc :militaryregistration (:registration ac)
:militaryicao (:icao ac))) :militaryicao (:icao ac)))