add support for sortby

Author: bitner

tifeatures/dependencies.py

@@ -241,3 +241,7 @@ def filter_query(
         return cql2_text_parser(query)
 
     return None
+
+
+def sortby_query(sortby: Optional[str] = Query(None, description="Sort By Column")):
+    return sortby

tifeatures/factory.py

@@ -20,6 +20,7 @@
     filter_query,
     ids_query,
     properties_query,
+    sortby_query,
 )
 from tifeatures.errors import NotFound
 from tifeatures.layer import CollectionLayer
@@ -547,6 +548,7 @@ async def items(
             datetime_filter: Optional[List[str]] = Depends(datetime_query),
             properties: Optional[List[str]] = Depends(properties_query),
             cql_filter: Optional[AstType] = Depends(filter_query),
+            sortby: Optional[str] = Depends(sortby_query),
             geom_column: Optional[str] = Query(
                 None,
                 description="Select geometry column.",
@@ -594,6 +596,7 @@ async def items(
                 "offset",
                 "bbox-only",
                 "simplify",
+                "sortby",
             ]
             properties_filter = [
                 (key, value)
@@ -608,6 +611,7 @@ async def items(
                 datetime_filter=datetime_filter,
                 properties_filter=properties_filter,
                 cql_filter=cql_filter,
+                sortby=sortby,
                 properties=properties,
                 limit=limit,
                 offset=offset,

tifeatures/layer.py

@@ -261,6 +261,19 @@ def _datetime_filter_to_sql(self, interval: List[str], dt_name: str):
                     logic.V(dt_name) < logic.S(pg_funcs.cast(end, "timestamptz")),
                 )
 
+    def _sortby(self, sortby: Optional[str]):
+        sortby = sortby.strip()
+        if sortby is None:
+            sortby = self.id_column
+        if sortby.startswith("-"):
+            sortby = sortby.replace("-", "")
+            sort_clause = logic.V(sortby).desc()
+        else:
+            sortby = sortby.replace("+", "")
+            sort_clause = logic.V(sortby).asc()
+        if self.get_column(sortby) is not None:
+            return clauses.OrderBy(sort_clause)
+
     def _features_query(
         self,
         *,
@@ -269,6 +282,7 @@ def _features_query(
         datetime_filter: Optional[List[str]] = None,
         properties_filter: Optional[List[Tuple[str, str]]] = None,
         cql_filter: Optional[AstType] = None,
+        sortby: Optional[str] = None,
         properties: Optional[List[str]] = None,
         geom: str = None,
         dt: str = None,
@@ -288,6 +302,7 @@ def _features_query(
                 geom=geom,
                 dt=dt,
             )
+            + self._sortby(sortby)
             + clauses.Limit(limit or 10)
             + clauses.Offset(offset or 0)
         )
@@ -327,6 +342,7 @@ async def query(
         datetime_filter: Optional[List[str]] = None,
         properties_filter: Optional[List[Tuple[str, str]]] = None,
         cql_filter: Optional[AstType] = None,
+        sortby: Optional[str] = None,
         properties: Optional[List[str]] = None,
         geom: str = None,
         dt: str = None,
@@ -370,6 +386,7 @@ async def query(
                 datetime_filter=datetime_filter,
                 properties_filter=properties_filter,
                 cql_filter=cql_filter,
+                sortby=sortby,
                 properties=properties,
                 geom=geom,
                 dt=dt,