From eb130a45c7c16ae024e6c7c2fd9ac0fe4dadf96f Mon Sep 17 00:00:00 2001 From: Phil Varner Date: Mon, 7 Jun 2021 20:17:03 -0400 Subject: [PATCH] allow html in markdown, fix problems with filter openapi spec --- .circleci/rc.yaml | 4 ++-- fragments/filter/openapi.yaml | 32 ++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.circleci/rc.yaml b/.circleci/rc.yaml index b0dd538c..f70a2fb8 100644 --- a/.circleci/rc.yaml +++ b/.circleci/rc.yaml @@ -4,7 +4,7 @@ plugins: # Apply some recommended defaults for consistency - remark-preset-lint-consistent - remark-preset-lint-recommended - - lint-no-html + # - lint-no-html # General formatting - - remark-lint-emphasis-marker - '*' @@ -40,4 +40,4 @@ plugins: - space # Tables - remark-lint-table-pipes - - remark-lint-no-literal-urls \ No newline at end of file + - remark-lint-no-literal-urls diff --git a/fragments/filter/openapi.yaml b/fragments/filter/openapi.yaml index 98af69e5..bdfb7299 100644 --- a/fragments/filter/openapi.yaml +++ b/fragments/filter/openapi.yaml @@ -32,14 +32,21 @@ paths: responses: '200': description: A JSON Schema defining the Queryables allowed in CQL expressions - content: - application/schema+json: - schema: - $ref: 'https://json-schema.org/draft/2019-09/schema' + # content: + # application/schema+json: + # schema: + # $ref: 'https://json-schema.org/draft/2019-09/schema' default: $ref: '../../core/commons.yaml#/components/responses/Error' /collections/{collectionId}: get: + parameters: + - in: path + name: collectionId + schema: + type: string + required: true + description: ID of Collection responses: '200': description: Collection description @@ -56,15 +63,22 @@ paths: This endpoint returns a list of variable terms that can be used in CQL expressions. The precise definition of this can be found in the OGC API - Features - Part 3: Filtering and the Common Query Language (CQL) specification. + parameters: + - in: path + name: collectionId + schema: + type: string + required: true + description: ID of Collection tags: - Queryables responses: '200': description: A JSON Schema defining the Queryables allowed in CQL expressions filtering only that collection - content: - application/schema+json: - schema: - $ref: 'https://json-schema.org/draft/2019-09/schema' + # content: + # application/schema+json: + # schema: + # $ref: 'https://json-schema.org/draft/2019-09/schema' default: $ref: '../../core/commons.yaml#/components/responses/Error' components: @@ -125,8 +139,6 @@ components: A CQL filter expression in the 'cql-text' encoding. type: string filter-cql-json: - description: | - A CQL filter expression in the 'cql-json' encoding. $ref: './cql.yml#/components/schemas/booleanValueExpression' filter-lang: description: |