From 30a23711626c5afe7f86ca34fbc489d7979b71d9 Mon Sep 17 00:00:00 2001 From: Arturs Artamonovs Date: Thu, 8 Aug 2024 12:25:55 +0100 Subject: Live data works --- ADSBDecoder.xcodeproj/project.pbxproj | 24 +- .../xcschemes/xcschememanagement.plist | 28 +++ LearnMapKit/ADSBDataQueue.swift | 122 ++++++++++ LearnMapKit/ADSBFileRunner.swift | 149 ++++++++++++ LearnMapKit/ADSBNetRunner.swift | 111 +++++++++ LearnMapKit/ADSBRunner.swift | 262 --------------------- LearnMapKit/FlighState.swift | 126 +++++++--- Net1090/NetADSBDecoder.swift | 46 +++- Net1090/main.swift | 36 ++- 9 files changed, 595 insertions(+), 309 deletions(-) create mode 100644 LearnMapKit/ADSBDataQueue.swift create mode 100644 LearnMapKit/ADSBFileRunner.swift create mode 100644 LearnMapKit/ADSBNetRunner.swift delete mode 100644 LearnMapKit/ADSBRunner.swift diff --git a/ADSBDecoder.xcodeproj/project.pbxproj b/ADSBDecoder.xcodeproj/project.pbxproj index 7790139..0e0c319 100644 --- a/ADSBDecoder.xcodeproj/project.pbxproj +++ b/ADSBDecoder.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 8D8480EF2C56344B007ACD95 /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 8D8480EE2C56344B007ACD95 /* ArgumentParser */; }; + 8D8480F12C60C79E007ACD95 /* ADSBDataQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8480F02C60C79E007ACD95 /* ADSBDataQueue.swift */; }; + 8D8480F32C60C7E6007ACD95 /* ADSBNetRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8480F22C60C7E6007ACD95 /* ADSBNetRunner.swift */; }; 8D93B64C2C32030B00C91865 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D93B64B2C32030B00C91865 /* Utils.swift */; }; 8D93B64F2C3206DD00C91865 /* AirplaneTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DB347C42C242BAC00F3C020 /* AirplaneTracker.swift */; }; 8D93B6502C3206E700C91865 /* PositionDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DB347BE2C1C501200F3C020 /* PositionDecoder.swift */; }; @@ -37,7 +40,7 @@ 8DB347BF2C1C501200F3C020 /* PositionDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DB347BE2C1C501200F3C020 /* PositionDecoder.swift */; }; 8DB347C32C1C53ED00F3C020 /* Collections in Frameworks */ = {isa = PBXBuildFile; productRef = 8DB347C22C1C53ED00F3C020 /* Collections */; }; 8DB347C52C242BAC00F3C020 /* AirplaneTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DB347C42C242BAC00F3C020 /* AirplaneTracker.swift */; }; - 8DEC6F2E2C2E9C3000AC6209 /* ADSBRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DEC6F2D2C2E9C3000AC6209 /* ADSBRunner.swift */; }; + 8DEC6F2E2C2E9C3000AC6209 /* ADSBFileRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DEC6F2D2C2E9C3000AC6209 /* ADSBFileRunner.swift */; }; 8DEC6F302C2E9F0E00AC6209 /* Collections in Frameworks */ = {isa = PBXBuildFile; productRef = 8DEC6F2F2C2E9F0E00AC6209 /* Collections */; }; 8DEC6F322C31530C00AC6209 /* FlighState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DEC6F312C31530C00AC6209 /* FlighState.swift */; }; 8DF756632C0595AA008E8DFF /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF756622C0595AA008E8DFF /* main.swift */; }; @@ -112,6 +115,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 8D8480F02C60C79E007ACD95 /* ADSBDataQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ADSBDataQueue.swift; sourceTree = ""; }; + 8D8480F22C60C7E6007ACD95 /* ADSBNetRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ADSBNetRunner.swift; sourceTree = ""; }; 8D93B64B2C32030B00C91865 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; 8D93B6522C32095300C91865 /* ADSBRegEx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ADSBRegEx.swift; sourceTree = ""; }; 8D93B6562C3D27A000C91865 /* Configs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configs.swift; sourceTree = ""; }; @@ -124,7 +129,7 @@ 8D93B69D2C4A788F00C91865 /* NetADSBDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetADSBDecoder.swift; sourceTree = ""; }; 8DB347BE2C1C501200F3C020 /* PositionDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PositionDecoder.swift; sourceTree = ""; }; 8DB347C42C242BAC00F3C020 /* AirplaneTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AirplaneTracker.swift; sourceTree = ""; }; - 8DEC6F2D2C2E9C3000AC6209 /* ADSBRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ADSBRunner.swift; sourceTree = ""; }; + 8DEC6F2D2C2E9C3000AC6209 /* ADSBFileRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ADSBFileRunner.swift; sourceTree = ""; }; 8DEC6F312C31530C00AC6209 /* FlighState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlighState.swift; sourceTree = ""; }; 8DF7565F2C0595AA008E8DFF /* ADSBDecoder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ADSBDecoder; sourceTree = BUILT_PRODUCTS_DIR; }; 8DF756622C0595AA008E8DFF /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; @@ -183,6 +188,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8D8480EF2C56344B007ACD95 /* ArgumentParser in Frameworks */, 8DEC6F302C2E9F0E00AC6209 /* Collections in Frameworks */, 8D93B6812C3FEA5600C91865 /* NIO in Frameworks */, ); @@ -292,7 +298,9 @@ 8DF756832C10556A008E8DFF /* LearnMapKit */ = { isa = PBXGroup; children = ( - 8DEC6F2D2C2E9C3000AC6209 /* ADSBRunner.swift */, + 8DEC6F2D2C2E9C3000AC6209 /* ADSBFileRunner.swift */, + 8D8480F22C60C7E6007ACD95 /* ADSBNetRunner.swift */, + 8D8480F02C60C79E007ACD95 /* ADSBDataQueue.swift */, 8DF756862C10556A008E8DFF /* ContentView.swift */, 8D93B6992C4A665B00C91865 /* NetConfigView.swift */, 8DF756842C10556A008E8DFF /* LearnMapKitApp.swift */, @@ -428,6 +436,7 @@ packageProductDependencies = ( 8DEC6F2F2C2E9F0E00AC6209 /* Collections */, 8D93B6802C3FEA5600C91865 /* NIO */, + 8D8480EE2C56344B007ACD95 /* ArgumentParser */, ); productName = LearnMapKit; productReference = 8DF756822C10556A008E8DFF /* LearnMapKit.app */; @@ -617,13 +626,15 @@ 8D93B69C2C4A727300C91865 /* NetworkConfigure.swift in Sources */, 8DF756872C10556A008E8DFF /* ContentView.swift in Sources */, 8D93B6552C32099B00C91865 /* Utils.swift in Sources */, - 8DEC6F2E2C2E9C3000AC6209 /* ADSBRunner.swift in Sources */, + 8DEC6F2E2C2E9C3000AC6209 /* ADSBFileRunner.swift in Sources */, 8D93B69F2C4A7A0700C91865 /* NetADSBDecoder.swift in Sources */, + 8D8480F32C60C7E6007ACD95 /* ADSBNetRunner.swift in Sources */, 8D93B6502C3206E700C91865 /* PositionDecoder.swift in Sources */, 8D93B6582C3D290C00C91865 /* Configs.swift in Sources */, 8D93B6512C3206EB00C91865 /* Decoder.swift in Sources */, 8DEC6F322C31530C00AC6209 /* FlighState.swift in Sources */, 8DF756852C10556A008E8DFF /* LearnMapKitApp.swift in Sources */, + 8D8480F12C60C79E007ACD95 /* ADSBDataQueue.swift in Sources */, 8D93B6542C32095800C91865 /* ADSBRegEx.swift in Sources */, 8D93B69A2C4A665B00C91865 /* NetConfigView.swift in Sources */, ); @@ -1093,6 +1104,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 8D8480EE2C56344B007ACD95 /* ArgumentParser */ = { + isa = XCSwiftPackageProductDependency; + package = 8DF7566A2C0595F6008E8DFF /* XCRemoteSwiftPackageReference "swift-argument-parser" */; + productName = ArgumentParser; + }; 8D93B67E2C3FEA0000C91865 /* NIO */ = { isa = XCSwiftPackageProductDependency; package = 8D93B67D2C3FEA0000C91865 /* XCRemoteSwiftPackageReference "swift-nio" */; diff --git a/ADSBDecoder.xcodeproj/xcuserdata/jackyjack.xcuserdatad/xcschemes/xcschememanagement.plist b/ADSBDecoder.xcodeproj/xcuserdata/jackyjack.xcuserdatad/xcschemes/xcschememanagement.plist index decefeb..70a9ecd 100644 --- a/ADSBDecoder.xcodeproj/xcuserdata/jackyjack.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ADSBDecoder.xcodeproj/xcuserdata/jackyjack.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,34 @@ orderHint 0 + ADSBStats.xcscheme_^#shared#^_ + + orderHint + 3 + + LearnMapKit.xcscheme_^#shared#^_ + + orderHint + 1 + + Net1090.xcscheme_^#shared#^_ + + orderHint + 4 + + Test.xcscheme_^#shared#^_ + + orderHint + 2 + + + SuppressBuildableAutocreation + + 8DF7565E2C0595AA008E8DFF + + primary + + diff --git a/LearnMapKit/ADSBDataQueue.swift b/LearnMapKit/ADSBDataQueue.swift new file mode 100644 index 0000000..ada0ab5 --- /dev/null +++ b/LearnMapKit/ADSBDataQueue.swift @@ -0,0 +1,122 @@ +// +// ADSBDataQueue.swift +// LearnMapKit +// +// Created by Jacky Jack on 05/08/2024. +// + +import Foundation +import Collections + +struct ADSBLocation { + let address: Int + let lat: Double + let long: Double + //let alt: Int +} + +struct ADSBAltitude { + let address: Int + let altitude: Int +} + +struct ADSBICAOname { + let address: Int + let ICAOname: String +} + +enum DataStreamType { + case EMPTY + case ADSB_ICAO + case ADSB_LOCATION + case ADSB_ALTITUDE +} + +//get stream of decoded data, to tagged stream so all can be processed in sequence +class ADSBDataQueue { + //var icaoQueue: Deque = [] + var icaoArray: Array = [] + var altQueue: Deque = [] + var locQueue: Deque = [] + //var tagQueue: Deque<> = [] + var tagArray: Array = [] + + func getNextTag() -> DataStreamType { + if tagArray.count < 0 { + return DataStreamType.EMPTY + } + return tagArray[tagArray.count-1] + } + + func addIcaoName(_ address: Int, _ icaoname: String) { + tagArray.append(DataStreamType.ADSB_ICAO) + icaoArray.append(ADSBICAOname(address: address, ICAOname: icaoname)) + } + + func addAltitude(_ address: Int, _ altitude: Int) { + tagArray.append(DataStreamType.ADSB_ALTITUDE) + altQueue.append(ADSBAltitude(address: address, altitude: altitude)) + } + + func addLocation(_ address: Int, _ lat: Double, _ long: Double) { + tagArray.append(DataStreamType.ADSB_LOCATION) + locQueue.append(ADSBLocation(address: address, lat: lat, long: long)) + } + + func getIcaoName() -> ADSBICAOname { + if tagArray.count < 1 { + print("ADSB tag Queue is empty") + return ADSBICAOname(address:0,ICAOname: "TEmpty") + } + let tag = tagArray[tagArray.count-1] + if tag != DataStreamType.ADSB_ICAO { + print("ADSB Queue empty") + return ADSBICAOname(address:0,ICAOname: "QEmpty") + } + tagArray.removeLast() + var ret_icao_name = ADSBICAOname(address:0, ICAOname: "Default") + if let last_icao_name = icaoArray.popLast() { + ret_icao_name = last_icao_name + } + return ret_icao_name + } + + func getAltitude() -> ADSBAltitude { + if tagArray.count < 1 { + print("ADSB tag Queue is empty") + return ADSBAltitude(address:0,altitude:0) + } + let tag = tagArray[tagArray.count-1] + if tag != DataStreamType.ADSB_ALTITUDE { + print("ADSB Queue empty") + return ADSBAltitude(address:0,altitude:0) + } + tagArray.removeLast() + return altQueue.popLast()! + } + + func getLocation() -> ADSBLocation { + if tagArray.count < 1 { + print("ADSB tag Queue is empry") + return ADSBLocation(address:0,lat:0.0,long:0.0) + } + let tag = tagArray[tagArray.count-1] + if tag != DataStreamType.ADSB_LOCATION { + print("ADSB Queue empty") + return ADSBLocation(address:0,lat:0.0,long:0.0) + } + tagArray.removeLast() + return locQueue.popLast()! + } + + func haveNum(_ num: Int) -> Bool { + if (tagArray.count > num) { + return true + } + return false + } + + func getCount() -> Int { + return tagArray.count + } +} diff --git a/LearnMapKit/ADSBFileRunner.swift b/LearnMapKit/ADSBFileRunner.swift new file mode 100644 index 0000000..d61b91b --- /dev/null +++ b/LearnMapKit/ADSBFileRunner.swift @@ -0,0 +1,149 @@ +// +// ADSBRunner.swift +// LearnMapKit +// +// Created by Jacky Jack on 28/06/2024. +// + +import Foundation +import Collections + +class ADSBFileRunner { + var filename: URL + //track all airplanes + var tracker = AirPlaneTracker() + var adsb_source: String = "" + //should make it outside and use here? + var adsb_tag_stream = ADSBDataQueue() + private var decoded_status: Bool = false + + init(filename:String) { + self.filename = URL(fileURLWithPath:filename) + } + + init() { + self.filename = URL(fileURLWithPath:"") + } + + func setFileName(_ filename:String) { + self.filename = URL(fileURLWithPath: filename) + } + + func openFile() { + if self.filename == URL(fileURLWithPath:"") { + print("File name for ADSBRunner not specified") + return + } + print("File location [\(filename.absoluteString)]") + + //check if file excists + if (checkIfFileExists(filename.path) == false) { + print("Supplied path \(filename.path) doesnt exists") + exit(1) + } + } + + func readFile() { + //load the file with adsb data + do { + adsb_source = try String(contentsOfFile: filename.path) + print("Loaded \(adsb_source.count) bytes") + } catch { + print("Couldn't load text from a file \(filename.path) \(error)") + exit(1) + } + print("If there anything new in file") + } + + func decodeFromFile() { + for line in self.adsb_source.components(separatedBy: .newlines) { + var found=false + do { + if let tokenMatch = try matchADSBLong.prefixMatch(in: line) { + //print("\(String(tokenMatch.output))") + found = true + let str = String(tokenMatch.output) + let startIndex = str.index(str.startIndex, offsetBy: 1) + let endIndex = str.index(str.endIndex, offsetBy: -2) + let decoder = Decoder(String(str[startIndex...endIndex])) + if decoder.DataFormat == 17 { + if let d17 = decoder.getDataFormat17() { + if (d17.TypeCode == 4) { + if let indentification = d17.messageIdentification { + tracker.addDF17Indentification(d17.AddressAnnounced, indentification.ICAOName) + adsb_tag_stream.addIcaoName(d17.AddressAnnounced, tracker.getICAOname(d17.AddressAnnounced)!) + } + } else if (d17.TypeCode >= 9 && d17.TypeCode <= 18) { + if let airbornposition = d17.messageAirbornPositon { + tracker.addDF17AirBornPosition( + d17.AddressAnnounced, + airbornposition.Latitude, + airbornposition.Longitude, + airbornposition.Altitude, + airbornposition.CPRFormat == 0 + ) + if let position = tracker.getPosition(d17.AddressAnnounced) { + print("position: \(position)") + adsb_tag_stream.addAltitude(d17.AddressAnnounced, tracker.getAltitude(d17.AddressAnnounced)!) + let location = tracker.getPosition(d17.AddressAnnounced)! + adsb_tag_stream.addLocation(d17.AddressAnnounced, location.0, location.1) + } + } + } + } + } + }; + } catch { + print("Error") + } + + if (found == false) { + print("Unknown adsb data line \(line)") + } + } + self.decoded_status = true + //try to free the string after decoded + //adsb_source = "" + for i in 0.. Bool { + return self.decoded_status + } + + func getPlainData(_ num_queries: Int) -> ADSBDataQueue { + var ret = ADSBDataQueue() + if adsb_tag_stream.haveNum(num_queries) { + + for _ in 0.. Int { + return self.adsb_tag_stream.getCount() + } +} + + diff --git a/LearnMapKit/ADSBNetRunner.swift b/LearnMapKit/ADSBNetRunner.swift new file mode 100644 index 0000000..7125615 --- /dev/null +++ b/LearnMapKit/ADSBNetRunner.swift @@ -0,0 +1,111 @@ +// +// ADSBNetRunner.swift +// LearnMapKit +// +// Created by Jacky Jack on 05/08/2024. +// + +import Foundation + +class ADSBNetRunner { + var address = "" + var port = 0 + var tracker = AirPlaneTracker() + var adsb_tag_stream = ADSBDataQueue() + var ADSBClient:NetADSBDecoder! + var timer: Timer? + + init(address:String, port:Int) { + self.address = address + self.port = port + } + + func start() { + var found: Bool = false + let adsb_net_decoder = NetADSBDecoder(host: self.address, port: self.port) + //var _adsb_tag_stream = ADSBDataQueue() + //var _tracker = AirPlaneTracker() + print("_start ADSBNetRunner") + timer = Timer.scheduledTimer( + withTimeInterval: 1, + repeats: true + ) { _ in + print("Timer drain queue") + print("\(adsb_net_decoder.msgarray.message_array.count)") + if adsb_net_decoder.msgarray.message_array.count > 0 { + print(adsb_net_decoder.msgarray.message_array.count) + for _ in 0..= 9 && d17.TypeCode <= 18) { + if let airbornposition = d17.messageAirbornPositon { + self.tracker.addDF17AirBornPosition( + d17.AddressAnnounced, + airbornposition.Latitude, + airbornposition.Longitude, + airbornposition.Altitude, + airbornposition.CPRFormat == 0 + ) + if let position = self.tracker.getPosition(d17.AddressAnnounced) { + print("position: \(position)") + self.adsb_tag_stream.addAltitude(d17.AddressAnnounced, self.tracker.getAltitude(d17.AddressAnnounced)!) + let location = self.tracker.getPosition(d17.AddressAnnounced)! + self.adsb_tag_stream.addLocation(d17.AddressAnnounced, location.0, location.1) + } + } + } + } + } + }; + } catch { + print("Error") + } + + if (found == false) { + print("Unknown adsb data line [\(msg)]") + } + } + } + } + + } + + DispatchQueue.global(qos: .background).async { + do { + try adsb_net_decoder.start() + } catch let error { + print("Error: \(error.localizedDescription)") + adsb_net_decoder.stop() + } + } + } + + func getDataOut() { + + } + + func stop() { + + } + + func getCount() -> Int { + return self.adsb_tag_stream.getCount() + } +} diff --git a/LearnMapKit/ADSBRunner.swift b/LearnMapKit/ADSBRunner.swift deleted file mode 100644 index e05978c..0000000 --- a/LearnMapKit/ADSBRunner.swift +++ /dev/null @@ -1,262 +0,0 @@ -// -// ADSBRunner.swift -// LearnMapKit -// -// Created by Jacky Jack on 28/06/2024. -// - -import Foundation -import Collections - -struct ADSBLocation { - let address: Int - let lat: Double - let long: Double - //let alt: Int -} - -struct ADSBAltitude { - let address: Int - let altitude: Int -} - -struct ADSBICAOname { - let address: Int - let ICAOname: String -} - -enum DataStreamType { - case EMPTY - case ADSB_ICAO - case ADSB_LOCATION - case ADSB_ALTITUDE -} - -//get stream of decoded data, to tagged stream so all can be processed in sequence -class ADSBDataQueue { - //var icaoQueue: Deque = [] - var icaoArray: Array = [] - var altQueue: Deque = [] - var locQueue: Deque = [] - //var tagQueue: Deque<> = [] - var tagArray: Array = [] - - func getNextTag() -> DataStreamType { - if tagArray.count < 0 { - return DataStreamType.EMPTY - } - return tagArray[tagArray.count-1] - } - - func addIcaoName(_ address: Int, _ icaoname: String) { - tagArray.append(DataStreamType.ADSB_ICAO) - icaoArray.append(ADSBICAOname(address: address, ICAOname: icaoname)) - } - - func addAltitude(_ address: Int, _ altitude: Int) { - tagArray.append(DataStreamType.ADSB_ALTITUDE) - altQueue.append(ADSBAltitude(address: address, altitude: altitude)) - } - - func addLocation(_ address: Int, _ lat: Double, _ long: Double) { - tagArray.append(DataStreamType.ADSB_LOCATION) - locQueue.append(ADSBLocation(address: address, lat: lat, long: long)) - } - - func getIcaoName() -> ADSBICAOname { - if tagArray.count < 1 { - print("ADSB tag Queue is empty") - return ADSBICAOname(address:0,ICAOname: "TEmpty") - } - let tag = tagArray[tagArray.count-1] - if tag != DataStreamType.ADSB_ICAO { - print("ADSB Queue empty") - return ADSBICAOname(address:0,ICAOname: "QEmpty") - } - tagArray.removeLast() - var ret_icao_name = ADSBICAOname(address:0, ICAOname: "Default") - if let last_icao_name = icaoArray.popLast() { - ret_icao_name = last_icao_name - } - return ret_icao_name - } - - func getAltitude() -> ADSBAltitude { - if tagArray.count < 1 { - print("ADSB tag Queue is empry") - return ADSBAltitude(address:0,altitude:0) - } - let tag = tagArray[tagArray.count-1] - if tag != DataStreamType.ADSB_ALTITUDE { - print("ADSB Queue empty") - return ADSBAltitude(address:0,altitude:0) - } - tagArray.removeLast() - return altQueue.popLast()! - } - - func getLocation() -> ADSBLocation { - if tagArray.count < 1 { - print("ADSB tag Queue is empry") - return ADSBLocation(address:0,lat:0.0,long:0.0) - } - let tag = tagArray[tagArray.count-1] - if tag != DataStreamType.ADSB_LOCATION { - print("ADSB Queue empty") - return ADSBLocation(address:0,lat:0.0,long:0.0) - } - tagArray.removeLast() - return locQueue.popLast()! - } - - func haveNum(_ num: Int) -> Bool { - if (tagArray.count > num) { - return true - } - return false - } - - func getCount() -> Int { - return tagArray.count - } -} - -class ADSBFileRunner { - - var filename: URL - //track all airplanes - var tracker = AirPlaneTracker() - var adsb_source: String = "" - //should make it outside and use here? - var adsb_tag_stream = ADSBDataQueue() - private var decoded_status: Bool = false - - init(filename:String) { - self.filename = URL(fileURLWithPath:filename) - } - - init() { - self.filename = URL(fileURLWithPath:"") - } - - func setFileName(_ filename:String) { - self.filename = URL(fileURLWithPath: filename) - } - - func openFile() { - if self.filename == URL(fileURLWithPath:"") { - print("File name for ADSBRunner not specified") - return - } - print("File location [\(filename.absoluteString)]") - - //check if file excists - if (checkIfFileExists(filename.path) == false) { - print("Supplied path \(filename.path) doesnt exists") - exit(1) - } - } - - func readFile() { - //load the file with adsb data - do { - adsb_source = try String(contentsOfFile: filename.path) - print("Loaded \(adsb_source.count) bytes") - } catch { - print("Couldn't load text from a file \(filename.path) \(error)") - exit(1) - } - print("If there anything new in file") - } - - func decode() { - for line in self.adsb_source.components(separatedBy: .newlines) { - var found=false - do { - if let tokenMatch = try matchADSBLong.prefixMatch(in: line) { - //print("\(String(tokenMatch.output))") - found = true - let str = String(tokenMatch.output) - let startIndex = str.index(str.startIndex, offsetBy: 1) - let endIndex = str.index(str.endIndex, offsetBy: -2) - let decoder = Decoder(String(str[startIndex...endIndex])) - if decoder.DataFormat == 17 { - if let d17 = decoder.getDataFormat17() { - if (d17.TypeCode == 4) { - if let indentification = d17.messageIdentification { - tracker.addDF17Indentification(d17.AddressAnnounced, indentification.ICAOName) - adsb_tag_stream.addIcaoName(d17.AddressAnnounced, tracker.getICAOname(d17.AddressAnnounced)!) - } - } else if (d17.TypeCode >= 9 && d17.TypeCode <= 18) { - if let airbornposition = d17.messageAirbornPositon { - tracker.addDF17AirBornPosition( - d17.AddressAnnounced, - airbornposition.Latitude, - airbornposition.Longitude, - airbornposition.Altitude, - airbornposition.CPRFormat == 0 - ) - if let position = tracker.getPosition(d17.AddressAnnounced) { - print("position: \(position)") - adsb_tag_stream.addAltitude(d17.AddressAnnounced, tracker.getAltitude(d17.AddressAnnounced)!) - let location = tracker.getPosition(d17.AddressAnnounced)! - adsb_tag_stream.addLocation(d17.AddressAnnounced, location.0, location.1) - - } - } - } - } - } - }; - } catch { - print("Error") - } - - if (found == false) { - print("Unknown adsb data line \(line)") - } - } - self.decoded_status = true - //try to free the string after decoded - //adsb_source = "" - for i in 0.. Bool { - return self.decoded_status - } - - func getPlainData(_ num_queries: Int) -> ADSBDataQueue { - var ret = ADSBDataQueue() - if adsb_tag_stream.haveNum(num_queries) { - - for _ in 0.. Int { - return self.adsb_tag_stream.getCount() - } -} diff --git a/LearnMapKit/FlighState.swift b/LearnMapKit/FlighState.swift index cfb34f1..446b491 100644 --- a/LearnMapKit/FlighState.swift +++ b/LearnMapKit/FlighState.swift @@ -8,6 +8,7 @@ import Foundation import Collections + class FlightTracker { var last_time_seen: Int = 0 var ICAOName_avaliable = false @@ -27,60 +28,121 @@ class FlightState: ObservableObject { @Published var flight:[Int:FlightTracker] = [:] //configuration options + let sourceFile = false let default_file_path = "/Users/jackyjack/Downloads/2024_05_27_raw_adsb.txt" let process_per_second = 120 + let sourceDump1090Server = true + let dump1090address = "192.168.4.201" + let dump1090port = 30002 + init() { var count = 0 //let ADSBtask = ADSBFileRunner(filename: "") - let adsb_file = ADSBFileRunner(filename: self.default_file_path) + //let adsb_net = ADSBNetRunner(address: dump1090address, port: dump1090port) - DispatchQueue.global(qos: .background).sync { - print("Open file") - adsb_file.openFile() - adsb_file.readFile() - } - - DispatchQueue.global(qos: .background).async { - print("Start decoding data") - adsb_file.decode() - print("Stop decoding data") + if sourceFile { + let adsb_file = ADSBFileRunner(filename: self.default_file_path) + DispatchQueue.global(qos: .background).sync { + print("Open file") + adsb_file.openFile() + adsb_file.readFile() + } + + DispatchQueue.global(qos: .background).async { + print("Start decoding data") + adsb_file.decodeFromFile() + print("Stop decoding data") + } + + //once a second read some data from decoded queue + timer = Timer.scheduledTimer( + withTimeInterval: 1, + repeats: true + ) { _ in + //get the 10 entries if there is + if adsb_file.jobDone() { + print("Decoding done let get some data \(adsb_file.getCount())") + //if adsb_file + if adsb_file.getCount() > self.process_per_second { + let data = adsb_file.getPlainData(self.process_per_second) + //print(data.getCount()) + for idx in 0.. self.process_per_second { - let data = adsb_file.getPlainData(self.process_per_second) - //print(data.getCount()) - for idx in 0.. 0 { + print(ADSBClient.msgarray.message_array.count) + for i in 0.. 0 { + print("Process onse a second") + for idx in 0.. {get set} +} + +class NetADSBHandlder: ChannelInboundHandler { typealias InboundIn = ByteBuffer typealias OutboundOut = ByteBuffer + var messageDelegate: ADSBQueueDelegate? + func channelActive(context: ChannelHandlerContext) { print("Channel is active") } @@ -21,7 +27,31 @@ class ADSBHandlder: ChannelInboundHandler { var buffer = unwrapInboundIn(data) let readableBytes = buffer.readableBytes if let received = buffer.readString(length: readableBytes) { - print(received,terminator: "") + //print(received,terminator: "") + /* + if let message_queue = message_queue { + message_queue.append(String(received)) + print("Add new messsge") + }*/ + //if self.message_array != nil { + // message_array?.append(String(received)) + // print("\(message_array?.count)") + //} + if self.messageDelegate != nil { + if received.count == 17 { + let trimmed = received.trimmingCharacters(in: .newlines).lowercased() + messageDelegate?.message_array.append(String(trimmed)) + + } else if received.count == 31 { + let trimmed = received.trimmingCharacters(in: .newlines).lowercased() + messageDelegate?.message_array.append(String(trimmed)) + } else { + for line in received.components(separatedBy: .newlines) { + let trimmed = line.trimmingCharacters(in: .newlines).lowercased() + messageDelegate?.message_array.append(String(trimmed)) + } + } + } } } @@ -31,14 +61,24 @@ class ADSBHandlder: ChannelInboundHandler { } } +class ADSBQueue: ADSBQueueDelegate { + var message_array:Array = [] +} + class NetADSBDecoder { let group = MultiThreadedEventLoopGroup(numberOfThreads: 1) var host: String var port: Int + var msgarray = ADSBQueue() + var handler = NetADSBHandlder() + //var msg_array:Array = [] + init(host: String, port: Int) { self.host = host self.port = port + //regiter delegate + handler.messageDelegate = msgarray } func start() throws { @@ -47,7 +87,7 @@ class NetADSBDecoder { .channelOption(ChannelOptions.socket(SocketOptionLevel(SOL_SOCKET), SO_REUSEADDR), value: 1) .channelInitializer{channel in //channel.pipeline.add(handler: ADSBHandlder()) - channel.pipeline.addHandlers([ADSBHandlder()]) + channel.pipeline.addHandlers([self.handler]) }.connect(host: self.host, port: self.port) .wait() try channel.closeFuture.wait() diff --git a/Net1090/main.swift b/Net1090/main.swift index d142613..06c2652 100644 --- a/Net1090/main.swift +++ b/Net1090/main.swift @@ -10,16 +10,36 @@ import Network import NIO - +var timer: Timer? +let ADSBClient = NetADSBDecoder(host: "192.168.4.201", port: 30002) print("Hello, World!") -print("Start listening client") +print("Start listening client 2") -let ADSBClient = NetADSBDecoder(host: "192.168.4.201", port: 30002) -do { - try ADSBClient.start() -} catch let error { - print("Error: \(error.localizedDescription)") - ADSBClient.stop() +//var timer:Timer? +timer = Timer.scheduledTimer( + withTimeInterval: 1, + repeats: true +) { _ in + print("Timer drain queue") + print("\(ADSBClient.msgarray.message_array.count)") + if ADSBClient.msgarray.message_array.count > 0 { + print(ADSBClient.msgarray.message_array.count) + for i in 0..