метео данные eop2m

fte/lib/libpy/fileFactory.py

@@ -452,18 +452,18 @@ meteo = {
 							"data":{
 								"type": "object",
 								"required": [
-									"precipitation","date","precipitation_last_24h","pressure","wind_dir","ambient_t",
+									"precipitation","date","pressure","wind_dir","ambient_t",
 									"sky_t","dew_point","ambient_hum","wind_speed"
 								],
 								"properties": {
 									"date": {"$ref": "#/$defs/timestamp"},
-									"precipitation": {"type": "number"},
-									"precipitation_last_24h": {"type": "number"},
-									"pressure": {"type": "number"},
-									"ambient_t": {"type": "number"},
-									"ambient_hum": {"type": "number"},
-									"wind_dir": {"type": "number"},
-									"wind_speed": {"type": "number"},
+									"precipitation": {"$ref": "#/$defs/number"},
+									"precipitation_last_24h": {"$ref": "#/$defs/number"},
+									"pressure": {"$ref": "#/$defs/number"},
+									"ambient_t": {"$ref": "#/$defs/number"},
+									"ambient_hum": {"$ref": "#/$defs/number"},
+									"wind_dir": {"$ref": "#/$defs/number"},
+									"wind_speed": {"$ref": "#/$defs/number"},
 									"sky_t": {"$ref": "#/$defs/number"},
 									"dew_point": {"$ref": "#/$defs/number"}
 								}
@@ -484,12 +484,7 @@ meteo = {
 	},
 	"$defs": {
 		"timestamp": {"type" : "string","pattern" : "^(\\d{4})-(\\d{2})-(\\d{2})([T ](\\d{2}):(\\d{2})(:(\\d{2}(?:\\.\\d+)?))?)?$"},
-		"number":{
-			"anyOf" : [
-				{ "type": "number"},
-				{ "type" : "null"}
-			]
-		}
+		"number":{ "anyOf" : [{ "type": "number"},{ "type" : "null"}]}
 	}
 }
 factory.register_file('M2M',   _create_m2mFile,    schema=meteo)

fte/lib/libpy/meteoFile.py

@@ -236,7 +236,7 @@ class eop2mFile(meteoBaseFile):
 				tm = datetime.fromisoformat(r['data']['date']).replace(microsecond=0)
 				self.tbeg, self.tend = min(self.tbeg,tm), max(self.tend,tm)
 				d = r['data']
-				row = '{{{}}}'.format(','.join(map(_cnv,[d[k] for k in atypes.keys()])))
+				row = '{{{}}}'.format(','.join(map(_cnv,[d.get(k) for k in atypes.keys()])))
 				self.write(fo,(tm,dev,row))
 
 		self.fid = await self.getfid()