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

Merge pull request #80 from alexey-zakharenkov/fix-platform-counting

Browse source 
Fix platform counting
This commit is contained in:
Sergey Yershov 2019-07-16 17:10:51 +03:00 • committed by GitHub
commit 226ae68b09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
subway_structure.py
View file

@ -386,9 +386,14 @@ class RouteStop:
self.can_enter = False
self.can_exit = False
self.seen_stop = False
self.seen_platform = False
self.seen_platform_entry = False
self.seen_platform_exit = False
self.seen_station = False
@property
def seen_platform(self):
return self.seen_platform_entry or self.seen_platform_exit
@staticmethod
def get_member_type(el, role, modes):
if StopArea.is_stop(el):
@ -444,8 +449,18 @@ class RouteStop:
multiple_check = False
el_type = RouteStop.get_member_type(el, role, city.modes)
if el_type == 'platform':
multiple_check = self.seen_platform
self.seen_platform = True
if role == 'platform_entry_only':
multiple_check = self.seen_platform_entry
self.seen_platform_entry = True
elif role == 'platform_exit_only':
multiple_check = self.seen_platform_exit
self.seen_platform_exit = True
else:
if role != 'platform' and 'stop' not in role:
city.warn("Platform with invalid role '{}' in a route".format(role), el)
multiple_check = self.seen_platform
self.seen_platform_entry = True
self.seen_platform_exit = True
elif el_type == 'stop':
multiple_check = self.seen_stop
self.seen_stop = True
@ -1216,7 +1231,7 @@ class City:
len(unused), format_elid_list(unused)))
if not_in_sa:
self.warn('{} subway entrances are not in stop_area relations: {}'.format(
len(not_in_sa), format_elid_list(not_in_sa))
len(not_in_sa), format_elid_list(not_in_sa)))
def check_return_routes(self, rmaster):
variants = {}