Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solvers-acuk-m
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Takhir Fakhrutdinov
solvers-acuk-m
Commits
5aba3e33
Commit
5aba3e33
authored
Oct 28, 2022
by
Takhir Fakhrutdinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
метео данные eop2m
parent
b3f51337
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
15 deletions
+10
-15
fileFactory.py
fte/lib/libpy/fileFactory.py
+9
-14
meteoFile.py
fte/lib/libpy/meteoFile.py
+1
-1
No files found.
fte/lib/libpy/fileFactory.py
View file @
5aba3e33
...
@@ -452,18 +452,18 @@ meteo = {
...
@@ -452,18 +452,18 @@ meteo = {
"data"
:{
"data"
:{
"type"
:
"object"
,
"type"
:
"object"
,
"required"
:
[
"required"
:
[
"precipitation"
,
"date"
,
"pre
cipitation_last_24h"
,
"pre
ssure"
,
"wind_dir"
,
"ambient_t"
,
"precipitation"
,
"date"
,
"pressure"
,
"wind_dir"
,
"ambient_t"
,
"sky_t"
,
"dew_point"
,
"ambient_hum"
,
"wind_speed"
"sky_t"
,
"dew_point"
,
"ambient_hum"
,
"wind_speed"
],
],
"properties"
:
{
"properties"
:
{
"date"
:
{
"$ref"
:
"#/$defs/timestamp"
},
"date"
:
{
"$ref"
:
"#/$defs/timestamp"
},
"precipitation"
:
{
"
type"
:
"
number"
},
"precipitation"
:
{
"
$ref"
:
"#/$defs/
number"
},
"precipitation_last_24h"
:
{
"
type"
:
"
number"
},
"precipitation_last_24h"
:
{
"
$ref"
:
"#/$defs/
number"
},
"pressure"
:
{
"
type"
:
"
number"
},
"pressure"
:
{
"
$ref"
:
"#/$defs/
number"
},
"ambient_t"
:
{
"
type"
:
"
number"
},
"ambient_t"
:
{
"
$ref"
:
"#/$defs/
number"
},
"ambient_hum"
:
{
"
type"
:
"
number"
},
"ambient_hum"
:
{
"
$ref"
:
"#/$defs/
number"
},
"wind_dir"
:
{
"
type"
:
"
number"
},
"wind_dir"
:
{
"
$ref"
:
"#/$defs/
number"
},
"wind_speed"
:
{
"
type"
:
"
number"
},
"wind_speed"
:
{
"
$ref"
:
"#/$defs/
number"
},
"sky_t"
:
{
"$ref"
:
"#/$defs/number"
},
"sky_t"
:
{
"$ref"
:
"#/$defs/number"
},
"dew_point"
:
{
"$ref"
:
"#/$defs/number"
}
"dew_point"
:
{
"$ref"
:
"#/$defs/number"
}
}
}
...
@@ -484,12 +484,7 @@ meteo = {
...
@@ -484,12 +484,7 @@ meteo = {
},
},
"$defs"
:
{
"$defs"
:
{
"timestamp"
:
{
"type"
:
"string"
,
"pattern"
:
"^(
\\
d{4})-(
\\
d{2})-(
\\
d{2})([T ](
\\
d{2}):(
\\
d{2})(:(
\\
d{2}(?:
\\
.
\\
d+)?))?)?$"
},
"timestamp"
:
{
"type"
:
"string"
,
"pattern"
:
"^(
\\
d{4})-(
\\
d{2})-(
\\
d{2})([T ](
\\
d{2}):(
\\
d{2})(:(
\\
d{2}(?:
\\
.
\\
d+)?))?)?$"
},
"number"
:{
"number"
:{
"anyOf"
:
[{
"type"
:
"number"
},{
"type"
:
"null"
}]}
"anyOf"
:
[
{
"type"
:
"number"
},
{
"type"
:
"null"
}
]
}
}
}
}
}
factory
.
register_file
(
'M2M'
,
_create_m2mFile
,
schema
=
meteo
)
factory
.
register_file
(
'M2M'
,
_create_m2mFile
,
schema
=
meteo
)
...
...
fte/lib/libpy/meteoFile.py
View file @
5aba3e33
...
@@ -236,7 +236,7 @@ class eop2mFile(meteoBaseFile):
...
@@ -236,7 +236,7 @@ class eop2mFile(meteoBaseFile):
tm
=
datetime
.
fromisoformat
(
r
[
'data'
][
'date'
])
.
replace
(
microsecond
=
0
)
tm
=
datetime
.
fromisoformat
(
r
[
'data'
][
'date'
])
.
replace
(
microsecond
=
0
)
self
.
tbeg
,
self
.
tend
=
min
(
self
.
tbeg
,
tm
),
max
(
self
.
tend
,
tm
)
self
.
tbeg
,
self
.
tend
=
min
(
self
.
tbeg
,
tm
),
max
(
self
.
tend
,
tm
)
d
=
r
[
'data'
]
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
.
write
(
fo
,(
tm
,
dev
,
row
))
self
.
fid
=
await
self
.
getfid
()
self
.
fid
=
await
self
.
getfid
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment