Merge pull request #449 from opengeospatial/Update-schema-locations-in-v1.1.0

ghobona · web-flow · commit 2810187e1bd7 · 2023-07-26T17:29:55.000+01:00
Fix v1.1.0 schema locations
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
@@ -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]|<<ats_html_content,/conf/html/content>>
-|JSON |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collection.yaml[collection.yaml] |<<ats_json_content,/conf/json/content>>
+|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collection.yaml[collection.yaml]|<<ats_html_content,/conf/html/content>>
+|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collection.yaml[collection.yaml] |<<ats_json_content,/conf/json/content>>
 |===
diff --git 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]|<<ats_html_content,/conf/html/content>>
-|JSON |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections.yaml[collections.yaml] |<<ats_geojson_content,/conf/geojson/content>>
+|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collections.yaml[collections.yaml]|<<ats_html_content,/conf/html/content>>
+|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collections.yaml[collections.yaml] |<<ats_geojson_content,/conf/geojson/content>>
 |===
diff --git 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.
-====
+====
diff --git 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]|<<ats_html_content,/conf/html/content>>
-|JSON |link:http://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/landingPage.yaml[landingPage.yaml] |<<ats_geojson_content,/conf/geojson/content>>
+|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/landingPage.yaml[landingPage.yaml]|<<ats_html_content,/conf/html/content>>
+|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/landingPage.yaml[landingPage.yaml] |<<ats_geojson_content,/conf/geojson/content>>
 |===
diff --git 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.
-====
+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
@@ -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.
-====
+    * 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
@@ -3,6 +3,6 @@
 ====
 *A:*
 
-If a collection using other EDR queries uses the <<rc_items-section,`items`>> 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 <<rc_items-section,`items`>> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 The EDR API Items query is an <<OGC17-069r3,OGC API - Features>> 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
@@ -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
@@ -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
@@ -124,7 +124,7 @@ Implementations shall also advertise conformance with this Requirements Class.
 
 Apply <<req_oas30_oas-impl,Requirement /req/oas30/oas-impl>> 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
