Skip to content

sync, 2019-01-06#43

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
yakra merged 5 commits into from
Jan 6, 2019
Merged

sync, 2019-01-06 #43

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a9a4b0
Strip `+` from .list labels
yakra Jan 2, 2019
e1eddf5
newline fix
yakra Jan 3, 2019
42e96b6
expand LABEL_INVALID_CHAR datacheck to AltLabels
yakra Jan 3, 2019
e752abd
Merge pull request #160 from yakra/TravelerList
jteresco Jan 3, 2019
103c84d
Merge pull request #161 from yakra/label_invalid_char
jteresco Jan 3, 2019
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
9 changes: 6 additions & 3 deletions siteupdate/python-teresco/siteupdate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,8 +1042,8 @@ def __init__(self,travelername,route_hash,path="../../../UserData/list_files"):
checking_index = 0;
for w in r.point_list:
lower_label = w.label.lower().strip("+*")
list_label_1 = fields[2].lower().strip("*")
list_label_2 = fields[3].lower().strip("*")
list_label_1 = fields[2].lower().strip("+*")
list_label_2 = fields[3].lower().strip("+*")
if list_label_1 == lower_label or list_label_2 == lower_label:
canonical_waypoints.append(w)
canonical_waypoint_indices.append(checking_index)
Expand DownExpand Up@@ -2891,7 +2891,7 @@ def run(self):
'These graphs contain all routes currently plotted in the Travel Mapping project.'])

# graphs restricted by place/area - from areagraphs.csv file
print(et.et() + "\nCreating area data graphs.", flush=True)
print("\n" + et.et() + "Creating area data graphs.", flush=True)
with open(args.highwaydatapath+"/graphs/areagraphs.csv", "rt",encoding='utf-8') as file:
lines = file.readlines()
lines.pop(0); # ignore header line
Expand DownExpand Up@@ -3202,6 +3202,9 @@ def run(self):
# look for labels with invalid characters
if not re.fullmatch('[a-zA-Z0-9()/\+\*_\-\.]+', w.label):
datacheckerrors.append(DatacheckEntry(r,[w.label],'LABEL_INVALID_CHAR'))
for a in w.alt_labels:
if not re.fullmatch('[a-zA-Z0-9()/\+\*_\-\.]+', a):
datacheckerrors.append(DatacheckEntry(r,[a],'LABEL_INVALID_CHAR'))

# look for labels with a slash after an underscore
if '_' in w.label and '/' in w.label and \
Expand Down