Skip to content

Commit 111942e

Browse files
TaehoonKTaehoonK
committed
Fix some minor bugs (typo of interpolation type, date-time format, name of the queryable resources)
1 parent edb0e93 commit 111942e

File tree

5 files changed

+126
-125
lines changed

5 files changed

+126
-125
lines changed

‎pygeoapi/api.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -866,13 +866,13 @@ def describe_collections(self, request: Union[APIRequest, Any]) -> Tuple[dict, i
866866
time = []
867867
lifespan = row[2]
868868
if lifespan is not None:
869-
time.append(lifespan._lower.strftime("%Y/%m/%dT%H:%M:%SZ"))
870-
time.append(lifespan._upper.strftime("%Y/%m/%dT%H:%M:%SZ"))
869+
time.append(lifespan._lower.strftime("%Y-%m-%dT%H:%M:%SZ"))
870+
time.append(lifespan._upper.strftime("%Y-%m-%dT%H:%M:%SZ"))
871871
else:
872872
if extend_stbox is not None:
873873
if extend_stbox.tmin is not None:
874-
time.append(extend_stbox.tmin.strftime("%Y/%m/%dT%H:%M:%SZ"))
875-
time.append(extend_stbox.tmax.strftime("%Y/%m/%dT%H:%M:%SZ"))
874+
time.append(extend_stbox.tmin.strftime("%Y-%m-%dT%H:%M:%SZ"))
875+
time.append(extend_stbox.tmax.strftime("%Y-%m-%dT%H:%M:%SZ"))
876876

877877
collection['extent'] = {
878878
'spatial': {
@@ -1064,13 +1064,13 @@ def get_collection(self, request: Union[APIRequest, Any],
10641064
time = []
10651065
lifespan = row[2]
10661066
if lifespan is not None:
1067-
time.append(lifespan._lower.strftime("%Y/%m/%dT%H:%M:%SZ"))
1068-
time.append(lifespan._upper.strftime("%Y/%m/%dT%H:%M:%SZ"))
1067+
time.append(lifespan._lower.strftime("%Y-%m-%dT%H:%M:%SZ"))
1068+
time.append(lifespan._upper.strftime("%Y-%m-%dT%H:%M:%SZ"))
10691069
else:
10701070
if extend_stbox is not None:
10711071
if extend_stbox.tmin is not None:
1072-
time.append(extend_stbox.tmin.strftime("%Y/%m/%dT%H:%M:%SZ"))
1073-
time.append(extend_stbox.tmax.strftime("%Y/%m/%dT%H:%M:%SZ"))
1072+
time.append(extend_stbox.tmin.strftime("%Y-%m-%dT%H:%M:%SZ"))
1073+
time.append(extend_stbox.tmax.strftime("%Y-%m-%dT%H:%M:%SZ"))
10741074

10751075
collection['extent'] = {
10761076
'spatial': {
@@ -1282,13 +1282,13 @@ def get_collection_items(
12821282
time = []
12831283
lifespan = row[4]
12841284
if lifespan is not None:
1285-
time.append(lifespan._lower.strftime("%Y/%m/%dT%H:%M:%SZ"))
1286-
time.append(lifespan._upper.strftime("%Y/%m/%dT%H:%M:%SZ"))
1285+
time.append(lifespan._lower.strftime("%Y-%m-%dT%H:%M:%SZ"))
1286+
time.append(lifespan._upper.strftime("%Y-%m-%dT%H:%M:%SZ"))
12871287
else:
12881288
if extend_stbox is not None:
12891289
if extend_stbox.tmin is not None:
1290-
time.append(extend_stbox.tmin.strftime("%Y/%m/%dT%H:%M:%SZ"))
1291-
time.append(extend_stbox.tmax.strftime("%Y/%m/%dT%H:%M:%SZ"))
1290+
time.append(extend_stbox.tmin.strftime("%Y-%m-%dT%H:%M:%SZ"))
1291+
time.append(extend_stbox.tmax.strftime("%Y-%m-%dT%H:%M:%SZ"))
12921292
mfeature['time'] = time
12931293

12941294
if 'crs' not in mfeature:
@@ -1524,13 +1524,13 @@ def get_collection_item(self, request: Union[APIRequest, Any],
15241524
time = []
15251525
lifespan = row[4]
15261526
if lifespan is not None:
1527-
time.append(lifespan._lower.strftime("%Y/%m/%dT%H:%M:%SZ"))
1528-
time.append(lifespan._upper.strftime("%Y/%m/%dT%H:%M:%SZ"))
1527+
time.append(lifespan._lower.strftime("%Y-%m-%dT%H:%M:%SZ"))
1528+
time.append(lifespan._upper.strftime("%Y-%m-%dT%H:%M:%SZ"))
15291529
else:
15301530
if extend_stbox is not None:
15311531
if extend_stbox.tmin is not None:
1532-
time.append(extend_stbox.tmin.strftime("%Y/%m/%dT%H:%M:%SZ"))
1533-
time.append(extend_stbox.tmax.strftime("%Y/%m/%dT%H:%M:%SZ"))
1532+
time.append(extend_stbox.tmin.strftime("%Y-%m-%dT%H:%M:%SZ"))
1533+
time.append(extend_stbox.tmax.strftime("%Y-%m-%dT%H:%M:%SZ"))
15341534
mfeature['time'] = time
15351535

15361536
if 'crs' not in mfeature:

‎pygeoapi/flask_app.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,8 @@ def collections(collection_id=None):
197197
api_.get_collection(request, collection_id))
198198

199199

200-
@BLUEPRINT.route('/collections/<path:collection_id>/items',
201-
methods=['GET', 'POST'])
202-
@BLUEPRINT.route('/collections/<path:collection_id>/items/<item_id>',
203-
methods=['GET', 'DELETE'])
200+
@BLUEPRINT.route('/collections/<path:collection_id>/items', methods=['GET', 'POST'])
201+
@BLUEPRINT.route('/collections/<path:collection_id>/items/<item_id>', methods=['GET', 'DELETE'])
204202
def collection_items(collection_id, item_id=None):
205203
"""
206204
OGC API collections items endpoint
@@ -216,13 +214,11 @@ def collection_items(collection_id, item_id=None):
216214
return get_response(
217215
api_.get_collection_items(request, collection_id))
218216
elif request.method == 'POST': # filter or manage items
219-
return get_response(api_.manage_collection_item(request, 'create',
220-
collection_id))
217+
return get_response(api_.manage_collection_item(request, 'create', collection_id))
221218

222219
elif request.method == 'DELETE':
223220
return get_response(
224-
api_.manage_collection_item(request, 'delete',
225-
collection_id, item_id))
221+
api_.manage_collection_item(request, 'delete', collection_id, item_id))
226222
else:
227223
return get_response(
228224
api_.get_collection_item(request, collection_id, item_id))
@@ -247,13 +243,12 @@ def collection_items_tgeometries(collection_id, item_id, tGeometry_id=None):
247243
return get_response(
248244
api_.get_collection_items_tGeometry(request, collection_id, item_id))
249245
elif request.method == 'POST': # filter or manage items
250-
return get_response(api_.manage_collection_item_tGeometry(request, 'create',
251-
collection_id, item_id))
246+
return get_response(
247+
api_.manage_collection_item_tGeometry(request, 'create',collection_id, item_id))
252248

253249
elif request.method == 'DELETE':
254250
return get_response(
255-
api_.manage_collection_item_tGeometry(request, 'delete',
256-
collection_id, item_id, tGeometry_id))
251+
api_.manage_collection_item_tGeometry(request, 'delete', collection_id, item_id, tGeometry_id))
257252

258253

259254
@BLUEPRINT.route('/collections/<path:collection_id>/items/<item_id>/tgsequence/<tGeometry_id>/velocity',

0 commit comments

Comments
 (0)