Skip to content

D
df-aggregator
Commit a433c4d0 by Corey Koval
Options

Fixed ellipse rotation

parent 8d7e4abb
Showing with 4 additions and 3 deletions
df-aggregator.py
...@@ -242,7 +242,7 @@ def write_czml(best_point, all_the_points, ellipsedata): ...@@ -242,7 +242,7 @@ def write_czml(best_point, all_the_points, ellipsedata):
} }
} }
best_point_properties = { best_point_properties = {
"pixelSize":20.0, "pixelSize":12.0,
"heightReference":"RELATIVE_TO_GROUND", "heightReference":"RELATIVE_TO_GROUND",
"color": { "color": {
"rgba": [0, 255, 0, 255], "rgba": [0, 255, 0, 255],
...@@ -306,15 +306,16 @@ def write_czml(best_point, all_the_points, ellipsedata): ...@@ -306,15 +306,16 @@ def write_czml(best_point, all_the_points, ellipsedata):
if ellipsedata != None: if ellipsedata != None:
for x in ellipsedata: for x in ellipsedata:
rotation = 2 * np.pi - x[2] # rotation = 2 * np.pi - x[2]
if x[0] >= x[1]: if x[0] >= x[1]:
semiMajorAxis = x[0] semiMajorAxis = x[0]
semiMinorAxis = x[1] semiMinorAxis = x[1]
rotation = 2 * np.pi - x[2]
rotation += np.pi/2 rotation += np.pi/2
else: else:
rotation = x[2]
semiMajorAxis = x[1] semiMajorAxis = x[1]
semiMinorAxis = x[0] semiMinorAxis = x[0]
# rotation += np.pi/2
ellipse_info = {"semiMajorAxis": semiMajorAxis, "semiMinorAxis": semiMinorAxis, "rotation": rotation} ellipse_info = {"semiMajorAxis": semiMajorAxis, "semiMinorAxis": semiMinorAxis, "rotation": rotation}
ellipse_packets.append(Packet(id=str(x[4]) + ", " + str(x[3]), ellipse_packets.append(Packet(id=str(x[4]) + ", " + str(x[3]),
......
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