nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

velib: add longitude,latitude coordinates attributes to sensors

Browse source
This commit is contained in:
Vincent A 2013-11-05 09:52:18 +01:00 • committed by Florent
commit 60dc02e30f
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/velib/backend.py
View file

@ -19,6 +19,7 @@
from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.capabilities.base import StringField
from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge, GaugeMeasure, SensorNotFound from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge, GaugeMeasure, SensorNotFound
from weboob.tools.value import Value from weboob.tools.value import Value
@ -43,6 +44,11 @@ class BikeMeasure(GaugeMeasure):
return '<GaugeMeasure level=%d>' % self.level return '<GaugeMeasure level=%d>' % self.level
class BikeSensor(GaugeSensor):
longitude = StringField('Longitude of the sensor')
latitude = StringField('Latitude of the sensor')
class VelibBackend(BaseBackend, ICapGauge): class VelibBackend(BaseBackend, ICapGauge):
NAME = 'velib' NAME = 'velib'
DESCRIPTION = (u'City bike renting availability information.\nCities: %s' % DESCRIPTION = (u'City bike renting availability information.\nCities: %s' %
@ -71,10 +77,12 @@ class VelibBackend(BaseBackend, ICapGauge):
def _make_sensor(self, sensor_type, info, gauge): def _make_sensor(self, sensor_type, info, gauge):
id = '%s.%s' % (sensor_type, gauge.id) id = '%s.%s' % (sensor_type, gauge.id)
sensor = GaugeSensor(id) sensor = BikeSensor(id)
sensor.gaugeid = gauge.id sensor.gaugeid = gauge.id
sensor.name = SENSOR_TYPES[sensor_type] sensor.name = SENSOR_TYPES[sensor_type]
sensor.address = unicode(info['address']) sensor.address = unicode(info['address'])
sensor.longitude = info['longitude']
sensor.latitude = info['latitude']
sensor.history = [] sensor.history = []
return sensor return sensor

3
modules/velib/browser.py
View file

@ -63,4 +63,7 @@ class VelibBrowser(BaseBrowser):
jgauge['id'] = '%s.%s' % (jgauge['number'], jgauge['contract_name']) jgauge['id'] = '%s.%s' % (jgauge['number'], jgauge['contract_name'])
jgauge['city'] = jgauge['contract_name'] jgauge['city'] = jgauge['contract_name']
jgauge['last_update'] = datetime.datetime.fromtimestamp(jgauge['last_update'] / 1000) jgauge['last_update'] = datetime.datetime.fromtimestamp(jgauge['last_update'] / 1000)
jgauge['latitude'] = str(jgauge['position']['lat'])
jgauge['longitude'] = str(jgauge['position']['lng'])
del jgauge['position']
return jgauge return jgauge