Skip to content

system graphs: prevent crash when system(s) commented out#127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jteresco merged 2 commits into from
Nov 13, 2018
Merged

system graphs: prevent crash when system(s) commented out #127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76f63bd
Merge pull request #20 from TravelMapping/master
yakra Nov 12, 2018
2c9d199
system graphs: prevent crash...
yakra Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions siteupdate/python-teresco/siteupdate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2856,19 +2856,22 @@ def run(self):

# We will create graph data and a graph file for only a few interesting
# systems, as many are not useful on their own
h = None
for hname in ['usai', 'usaus', 'cantch', 'eure']:
h = None
for hs in highway_systems:
if hs.systemname == hname:
h = hs
break
print(h.systemname + ' ', end="",flush=True)
(sv, se) = graph_data.write_subgraph_tmg_simple(args.graphfilepath + '/' + h.systemname + '-system-simple.tmg', None, [ h ], None)
(cv, ce) = graph_data.write_subgraph_tmg_collapsed(args.graphfilepath + '/' + h.systemname + '-system.tmg', None, [ h ], None)
graph_list.append(GraphListEntry(h.systemname + '-system-simple.tmg', h.systemname + ' (' + h.fullname + ')', sv, se, 'simple', 'system'))
graph_list.append(GraphListEntry(h.systemname + '-system.tmg', h.systemname + ' (' + h.fullname + ')', cv, ce, 'collapsed', 'system'))
graph_types.append(['system', 'Routes Within a Single Highway System',
'These graphs contain the routes within a single highway system and are not restricted by region.'])
if h is not None:
print(h.systemname + ' ', end="",flush=True)
(sv, se) = graph_data.write_subgraph_tmg_simple(args.graphfilepath + '/' + h.systemname + '-system-simple.tmg', None, [ h ], None)
(cv, ce) = graph_data.write_subgraph_tmg_collapsed(args.graphfilepath + '/' + h.systemname + '-system.tmg', None, [ h ], None)
graph_list.append(GraphListEntry(h.systemname + '-system-simple.tmg', h.systemname + ' (' + h.fullname + ')', sv, se, 'simple', 'system'))
graph_list.append(GraphListEntry(h.systemname + '-system.tmg', h.systemname + ' (' + h.fullname + ')', cv, ce, 'collapsed', 'system'))
if h is not None:
graph_types.append(['system', 'Routes Within a Single Highway System',
'These graphs contain the routes within a single highway system and are not restricted by region.'])
print("!")

# Some additional interesting graphs, the "multisystem" graphs
Expand Down