Skip to content

Commit

Permalink
Add adapter for OpenAQ
Browse files Browse the repository at this point in the history
  • Loading branch information
amotl committed Jan 8, 2020
1 parent 477f6c3 commit 15b117a
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Expand Up @@ -7,6 +7,11 @@ in progress
===========


2020-01-08 0.20.0
=================
- Add adapter for OpenAQ


2019-12-09 0.19.1
=================
- Fix invalid JSON file export for stations list (#17). Thanks, David!
Expand Down
10 changes: 7 additions & 3 deletions README.rst
Expand Up @@ -26,9 +26,10 @@ Luftdatenpumpe
*****
About
*****
Process live and historical data from `luftdaten.info`_. Filter by station-id, sensor-id
and sensor-type, apply reverse geocoding, store into TSDB_ and RDBMS_ databases
(InfluxDB_ and PostGIS_), publish to MQTT_ or just output as JSON.
Process live and historical data from `luftdaten.info`_, irceline_ and OpenAQ_.
Filter by station-id, sensor-id and sensor-type, apply reverse geocoding,
store into TSDB_ and RDBMS_ databases (InfluxDB_ and PostGIS_),
publish to MQTT_ or just output as JSON.

.. figure:: https://cdn.jsdelivr.net/gh/hiveeyes/luftdatenpumpe@master/doc/logo.svg
:target: https://github.com/hiveeyes/luftdatenpumpe
Expand Down Expand Up @@ -201,6 +202,9 @@ Icons and pictograms


.. _luftdaten.info: https://luftdaten.info/
.. _irceline: http://www.irceline.be/en/documentation/open-data
.. _OpenAQ: https://openaq.org/

.. _Luftdatenpumpe: https://github.com/hiveeyes/luftdatenpumpe

.. _Testimonials for Luftdatenpumpe: https://github.com/hiveeyes/luftdatenpumpe/blob/master/doc/testimonials.rst
Expand Down
2 changes: 1 addition & 1 deletion luftdatenpumpe/commands.py
Expand Up @@ -15,7 +15,7 @@

log = logging.getLogger(__name__)

network_list = ['ldi', 'irceline']
network_list = ['ldi', 'irceline', 'openaq']


def run():
Expand Down
6 changes: 4 additions & 2 deletions luftdatenpumpe/grafana/doc/about-luftdatenpumpe.md
@@ -1,7 +1,7 @@
## About Luftdatenpumpe

#### Features
- **Data sources**: [luftdaten.info] (LDI), [IRCELINE]
- **Data sources**: [luftdaten.info] (LDI), [IRCELINE], [OpenAQ]
- **Production**: [Luftdatenpumpe]
- **Development**: [Erneuerung der Luftdatenpumpe], [LDI data plane v2]. All contributions welcome.
- **Composition**: [The Hiveeyes Project]. Developing a flexible beehive monitoring infrastructure.
Expand All @@ -19,7 +19,9 @@
Enjoy exploring and stay curious.

[luftdaten.info]: http://luftdaten.info/
[IRCELINE]: https://github.com/irceline/open_data
[IRCELINE]: http://www.irceline.be/en/documentation/open-data
[OpenAQ]: https://openaq.org/

[Luftdatenpumpe]: https://github.com/hiveeyes/luftdatenpumpe
[Erneuerung der Luftdatenpumpe]: https://community.hiveeyes.org/t/erneuerung-der-luftdatenpumpe/1199
[LDI data plane v2]: https://community.hiveeyes.org/t/ldi-data-plane-v2/1412
Expand Down
4 changes: 4 additions & 0 deletions luftdatenpumpe/source/__init__.py
Expand Up @@ -9,6 +9,7 @@
from luftdatenpumpe.source.luftdaten_info import LuftdatenPumpe
from luftdatenpumpe.source.irceline import IrcelinePumpe
from luftdatenpumpe.source.eea import EEAAirQualityPumpe
from luftdatenpumpe.source.openaq import OpenAQPumpe
from luftdatenpumpe.util import read_list

log = logging.getLogger(__name__)
Expand All @@ -27,6 +28,9 @@ def resolve_source_handler(options, dry_run=False):
elif options.network == 'eea':
datapump_class = EEAAirQualityPumpe

elif options.network == 'openaq':
datapump_class = OpenAQPumpe

else:
message = f'Network "{options.network}" not implemented'
log.error(message)
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Expand Up @@ -17,6 +17,7 @@
# Acquisition
'requests==2.21.0',
'tablib[pandas]==0.13.0',
'py-openaq==1.1.0',

# Caching
'requests-cache==0.5.0',
Expand Down Expand Up @@ -70,6 +71,7 @@
"Intended Audience :: Science/Research",
"Intended Audience :: System Administrators",
"Intended Audience :: Telecommunications Industry",
"Programming Language :: Python",
"Topic :: Communications",
"Topic :: Database",
"Topic :: Internet",
Expand All @@ -93,7 +95,7 @@
author='Andreas Motl',
author_email='andreas@hiveeyes.org',
url='https://github.com/hiveeyes/luftdatenpumpe',
keywords='luftdaten.info irceline '
keywords='luftdaten.info irceline openaq '
'air quality particulate matter pollution '
'feinstaub luftdaten '
'ogc sos '
Expand Down

0 comments on commit 15b117a

Please sign in to comment.