From db8fae61eb63532ae308fe80ec1f816f0e96c815 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sat, 29 Oct 2022 02:41:45 -0400 Subject: [PATCH] minor fixes following #964 (#1030) --- docs/source/cql.rst | 5 +++-- docs/source/data-publishing/ogcapi-features.rst | 6 ++++-- docs/source/installation.rst | 7 +++++-- pygeoapi/api.py | 1 + 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/source/cql.rst b/docs/source/cql.rst index b630f90..e462fc2 100644 --- a/docs/source/cql.rst +++ b/docs/source/cql.rst @@ -32,7 +32,7 @@ The PostgreSQL provider uses `pygeofilter `_ * `Spatial predicates `_ -* `Temporal predicates +* `Temporal predicates `_ Using Elasticsearch the following type of queries are supported right now: @@ -80,6 +80,7 @@ The same ``BETWEEN`` query using HTTP GET request formatted as CQL text and URL An ``EQUALS`` example for a specific property: .. code-block:: bash + curl --location --request POST 'http://localhost:5000/collections/recentearthquakes/items?f=json&limit=10&filter-lang=cql-json' --header 'Content-Type: application/query-cql-json' --data-raw '{ @@ -92,4 +93,4 @@ A ``CROSSES`` example via an HTTP GET request. The CQL text is passed via the ` curl "http://localhost:5000/collections/hot_osm_waterways/items?f=json&filter=CROSSES(foo_geom,%20LINESTRING(28%20-2,%2030%20-4))" -Note the the CQL text has been URL encoded. This is required in CURL commands but when entering in a browser, plain text can be used e.g. ``CROSSES(foo_geom, LINESTRING(28 -2, 30 -4))``. \ No newline at end of file +Note that the CQL text has been URL encoded. This is required in curl commands but when entering in a browser, plain text can be used e.g. ``CROSSES(foo_geom, LINESTRING(28 -2, 30 -4))``. diff --git a/docs/source/data-publishing/ogcapi-features.rst b/docs/source/data-publishing/ogcapi-features.rst index 018ec48..7256976 100644 --- a/docs/source/data-publishing/ogcapi-features.rst +++ b/docs/source/data-publishing/ogcapi-features.rst @@ -94,7 +94,7 @@ To publish an Elasticsearch index, the following are required in your index: This provider has the support for the CQL queries as indicated in the table above. .. seealso:: - :ref:`cql` for more details on how to use the Common Query Language to filter the collection with specific queries. + :ref:`cql` for more details on how to use Common Query Language (CQL) to filter the collection with specific queries. ESRI Feature Service @@ -209,6 +209,8 @@ MongoDB collection: testplaces +.. _PostgreSQL: + PostgreSQL ^^^^^^^^^^ @@ -236,7 +238,7 @@ Must have PostGIS installed. This provider has support for the CQL queries as indicated in the Provider table above. .. seealso:: - :ref:`cql` for more details on how to use the Common Query Language (CQL) to filter the collection with specific queries. + :ref:`cql` for more details on how to use Common Query Language (CQL) to filter the collection with specific queries. SQLiteGPKG ^^^^^^^^^^ diff --git a/docs/source/installation.rst b/docs/source/installation.rst index ffc0629..29221c7 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -52,7 +52,7 @@ Docker Using DockerHub ^^^^^^^^^^^^^^^ -`Docker image `_ +`Docker image`_ .. code-block:: bash @@ -61,7 +61,7 @@ Using DockerHub Using GitHub Container Registry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -`Docker image `_ +`Docker image`_ .. code-block:: bash @@ -101,3 +101,6 @@ Summary ------- Congratulations! Whichever of the abovementioned methods you chose, you have successfully installed pygeoapi onto your system. + + +.. _`Docker image`: https://github.com/geopython/pygeoapi/pkgs/container/pygeoapi diff --git a/pygeoapi/api.py b/pygeoapi/api.py index 8ccc2dc..0160fb8 100644 --- a/pygeoapi/api.py +++ b/pygeoapi/api.py @@ -1875,6 +1875,7 @@ class API: return self.get_exception( 400, headers, request.format, 'InvalidParameterValue', msg) + # FIXME: remove testing backend in use once CQL support is normalized if p.name == 'PostgreSQL': LOGGER.debug('processing PostgreSQL CQL_JSON data') try: