Skip to content
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

Bugfix: check for NoneType in OSM Connector #124

Merged
merged 1 commit into from
Mar 1, 2018
Merged

Bugfix: check for NoneType in OSM Connector #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions osm2gtfs/core/osm_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,9 @@ def get_routes(self, refresh=False):
# Create Itinerary objects from member route variants
if member.ref in route_variants:
rv = route_variants.pop(member.ref)
itineraries[rv.id] = self._build_itinerary(rv, result,
route_master)
itinerary = self._build_itinerary(rv, result, route_master)
if itinerary is not None:
itineraries[rv.id] = itinerary

# Route variant was already used or is not valid
else:
Expand All @@ -145,8 +146,9 @@ def get_routes(self, refresh=False):
sys.stderr.write("Itinerary was assigned again:\n")
sys.stderr.write(
"https://osm.org/relation/" + str(rv.id) + "\n")
itineraries[rv.id] = self._build_itinerary(rv, result,
route_master)
itinerary = self._build_itinerary(rv, result, route_master)
if itinerary is not None:
itineraries[rv.id] = itinerary
else:
sys.stderr.write(
"Warning: This relation route master:\n")
Expand All @@ -160,6 +162,9 @@ def get_routes(self, refresh=False):
# Create Line object from route master
line = self._build_line(route_master, itineraries)

if line is None:
continue

# Make sure route_id (ref) number is not already taken
if line.route_id in self.routes:
sys.stderr.write("'Ref' of route_master already taken\n")
Expand Down Expand Up @@ -189,7 +194,8 @@ def get_routes(self, refresh=False):
itineraries = OrderedDict()
itineraries[itinerary.osm_id] = itinerary
line = self._build_line(route_variant, itineraries)
self.routes[line.route_id] = line
if line is not None:
self.routes[line.route_id] = line

# Cache data
Cache.write_data(self.selector + '-routes', self.routes)
Expand Down Expand Up @@ -286,6 +292,16 @@ def _build_line(self, route_master, itineraries):

"""
osm_type = "relation"

if len(itineraries) == 0:
sys.stderr.write(
"Relation without valid members. Please fix in OpenStreetMap\n")
sys.stderr.write(
"https://osm.org/relation/" + str(route_master.id) + "\n")
sys.stderr.write(
"Skipping whole route without valid members.\n")
return None

if 'ref' in route_master.tags:
ref = route_master.tags['ref']
else:
Expand Down