Commit c9abfe67 by Corey Koval

Update czml minimization method.

parent a9c56224
...@@ -522,10 +522,7 @@ def write_czml(best_point, all_the_points, ellipsedata): ...@@ -522,10 +522,7 @@ def write_czml(best_point, all_the_points, ellipsedata):
ellipse={**ellipse_properties, **ellipse_info}, ellipse={**ellipse_properties, **ellipse_info},
position={"cartographicDegrees": [ x[3], x[4], 0 ]})) position={"cartographicDegrees": [ x[3], x[4], 0 ]}))
output = json.dumps(json.loads(str(Document([top] + best_point_packets + all_point_packets + ellipse_packets))), return Document([top] + best_point_packets + all_point_packets + ellipse_packets).dumps(separators=(',', ':'))
separators=(',', ':'))
return output
############################################### ###############################################
# Writes receivers.czml used by the WebUI # Writes receivers.czml used by the WebUI
...@@ -590,9 +587,7 @@ def write_rx_czml(): ...@@ -590,9 +587,7 @@ def write_rx_czml():
billboard={**rx_properties, **rx_icon}, billboard={**rx_properties, **rx_icon},
position={"cartographicDegrees": [ x.longitude, x.latitude, 15 ]})) position={"cartographicDegrees": [ x.longitude, x.latitude, 15 ]}))
output = json.dumps(json.loads(str(Document([top] + receiver_point_packets + lob_packets))),separators=(',', ':')) return Document([top] + receiver_point_packets + lob_packets).dumps(separators=(',', ':'))
# output = str(Document([top] + receiver_point_packets + lob_packets))
return output
############################################### ###############################################
# Writes aoi.czml used by the WebUI # Writes aoi.czml used by the WebUI
...@@ -651,9 +646,7 @@ def wr_aoi_czml(): ...@@ -651,9 +646,7 @@ def wr_aoi_czml():
ellipse={**aoi_properties, **aoi_info}, ellipse={**aoi_properties, **aoi_info},
position={"cartographicDegrees": [ aoi['longitude'], aoi['latitude'], 0 ]})) position={"cartographicDegrees": [ aoi['longitude'], aoi['latitude'], 0 ]}))
output = json.dumps(json.loads(str(Document([top] + aoi_packets))),separators=(',', ':')) return Document([top] + aoi_packets).dumps(separators=(',', ':'))
# output = str(Document([top] + aoi_packets))
return output
############################################### ###############################################
# CLears the screen if debugging is off. # CLears the screen if debugging is off.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment