From e7f2f9d0fab1982396bb8e7901e37b8cc26bc0fd Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Mon, 29 Oct 2018 19:01:44 -0400 Subject: [PATCH 1/2] deterministic HIDDEN_JUNCTION entries only for > 2 incident_collapsed_edges, to avoid dual-reporting HIDDEN_TERMINUS entries --- siteupdate/python-teresco/siteupdate.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index 375ae786..96aef925 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -1577,8 +1577,11 @@ def __init__(self, all_waypoints, highway_systems, datacheckerrors): # compress edges adjacent to hidden vertices for label, vinfo in self.vertices.items(): if vinfo.is_hidden: - if len(vinfo.incident_collapsed_edges) != 2: - datacheckerrors.append(DatacheckEntry(vinfo.first_waypoint.route,[vinfo.unique_name],"HIDDEN_JUNCTION",str(len(vinfo.incident_collapsed_edges)))) + if len(vinfo.incident_collapsed_edges) < 2: + continue + if len(vinfo.incident_collapsed_edges) > 2: + dc_waypoint = sorted(vinfo.first_waypoint.colocated, key=lambda waypoint: waypoint.route.root + "@" + waypoint.label)[0] + datacheckerrors.append(DatacheckEntry(dc_waypoint.route,[dc_waypoint.label],"HIDDEN_JUNCTION",str(len(vinfo.incident_collapsed_edges)))) vinfo.is_hidden = False continue # construct from vertex_info this time From b642e06489e6e51a482b9af991f704298e4501db Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Thu, 1 Nov 2018 22:35:48 -0400 Subject: [PATCH 2/2] unhide hidden termini in graphs --- siteupdate/python-teresco/siteupdate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index 96aef925..c04f07bc 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -1578,6 +1578,8 @@ def __init__(self, all_waypoints, highway_systems, datacheckerrors): for label, vinfo in self.vertices.items(): if vinfo.is_hidden: if len(vinfo.incident_collapsed_edges) < 2: + # these cases are flagged as HIDDEN_TERMINUS + vinfo.is_hidden = False continue if len(vinfo.incident_collapsed_edges) > 2: dc_waypoint = sorted(vinfo.first_waypoint.colocated, key=lambda waypoint: waypoint.route.root + "@" + waypoint.label)[0]