Merge pull request #80 from ngjunsiang/master

Handle Damage Description records

Author: leif81

examples/dis_receiver.py

@@ -5,8 +5,7 @@
 
 import socket
 import time
-import sys
-import array
+from typing import cast
 
 from opendis.dis7 import *
 from opendis.RangeCoordinates import *
@@ -20,7 +19,7 @@
 
 print("Listening for DIS on UDP socket {}".format(UDP_PORT))
 
-gps = GPS();
+gps = GPS()
 
 def recv():
     print('Reading from socket...')
@@ -31,6 +30,7 @@ def recv():
     pduTypeName = pdu.__class__.__name__
 
     if pdu.pduType == 1: # PduTypeDecoders.EntityStatePdu:
+        pdu = cast(EntityStatePdu, pdu)  # for static checkers
         loc = (pdu.entityLocation.x, 
                pdu.entityLocation.y, 
                pdu.entityLocation.z,
@@ -42,7 +42,7 @@ def recv():
         body = gps.ecef2llarpy(*loc)
 
         print("Received {}\n".format(pduTypeName)
-              + " Id        : {}\n".format(pdu.entityID.entityID)
+              + " Id        : {}\n".format(pdu.entityID.entityNumber)
               + " Latitude  : {:.2f} degrees\n".format(rad2deg(body[0]))
               + " Longitude : {:.2f} degrees\n".format(rad2deg(body[1]))
               + " Altitude  : {:.0f} meters\n".format(body[2])

examples/dis_sender.py

@@ -8,7 +8,7 @@
 
 from io import BytesIO
 
-from opendis.DataOutputStream import DataOutputStream
+from opendis.stream import DataOutputStream
 from opendis.dis7 import EntityStatePdu
 from opendis.RangeCoordinates import *
 
@@ -23,9 +23,9 @@
 def send():
     pdu = EntityStatePdu()
 
-    pdu.entityID.entityID = 42
-    pdu.entityID.siteID = 17
-    pdu.entityID.applicationID = 23
+    pdu.entityID.entityNumber = 42
+    pdu.entityID.simulationAddress.site = 17
+    pdu.entityID.simulationAddress.application = 23
     pdu.marking.setString('Igor3d')
 
      # Entity in Monterey, CA, USA facing North, no roll or pitch