afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated long to use lon in emane code to avoid name conflicts in 2.7

Browse source
This commit is contained in:
Blake Harnden 2019-06-19 08:22:28 -07:00
parent 948b1126ba
commit 14fc16832d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/emane/nodes.py
View file

@ -199,12 +199,12 @@ class EmaneNode(EmaneNet):
logging.info("nemid for %s is unknown" % ifname) logging.info("nemid for %s is unknown" % ifname)
continue continue
x, y, z = netif.node.getposition() x, y, z = netif.node.getposition()
lat, long, alt = self.session.location.getgeo(x, y, z) lat, lon, alt = self.session.location.getgeo(x, y, z)
logging.info("setnempositions %d %s (%s) x,y,z=(%d,%d,%s)(%.6f,%.6f,%.6f)", logging.info("setnempositions %d %s (%s) x,y,z=(%d,%d,%s)(%.6f,%.6f,%.6f)",
i, ifname, nemid, x, y, z, lat, long, alt) i, ifname, nemid, x, y, z, lat, lon, alt)
# altitude must be an integer or warning is printed # altitude must be an integer or warning is printed
alt = int(round(alt)) alt = int(round(alt))
event.append(nemid, latitude=lat, longitude=long, altitude=alt) event.append(nemid, latitude=lat, longitude=lon, altitude=alt)
i += 1 i += 1
self.session.emane.service.publish(0, event) self.session.emane.service.publish(0, event)