daemon: renamed NodeData.node_type to type, removed NodeData/NodeOptions fields that were not being used for clarity

This commit is contained in:
Blake Harnden 2020-06-17 22:43:13 -07:00
parent a64047e221
commit b92ff0586a
7 changed files with 70 additions and 92 deletions

View file

@ -195,29 +195,26 @@ class NodeBase(abc.ABC):
"""
if self.apitype is None:
return None
x, y, _ = self.getposition()
model = self.type
server = None
if self.server is not None:
server = self.server.name
services = [service.name for service in self.services]
services = [x.name for x in self.services]
return NodeData(
message_type=message_type,
type=self.apitype,
id=self.id,
node_type=self.apitype,
name=self.name,
emulation_id=self.id,
model=model,
server=server,
canvas=self.canvas,
icon=self.icon,
opaque=self.opaque,
x_position=x,
y_position=y,
latitude=self.position.lat,
longitude=self.position.lon,
altitude=self.position.alt,
model=model,
server=server,
services=services,
source=source,
)