From da92ddf95afb0fef2e3d1e32d6badc8eef781331 Mon Sep 17 00:00:00 2001 From: Darren Jeffrey Date: Sat, 1 Apr 2023 14:53:35 -0600 Subject: [PATCH] Fixed file name and counting --- gedcom-to-map/gedcomVisualGUI.py | 5 +++-- gedcom-to-map/render/KmlExporter.py | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gedcom-to-map/gedcomVisualGUI.py b/gedcom-to-map/gedcomVisualGUI.py index 07cbd7a..8c082bb 100644 --- a/gedcom-to-map/gedcomVisualGUI.py +++ b/gedcom-to-map/gedcomVisualGUI.py @@ -1278,12 +1278,13 @@ def Run(self): logger.info("start do 2") if (self.gOptions.parsed): logger.info("doHTML or doKML") + fname = self.gOptions.Result if (self.gOptions.ResultHTML): doHTML(self.gOptions, self.humans) - self.AddInfo(f"HTML generated resulting in {self.gOptions.totalpeople} people") + self.AddInfo(f"HTML generated for {self.gOptions.totalpeople} people ({fname})") else: doKML(self.gOptions, self.humans) - self.AddInfo(f"KML File generated for {self.gOptions.totalpeople} people in %s", self.gOptions.get('Result')) + self.AddInfo(f"KML file generated for {self.gOptions.totalpeople} people/points ({fname})") else: logger.info("not parsed") logger.info("done draw") diff --git a/gedcom-to-map/render/KmlExporter.py b/gedcom-to-map/render/KmlExporter.py index 18f8baa..db9d82b 100644 --- a/gedcom-to-map/render/KmlExporter.py +++ b/gedcom-to-map/render/KmlExporter.py @@ -22,6 +22,7 @@ def __init__(self, gOp: gvOptions): self.gOp.Referenced = Referenced() random.seed() self.driftOn = True + self.gOp.totalpeople = 0 def driftPos(self, l : Pos): if not l or not self.driftOn: @@ -41,8 +42,8 @@ def export(self, main: Pos, lines: [Line], ntag =""): kml = simplekml.Kml() self.kml = kml if main: - kml.newpoint(name=(self.gOp.Name + ntag),coords=[ (main.lon, main.lat) ]) + self.gOp.totalpeople += 1 else: logger.error ("No GPS locations to generate a map.") @@ -53,9 +54,11 @@ def export(self, main: Pos, lines: [Line], ntag =""): if (line.a.lon and line.a.lat): kml.newpoint(name=line.name + ntag, coords=[self.driftPos(line.a)]) self.gOp.Referenced.add(line.human.xref_id, 'kml-a') + self.gOp.totalpeople += 1 if (line.b.lon and line.b.lat): kml.newpoint(name=line.name + ntag, coords=[self.driftPos(line.b)]) self.gOp.Referenced.add(line.human.xref_id, 'kml-b') + self.gOp.totalpeople += 1 if (line.a.lon and line.a.lat and line.b.lon and line.b.lat): kml_line = kml.newlinestring(name=line.name, coords=[self.driftPos(line.a), self.driftPos(line.b)]) kml_line.linestyle.color = line.color.to_hexa()