mirror
/
ogn-python
kopia lustrzana https://github.com/glidernet/ogn-python
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Better receiver update informations

pull/52/head
Konstantin Gründger 2016-06-01 08:36:14 +02:00
rodzic 2b59894664
commit 69cce3a57b
1 zmienionych plików z 20 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

35
ogn/collect/receiver.py
Wyświetl plik

@ -1,6 +1,6 @@
from sqlalchemy.sql import func, null from sqlalchemy.sql import func, null
from sqlalchemy.sql.functions import coalesce from sqlalchemy.sql.functions import coalesce
from sqlalchemy import and_, not_ from sqlalchemy import and_, not_, or_
from celery.utils.log import get_task_logger from celery.utils.log import get_task_logger
@ -25,6 +25,7 @@ def update_receivers():
.group_by(ReceiverBeacon.name) \ .group_by(ReceiverBeacon.name) \
.subquery() .subquery()
# update receivers
receivers_to_update = app.session.query(ReceiverBeacon.name, receivers_to_update = app.session.query(ReceiverBeacon.name,
ReceiverBeacon.location_wkt, ReceiverBeacon.location_wkt,
ReceiverBeacon.altitude, ReceiverBeacon.altitude,
@ -35,26 +36,24 @@ def update_receivers():
ReceiverBeacon.timestamp == last_receiver_beacon_sq.columns.lastseen)) \ ReceiverBeacon.timestamp == last_receiver_beacon_sq.columns.lastseen)) \
.subquery() .subquery()
# set country code to None if lat or lon changed # ... set country code to None if lat or lon changed
count = app.session.query(Receiver) \ changed_count = app.session.query(Receiver) \
.filter(and_(Receiver.name == receivers_to_update.columns.name, .filter(Receiver.name == receivers_to_update.columns.name) \
not_(func.ST_Equals(Receiver.location_wkt, receivers_to_update.columns.location)))) \ .filter(or_(not_(func.ST_Equals(Receiver.location_wkt, receivers_to_update.columns.location)),
and_(Receiver.location_wkt == null(),
receivers_to_update.columns.location != null()))) \
.update({"location_wkt": receivers_to_update.columns.location, .update({"location_wkt": receivers_to_update.columns.location,
"country_code": null()}, "country_code": null()},
synchronize_session=False) synchronize_session=False)
logger.info("Count of receivers who changed lat or lon: {}".format(count)) # ... and update altitude, lastseen, version and platform
update_count = app.session.query(Receiver) \
# update lastseen of known receivers
count = app.session.query(Receiver) \
.filter(Receiver.name == receivers_to_update.columns.name) \ .filter(Receiver.name == receivers_to_update.columns.name) \
.update({"altitude": receivers_to_update.columns.altitude, .update({"altitude": receivers_to_update.columns.altitude,
"lastseen": receivers_to_update.columns.lastseen, "lastseen": receivers_to_update.columns.lastseen,
"version": receivers_to_update.columns.version, "version": receivers_to_update.columns.version,
"platform": receivers_to_update.columns.platform}) "platform": receivers_to_update.columns.platform})
logger.info("Count of receivers who where updated: {}".format(count))
# add new receivers # add new receivers
empty_sq = app.session.query(ReceiverBeacon.name, empty_sq = app.session.query(ReceiverBeacon.name,
ReceiverBeacon.location_wkt, ReceiverBeacon.location_wkt,
@ -88,21 +87,25 @@ def update_receivers():
.group_by(Receiver.name) \ .group_by(Receiver.name) \
.subquery() .subquery()
count = app.session.query(Receiver) \ added_count = app.session.query(Receiver) \
.filter(Receiver.name == firstseen_null_query.columns.name) \ .filter(Receiver.name == firstseen_null_query.columns.name) \
.update({'firstseen': firstseen_null_query.columns.firstseen}) .update({'firstseen': firstseen_null_query.columns.firstseen})
logger.info("Total: {} receivers added".format(count))
# update country code if None # update country code if None
unknown_country_query = app.session.query(Receiver) \ unknown_country_query = app.session.query(Receiver) \
.filter(Receiver.country_code == null()) \ .filter(Receiver.country_code == null()) \
.filter(Receiver.location_wkt != null()) \
.order_by(Receiver.name) .order_by(Receiver.name)
for receiver in unknown_country_query.all(): for receiver in unknown_country_query.all():
location = receiver.location location = receiver.location
if location is not None: country_code = get_country_code(location.latitude, location.longitude)
receiver.country_code = get_country_code(location.latitude, location.longitude) if country_code is not None:
if receiver.country_code is not None: receiver.country_code = country_code
logger.info("Updated country_code for {} to {}".format(receiver.name, receiver.country_code)) logger.info("Updated country_code for {} to {}".format(receiver.name, receiver.country_code))
logger.info("Added: {}, location changed: {}".format(added_count, changed_count))
app.session.commit() app.session.commit()
return update_count