Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change URL's to https and from 1.1 to 1.2 #585

Merged
merged 4 commits into from
Dec 5, 2024
Merged

Change URL's to https and from 1.1 to 1.2 #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5693483
Change URL's to https and from 1.1 to 1.2
m-burgoyne Oct 28, 2024
ad6a3ca
URL corrections
m-burgoyne Nov 4, 2024
bd2abd1
replace instances of opengeospatial with ogc
m-burgoyne Nov 4, 2024
d065434
Merge branch 'master' into Update-URLs
chris-little Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# OGC API - Environmental Data Retrieval

[<img src="http://www.opengeospatial.org/pub/www/files/OGC_Logo_2D_Blue_x_0_0.png" width="200"/>](https://www.opengeospatial.org)
[<img src="https://www.ogc.org/pub/www/files/OGC_Logo_2D_Blue_x_0_0.png" width="200"/>](https://www.ogc.org/)

This is the GitHub repository of the [OGC Environmental Data Retrieval API Standard Working Group (EDR API SWG)](https://www.opengeospatial.org/projects/groups/edr-apiswg).
This is the GitHub repository of the [OGC Environmental Data Retrieval API Standard Working Group (EDR API SWG)](https://www.ogc.org/projects/groups/edr-apiswg).

The **[OGC API - Environmental Data Retrieval](https://ogcapi.ogc.org/edr/)** standard is part of the OGC API suite of standards. [OGC API standards](https://ogcapi.ogc.org) define modular API building blocks to spatially enable Web APIs in a consistent way. [OpenAPI](http://openapis.org) is used to define the reusable API building blocks.
The **[OGC API - Environmental Data Retrieval](https://ogcapi.ogc.org/edr/)** standard is part of the OGC API suite of standards. [OGC API standards](https://ogcapi.ogc.org) define modular API building blocks to spatially enable Web APIs in a consistent way. [OpenAPI](https://www.openapis.org/) is used to define the reusable API building blocks.

### EDR API Collections
As with other OGC APIs that include a `/collections` end point, EDR supports distribution of _collections_ of geospatial data in particular ways. An EDR collection can contain virtually any data about the natural or built environment that needs to be _sampled_ using a spatio-temporal query pattern. The following is a list of examples that illustrate what this environmental data sampling paradigm might entail.
Expand Down Expand Up @@ -149,7 +149,7 @@ The Working Group is now developing a backwards-compatible V1.1 and future enhan

### Best Practice

* [OGC API - Environmental Data Retrieval Best Practice](http://docs.opengeospatial.org/DRAFTS/20-065.html) - No Content yet
* [OGC API - Environmental Data Retrieval Best Practice](https://docs.ogc.org/DRAFTS/20-065.html) - No Content yet

### Contributing

Expand Down
4 changes: 2 additions & 2 deletions asciidoctor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"0": {
"OGC_doc_number": "19-086r6",
"urn":"http://www.opengis.net/doc/IS/ogcapi-edr/1.1",
"urn":"https://www.opengis.net/doc/IS/ogcapi-edr/1.2",
"title":"OGC API - Environmental Data Retrieval Standard",
"path":"standard/document.adoc",
"options": ["--trace"],
Expand All @@ -16,7 +16,7 @@
},
"1": {
"OGC_doc_number": "20-065",
"urn":"http://www.opengis.net/doc/BP/ogcapi-edrBP/1.0",
"urn":"https://www.opengis.net/doc/BP/ogcapi-edrBP/1.0",
"title":"OGC API EDR Best Practice",
"path":"best_practice/bp.adoc",
"options": ["--trace"],
Expand Down
6 changes: 3 additions & 3 deletions core/standard/abstract_tests/ATS_class_collections.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
.Collections
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/collections
subject:: <<rc_collections,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/collections>>
inherit:: http://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/collections
subject:: <<rc_collections,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/collections>>
inherit:: https://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections
classification:: Target Type:Web API
conformance-test:: /conf/core/crs
conformance-test:: /conf/collections/rc-md-op
Expand Down
6 changes: 3 additions & 3 deletions core/standard/abstract_tests/ATS_class_core.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
.Core
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
subject:: <<rc_core,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/core>>
inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core
subject:: <<rc_core,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/core>>
inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core
classification:: Target Type:Web API
conformance-test:: /conf/core/http
conformance-test:: /conf/core/root-op
Expand Down
6 changes: 3 additions & 3 deletions core/standard/abstract_tests/ATS_class_covjson.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
.CoverageJSON
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/covjson
subject:: <<rc_covjson,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/covjson>>
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/covjson
subject:: <<rc_covjson,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/covjson>>
classification:: Target Type:Web API
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core
conformance-test:: /conf/covjson/content
conformance-test:: /conf/covjson/definition
====
Expand Down
6 changes: 3 additions & 3 deletions core/standard/abstract_tests/ATS_class_edr-geojson.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
.EDR GeoJSON
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/edr-geojson
subject:: <<rc_edr_geojson,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/edr-geojson>>
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/edr-geojson
subject:: <<rc_edr_geojson,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/edr-geojson>>
classification:: Target Type:Web API
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core
conformance-test:: /conf/edr-geojson/content
conformance-test:: /conf/edr-geojson/definition
====
Expand Down
6 changes: 3 additions & 3 deletions core/standard/abstract_tests/ATS_class_geojson.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
.GeoJSON
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/geojson
subject:: <<rc_geojson,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/geojson>>
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/geojson
subject:: <<rc_geojson,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/geojson>>
classification:: Target Type:Web API
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core
conformance-test:: /conf/geojson/definition
conformance-test:: /conf/geojson/content
====
Expand Down
8 changes: 4 additions & 4 deletions core/standard/abstract_tests/ATS_class_html.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
.HTML
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/html
subject:: <<rc_html,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/html>>
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/html
subject:: <<rc_html,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/html>>
classification:: Target Type:Web API
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/html
inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core
inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/html
conformance-test:: /conf/html/content
conformance-test:: /conf/html/definition
====
Expand Down
6 changes: 3 additions & 3 deletions core/standard/abstract_tests/ATS_class_instances.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
.Conformance Class "Instances"
|===
2+|*Conformance Class*
2+|http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/instances
2+|https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/instances
|Target type |Web API
|Requirements Class |<<rc_collections,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/instances>>
|Dependency |<<ats_core,http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core>>
|Requirements Class |<<rc_collections,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/instances>>
|Dependency |<<ats_core,https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core>>
|===

==== General Tests
Expand Down
8 changes: 4 additions & 4 deletions core/standard/abstract_tests/ATS_class_json.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
.JSON
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/json
subject:: <<rc_json,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/json>>
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/json
subject:: <<rc_json,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/json>>
classification:: Target Type:Web API
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/json
inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core
inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/json
conformance-test:: /conf/json/definition
conformance-test:: /conf/json/content
====
Expand Down
8 changes: 4 additions & 4 deletions core/standard/abstract_tests/ATS_class_oas30.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
.OpenAPI 3.0
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/oas30
subject:: <<rc_oas30,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/oas30>>
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/oas30
subject:: <<rc_oas30,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/oas30>>
classification:: Target Type:Web API
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/oas30
inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core
inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/oas30
conformance-test:: /conf/oas30/completeness
conformance-test:: /conf/oas30/exceptions-codes
conformance-test:: /conf/oas30/oas-definition-1
Expand Down
8 changes: 4 additions & 4 deletions core/standard/abstract_tests/ATS_class_queries.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
.Queries
====
[%metadata]
identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/queries
subject:: <<rc_queries,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/queries>>
identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/queries
subject:: <<rc_queries,https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/queries>>
classification:: Target Type:Web API
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/collections
inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core
inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/collections
conformance-test:: /conf/position/no-query-params
conformance-test:: /conf/position/no-coords-param
conformance-test:: /conf/position/coords-param-invalid
Expand Down
4 changes: 2 additions & 2 deletions core/standard/abstract_tests/collections/ATS_rc-md-collection-info-table.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
[width="90%",cols="3",options="header"]
|===
|Format |Schema Document |Test ID
|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>>
|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collection.yaml[collection.yaml]|<<ats_html_content,/conf/html/content>>
|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collection.yaml[collection.yaml] |<<ats_json_content,/conf/json/content>>
|===
4 changes: 2 additions & 2 deletions core/standard/abstract_tests/collections/ATS_rc-md-success-table.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
[width="90%",cols="3",options="header"]
|===
|Format |Schema Document |Test ID
|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>>
|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collections.yaml[collections.yaml]|<<ats_html_content,/conf/html/content>>
|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collections.yaml[collections.yaml] |<<ats_geojson_content,/conf/geojson/content>>
|===
4 changes: 2 additions & 2 deletions core/standard/abstract_tests/core/ATS_conformance-success.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: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 the response document against OpenAPI 3.0 schema link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/core/confClasses.yaml[confClasses.yaml]
step::: Validate that the document includes the conformance class "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core"
step::: Validate that the document lists all OGC API conformance classes that the API implements.
====
4 changes: 2 additions & 2 deletions core/standard/abstract_tests/core/ATS_root-success.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: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>>
|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/core/landingPage.yaml[landingPage.yaml]|<<ats_html_content,/conf/html/content>>
|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/core/landingPage.yaml[landingPage.yaml] |<<ats_geojson_content,/conf/geojson/content>>
|===
2 changes: 1 addition & 1 deletion core/standard/abstract_tests/covjson/ATS_content.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/covjson/coverageJSON.yaml[coverageJSON.yaml] schema using a JSON Schema validator.
step::: Validate the document against the link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/covjson/coverageJSON.yaml[coverageJSON.yaml] schema using a JSON Schema validator.
====
6 changes: 3 additions & 3 deletions core/standard/abstract_tests/edr-geojson/ATS_content.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: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.
* FeatureCollection: link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/edr-geojson/edrFeatureCollectionGeoJSON.yaml[edrFeatureCollectionGeoJSON.yaml]
* Feature: link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/geojson/featureGeoJSON.yaml[featureGeoJSON.yaml]
* GeometryCollection: link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/geojson/geometrycollectionGeoJSON.yaml[geometrycollectionGeoJSON.yaml] using a JSON Schema validator.
====
4 changes: 2 additions & 2 deletions core/standard/abstract_tests/queries/ATS_instances.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
[cols="1,4",width="90%"]
|===
2+|*Conformance Class*
2+|http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/collections
2+|https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/collections
|Target type |Web API
|Requirements Class |<<rc_collections,http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/collections>>
|Requirements Class |<<rc_collections,https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/collections>>
|Dependency |<<ats_core,Conformance Class "OAPI Core">>
|===

Expand Down
2 changes: 1 addition & 1 deletion core/standard/document.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:status: draft
:committee: technical
:draft: 3.0
:external-id: http://www.opengis.net/doc/IS/ogcapi-edr-1/1.2
:external-id: https://www.opengis.net/doc/IS/ogcapi-edr-1/1.2
:docnumber: 19-086r7
:received-date: 2022-07-26
:issued-date: 2022-09-30
Expand Down
Loading