diff --git a/standard/abstract_tests/collections/ATS_rc-md-collection-info-table.adoc b/standard/abstract_tests/collections/ATS_rc-md-collection-info-table.adoc index 7fdf9b1d..fe25e8e2 100644 --- a/standard/abstract_tests/collections/ATS_rc-md-collection-info-table.adoc +++ b/standard/abstract_tests/collections/ATS_rc-md-collection-info-table.adoc @@ -3,6 +3,6 @@ [width="90%",cols="3",options="header"] |=== |Format |Schema Document |Test ID -|HTML |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collection.yaml[collection.yaml]|<> -|JSON |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collection.yaml[collection.yaml] |<> +|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collection.yaml[collection.yaml]|<> +|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collection.yaml[collection.yaml] |<> |=== diff --git a/standard/abstract_tests/collections/ATS_rc-md-success-table.adoc b/standard/abstract_tests/collections/ATS_rc-md-success-table.adoc index ca590a95..37e58eff 100644 --- a/standard/abstract_tests/collections/ATS_rc-md-success-table.adoc +++ b/standard/abstract_tests/collections/ATS_rc-md-success-table.adoc @@ -3,6 +3,6 @@ [width="90%",cols="3",options="header"] |=== |Format |Schema Document |Test ID -|HTML |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections.yaml[collections.yaml]|<> -|JSON |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections.yaml[collections.yaml] |<> +|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collections.yaml[collections.yaml]|<> +|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collections.yaml[collections.yaml] |<> |=== diff --git a/standard/abstract_tests/core/ATS_conformance-success.adoc b/standard/abstract_tests/core/ATS_conformance-success.adoc index deba6645..cc8774eb 100644 --- a/standard/abstract_tests/core/ATS_conformance-success.adoc +++ b/standard/abstract_tests/core/ATS_conformance-success.adoc @@ -6,7 +6,7 @@ identifier:: /conf/core/conformance-success target:: /req/core/conformance-success test-purpose:: Validate that the Conformance Declaration response complies with the required structure and contents. test-method:: -step::: Validate the response document against OpenAPI 3.0 schema link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/confClasses.yaml[confClasses.yaml] +step::: Validate the response document against OpenAPI 3.0 schema link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/confClasses.yaml[confClasses.yaml] step::: Validate that the document includes the conformance class "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core" step::: Validate that the document lists all OGC API conformance classes that the API implements. -==== \ No newline at end of file +==== diff --git a/standard/abstract_tests/core/ATS_root-success.adoc b/standard/abstract_tests/core/ATS_root-success.adoc index d1ab401e..0c49852a 100644 --- a/standard/abstract_tests/core/ATS_root-success.adoc +++ b/standard/abstract_tests/core/ATS_root-success.adoc @@ -29,6 +29,6 @@ The landing page may be retrieved in a number of different formats. The followin [width="90%",cols="3",options="header"] |=== |Format |Schema Document |Test ID -|HTML |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/landingPage.yaml[landingPage.yaml]|<> -|JSON |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/landingPage.yaml[landingPage.yaml] |<> +|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/landingPage.yaml[landingPage.yaml]|<> +|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/landingPage.yaml[landingPage.yaml] |<> |=== diff --git a/standard/abstract_tests/covjson/ATS_content.adoc b/standard/abstract_tests/covjson/ATS_content.adoc index 08cb0ff8..e6b43eaa 100644 --- a/standard/abstract_tests/covjson/ATS_content.adoc +++ b/standard/abstract_tests/covjson/ATS_content.adoc @@ -7,5 +7,5 @@ target:: /req/covjson/content test-purpose:: Verify the content of a CoverageJSON document given an input document and schema. test-method:: step::: Validate that the document is a CoverageJSON document. -step::: Validate the document against the link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/coverageJSON.yaml[coverageJSON.yaml] schema using a JSON Schema validator. -==== \ No newline at end of file +step::: Validate the document against the link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/covjson/coverageJSON.yaml[coverageJSON.yaml] schema using a JSON Schema validator. +==== diff --git a/standard/abstract_tests/edr-geojson/ATS_content.adoc b/standard/abstract_tests/edr-geojson/ATS_content.adoc index 59d4eb9e..bb5dd22b 100644 --- a/standard/abstract_tests/edr-geojson/ATS_content.adoc +++ b/standard/abstract_tests/edr-geojson/ATS_content.adoc @@ -8,7 +8,7 @@ test-purpose:: Verify the content of an EDR GeoJSON document given an input docu test-method:: . Validate that the document is an EDR GeoJSON document. . Validate the document against one of the EDR GeoJSON schemas: - * FeatureCollection: link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/edrFeatureCollectionGeoJSON.yaml[edrFeatureCollectionGeoJSON.yaml] - * Feature: link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/featureGeoJSON.yaml[featureGeoJSON.yaml] - * GeometryCollection: link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/geometrycollectionGeoJSON.yaml[geometrycollectionGeoJSON.yaml] using a JSON Schema validator. -==== \ No newline at end of file + * FeatureCollection: link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/edr-geojson/edrFeatureCollectionGeoJSON.yaml[edrFeatureCollectionGeoJSON.yaml] + * Feature: link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/geojson/featureGeoJSON.yaml[featureGeoJSON.yaml] + * GeometryCollection: link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/geojson/geometrycollectionGeoJSON.yaml[geometrycollectionGeoJSON.yaml] using a JSON Schema validator. +==== diff --git a/standard/recommendations/core/REC_edr-geojson.adoc b/standard/recommendations/core/REC_edr-geojson.adoc index 51fbb035..4c09ca44 100644 --- a/standard/recommendations/core/REC_edr-geojson.adoc +++ b/standard/recommendations/core/REC_edr-geojson.adoc @@ -3,6 +3,6 @@ ==== *A:* -If a collection using other EDR queries uses the <> query, implementations SHOULD consider support for the http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/edrFeatureCollectionGeoJSON.yaml[EDR GeoJSON Schema] as an encoding. +If a collection using other EDR queries uses the <> query, implementations SHOULD consider support for the https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/edr-geojson/edrFeatureCollectionGeoJSON.yaml[EDR GeoJSON Schema] as an encoding. ==== diff --git a/standard/requirements/collections/REQ_rc-md-success.adoc b/standard/requirements/collections/REQ_rc-md-success.adoc index 6eecfe62..f47e28e6 100644 --- a/standard/requirements/collections/REQ_rc-md-success.adoc +++ b/standard/requirements/collections/REQ_rc-md-success.adoc @@ -13,6 +13,6 @@ A successful execution of the operation SHALL be reported as a response with an *B:* -The content of that response SHALL be based upon the schema link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections.yaml[collections.yaml]. +The content of that response SHALL be based upon the schema link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collections.yaml[collections.yaml]. ==== diff --git a/standard/requirements/collections/REQ_src-md-success.adoc b/standard/requirements/collections/REQ_src-md-success.adoc index 99aa242b..741fef48 100644 --- a/standard/requirements/collections/REQ_src-md-success.adoc +++ b/standard/requirements/collections/REQ_src-md-success.adoc @@ -13,7 +13,7 @@ A successful execution of the operation SHALL be reported as a response with an *B:* -The content of that response SHALL be based upon the schema link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collection.yaml[collection.yaml]. +The content of that response SHALL be based upon the schema link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collection.yaml[collection.yaml]. --- diff --git a/standard/requirements/core/REQ_conformance-success.adoc b/standard/requirements/core/REQ_conformance-success.adoc index 79b1d13d..1f84defb 100644 --- a/standard/requirements/core/REQ_conformance-success.adoc +++ b/standard/requirements/core/REQ_conformance-success.adoc @@ -12,6 +12,6 @@ A successful execution of the operation SHALL be reported as a response with an --- *B:* -The content of that response SHALL be based upon the schema link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/confClasses.yaml[confClasses.yaml] and list all OGC API conformance classes that the API conforms to. +The content of that response SHALL be based upon the schema link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/confClasses.yaml[confClasses.yaml] and list all OGC API conformance classes that the API conforms to. ==== diff --git a/standard/requirements/core/REQ_root-success.adoc b/standard/requirements/core/REQ_root-success.adoc index 882a53d6..36410a13 100644 --- a/standard/requirements/core/REQ_root-success.adoc +++ b/standard/requirements/core/REQ_root-success.adoc @@ -12,7 +12,7 @@ A successful execution of the operation SHALL be reported as a response with an --- *B:* -The content of that response SHALL be based upon the OpenAPI 3.0 schema link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/landingPage.yaml[landingPage.yaml] and include at least links to the following resources: +The content of that response SHALL be based upon the OpenAPI 3.0 schema link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/landingPage.yaml[landingPage.yaml] and include at least links to the following resources: * the API definition (relation type `service-desc` or `service-doc`) diff --git a/standard/requirements/edr-geojson/REQ_content.adoc b/standard/requirements/edr-geojson/REQ_content.adoc index 080fbb90..f1838e84 100644 --- a/standard/requirements/edr-geojson/REQ_content.adoc +++ b/standard/requirements/edr-geojson/REQ_content.adoc @@ -12,9 +12,9 @@ Every `200`-response with the media type `application/geo+json` SHALL be -* an link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/edrFeatureCollectionGeoJSON.yaml[EDR GeoJSON FeatureCollection Object] for features, and +* an link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/edr-geojson/edrFeatureCollectionGeoJSON.yaml[EDR GeoJSON FeatureCollection Object] for features, and -* an link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/featureGeoJSON.yaml[EDR GeoJSON Feature Object] for a single feature. +* an link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/geojson/featureGeoJSON.yaml[EDR GeoJSON Feature Object] for a single feature. diff --git a/standard/requirements/edr/query_type/item.adoc b/standard/requirements/edr/query_type/item.adoc index 0859182c..571137a1 100644 --- a/standard/requirements/edr/query_type/item.adoc +++ b/standard/requirements/edr/query_type/item.adoc @@ -1,7 +1,7 @@ The EDR API Items query is an <> endpoint that may be used to catalog pre-existing EDR sampling features. The pre-existence of an EDR sampling feature may be because a particular query has been cached for later use,such as a monitoring location. Or -there may be a catalog of spatiotemporal sampling features such as domains of anomalies in a dataset. A http://schemas.opengis.net/ogcapi/edr/1.1/openapi/EDR_OpenAPI.yaml[GeoJSON-compatible +there may be a catalog of spatiotemporal sampling features such as domains of anomalies in a dataset. A https://schemas.opengis.net/ogcapi/edr/1.1/openapi/ogcapi-environmental-data-retrieval-1.yaml[GeoJSON-compatible JSON-Schema] is specified to document an EDR API query endpoint and valid query parameters including time range, parameters, and spatial characteristics. A service can define a custom GeoJSON schema in the OpenAPI definition for the service, with the default being the edr-geojson schema if no alternative is documented. diff --git a/standard/requirements/instances/REQ_src-md-success.adoc b/standard/requirements/instances/REQ_src-md-success.adoc index 7119891c..13dfa162 100644 --- a/standard/requirements/instances/REQ_src-md-success.adoc +++ b/standard/requirements/instances/REQ_src-md-success.adoc @@ -13,7 +13,7 @@ A successful execution of the operation SHALL be reported as a response with a H *B:* -The content of that response SHALL be based upon the JSON schema link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/instances.yaml[instances.yaml]. +The content of that response SHALL be based upon the JSON schema link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/queries/instances.yaml[instances.yaml]. --- diff --git a/standard/sections/annex_examples.adoc b/standard/sections/annex_examples.adoc index 7422b7d4..d4afa4bf 100644 --- a/standard/sections/annex_examples.adoc +++ b/standard/sections/annex_examples.adoc @@ -12,7 +12,7 @@ include::../examples/landing_page_JSON_1.adoc[] The API is described using the OpenAPI 3.0 specification, example responses for a server which supports all possible EDR query patterns can be found at: -link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/EDR_OpenAPI.yaml[YAML OpenAPI document] +link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/ogcapi-environmental-data-retrieval-1.yaml[YAML OpenAPI document] [[conformance-response-examples]] === Conformance Examples diff --git a/standard/sections/clause_9_general.adoc b/standard/sections/clause_9_general.adoc index 5b83480a..5c360cca 100644 --- a/standard/sections/clause_9_general.adoc +++ b/standard/sections/clause_9_general.adoc @@ -124,7 +124,7 @@ Implementations shall also advertise conformance with this Requirements Class. Apply <> for OpenAPI 3.0 implementation. -An example OpenAPI definition document is available at http://schemas.opengis.net/ogcapi/edr/1.1/openapi/EDR_OpenAPI.yaml +An example OpenAPI definition document is available at https://schemas.opengis.net/ogcapi/edr/1.1/openapi/ogcapi-environmental-data-retrieval-1.yaml ==== Complete definition @@ -147,7 +147,7 @@ description: An error occurred. content: application/json: schema: - $ref: http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/exception.yaml + $ref: https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/exception.yaml text/html: schema: type: string