feat: ensure /cql and /object endpoints work with GeoJSON; include co…

…unts with /cql GeoJSON.
RDFLib · Jan 10, 2025 · 837c134 · 837c134
1 parent a26c895
commit 837c134
Show file tree

Hide file tree

Showing 12 changed files with 371 additions and 2,482 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/prez/dependencies.py b/prez/dependencies.py
@@ -169,10 +169,10 @@ async def cql_get_parser_dependency(
     query_params: QueryParams = Depends(),
     queryable_props: list = Depends(get_queryable_props),
 ) -> CQLParser:
-    if query_params.filter:
+    if query_params._filter:
         try:
             crs = query_params.filter_crs
-            query = json.loads(query_params.filter)
+            query = json.loads(query_params._filter)
             cql_parser = CQLParser(cql=query, crs=crs, queryable_props=queryable_props)
             cql_parser.generate_jsonld()
             try:
@@ -182,7 +182,7 @@ async def cql_get_parser_dependency(
             return cql_parser
         except json.JSONDecodeError:
             raise HTTPException(status_code=400, detail="Invalid JSON format.")
-        except Exception:
+        except Exception as e:
             raise HTTPException(
                 status_code=400, detail="Invalid CQL format: Parsing failed."
             )

diff --git a/prez/models/query_params.py b/prez/models/query_params.py
@@ -141,22 +141,23 @@ def __init__(
         ),
         datetime: Optional[tuple] = Depends(validate_datetime),
         bbox: List[float] = Depends(reformat_bbox),
-        filter_lang: FilterLangEnum = Query(
+        filter_lang: Optional[FilterLangEnum] = Query(
             default="cql2-json",
             description="Language of the filter expression",
             alias="filter-lang",
         ),
-        filter_crs: str = Query(
+        filter_crs: Optional[str] = Query(
             "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
             description="CRS used for the filter expression",
         ),
-        q: str = Query(None, description="Search query", example="building"),
-        filter: str = Query(
+        q: Optional[str] = Query(None, description="Search query", example="building"),
+        _filter: Optional[str] = Query(
             default=None,
             description="CQL JSON expression.",
+            alias="filter"
         ),
-        order_by: str = Query(default=None, description="Optional: Field to order by"),
-        order_by_direction: OrderByDirectionEnum = Query(
+        order_by: Optional[str] = Query(default=None, description="Optional: Field to order by"),
+        order_by_direction: Optional[OrderByDirectionEnum] = Query(
             default=None,
             description="Optional: Order direction, must be 'ASC' or 'DESC'",
         ),
@@ -175,15 +176,15 @@ def __init__(
         self.datetime = datetime
         self.order_by = order_by
         self.order_by_direction = order_by_direction
-        self.filter = filter
+        self._filter = _filter
         self.mediatype = mediatype
         self.subscription_key = subscription_key
         self.validate_filter()
 
     def validate_filter(self):
-        if self.filter:
+        if self._filter:
             try:
-                json.loads(self.filter)
+                json.loads(self._filter)
             except json.JSONDecodeError:
                 raise HTTPException(
                     status_code=400, detail="Filter criteria must be valid JSON."

diff --git a/prez/reference_data/profiles/prez_default_profiles.ttl b/prez/reference_data/profiles/prez_default_profiles.ttl
@@ -63,23 +63,23 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
 
 
 <https://prez.dev/profile/cqlgeo>
-    a prof:Profile , prez:ListingProfile;
+    a prof:Profile , prez:ListingProfile ;
     dcterms:identifier "cqlgeo"^^xsd:token ;
     dcterms:description "A CQL profile targeted towards listing CQL results, including geospatial information." ;
     dcterms:title "CQL Geo profile" ;
     altr-ext:constrainsClass rdfs:Resource ;
     altr-ext:hasDefaultResourceFormat "text/anot+turtle" ;
-    altr-ext:hasResourceFormat "application/ld+json" ,
+    altr-ext:hasResourceFormat "application/geo+json" ,
         "application/ld+json" ,
         "application/anot+ld+json" ,
         "application/rdf+xml" ,
         "text/anot+turtle" ,
         "text/turtle" ;
+    shext:bnode-depth 2 ;
     sh:property [
-        sh:minCount 0 ;
         sh:path (
             sh:union (
-              rdf:type
+              shext:allPredicateValues
               ( geo:hasGeometry geo:asWKT )
             )
           )