fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add _sorted_locations to iteratively sort

Browse source
This commit is contained in:
Sean Breckenridge 2022-04-26 12:47:41 -07:00
parent 61e84bd874
commit c7dc29e225
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
my/time/tz/via_location.py
View file

@ -74,14 +74,21 @@ def _locations() -> Iterator[Tuple[LatLon, datetime]]:
for gloc in my.location.google.locations(): for gloc in my.location.google.locations():
yield ((gloc.lat, gloc.lon), gloc.dt) yield ((gloc.lat, gloc.lon), gloc.dt)
# TODO: could use heapmerge or sort the underlying iterators somehow?
# see https://github.com/karlicoss/HPI/pull/237#discussion_r858372934
def _sorted_locations() -> List[Tuple[LatLon, datetime]]:
return list(sorted(_locations(), key=lambda x: x[1]))
# Note: since _locations isn't sorted, this is not sorted either
# Note: this takes a while, as the upstream since _locations isn't sorted, so this
# has to do an iterative sort of the entire my.locations.all list
def _iter_local_dates() -> Iterator[DayWithZone]: def _iter_local_dates() -> Iterator[DayWithZone]:
finder = _timezone_finder(fast=config.fast) # rely on the default finder = _timezone_finder(fast=config.fast) # rely on the default
pdt = None #pdt = None
# TODO: warnings doesnt actually warn?
warnings = [] warnings = []
# todo allow to skip if not noo many errors in row? # todo allow to skip if not noo many errors in row?
for (lat, lon), dt in _locations(): for (lat, lon), dt in _sorted_locations():
# TODO right. its _very_ slow... # TODO right. its _very_ slow...
zone = finder.timezone_at(lat=lat, lng=lon) zone = finder.timezone_at(lat=lat, lng=lon)
if zone is None: if zone is None:
@ -91,12 +98,12 @@ def _iter_local_dates() -> Iterator[DayWithZone]:
# TODO this is probably a bit expensive... test & benchmark # TODO this is probably a bit expensive... test & benchmark
ldt = dt.astimezone(tz) ldt = dt.astimezone(tz)
ndate = ldt.date() ndate = ldt.date()
if pdt is not None and ndate < pdt.date(): #if pdt is not None and ndate < pdt.date():
# TODO for now just drop and collect the stats # # TODO for now just drop and collect the stats
# I guess we'd have minor drops while air travel... # # I guess we'd have minor drops while air travel...
warnings.append("local time goes backwards {ldt} ({tz}) < {pdt}") # warnings.append("local time goes backwards {ldt} ({tz}) < {pdt}")
continue # continue
pdt = ldt #pdt = ldt
z = tz.zone; assert z is not None z = tz.zone; assert z is not None
yield DayWithZone(day=ndate, zone=z) yield DayWithZone(day=ndate, zone=z)