Changeset - 6e0ef130f073
[Not reviewed]
default
0 1 0
Dennis Fink - 5 years ago 2020-04-25 13:43:13
dennis.fink@c3l.lu
Fix barometer unit in v13 and v14
1 file changed with 4 insertions and 1 deletions:
0 comments (0 inline, 0 general)
spaceapi/sensors.py
Show inline comments
 
@@ -13,55 +13,58 @@ from .utils import first, fuzzy_list_fin
 
sensors_views = Blueprint("sensors", __name__)
 

	
 
ALLOWED_SENSORS_KEYS = json.load(
 
    open(resource_filename("spaceapi", "schema/sensors.json"), encoding="utf-8")
 
)
 

	
 
RADIATON_SUBKEYS = frozenset(("alpha", "beta", "gamma", "beta_gamma"))
 

	
 
get_identification_key = partial(first, keys=frozenset(("name", "location")))
 

	
 

	
 
def set_value(data, key):
 

	
 
    active = ActiveStatus()
 
    active_v14 = ActiveStatusv14()
 

	
 
    try:
 
        subkey = get_identification_key(data)
 
    except ValueError:
 
        current_app.logger.error("Subkey Error")
 
        return abort(400)
 

	
 
    try:
 
        index = fuzzy_list_find(active["sensors"][key], subkey, data[subkey])
 
        if key == "barometer":
 
            data["unit"] == "hPA"
 
        active["sensors"][key][index].update(data)
 
    except ValueError:
 
        active["sensors"][key].append(data)
 

	
 
    try:
 

	
 
        index_v14 = fuzzy_list_find(active_v14["sensors"][key], subkey, data[subkey])
 
        if key == "barometer":
 
            data["unit"] = "hPa"
 
        active_v14["sensors"][key][index].update(data)
 
    except ValueError:
 
        active_v14["sensors"][key].append(data)
 

	
 
    return jsonify(active)
 

	
 

	
 
def set_radiation_value(data):
 

	
 
    active = ActiveStatus()
 

	
 
    radiation_keys = [k for k in RADIATON_SUBKEYS if k in data]
 

	
 
    if not radiation_keys:
 
        return abort(400)
 

	
 
    for first_subkey in radiation_keys:
 

	
 
        try:
 
            second_subkey = get_identification_key(data[first_subkey])
 
        except ValueError:
 
            return abort(400)
 

	
 
        try:
0 comments (0 inline, 0 general)