organicmaps/subways
13
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity Actions

Recover after 'Item is not in dataset' exception to continue validating other cities

Browse source
This commit is contained in:
Alexey Zakharenkov 2019-07-02 11:46:27 +03:00
parent 1975f10ee3
commit 5e347b09a1
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
process_subways.py
View file

@ -22,6 +22,7 @@ from subway_structure import (
get_unused_entrances_geojson,
MODES_OVERGROUND,
MODES_RAPID,
StopperException,
)
@ -157,7 +158,10 @@ if __name__ == '__main__':
logging.info('Building routes for each city')
good_cities = []
for c in cities:
c.extract_routes()
try:
c.extract_routes()
except StopperException as e:
logging.error("Critical validation error: %s", str(e))
c.validate()
if c.is_good():
good_cities.append(c)

32
subway_structure.py
View file

@ -32,6 +32,11 @@ NOWHERE_STOP = (0, 0) # too far away from any metro system
used_entrances = set()
class StopperException(Exception):
"""Is thrown if a critical validation error occurs
that prevents further validation."""
def el_id(el):
if not el:
return None
@ -706,9 +711,10 @@ class Route:
if 'stop' in m['role'] or 'platform' in m['role']:
city.error('{} {} {} for route relation is not in the dataset'.format(
m['role'], m['type'], m['ref']), relation)
raise Exception('Stop or platform {} {} in relation {} '
'is not in the dataset for {}'.format(
m['type'], m['ref'], relation['id'], city.name))
raise StopperException(
'Stop or platform {} {} in relation {} '
'is not in the dataset for {}'.format(
m['type'], m['ref'], relation['id'], city.name))
continue
el = city.elements[k]
if 'tags' not in el:
@ -1152,17 +1158,17 @@ class City:
'name': self.name,
'country': self.country,
'continent': self.continent,
'stations_found': self.found_stations,
'transfers_found': self.found_interchanges,
'unused_entrances': self.unused_entrances,
'networks': self.found_networks,
'stations_found': getattr(self, 'found_stations', 0),
'transfers_found': getattr(self, 'found_interchanges', 0),
'unused_entrances': getattr(self, 'unused_entrances', 0),
'networks': getattr(self, 'found_networks', 0)
}
if not self.overground:
result.update({
'subwayl_expected': self.num_lines,
'lightrl_expected': self.num_light_lines,
'subwayl_found': self.found_lines,
'lightrl_found': self.found_light_lines,
'subwayl_found': getattr(self, 'found_lines', 0),
'lightrl_found': getattr(self, 'found_light_lines', 0),
'stations_expected': self.num_stations,
'transfers_expected': self.num_interchanges,
})
@ -1174,10 +1180,10 @@ class City:
'trolleybusl_expected': self.num_trolleybus_lines,
'traml_expected': self.num_tram_lines,
'otherl_expected': self.num_other_lines,
'busl_found': self.found_bus_lines,
'trolleybusl_found': self.found_trolleybus_lines,
'traml_found': self.found_tram_lines,
'otherl_found': self.found_other_lines,
'busl_found': getattr(self, 'found_bus_lines', 0),
'trolleybusl_found': getattr(self, 'found_trolleybus_lines', 0),
'traml_found': getattr(self, 'found_tram_lines', 0),
'otherl_found': getattr(self, 'found_other_lines', 0)
})
result['warnings'] = self.warnings
result['errors'] = self.errors