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

Take into account that two route itineraries may have the same stop sequence and differ only by interval

Browse source
This commit is contained in:
Alexey Zakharenkov 2020-07-30 21:59:38 +03:00 • committed by Maksim Andrianov
parent 9b74358c1b
commit 3a2d2d9d4d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
checkers/common.py
View file

@ -1,7 +1,6 @@
import logging
import math
import functools
from itertools import chain
"""A coordinate of a station precision of which we must take into account
@ -22,6 +21,11 @@ def osm_id_comparator(el):
return (el['osm_type'], el['osm_id'])
def itinerary_comparator(itinerary):
"This function is used as key for sorting itineraries in a route"""
return (itinerary['stops'], itinerary['interval'])
def compare_stops(stop0, stop1):
"""Compares json of two stops in route"""
stop_keys = ('name', 'int_name', 'id', 'osm_id', 'osm_type')
@ -119,10 +123,8 @@ def compare_networks(network0, network1):
route0['route_id'], route0_props, route1_props)
return False
itineraries0 = sorted(route0['itineraries'],
key=lambda x: tuple(chain(*x['stops'])))
itineraries1 = sorted(route1['itineraries'],
key=lambda x: tuple(chain(*x['stops'])))
itineraries0 = sorted(route0['itineraries'], key=itinerary_comparator)
itineraries1 = sorted(route1['itineraries'], key=itinerary_comparator)
for itin0, itin1 in zip(itineraries0, itineraries1):
if itin0['interval'] != itin1['interval']: