From 14fc16832dd7798ff57fa4cd50ce6748598bd450 Mon Sep 17 00:00:00 2001 From: Blake Harnden Date: Wed, 19 Jun 2019 08:22:28 -0700 Subject: [PATCH] updated long to use lon in emane code to avoid name conflicts in 2.7 --- daemon/core/emane/nodes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/core/emane/nodes.py b/daemon/core/emane/nodes.py index 256351b4..8280e6f5 100644 --- a/daemon/core/emane/nodes.py +++ b/daemon/core/emane/nodes.py @@ -199,12 +199,12 @@ class EmaneNode(EmaneNet): logging.info("nemid for %s is unknown" % ifname) continue 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)", - 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 alt = int(round(alt)) - event.append(nemid, latitude=lat, longitude=long, altitude=alt) + event.append(nemid, latitude=lat, longitude=lon, altitude=alt) i += 1 self.session.emane.service.publish(0, event)