diff --git a/daemon/core/api/tlv/dataconversion.py b/daemon/core/api/tlv/dataconversion.py index 8228b536..8d47613d 100644 --- a/daemon/core/api/tlv/dataconversion.py +++ b/daemon/core/api/tlv/dataconversion.py @@ -31,9 +31,9 @@ def convert_node(node_data): (NodeTlvs.CANVAS, node_data.canvas), (NodeTlvs.NETWORK_ID, node_data.network_id), (NodeTlvs.SERVICES, node_data.services), - (NodeTlvs.LATITUDE, node_data.latitude), - (NodeTlvs.LONGITUDE, node_data.longitude), - (NodeTlvs.ALTITUDE, node_data.altitude), + (NodeTlvs.LATITUDE, str(node_data.latitude)), + (NodeTlvs.LONGITUDE, str(node_data.longitude)), + (NodeTlvs.ALTITUDE, str(node_data.altitude)), (NodeTlvs.ICON, node_data.icon), (NodeTlvs.OPAQUE, node_data.opaque), ], diff --git a/daemon/core/emane/emanemanager.py b/daemon/core/emane/emanemanager.py index 9a7b3a0d..0eb3f9d4 100644 --- a/daemon/core/emane/emanemanager.py +++ b/daemon/core/emane/emanemanager.py @@ -698,8 +698,6 @@ class EmaneManager(ModelManager): self.initeventservice(shutdown=True) if self.eventmonthread is not None: - # TODO: fix this - self.eventmonthread._Thread__stop() self.eventmonthread.join() self.eventmonthread = None @@ -773,7 +771,7 @@ class EmaneManager(ModelManager): x = int(x) y = int(y) z = int(z) - logging.info( + logging.debug( "location event NEM %s (%s, %s, %s) -> (%s, %s, %s)", nemid, lat,