jdejaegh/python-irceline
1
0
Fork 0
mirror of https://github.com/jdejaegh/python-irceline.git synced 2025-06-27 03:35:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor

Browse source
This commit is contained in:
Jules 2024-06-16 13:27:09 +02:00
parent 8b00d85957
commit e146c8359e
Signed by: jdejaegh
GPG key ID: 99D6D184CA66933A
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/open_irceline/api.py
View file

@ -49,8 +49,14 @@ class IrcelineClient:
# (e.g. 5.01 PM, but the most recent data is for 4.00 PM) # (e.g. 5.01 PM, but the most recent data is for 4.00 PM)
if isinstance(timestamp, datetime): if isinstance(timestamp, datetime):
timestamp = timestamp.replace(microsecond=0, second=0, minute=0) - timedelta(hours=1) timestamp = timestamp.replace(microsecond=0, second=0, minute=0) - timedelta(hours=1)
timestamp = timestamp.isoformat()
key = 'timestamp'
elif isinstance(timestamp, date): elif isinstance(timestamp, date):
timestamp = timestamp - timedelta(days=1) timestamp = timestamp - timedelta(days=1)
timestamp = timestamp.isoformat()
key = 'date'
else:
raise IrcelineApiError(f"Wrong parameter type for timestamp: {type(timestamp)}")
coord = self.epsg_transform(position) coord = self.epsg_transform(position)
querystring = {"service": "WFS", querystring = {"service": "WFS",
@ -59,7 +65,7 @@ class IrcelineClient:
"outputFormat": "application/json", "outputFormat": "application/json",
"typeName": ",".join(features), "typeName": ",".join(features),
"cql_filter": "cql_filter":
f"{'timestamp' if isinstance(timestamp, datetime) else 'date'}>='{timestamp.isoformat()}'" f"{key}>='{timestamp}'"
f" AND " f" AND "
f"INTERSECTS(the_geom, POINT ({coord[0]} {coord[1]}))"} f"INTERSECTS(the_geom, POINT ({coord[0]} {coord[1]}))"}