FGFS-4.1/gr-air-modes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix KML/SBS-1 interfaces for new BDS08 output type

Browse Source
This commit is contained in:
Nick Foster
2012-06-13 20:35:05 -07:00
parent c2e5f6c2a9
commit 1be63eba0a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/modes_kml.py
View File

@@ -85,9 +85,10 @@ class modes_kml(threading.Thread):
def genkml(self):
#first let's draw the static content
retstr="""<?xml version="1.0" encoding="UTF-8"?>\n<kml xmlns="http://www.opengis.net/kml/2.2">\n<Document>\n\t<Style id="airplane">\n\t\t<IconStyle>\n\t\t\t<Icon><href>airports.png</href></Icon>\n\t\t</IconStyle>\n\t</Style>\n\t<Style id="rangering">\n\t<LineStyle>\n\t\t<color>9f4f4faf</color>\n\t\t<width>2</width>\n\t</LineStyle>\n\t</Style>\n\t<Style id="track">\n\t<LineStyle>\n\t\t<color>5fff8f8f</color>\n\t\t<width>4</width>\n\t</LineStyle>\n\t</Style>"""
retstr += """\t<Folder>\n\t\t<name>Range rings</name>\n\t\t<open>0</open>"""
for rng in [100, 200, 300]:
if self.my_coords is not None:
retstr += """\t<Folder>\n\t\t<name>Range rings</name>\n\t\t<open>0</open>"""
for rng in [100, 200, 300]:
retstr += """\n\t\t<Placemark>\n\t\t\t<name>%inm</name>\n\t\t\t<styleUrl>#rangering</styleUrl>\n\t\t\t<LinearRing>\n\t\t\t\t<coordinates>%s</coordinates>\n\t\t\t</LinearRing>\n\t\t</Placemark>""" % (rng, self.draw_circle(self.my_coords, rng),)
retstr += """\t</Folder>\n\t<Folder>\n\t\t<name>Aircraft locations</name>\n\t\t<open>0</open>"""

2
python/modes_sbs1.py
View File

@@ -166,7 +166,7 @@ class modes_output_sbs1(modes_parse.modes_parse):
if subtype >= 1 and subtype <= 4:
# Aircraft Identification
msg = self.parseBDS08(shortdata, longdata)
(msg, typestring) = self.parseBDS08(shortdata, longdata)
retstr = "MSG,1,0,%i,%X,%i,%s,%s,%s,%s,%s,,,,,,,,,,,\n" % (aircraft_id, icao24, aircraft_id+100, datestr, timestr, datestr, timestr, msg)
elif subtype >= 5 and subtype <= 8:

2
python/modes_sql.py
View File

@@ -92,7 +92,7 @@ class modes_output_sql(modes_parse.modes_parse):
retstr = None
if subtype == 4:
msg = self.parseBDS08(shortdata, longdata)
(msg, typename) = self.parseBDS08(shortdata, longdata)
retstr = "INSERT OR REPLACE INTO ident (icao, ident) VALUES (" + "%i" % icao24 + ", '" + msg + "')"
elif subtype >= 5 and subtype <= 8: