Fix iid and cid

This commit is contained in:
Klaus-Uwe Mitterer 2017-09-25 22:15:36 +02:00
parent 7341b69ebf
commit a6ff5fe157

View file

@ -117,7 +117,7 @@ class Service:
def json(self, indent = 0, iid = False, name = True, depst = True, deptime = True, arrst = True, arrtime = True, deppf = True, currdep = True, arrpf = True, curarr = True, duration = True, dest = True, stationkwargs = {}):
out = " " * indent + "{\n"
out += (" " * indent + " \"@id\": %i,\n" % iid) if iid else ""
out += (" " * indent + " \"@id\": %i,\n" % iid) if iid is not False else ""
out += (" " * indent + " \"name\": \"%s\",\n" % self.name) if name else ""
out += (" " * indent + " \"destination\": \"%s\",\n" % self.dest.name) if dest and self.dest else ""
@ -268,7 +268,7 @@ class Connection:
def json(self, indent = 0, cid = False, frm = True, to = True, deptime = True, arrtime = True, duration = True, changes = True, services = True, servicekwargs = {}, stationkwargs = {}):
out = " " * indent + "{\n"
out += (" " * indent + " \"@id\": %i,\n" % cid) if cid else ""
out += (" " * indent + " \"@id\": %i,\n" % cid) if cid is not False else ""
if frm:
out += " " * indent + " \"from\":\n"