kopia lustrzana https://github.com/sq9atk/sr0wx
poprawka brakujących danych
rodzic
0ae13821e5
commit
fd57962959
|
@ -51,16 +51,19 @@ class AirPollutionSq9atk(SR0WXModule):
|
||||||
def getSensorValue(self, sensorId):
|
def getSensorValue(self, sensorId):
|
||||||
url = self.__service_url + self.__sensor_url + str(sensorId)
|
url = self.__service_url + self.__sensor_url + str(sensorId)
|
||||||
data = self.getJson(url)
|
data = self.getJson(url)
|
||||||
|
if data['values'][0]['value'] > 0: # czasem tu schodzi null
|
||||||
|
value = data['values'][0]['value']
|
||||||
|
else:
|
||||||
|
value = data['values'][1]['value']
|
||||||
return [
|
return [
|
||||||
data['key'],
|
data['key'],
|
||||||
data['values'][0]['value']
|
value
|
||||||
]
|
]
|
||||||
|
|
||||||
def getLevelIndexData(self):
|
def getLevelIndexData(self):
|
||||||
url = self.__service_url + self.__index_url + str(self.__station_id)
|
url = self.__service_url + self.__index_url + str(self.__station_id)
|
||||||
return self.getJson(url)
|
return self.getJson(url)
|
||||||
|
|
||||||
|
|
||||||
def getSensorsData(self):
|
def getSensorsData(self):
|
||||||
url = self.__service_url + self.__station_url + str(self.__station_id)
|
url = self.__service_url + self.__station_url + str(self.__station_id)
|
||||||
levelIndexArray = self.getLevelIndexData()
|
levelIndexArray = self.getLevelIndexData()
|
||||||
|
@ -70,14 +73,16 @@ class AirPollutionSq9atk(SR0WXModule):
|
||||||
if(value[1]>1): # czasem tu schodzi none
|
if(value[1]>1): # czasem tu schodzi none
|
||||||
qualityIndexName = self.mbstr2asci(value[0]) + "IndexLevel"
|
qualityIndexName = self.mbstr2asci(value[0]) + "IndexLevel"
|
||||||
if levelIndexArray.has_key(qualityIndexName):
|
if levelIndexArray.has_key(qualityIndexName):
|
||||||
index = levelIndexArray[qualityIndexName]
|
index = levelIndexArray[qualityIndexName]['indexLevelName']
|
||||||
sensors.append([
|
else:
|
||||||
row['id'],
|
index = 'empty'
|
||||||
qualityIndexName,
|
sensors.append([
|
||||||
self.mbstr2asci(row['param']['paramName']),
|
row['id'],
|
||||||
value[1],
|
qualityIndexName,
|
||||||
self.mbstr2asci(index['indexLevelName'])
|
self.mbstr2asci(row['param']['paramName']),
|
||||||
])
|
value[1],
|
||||||
|
self.mbstr2asci(index)
|
||||||
|
])
|
||||||
if len(sensors) > 0:
|
if len(sensors) > 0:
|
||||||
return sensors
|
return sensors
|
||||||
else:
|
else:
|
||||||
|
@ -85,20 +90,21 @@ class AirPollutionSq9atk(SR0WXModule):
|
||||||
|
|
||||||
def prepareMessage(self, data):
|
def prepareMessage(self, data):
|
||||||
levels = {
|
levels = {
|
||||||
'bardzo_dobry' :'poziom_bardzo_dobry',
|
'bardzo_dobry' :'poziom_bardzo_dobry _ ',
|
||||||
'dobry' :'poziom_dobry',
|
'dobry' :'poziom_dobry _ ',
|
||||||
'dostateczny' :'poziom_dostateczny',
|
'dostateczny' :'poziom_dostateczny _ ',
|
||||||
'umiarkowany' :'poziom_umiarkowany',
|
'umiarkowany' :'poziom_umiarkowany _ ',
|
||||||
'zly' :'poziom_zl_y', # ten jest chyba nieuzywany
|
'zly' :'poziom_zl_y _ ', # ten jest chyba nieuzywany
|
||||||
'zl_y' :'poziom_zl_y',
|
'zl_y' :'poziom_zl_y _ ',
|
||||||
'bardzo_zly' :'poziom_bardzo_zl_y', # ten też jest chyba nieuzywany
|
'bardzo_zly' :'poziom_bardzo_zl_y _ ', # ten też jest chyba nieuzywany
|
||||||
'bardzo_zl_y' :'poziom_bardzo_zl_y'
|
'bardzo_zl_y' :'poziom_bardzo_zl_y _ ',
|
||||||
|
'empty' : ''
|
||||||
}
|
}
|
||||||
message = " "
|
message = " "
|
||||||
for row in data:
|
for row in data:
|
||||||
message += " " + row[2]
|
message += " " + row[2]
|
||||||
message += " " + self.__language.read_micrograms( int(row[3]) )
|
message += " " + self.__language.read_micrograms( int(row[3]) )
|
||||||
message += " " + levels[row[4]] + ' _ '
|
message += " " + levels[row[4]]
|
||||||
return message
|
return message
|
||||||
|
|
||||||
|
|
||||||
|
@ -131,4 +137,3 @@ class AirPollutionSq9atk(SR0WXModule):
|
||||||
replace(u')',u'').replace(u'.',u'').\
|
replace(u')',u'').replace(u'.',u'').\
|
||||||
replace(u',',u'')
|
replace(u',',u'')
|
||||||
|
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue