diff --git a/README.md b/README.md index 11b89a280..dd1db3c88 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # OGC API - Environmental Data Retrieval -[](https://www.opengeospatial.org) +[](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. @@ -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 diff --git a/asciidoctor.json b/asciidoctor.json index 94ea83c8f..9a9fc4964 100644 --- a/asciidoctor.json +++ b/asciidoctor.json @@ -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"], @@ -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"], diff --git a/core/standard/abstract_tests/ATS_class_collections.adoc b/core/standard/abstract_tests/ATS_class_collections.adoc index 35b618924..a9a7eb1da 100644 --- a/core/standard/abstract_tests/ATS_class_collections.adoc +++ b/core/standard/abstract_tests/ATS_class_collections.adoc @@ -3,9 +3,9 @@ .Collections ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/collections -subject:: <> -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:: <> +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 diff --git a/core/standard/abstract_tests/ATS_class_core.adoc b/core/standard/abstract_tests/ATS_class_core.adoc index 50ebdb39d..3c89ae4ab 100644 --- a/core/standard/abstract_tests/ATS_class_core.adoc +++ b/core/standard/abstract_tests/ATS_class_core.adoc @@ -3,9 +3,9 @@ .Core ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core -subject:: <> -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:: <> +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 diff --git a/core/standard/abstract_tests/ATS_class_covjson.adoc b/core/standard/abstract_tests/ATS_class_covjson.adoc index 77d783e39..3163456f8 100644 --- a/core/standard/abstract_tests/ATS_class_covjson.adoc +++ b/core/standard/abstract_tests/ATS_class_covjson.adoc @@ -3,10 +3,10 @@ .CoverageJSON ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/covjson -subject:: <> +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/covjson +subject:: <> 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 ==== diff --git a/core/standard/abstract_tests/ATS_class_edr-geojson.adoc b/core/standard/abstract_tests/ATS_class_edr-geojson.adoc index 4e201eacb..3eafd36cb 100644 --- a/core/standard/abstract_tests/ATS_class_edr-geojson.adoc +++ b/core/standard/abstract_tests/ATS_class_edr-geojson.adoc @@ -3,10 +3,10 @@ .EDR GeoJSON ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/edr-geojson -subject:: <> +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/edr-geojson +subject:: <> 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 ==== diff --git a/core/standard/abstract_tests/ATS_class_geojson.adoc b/core/standard/abstract_tests/ATS_class_geojson.adoc index b2c069bfb..06ace9dbf 100644 --- a/core/standard/abstract_tests/ATS_class_geojson.adoc +++ b/core/standard/abstract_tests/ATS_class_geojson.adoc @@ -3,10 +3,10 @@ .GeoJSON ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/geojson -subject:: <> +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/geojson +subject:: <> 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 ==== diff --git a/core/standard/abstract_tests/ATS_class_html.adoc b/core/standard/abstract_tests/ATS_class_html.adoc index e16ee63a7..da24289f6 100644 --- a/core/standard/abstract_tests/ATS_class_html.adoc +++ b/core/standard/abstract_tests/ATS_class_html.adoc @@ -3,11 +3,11 @@ .HTML ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/html -subject:: <> +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/html +subject:: <> 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 ==== diff --git a/core/standard/abstract_tests/ATS_class_instances.adoc b/core/standard/abstract_tests/ATS_class_instances.adoc index 3333c0539..7f8a02603 100644 --- a/core/standard/abstract_tests/ATS_class_instances.adoc +++ b/core/standard/abstract_tests/ATS_class_instances.adoc @@ -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 |<> -|Dependency |<> +|Requirements Class |<> +|Dependency |<> |=== ==== General Tests diff --git a/core/standard/abstract_tests/ATS_class_json.adoc b/core/standard/abstract_tests/ATS_class_json.adoc index 241c60474..9e2d36bca 100644 --- a/core/standard/abstract_tests/ATS_class_json.adoc +++ b/core/standard/abstract_tests/ATS_class_json.adoc @@ -3,11 +3,11 @@ .JSON ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/json -subject:: <> +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/json +subject:: <> 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 ==== diff --git a/core/standard/abstract_tests/ATS_class_oas30.adoc b/core/standard/abstract_tests/ATS_class_oas30.adoc index af5caccf0..e2d62e4e1 100644 --- a/core/standard/abstract_tests/ATS_class_oas30.adoc +++ b/core/standard/abstract_tests/ATS_class_oas30.adoc @@ -3,11 +3,11 @@ .OpenAPI 3.0 ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/oas30 -subject:: <> +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/oas30 +subject:: <> 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 diff --git a/core/standard/abstract_tests/ATS_class_queries.adoc b/core/standard/abstract_tests/ATS_class_queries.adoc index 49457e0f6..20da2c3a1 100644 --- a/core/standard/abstract_tests/ATS_class_queries.adoc +++ b/core/standard/abstract_tests/ATS_class_queries.adoc @@ -3,11 +3,11 @@ .Queries ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/queries -subject:: <> +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/queries +subject:: <> 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 diff --git a/core/standard/abstract_tests/collections/ATS_rc-md-collection-info-table.adoc b/core/standard/abstract_tests/collections/ATS_rc-md-collection-info-table.adoc index fe25e8e21..b00398681 100644 --- a/core/standard/abstract_tests/collections/ATS_rc-md-collection-info-table.adoc +++ b/core/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: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] |<> +|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collection.yaml[collection.yaml]|<> +|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collection.yaml[collection.yaml] |<> |=== diff --git a/core/standard/abstract_tests/collections/ATS_rc-md-success-table.adoc b/core/standard/abstract_tests/collections/ATS_rc-md-success-table.adoc index 37e58eff9..a7dfebc6a 100644 --- a/core/standard/abstract_tests/collections/ATS_rc-md-success-table.adoc +++ b/core/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: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] |<> +|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collections.yaml[collections.yaml]|<> +|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collections.yaml[collections.yaml] |<> |=== diff --git a/core/standard/abstract_tests/core/ATS_conformance-success.adoc b/core/standard/abstract_tests/core/ATS_conformance-success.adoc index cc8774ebc..937271ab8 100644 --- a/core/standard/abstract_tests/core/ATS_conformance-success.adoc +++ b/core/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: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. ==== diff --git a/core/standard/abstract_tests/core/ATS_root-success.adoc b/core/standard/abstract_tests/core/ATS_root-success.adoc index 0c49852af..73ce9cf29 100644 --- a/core/standard/abstract_tests/core/ATS_root-success.adoc +++ b/core/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: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] |<> +|HTML |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/core/landingPage.yaml[landingPage.yaml]|<> +|JSON |link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/core/landingPage.yaml[landingPage.yaml] |<> |=== diff --git a/core/standard/abstract_tests/covjson/ATS_content.adoc b/core/standard/abstract_tests/covjson/ATS_content.adoc index e6b43eaa9..0b45a911c 100644 --- a/core/standard/abstract_tests/covjson/ATS_content.adoc +++ b/core/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: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. ==== diff --git a/core/standard/abstract_tests/edr-geojson/ATS_content.adoc b/core/standard/abstract_tests/edr-geojson/ATS_content.adoc index bb5dd22b7..365831c5c 100644 --- a/core/standard/abstract_tests/edr-geojson/ATS_content.adoc +++ b/core/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: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. ==== diff --git a/core/standard/abstract_tests/queries/ATS_instances.adoc b/core/standard/abstract_tests/queries/ATS_instances.adoc index c72b7f048..6c8608589 100644 --- a/core/standard/abstract_tests/queries/ATS_instances.adoc +++ b/core/standard/abstract_tests/queries/ATS_instances.adoc @@ -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 |<> +|Requirements Class |<> |Dependency |<> |=== diff --git a/core/standard/document.adoc b/core/standard/document.adoc index 54e5b3556..f69bbfac1 100644 --- a/core/standard/document.adoc +++ b/core/standard/document.adoc @@ -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 diff --git a/core/standard/examples/collections_metadata_JSON_1.adoc b/core/standard/examples/collections_metadata_JSON_1.adoc index 727361fda..eea019939 100755 --- a/core/standard/examples/collections_metadata_JSON_1.adoc +++ b/core/standard/examples/collections_metadata_JSON_1.adoc @@ -205,7 +205,7 @@ There are also links to the license information for the observation and forecast } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "CoverageJSON", @@ -224,7 +224,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_windDirection", + "id": "https://codes.wmo.int//common/quantity-kind/_windDirection", "label": "Wind Direction" }, "measurementType": { @@ -243,7 +243,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_windSpeed", + "id": "https://codes.wmo.int//common/quantity-kind/_windSpeed", "label": "Wind Speed" }, "measurementType": { @@ -262,7 +262,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_maximumWindGustSpeed", + "id": "https://codes.wmo.int//common/quantity-kind/_maximumWindGustSpeed", "label": "Wind Gust" }, "measurementType": { @@ -281,7 +281,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -300,7 +300,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -319,7 +319,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/bufr4/b/13/_009", + "id": "https://codes.wmo.int//bufr4/b/13/_009", "label": "Relative Humidity" }, "measurementType": { @@ -338,7 +338,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_dewPointTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_dewPointTemperature", "label": "Dew point" }, "measurementType": { @@ -357,7 +357,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/bufr4/b/10/_051", + "id": "https://codes.wmo.int//bufr4/b/10/_051", "label": "Pressure" }, "measurementType": { @@ -376,7 +376,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_pressureTendency", + "id": "https://codes.wmo.int//common/quantity-kind/_pressureTendency", "label": "Pressure Tendancy" }, "measurementType": { @@ -395,7 +395,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { @@ -564,7 +564,7 @@ There are also links to the license information for the observation and forecast } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "CoverageJSON", @@ -582,7 +582,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -601,7 +601,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -620,7 +620,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -639,7 +639,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -658,7 +658,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -677,7 +677,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -696,7 +696,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -715,7 +715,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -734,7 +734,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probability of precipitation" }, "measurementType": { @@ -753,7 +753,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { diff --git a/core/standard/examples/conformance_response_JSON_1.adoc b/core/standard/examples/conformance_response_JSON_1.adoc index 6999de13e..27efdc65a 100644 --- a/core/standard/examples/conformance_response_JSON_1.adoc +++ b/core/standard/examples/conformance_response_JSON_1.adoc @@ -6,12 +6,12 @@ This example response in JSON is for an OGC API - EDR that supports OpenAPI 3.0 ---- { "conformsTo": [ - "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core", - "http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core", - "http://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections", - "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/oas30", - "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/html", - "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/geojson" + "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core", + "https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core", + "https://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections", + "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/oas30", + "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/html", + "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/geojson" ] } ---- diff --git a/core/standard/examples/instance_metadata_JSON.adoc b/core/standard/examples/instance_metadata_JSON.adoc index 81e704713..08e66055a 100644 --- a/core/standard/examples/instance_metadata_JSON.adoc +++ b/core/standard/examples/instance_metadata_JSON.adoc @@ -225,7 +225,7 @@ There are also links to the license information for the observation and forecast } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "GeoJSON", @@ -244,7 +244,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -263,7 +263,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -282,7 +282,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -301,7 +301,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -320,7 +320,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -339,7 +339,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -358,7 +358,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -377,7 +377,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -396,7 +396,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -415,7 +415,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { @@ -592,7 +592,7 @@ There are also links to the license information for the observation and forecast } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "GeoJSON", @@ -611,7 +611,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -630,7 +630,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -649,7 +649,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -668,7 +668,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -687,7 +687,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -706,7 +706,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -725,7 +725,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -744,7 +744,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -763,7 +763,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -782,7 +782,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { @@ -959,7 +959,7 @@ There are also links to the license information for the observation and forecast } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "GeoJSON", @@ -978,7 +978,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -997,7 +997,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -1016,7 +1016,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -1035,7 +1035,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -1054,7 +1054,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -1073,7 +1073,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -1092,7 +1092,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -1111,7 +1111,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -1130,7 +1130,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -1149,7 +1149,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { @@ -1325,7 +1325,7 @@ There are also links to the license information for the observation and forecast } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "GeoJSON", @@ -1344,7 +1344,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -1363,7 +1363,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -1382,7 +1382,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -1401,7 +1401,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -1420,7 +1420,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -1439,7 +1439,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -1458,7 +1458,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -1477,7 +1477,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -1496,7 +1496,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -1515,7 +1515,7 @@ There are also links to the license information for the observation and forecast } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { diff --git a/core/standard/examples/json/conformance_example.json b/core/standard/examples/json/conformance_example.json index dd6bca9b8..78c9be232 100644 --- a/core/standard/examples/json/conformance_example.json +++ b/core/standard/examples/json/conformance_example.json @@ -1,10 +1,10 @@ { "conformsTo": [ - "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core", - "http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core", - "http://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections", - "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/oas30", - "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/html", - "http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/geojson" + "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core", + "https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core", + "https://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections", + "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/oas30", + "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/html", + "https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/geojson" ] } diff --git a/core/standard/examples/pdf_test.adoc b/core/standard/examples/pdf_test.adoc index 058f96d42..6b372330e 100644 --- a/core/standard/examples/pdf_test.adoc +++ b/core/standard/examples/pdf_test.adoc @@ -8,7 +8,7 @@ Doc Writer // Uncomment next line to set page size (default is A4) //:pdf-page-size: Letter -A simple http://asciidoc.org[AsciiDoc] document. +A simple https://asciidoc.org/[AsciiDoc] document. == Introduction diff --git a/core/standard/examples/pdf_test.html b/core/standard/examples/pdf_test.html index 2f506efde..651726484 100644 --- a/core/standard/examples/pdf_test.html +++ b/core/standard/examples/pdf_test.html @@ -449,7 +449,7 @@

Document Title

-

A simple AsciiDoc document.

+

A simple AsciiDoc document.

diff --git a/core/standard/openapi/examples/collection.json b/core/standard/openapi/examples/collection.json index 5dab2cebb..821f9d42c 100644 --- a/core/standard/openapi/examples/collection.json +++ b/core/standard/openapi/examples/collection.json @@ -208,7 +208,7 @@ } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "CoverageJSON", @@ -227,7 +227,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_windDirection", + "id": "https://codes.wmo.int//common/quantity-kind/_windDirection", "label": "Wind Direction" }, "measurementType": { @@ -246,7 +246,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_windSpeed", + "id": "https://codes.wmo.int//common/quantity-kind/_windSpeed", "label": "Wind Speed" }, "measurementType": { @@ -265,7 +265,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_maximumWindGustSpeed", + "id": "https://codes.wmo.int//common/quantity-kind/_maximumWindGustSpeed", "label": "Wind Gust" }, "measurementType": { @@ -284,7 +284,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -303,7 +303,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -322,7 +322,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/bufr4/b/13/_009", + "id": "https://codes.wmo.int//bufr4/b/13/_009", "label": "Relative Humidity" }, "measurementType": { @@ -341,7 +341,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_dewPointTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_dewPointTemperature", "label": "Dew point" }, "measurementType": { @@ -360,7 +360,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/bufr4/b/10/_051", + "id": "https://codes.wmo.int//bufr4/b/10/_051", "label": "Pressure" }, "measurementType": { @@ -379,7 +379,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_pressureTendency", + "id": "https://codes.wmo.int//common/quantity-kind/_pressureTendency", "label": "Pressure Tendancy" }, "measurementType": { @@ -398,7 +398,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { @@ -488,7 +488,7 @@ } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "CoverageJSON", @@ -506,7 +506,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -525,7 +525,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -544,7 +544,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -563,7 +563,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -582,7 +582,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -601,7 +601,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -620,7 +620,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -639,7 +639,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -658,7 +658,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -677,7 +677,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { diff --git a/core/standard/openapi/examples/instance.json b/core/standard/openapi/examples/instance.json index 6821087f6..e9dd60012 100644 --- a/core/standard/openapi/examples/instance.json +++ b/core/standard/openapi/examples/instance.json @@ -202,7 +202,7 @@ } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "GeoJSON", @@ -221,7 +221,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -240,7 +240,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -259,7 +259,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -278,7 +278,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -297,7 +297,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -316,7 +316,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -335,7 +335,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -354,7 +354,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -373,7 +373,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -392,7 +392,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { @@ -563,7 +563,7 @@ } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "GeoJSON", @@ -582,7 +582,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -601,7 +601,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -620,7 +620,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -639,7 +639,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -658,7 +658,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -677,7 +677,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -696,7 +696,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -715,7 +715,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -734,7 +734,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -753,7 +753,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { @@ -924,7 +924,7 @@ } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "GeoJSON", @@ -943,7 +943,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -962,7 +962,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -981,7 +981,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -1000,7 +1000,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -1019,7 +1019,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -1038,7 +1038,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -1057,7 +1057,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -1076,7 +1076,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -1095,7 +1095,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -1114,7 +1114,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { @@ -1284,7 +1284,7 @@ } }, "crs": [ - "http://www.opengis.net/def/crs/OGC/1.3/CRS84" + "https://www.opengis.net/def/crs/OGC/1.3/CRS84" ], "output_formats": [ "GeoJSON", @@ -1303,7 +1303,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-0", "label": "Wind Direction" }, "measurementType": { @@ -1322,7 +1322,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Speed" }, "measurementType": { @@ -1341,7 +1341,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-1", "label": "Wind Gust" }, "measurementType": { @@ -1360,7 +1360,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Air Temperature" }, "measurementType": { @@ -1379,7 +1379,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/wmdr/ObservedVariableAtmosphere/_266", + "id": "https://codes.wmo.int//wmdr/ObservedVariableAtmosphere/_266", "label": "Weather" }, "measurementType": { @@ -1398,7 +1398,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Relative Humidity" }, "measurementType": { @@ -1417,7 +1417,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_airTemperature", + "id": "https://codes.wmo.int//common/quantity-kind/_airTemperature", "label": "Feels like temperature" }, "measurementType": { @@ -1436,7 +1436,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-4-51", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-4-51", "label": "UV index" }, "measurementType": { @@ -1455,7 +1455,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-1-1", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-1-1", "label": "Probabilty of precipitation" }, "measurementType": { @@ -1474,7 +1474,7 @@ } }, "observedProperty": { - "id": "http://codes.wmo.int/common/quantity-kind/_horizontalVisibility", + "id": "https://codes.wmo.int//common/quantity-kind/_horizontalVisibility", "label": "Visibility" }, "measurementType": { diff --git a/core/standard/openapi/ogcapi-environmental-data-retrieval-1.bundled.json b/core/standard/openapi/ogcapi-environmental-data-retrieval-1.bundled.json index 64ac95bc1..16d743fc9 100644 --- a/core/standard/openapi/ogcapi-environmental-data-retrieval-1.bundled.json +++ b/core/standard/openapi/ogcapi-environmental-data-retrieval-1.bundled.json @@ -268,7 +268,7 @@ { "name": "bbox", "in": "query", - "description": "Only features that have a geometry that intersects the bounding box are selected.\nThe bounding box is provided as four or six numbers, depending on whether the\ncoordinate reference system includes a vertical axis (height or depth):\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(http://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in the parameter `bbox-crs`.\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\nIf the vertical axis is included, the third and the sixth number are the\nbottom and the top of the 3-dimensional bounding box.\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.", + "description": "Only features that have a geometry that intersects the bounding box are selected.\nThe bounding box is provided as four or six numbers, depending on whether the\ncoordinate reference system includes a vertical axis (height or depth):\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(https://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in the parameter `bbox-crs`.\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\nIf the vertical axis is included, the third and the sixth number are the\nbottom and the top of the 3-dimensional bounding box.\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.", "required": false, "schema": { "oneOf": [ @@ -513,7 +513,7 @@ "type": "array", "minItems": 1, "items": { - "description": "Each bounding box is provided as four or six numbers, depending on\nwhether the coordinate reference system includes a vertical axis\n(height or depth):\n\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\n\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(http://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in `crs`.\n\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\n\nIf the vertical axis is included, the third and the sixth number are\nthe bottom and the top of the 3-dimensional bounding box.\n\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.", + "description": "Each bounding box is provided as four or six numbers, depending on\nwhether the coordinate reference system includes a vertical axis\n(height or depth):\n\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\n\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(https://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in `crs`.\n\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\n\nIf the vertical axis is included, the third and the sixth number are\nthe bottom and the top of the 3-dimensional bounding box.\n\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.", "oneOf": [ { "items": { @@ -633,7 +633,7 @@ "description": "Coordinate reference system of the coordinates in the temporal extent\n(property `interval`). The default reference system is the Gregorian calendar.\nIn the Core this is the only supported temporal coordinate reference system.\nExtensions may support additional temporal coordinate reference systems ", "type": "string", "example": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]]", - "default": "http://www.opengis.net/def/uom/ISO-8601/0/Gregorian" + "default": "https://www.opengis.net/def/uom/ISO-8601/0/Gregorian" }, "name": { "description": "Name of the temporal coordinate reference system", @@ -1385,7 +1385,7 @@ ], "example": { "value": "hPa", - "type": "http://www.opengis.net/def/uom/UCUM/" + "type": "https://www.opengis.net/def/uom/UCUM/" } }, "id": { @@ -1398,7 +1398,7 @@ }, "symbol": { "value": "K", - "type": "http://www.opengis.net/def/uom/UCUM/" + "type": "https://www.opengis.net/def/uom/UCUM/" } } }, @@ -1474,7 +1474,7 @@ } }, "example": { - "id": "http://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/", + "id": "https://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/", "label": "Sea Ice Concentration" } }, @@ -1530,11 +1530,11 @@ "label": "Ratio", "symbol": { "value": "1", - "type": "http://www.opengis.net/def/uom/UCUM/" + "type": "https://www.opengis.net/def/uom/UCUM/" } }, "observedProperty": { - "id": "http://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/", + "id": "https://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/", "label": "Sea Ice Concentration" } } @@ -1572,7 +1572,7 @@ { "name": "coords", "in": "query", - "description": "location(s) to return data for, the coordinates are defined by a Well Known Text\n(wkt) string. to retrieve a single location :\n\nPOINT(x y) i.e. POINT(0 51.48) for Greenwich, London\n\nAnd for a list of locations\n\nMULTIPOINT((x y),(x1 y1),(x2 y2),(x3 y3))\n\ni.e.\nMULTIPOINT((38.9 -77),(48.85 2.35),(39.92 116.38),(-35.29 149.1),(51.5 -0.1))\n\nsee http://portal.opengeospatial.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nthe coordinate values will depend on the CRS parameter, if this is not defined\nthe values will be assumed to WGS84 values (i.e x=longitude and y=latitude)\n", + "description": "location(s) to return data for, the coordinates are defined by a Well Known Text\n(wkt) string. to retrieve a single location :\n\nPOINT(x y) i.e. POINT(0 51.48) for Greenwich, London\n\nAnd for a list of locations\n\nMULTIPOINT((x y),(x1 y1),(x2 y2),(x3 y3))\n\ni.e.\nMULTIPOINT((38.9 -77),(48.85 2.35),(39.92 116.38),(-35.29 149.1),(51.5 -0.1))\n\nsee https://portal.ogc.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nthe coordinate values will depend on the CRS parameter, if this is not defined\nthe values will be assumed to WGS84 values (i.e x=longitude and y=latitude)\n", "required": true, "schema": { "type": "string" @@ -1706,7 +1706,7 @@ { "name": "coords", "in": "query", - "description": "location(s) to return data for, the coordinates are defined by a Well Known Text\n(wkt) string. to retrieve a single location :\n\nPOINT(x y) i.e. POINT(0 51.48) for Greenwich, London\n\nsee http://portal.opengeospatial.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nthe coordinate values will depend on the CRS parameter, if this is not defined\nthe values will be assumed to WGS84 values (i.e x=longitude and y=latitude)\n", + "description": "location(s) to return data for, the coordinates are defined by a Well Known Text\n(wkt) string. to retrieve a single location :\n\nPOINT(x y) i.e. POINT(0 51.48) for Greenwich, London\n\nsee https://portal.ogc.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nthe coordinate values will depend on the CRS parameter, if this is not defined\nthe values will be assumed to WGS84 values (i.e x=longitude and y=latitude)\n", "required": true, "schema": { "type": "string" @@ -1868,7 +1868,7 @@ { "name": "coords", "in": "query", - "description": "Only data that has a geometry that intersects the area defined by the polygon\nare selected. \n\nThe polygon is defined using a Well Known Text string following \n\ncoords=POLYGON((x y,x1 y1,x2 y2,...,xn yn x y))\n\nwhich are values in the coordinate system defined by the crs query parameter \n(if crs is not defined the values will be assumed to be WGS84 longitude/latitude coordinates). \n\nFor instance a polygon that roughly describes an area that contains \nSouth West England in WGS84 would look like: \n\ncoords=POLYGON((-6.1 50.3,-4.35 51.4,-2.6 51.6,-2.8 50.6,-5.3 49.9,-6.1,50.3))\n\nsee http://portal.opengeospatial.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nThe coords parameter will only support 2D POLYGON definitions", + "description": "Only data that has a geometry that intersects the area defined by the polygon\nare selected. \n\nThe polygon is defined using a Well Known Text string following \n\ncoords=POLYGON((x y,x1 y1,x2 y2,...,xn yn x y))\n\nwhich are values in the coordinate system defined by the crs query parameter \n(if crs is not defined the values will be assumed to be WGS84 longitude/latitude coordinates). \n\nFor instance a polygon that roughly describes an area that contains \nSouth West England in WGS84 would look like: \n\ncoords=POLYGON((-6.1 50.3,-4.35 51.4,-2.6 51.6,-2.8 50.6,-5.3 49.9,-6.1,50.3))\n\nsee https://portal.ogc.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nThe coords parameter will only support 2D POLYGON definitions", "required": true, "schema": { "type": "string" diff --git a/core/standard/openapi/parameters/core/areaCoords.yaml b/core/standard/openapi/parameters/core/areaCoords.yaml index 6c6f10642..f95d8e5b3 100644 --- a/core/standard/openapi/parameters/core/areaCoords.yaml +++ b/core/standard/openapi/parameters/core/areaCoords.yaml @@ -16,7 +16,7 @@ description: |- coords=POLYGON((-6.1 50.3,-4.35 51.4,-2.6 51.6,-2.8 50.6,-5.3 49.9,-6.1,50.3)) - see http://portal.opengeospatial.org/files/?artifact_id=25355 and + see https://portal.ogc.org/files/?artifact_id=25355 and https://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry The coords parameter will only support 2D POLYGON definitions diff --git a/core/standard/openapi/parameters/core/bbox.yaml b/core/standard/openapi/parameters/core/bbox.yaml index 9b1b0b0c6..db92270f9 100644 --- a/core/standard/openapi/parameters/core/bbox.yaml +++ b/core/standard/openapi/parameters/core/bbox.yaml @@ -11,7 +11,7 @@ description: |- * Upper right corner, coordinate axis 2 * Maximum value, coordinate axis 3 (optional) The coordinate reference system of the values is WGS 84 longitude/latitude - (http://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate + (https://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate reference system is specified in the parameter `bbox-crs`. For WGS 84 longitude/latitude the values are in most cases the sequence of minimum longitude, minimum latitude, maximum longitude and maximum latitude. diff --git a/core/standard/openapi/parameters/core/positionCoords.yaml b/core/standard/openapi/parameters/core/positionCoords.yaml index 11f9d0f8c..9aff64f0b 100644 --- a/core/standard/openapi/parameters/core/positionCoords.yaml +++ b/core/standard/openapi/parameters/core/positionCoords.yaml @@ -13,7 +13,7 @@ description: |+ i.e. MULTIPOINT((38.9 -77),(48.85 2.35),(39.92 116.38),(-35.29 149.1),(51.5 -0.1)) - see http://portal.opengeospatial.org/files/?artifact_id=25355 and + see https://portal.ogc.org/files/?artifact_id=25355 and https://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry the coordinate values will depend on the CRS parameter, if this is not defined diff --git a/core/standard/openapi/parameters/core/radiusCoords.yaml b/core/standard/openapi/parameters/core/radiusCoords.yaml index 0f5767d1a..c53bb4331 100644 --- a/core/standard/openapi/parameters/core/radiusCoords.yaml +++ b/core/standard/openapi/parameters/core/radiusCoords.yaml @@ -6,7 +6,7 @@ description: | POINT(x y) i.e. POINT(0 51.48) for Greenwich, London - see http://portal.opengeospatial.org/files/?artifact_id=25355 and + see https://portal.ogc.org/files/?artifact_id=25355 and https://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry the coordinate values will depend on the CRS parameter, if this is not defined diff --git a/core/standard/openapi/schemas/collections/extent.yaml b/core/standard/openapi/schemas/collections/extent.yaml index 470729ab4..cef78f47f 100644 --- a/core/standard/openapi/schemas/collections/extent.yaml +++ b/core/standard/openapi/schemas/collections/extent.yaml @@ -50,7 +50,7 @@ properties: The coordinate reference system of the values is WGS 84 longitude/latitude - (http://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate + (https://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate reference system is specified in `crs`. @@ -166,7 +166,7 @@ properties: Extensions may support additional temporal coordinate reference systems type: string example: TIMECRS["DateTime",TDATUM["Gregorian Calendar"],CS[TemporalDateTime,1],AXIS["Time (T)",future]] - default: http://www.opengis.net/def/uom/ISO-8601/0/Gregorian + default: https://www.opengis.net/def/uom/ISO-8601/0/Gregorian name: description: Name of the temporal coordinate reference system type: string diff --git a/core/standard/openapi/schemas/collections/observedPropertyCollection.yaml b/core/standard/openapi/schemas/collections/observedPropertyCollection.yaml index 9c0eef851..d2df4b402 100644 --- a/core/standard/openapi/schemas/collections/observedPropertyCollection.yaml +++ b/core/standard/openapi/schemas/collections/observedPropertyCollection.yaml @@ -47,5 +47,5 @@ properties: en: type: string example: - id: http://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/ + id: https://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/ label: Sea Ice Concentration diff --git a/core/standard/openapi/schemas/collections/parameterNames.yaml b/core/standard/openapi/schemas/collections/parameterNames.yaml index 231969012..057924c20 100644 --- a/core/standard/openapi/schemas/collections/parameterNames.yaml +++ b/core/standard/openapi/schemas/collections/parameterNames.yaml @@ -62,7 +62,7 @@ example: label: Ratio symbol: value: "1" - type: http://www.opengis.net/def/uom/UCUM/ + type: https://www.opengis.net/def/uom/UCUM/ observedProperty: - id: http://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/ + id: https://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/ label: Sea Ice Concentration diff --git a/core/standard/openapi/schemas/collections/units.yaml b/core/standard/openapi/schemas/collections/units.yaml index 26ad209ef..ee840ee42 100644 --- a/core/standard/openapi/schemas/collections/units.yaml +++ b/core/standard/openapi/schemas/collections/units.yaml @@ -31,7 +31,7 @@ properties: - type: string example: value: hPa - type: http://www.opengis.net/def/uom/UCUM/ + type: https://www.opengis.net/def/uom/UCUM/ id: type: string example: @@ -39,4 +39,4 @@ example: en: Kelvin symbol: value: K - type: http://www.opengis.net/def/uom/UCUM/ + type: https://www.opengis.net/def/uom/UCUM/ diff --git a/core/standard/recommendations/core/REC_edr-geojson.adoc b/core/standard/recommendations/core/REC_edr-geojson.adoc index 4c09ca44d..6f6ede8de 100644 --- a/core/standard/recommendations/core/REC_edr-geojson.adoc +++ b/core/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 https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/edr-geojson/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.2/openapi/schemas/edr-geojson/edrFeatureCollectionGeoJSON.yaml[EDR GeoJSON Schema] as an encoding. ==== diff --git a/core/standard/requirements/collections/REQ_rc-md-success.adoc b/core/standard/requirements/collections/REQ_rc-md-success.adoc index f47e28e63..89f738cd7 100644 --- a/core/standard/requirements/collections/REQ_rc-md-success.adoc +++ b/core/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:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collections.yaml[collections.yaml]. +The content of that response SHALL be based upon the schema link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collections.yaml[collections.yaml]. ==== diff --git a/core/standard/requirements/collections/REQ_src-md-success.adoc b/core/standard/requirements/collections/REQ_src-md-success.adoc index 741fef488..684c8717a 100644 --- a/core/standard/requirements/collections/REQ_src-md-success.adoc +++ b/core/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:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/collections/collection.yaml[collection.yaml]. +The content of that response SHALL be based upon the schema link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/collections/collection.yaml[collection.yaml]. --- diff --git a/core/standard/requirements/core/REQ_conformance-success.adoc b/core/standard/requirements/core/REQ_conformance-success.adoc index 1f84defbe..e137408b8 100644 --- a/core/standard/requirements/core/REQ_conformance-success.adoc +++ b/core/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: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. +The content of that response SHALL be based upon the schema link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/core/confClasses.yaml[confClasses.yaml] and list all OGC API conformance classes that the API conforms to. ==== diff --git a/core/standard/requirements/core/REQ_core_conformance.adoc b/core/standard/requirements/core/REQ_core_conformance.adoc index be802b492..73a5eb79d 100644 --- a/core/standard/requirements/core/REQ_core_conformance.adoc +++ b/core/standard/requirements/core/REQ_core_conformance.adoc @@ -10,8 +10,8 @@ identifier:: /req/core/conformance The list of Conformance Classes advertised by the API SHALL include: -* http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core -* http://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections -* http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core +* https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core +* https://www.opengis.net/spec/ogcapi-common-2/1.0/conf/collections +* https://www.opengis.net/spec/ogcapi-edr-1/1.2/conf/core ==== diff --git a/core/standard/requirements/core/REQ_root-success.adoc b/core/standard/requirements/core/REQ_root-success.adoc index 36410a137..484b55cde 100644 --- a/core/standard/requirements/core/REQ_root-success.adoc +++ b/core/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: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 content of that response SHALL be based upon the OpenAPI 3.0 schema link:https://schemas.opengis.net/ogcapi/edr/1.2/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/core/standard/requirements/edr-geojson/REQ_content.adoc b/core/standard/requirements/edr-geojson/REQ_content.adoc index f1838e84b..1a9764156 100644 --- a/core/standard/requirements/edr-geojson/REQ_content.adoc +++ b/core/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:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/edr-geojson/edrFeatureCollectionGeoJSON.yaml[EDR GeoJSON FeatureCollection Object] for features, and +* an link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/edr-geojson/edrFeatureCollectionGeoJSON.yaml[EDR GeoJSON FeatureCollection Object] for features, and -* an link:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/geojson/featureGeoJSON.yaml[EDR GeoJSON Feature Object] for a single feature. +* an link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/geojson/featureGeoJSON.yaml[EDR GeoJSON Feature Object] for a single feature. diff --git a/core/standard/requirements/edr/REQ_rc-coords-definition.adoc b/core/standard/requirements/edr/REQ_rc-coords-definition.adoc index 6516543ab..0dcb81efb 100644 --- a/core/standard/requirements/edr/REQ_rc-coords-definition.adoc +++ b/core/standard/requirements/edr/REQ_rc-coords-definition.adoc @@ -24,7 +24,7 @@ explode: false --- *B:* -The `coords` string value will be a Well Known Text representation of geometry as defined in link:http://www.opengeospatial.org/standards/sfa[Simple Feature Access - Part 1: Common Architecture]. The representation type will depend on the queryType of the API +The `coords` string value will be a Well Known Text representation of geometry as defined in link:https://www.ogc.org//standards/sfa[Simple Feature Access - Part 1: Common Architecture]. The representation type will depend on the queryType of the API ==== diff --git a/core/standard/requirements/edr/REQ_rc-parameters.adoc b/core/standard/requirements/edr/REQ_rc-parameters.adoc index 106bdbd47..458110e50 100644 --- a/core/standard/requirements/edr/REQ_rc-parameters.adoc +++ b/core/standard/requirements/edr/REQ_rc-parameters.adoc @@ -37,6 +37,6 @@ A parameter object SHALL have a member with the name "observedProperty" where th --- *G:* -A parameter object MAY have a member with the name "unit" where the value is an object which SHALL have either or both the members "label" or/and “symbol”, and which MAY have the member "id". If given, the value of "symbol" SHALL either be a string of the symbolic notation of the unit, or an object with the members "value" and "type" where "value" is the symbolic unit notation and "type" references the unit serialization scheme that is used. "type" SHALL HAVE the value "http://www.opengis.net/def/uom/UCUM/” if UCUM is used, or a custom value as recommended in section “Extensions”. If given, the value of "label" SHALL be a string of the name of the unit and SHOULD be short. If given, the value of "id" SHALL be a string and SHOULD be a common identifier. It is RECOMMENDED to reference a unit serialization scheme to allow automatic unit conversion. +A parameter object MAY have a member with the name "unit" where the value is an object which SHALL have either or both the members "label" or/and “symbol”, and which MAY have the member "id". If given, the value of "symbol" SHALL either be a string of the symbolic notation of the unit, or an object with the members "value" and "type" where "value" is the symbolic unit notation and "type" references the unit serialization scheme that is used. "type" SHALL HAVE the value "https://www.opengis.net/def/uom/UCUM/” if UCUM is used, or a custom value as recommended in section “Extensions”. If given, the value of "label" SHALL be a string of the name of the unit and SHOULD be short. If given, the value of "id" SHALL be a string and SHOULD be a common identifier. It is RECOMMENDED to reference a unit serialization scheme to allow automatic unit conversion. ==== diff --git a/core/standard/requirements/edr/query_type/item.adoc b/core/standard/requirements/edr/query_type/item.adoc index 87952fb23..93c88486a 100644 --- a/core/standard/requirements/edr/query_type/item.adoc +++ b/core/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 https://schemas.opengis.net/ogcapi/edr/1.1/openapi/ogcapi-environmental-data-retrieval-1.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.2/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/core/standard/requirements/edr/query_type/locations.adoc b/core/standard/requirements/edr/query_type/locations.adoc index f72183e3e..c4edf1aa2 100644 --- a/core/standard/requirements/edr/query_type/locations.adoc +++ b/core/standard/requirements/edr/query_type/locations.adoc @@ -6,7 +6,7 @@ The filter constraints are defined by the following query parameters: [cols="2,1,1,2,3"] |==== |Path Parameter| Type | Required|Description|Examples -a| **locationId**| String|No| Unique identifier(s) for the required location(s), such as a http://en.wikipedia.org/wiki/Geohash[GeoHash], a World Meteorological Organization (WMO) station identifier or place name. a| * `EGLL` +a| **locationId**| String|No| Unique identifier(s) for the required location(s), such as a https://en.wikipedia.org/wiki/Geohash[GeoHash], a World Meteorological Organization (WMO) station identifier or place name. a| * `EGLL` * `Ottawa` * `limit.broom.flip` * `gbsvn` diff --git a/core/standard/requirements/html/REQ_content.adoc b/core/standard/requirements/html/REQ_content.adoc index bb7c2f843..2002ec548 100644 --- a/core/standard/requirements/html/REQ_content.adoc +++ b/core/standard/requirements/html/REQ_content.adoc @@ -11,7 +11,7 @@ Every `200`-response of the server with the media type `text/html` SHALL be a li -* all information identified in the schemas of the link:http://spec.openapis.org/oas/v3.0.3#responseObject[Response Object] in the HTML ``, and +* all information identified in the schemas of the link:https://spec.openapis.org/oas/v3.0.3#responseObject[Response Object] in the HTML ``, and * all links in HTML `` elements in the HTML ``. diff --git a/core/standard/requirements/instances/REQ_src-md-success.adoc b/core/standard/requirements/instances/REQ_src-md-success.adoc index 13dfa162d..f6f4a2192 100644 --- a/core/standard/requirements/instances/REQ_src-md-success.adoc +++ b/core/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:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/queries/instances.yaml[instances.yaml]. +The content of that response SHALL be based upon the JSON schema link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/queries/instances.yaml[instances.yaml]. --- diff --git a/core/standard/requirements/requirements_class_collections.adoc b/core/standard/requirements/requirements_class_collections.adoc index 458f5cddf..fe3448ded 100644 --- a/core/standard/requirements/requirements_class_collections.adoc +++ b/core/standard/requirements/requirements_class_collections.adoc @@ -6,11 +6,11 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/collections +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/collections obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-2/1.0/req/collections -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-2/1.0/req/collections +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core inherit:: ISO 19107 inherit:: ISO 19108 inherit:: ISO 19111 diff --git a/core/standard/requirements/requirements_class_core.adoc b/core/standard/requirements/requirements_class_core.adoc index a1f2c01d6..303af0de2 100644 --- a/core/standard/requirements/requirements_class_core.adoc +++ b/core/standard/requirements/requirements_class_core.adoc @@ -7,11 +7,11 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/core +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/core obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core -inherit:: http://www.opengis.net/spec/ogcapi-common-2/1.0/req/collections +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-2/1.0/req/collections requirement:: /req/core/root-op requirement:: /req/core/root-success requirement:: /req/core/api-definition-op diff --git a/core/standard/requirements/requirements_class_covjson.adoc b/core/standard/requirements/requirements_class_covjson.adoc index beb184789..698651b31 100644 --- a/core/standard/requirements/requirements_class_covjson.adoc +++ b/core/standard/requirements/requirements_class_covjson.adoc @@ -6,10 +6,10 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/covjson +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/covjson obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core requirement:: /req/covjson/content requirement:: /req/covjson/definition diff --git a/core/standard/requirements/requirements_class_edr_geojson.adoc b/core/standard/requirements/requirements_class_edr_geojson.adoc index 10d7f8d58..ea4be233a 100644 --- a/core/standard/requirements/requirements_class_edr_geojson.adoc +++ b/core/standard/requirements/requirements_class_edr_geojson.adoc @@ -6,10 +6,10 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/edr-geojson +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/edr-geojson obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core requirement:: /req/edr-geojson/content requirement:: /req/edr-geojson/definition diff --git a/core/standard/requirements/requirements_class_geojson.adoc b/core/standard/requirements/requirements_class_geojson.adoc index 6a8100e3a..2fd85fa93 100644 --- a/core/standard/requirements/requirements_class_geojson.adoc +++ b/core/standard/requirements/requirements_class_geojson.adoc @@ -6,10 +6,10 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/geojson +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/geojson obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core requirement:: /req/geojson/content requirement:: /req/geojson/definition diff --git a/core/standard/requirements/requirements_class_html.adoc b/core/standard/requirements/requirements_class_html.adoc index 4fbd243b7..ff64d0f37 100644 --- a/core/standard/requirements/requirements_class_html.adoc +++ b/core/standard/requirements/requirements_class_html.adoc @@ -6,10 +6,10 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/html +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/html obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core requirement:: /req/html/content requirement:: /req/html/definition diff --git a/core/standard/requirements/requirements_class_json.adoc b/core/standard/requirements/requirements_class_json.adoc index 386233985..5497ea981 100644 --- a/core/standard/requirements/requirements_class_json.adoc +++ b/core/standard/requirements/requirements_class_json.adoc @@ -6,10 +6,10 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/json +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/json obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/json +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/json requirement:: /req/json/content requirement:: /req/json/definition diff --git a/core/standard/requirements/requirements_class_oas30.adoc b/core/standard/requirements/requirements_class_oas30.adoc index c9013cbd4..3193527be 100644 --- a/core/standard/requirements/requirements_class_oas30.adoc +++ b/core/standard/requirements/requirements_class_oas30.adoc @@ -5,11 +5,11 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/oas30 +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/oas30 obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/core -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/oas30 +inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/oas30 inherit:: OpenAPI Specification 3.0.3 requirement:: /req/oas30/oas-impl diff --git a/core/standard/requirements/requirements_class_post.adoc b/core/standard/requirements/requirements_class_post.adoc index 5f1a27fbf..f97b1601a 100644 --- a/core/standard/requirements/requirements_class_post.adoc +++ b/core/standard/requirements/requirements_class_post.adoc @@ -6,10 +6,10 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/post +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/post obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core requirement:: /req/post/definition requirement:: /req/post/content_type diff --git a/core/standard/requirements/requirements_class_queries.adoc b/core/standard/requirements/requirements_class_queries.adoc index d824e3210..7e7cae5c9 100644 --- a/core/standard/requirements/requirements_class_queries.adoc +++ b/core/standard/requirements/requirements_class_queries.adoc @@ -6,10 +6,10 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/queries +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/queries obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/collections +inherit:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/collections requirement:: /req/queries/position requirement:: /req/edr/rc-area diff --git a/core/standard/requirements/requirements_class_query_parameters.adoc b/core/standard/requirements/requirements_class_query_parameters.adoc index ec495c415..bf89fcaed 100644 --- a/core/standard/requirements/requirements_class_query_parameters.adoc +++ b/core/standard/requirements/requirements_class_query_parameters.adoc @@ -6,11 +6,11 @@ ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/query_parameters +identifier:: https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/query_parameters obligation:: requirement subject:: Web API -inherit:: http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core -inherit:: http://www.opengis.net/spec/ogcapi-common-2/1.0/req/collections +inherit:: https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +inherit:: https://www.opengis.net/spec/ogcapi-common-2/1.0/req/collections requirement:: /req/core/rc-bbox-definition requirement:: /req/core/rc-bbox-response diff --git a/core/standard/sections/annex_collection_response.adoc b/core/standard/sections/annex_collection_response.adoc index 941f2b3d2..1574f4b73 100755 --- a/core/standard/sections/annex_collection_response.adoc +++ b/core/standard/sections/annex_collection_response.adoc @@ -37,7 +37,7 @@ OGC Web API Standards use <> to express relatio |========================== |Field Name|Type|Required|Description |**href** |String|**Yes**| URL being referenced -|**rel** |String |**Yes**| Relation type of the URL. A list of valid relation types can be found at http://www.opengis.net/def/rel +|**rel** |String |**Yes**| Relation type of the URL. A list of valid relation types can be found at https://www.opengis.net/def/rel |type |String |No| Type of information being returned by the URL |hreflang |String |No| Attribute used to specify the language and geographical targeting of information accessed by the URL. Can be defined by using a value from either https://en.wikipedia.org/wiki/ISO_639-1[languages ISO 639-1] or https://en.wikipedia.org/wiki/ISO_3166-1[countries ISO 3166-1] |title |String|No| A short text label to describe the URL @@ -147,7 +147,7 @@ The spatial object describes the spatial area covered by the information availab * Lower left corner, coordinate axis 2 * Upper right corner, coordinate axis 1 * Upper right corner, coordinate axis 2 -|**crs** |String|**Yes**| This can either be a http://docs.opengeospatial.org/is/18-010r7/18-010r7.html[Well Known Text definition] of the CRS or follow a convention of http://www.opengis.net/def/crs/{authority}/{version}/{code} where the token **{authority}** is a placeholder for a code the designates to authority responsible for the definition of this CRS. Typical values include "EPSG" and "OGC". The token **{version}** is a placeholder for the specific version of the coordinate reference system definition or 0 for the latest version or if the version is unknown. The token **{code}** is a placeholder for the authority’s code for the CRS. +|**crs** |String|**Yes**| This can either be a https://docs.ogc.org/is/18-010r7/18-010r7.html[Well Known Text definition] of the CRS or follow a convention of https://www.opengis.net/def/crs/{authority}/{version}/{code} where the token **{authority}** is a placeholder for a code the designates to authority responsible for the definition of this CRS. Typical values include "EPSG" and "OGC". The token **{version}** is a placeholder for the specific version of the coordinate reference system definition or 0 for the latest version or if the version is unknown. The token **{code}** is a placeholder for the authority’s code for the CRS. |========================== @@ -161,7 +161,7 @@ The temporal object describes the time period covered by the information availab |Field Name|Type|Required|Description |**interval** | Array of ISO 8601 Date Array|**Yes**| An array of ISO 8601 Date Array, each ISO 8601 Date Array should contain two values first being the minimum date time and second the maximum date time for information in the collection (see https://en.wikipedia.org/wiki/ISO_8601) |**values** | ISO 8601 Date Array|**No**| An array of ISO 8601 datestrings which details the time intervals available in the collection, each member of the array can either be a single time, an ISO 8601 time interval or an ISO 8601 time duration (see https://en.wikipedia.org/wiki/ISO_8601) -|**trs** |String|**Yes**| This defaults to Gregorian, but other temporal systems can be supported following the conventions defined by the http://docs.opengeospatial.org/is/18-010r7/18-010r7.html[Well Known Text] standard. +|**trs** |String|**Yes**| This defaults to Gregorian, but other temporal systems can be supported following the conventions defined by the https://docs.ogc.org/is/18-010r7/18-010r7.html[Well Known Text] standard. |========================== @@ -175,7 +175,7 @@ The vertical object describes the vertical extent of information available in th |Field Name|Type|Required|Description |**interval** | String Array|**Yes**| Array of level values array, each Level value Array should contain two values first being the minimum vertical level and second the maximum vertical level for information in the collection |**values** | String Array|**No**| Array of height values supported by the collection. -|**vrs** |String|**Yes**| Follows the conventions defined by the http://docs.opengeospatial.org/is/18-010r7/18-010r7.html[Well Known Text] standard. +|**vrs** |String|**Yes**| Follows the conventions defined by the https://docs.ogc.org/is/18-010r7/18-010r7.html[Well Known Text] standard. |========================== @@ -476,11 +476,11 @@ A Parameter names example is shown below. "label": "K", "symbol": { "value": "K", - "type": "http://qudt.org/vocab/unit/K" + "type": "https://qudt.org/vocab/unit/K" } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-0-0", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-0-0", "label": "Temperature_altitude_above_msl" }, "measurementType": { @@ -495,11 +495,11 @@ A Parameter names example is shown below. "label": "m/s", "symbol": { "value": "m%20s", - "type": "http://qudt.org/vocab/unit/M-PER-SEC.html" + "type": "https://qudt.org/vocab/unit/M-PER-SEC.html" } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-2", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-2", "label": "u-component_of_wind_altitude_above_msl" }, "measurementType": { @@ -514,11 +514,11 @@ A Parameter names example is shown below. "label": "m/s", "symbol": { "value": "m%20s", - "type": "http://qudt.org/vocab/unit/M-PER-SEC.html" + "type": "https://qudt.org/vocab/unit/M-PER-SEC.html" } }, "observedProperty": { - "id": "http://codes.wmo.int/grib2/codeflag/4.2/_0-2-3", + "id": "https://codes.wmo.int//grib2/codeflag/4.2/_0-2-3", "label": "v-component_of_wind_altitude_above_msl" }, "measurementType": { diff --git a/core/standard/sections/annex_examples.adoc b/core/standard/sections/annex_examples.adoc index d4afa4bf7..643798a6b 100644 --- a/core/standard/sections/annex_examples.adoc +++ b/core/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:https://schemas.opengis.net/ogcapi/edr/1.1/openapi/ogcapi-environmental-data-retrieval-1.yaml[YAML OpenAPI document] +link:https://schemas.opengis.net/ogcapi/edr/1.2/openapi/ogcapi-environmental-data-retrieval-1.yaml[YAML OpenAPI document] [[conformance-response-examples]] === Conformance Examples diff --git a/core/standard/sections/annex_measurement_type_methods.adoc b/core/standard/sections/annex_measurement_type_methods.adoc index 937ede444..5da685530 100644 --- a/core/standard/sections/annex_measurement_type_methods.adoc +++ b/core/standard/sections/annex_measurement_type_methods.adoc @@ -38,11 +38,11 @@ Wind Speed and Wind direction values which represent a average value over the 10 "label": "K", "symbol": { "value": "K", - "type": "http://qudt.org/vocab/unit/K" + "type": "https://qudt.org/vocab/unit/K" } }, "observedProperty": { - "id": "http://codes.wmo.int/bufr4/b/12/004", + "id": "https://codes.wmo.int//bufr4/b/12/004", "label": "Air Temperature" }, "measurementType": { @@ -57,11 +57,11 @@ Wind Speed and Wind direction values which represent a average value over the 10 "label": "m/s", "symbol": { "value": "m%20s", - "type": "http://qudt.org/vocab/unit/M-PER-SEC.html" + "type": "https://qudt.org/vocab/unit/M-PER-SEC.html" } }, "observedProperty": { - "id": "http://codes.wmo.int/bufr4/b/11/012", + "id": "https://codes.wmo.int//bufr4/b/11/012", "label": "10m Wind Speed" }, "measurementType": { @@ -80,7 +80,7 @@ Wind Speed and Wind direction values which represent a average value over the 10 } }, "observedProperty": { - "id": "http://codes.wmo.int/bufr4/b/11/011", + "id": "https://codes.wmo.int//bufr4/b/11/011", "label": "10m wind direction" }, "measurementType": { diff --git a/core/standard/sections/annex_relationship.adoc b/core/standard/sections/annex_relationship.adoc index 0ebd4308a..ecdb4800e 100644 --- a/core/standard/sections/annex_relationship.adoc +++ b/core/standard/sections/annex_relationship.adoc @@ -9,10 +9,10 @@ This Annex outlines the relationships, in terms of underlying conceptual models, :sectnums!: === Relationship between OGC API-EDR and OGC API-Features -The EDR API is completely compatible with http://docs.opengeospatial.org/is/17-069r3/17-069r3.html[OGC API - Features - Part 1: Core (OGC 17-069r3)], in that it supports Collections and Items. It extends the Collection functionality by allowing 'Instances', a form of 'collection of collections'. The EDR API also supports the retrieval of spatiotemporal data by named location as well as coordinates. +The EDR API is completely compatible with https://docs.ogc.org/is/17-069r3/17-069r3.html[OGC API - Features - Part 1: Core (OGC 17-069r3)], in that it supports Collections and Items. It extends the Collection functionality by allowing 'Instances', a form of 'collection of collections'. The EDR API also supports the retrieval of spatiotemporal data by named location as well as coordinates. === Relationships between OGC API-EDR and Moving Features standards -There are four OGC Moving Features standards: http://docs.opengeospatial.org/is/18-075/18-075.html[conceptual model with XML encoding (OGC 18-075)], http://docs.opengeospatial.org/is/16-120r3/16-120r3.html[access (OGC 16-120r3)], http://docs.opengeospatial.org/is/14-084r2/14-084r2.html[CSV encoding (OGC 14-084r2)], and http://docs.opengeospatial.org/is/19-045r3/19-045r3.html[JSON encoding (OGC 19-045r3)]. The Moving Features Standards are concerned with things that move along a trajectory, and simultaneously change their orientation through rigid body rotation. The concepts are defined in https://www.uml.org[Unified Modeling Language (UML)] and encoded in GML. The EDR API does not have the concept of orientation, or foliation or prisms. EDR API is OpenAPI defined, over HTTP(S), and not defined in UML. +There are four OGC Moving Features standards: https://docs.ogc.org/is/18-075/18-075.html[conceptual model with XML encoding (OGC 18-075)], https://docs.ogc.org/is/16-120r3/16-120r3.html[access (OGC 16-120r3)], https://docs.ogc.org/is/14-084r2/14-084r2.html[CSV encoding (OGC 14-084r2)], and https://docs.ogc.org/is/19-045r3/19-045r3.html[JSON encoding (OGC 19-045r3)]. The Moving Features Standards are concerned with things that move along a trajectory, and simultaneously change their orientation through rigid body rotation. The concepts are defined in https://www.uml.org[Unified Modeling Language (UML)] and encoded in GML. The EDR API does not have the concept of orientation, or foliation or prisms. EDR API is OpenAPI defined, over HTTP(S), and not defined in UML. Moving Features and EDR API do share a common conceptual definition, from ISO, of a Trajectory, but the Moving Features Standards encode trajectories in GML, CSV and Moving Features JSON, whereas the EDR API encodes trajectories in WKT. The Moving Features Standards support relationships between trajectories and other features, including other trajectories, the EDR API does not. Moving Features also explicitly supports concepts such as velocity, acceleration and distance along a trajectory, whereas the EDR API does not. @@ -21,12 +21,12 @@ The Moving Features Standards consider trajectories as a primary resource to be === Relationships between OGC API-EDR and Web Coverage Service and Coverage Implementation Schema The primary messaging mechanism of the EDR API is JSON, including CoverageJSON, over HTTP(S). Implementations of the EDR API are described using the OpenAPI V3.0 specification. The target users are web-developers and end-users who are not geospatial experts. The target data resources are any dataset described as spatiotemporal, accessible by coordinates. -The EDR API is consistent with the http://docs.opengeospatial.org/is/17-089r1/17-089r1.html[Web Coverage Service (WCS)] and http://docs.opengeospatial.org/is/09-146r8/09-146r8.html[Coverage Implementation Schema (CIS)] standards but does not require the end user or developer to use the terms Domain and RangeSet. The EDR API can also be used to generate a single query against a collection of coverages, providing the data coordinate reference systems are consistent. The EDR API can support any of the WCS and CIS output formats if required. At the time of publication of version 1.0.0 of the EDR API, at least one EDR API implementation had been created by building on top of a WCS/CIS implementation. +The EDR API is consistent with the https://docs.ogc.org/is/17-089r1/17-089r1.html[Web Coverage Service (WCS)] and https://docs.ogc.org/is/09-146r8/09-146r8.html[Coverage Implementation Schema (CIS)] standards but does not require the end user or developer to use the terms Domain and RangeSet. The EDR API can also be used to generate a single query against a collection of coverages, providing the data coordinate reference systems are consistent. The EDR API can support any of the WCS and CIS output formats if required. At the time of publication of version 1.0.0 of the EDR API, at least one EDR API implementation had been created by building on top of a WCS/CIS implementation. The EDR API, with only a single form of spatiotemporal query, allows the retrieval of data from other data stores adhering to data models that are not coverages, such as features or observations. === Relationship between OGC API-EDR and the OGC MetOcean Application profile of Web Coverage Service (WCS) 2.1 -The OGC API-EDR standard was developed out of the experiences of creating http://docs.ogc.org/is/15-045r7/15-045r7.html[Part 0], http://docs.ogc.org/is/15-108r3/15-108r3.html[Part 1] and http://docs.ogc.org/is/17-086r3/17-086r3.html[Part 2] of the WCS 2.1 Met Ocean Application Profile, *ostensibly* for similar use cases, but for differing technology bases. +The OGC API-EDR standard was developed out of the experiences of creating https://docs.ogc.org/is/15-045r7/15-045r7.html[Part 0], https://docs.ogc.org/is/15-108r3/15-108r3.html[Part 1] and https://docs.ogc.org/is/17-086r3/17-086r3.html[Part 2] of the WCS 2.1 Met Ocean Application Profile, *ostensibly* for similar use cases, but for differing technology bases. The primary messaging mechanism of the EDR API is JSON, including CoverageJSON, over HTTP(S). Implementations of the EDR API are described using the OpenAPI V3.0 specification. The target users are web-developers and end-users who are not geospatial experts. The target data resources are any data described as spatiotemporal, accessible by coordinates, not just meteorological or oceanographic. diff --git a/core/standard/sections/clause_0_front_material.adoc b/core/standard/sections/clause_0_front_material.adoc index 275c57180..f0454a2ee 100644 --- a/core/standard/sections/clause_0_front_material.adoc +++ b/core/standard/sections/clause_0_front_material.adoc @@ -50,7 +50,7 @@ The goals of the EDR Application Programming Interface (API) that is specified b A major use case for the EDR API is to retrieve small subsets from large collections of environmental data, such as weather forecasts, though many other types of data can be accessed. The important aspect is that the requested data can be unambiguously specified by spatio-temporal coordinates. -The EDR API query patterns - <>, <>, <>, <> or <> - can be thought of as discrete sampling geometries, conceptually consistent with the feature of interest in the https://www.ogc.org/standards/sos[Sensor Observation Service (SOS)] standard. A typical data resource accessed by an EDR API instance is a multidimensional dataset that could be accessed via an implementation of the http://www.ogc.org/standards/wcs[Web Coverage Service (WCS)] standard. In contrast to SOS and WCS, the EDR API is fully consistent with the patterns of the https://ogcapi.ogc.org/[OGC API] family of standards and aims to provide a single set of simple-to-use query patterns. Use cases for EDR range from real or virtual time-series observation retrievals, to sub-setting 4-dimensional data cubes along user-supplied sampling geometries. These query patterns do not attempt to satisfy the full scope of either SOS or WCS, but instead provide useful building blocks to enable the composition of APIs that satisfy a wide range of geospatial data use cases. By defining a small set of query patterns (and no requirement to implement all of them), the EDR API should help to simplify the design of systems (as they can be performance tuned for the supported queries) making it easier to build robust and scalable infrastructures. +The EDR API query patterns - <>, <>, <>, <> or <> - can be thought of as discrete sampling geometries, conceptually consistent with the feature of interest in the https://www.ogc.org/standards/sos[Sensor Observation Service (SOS)] standard. A typical data resource accessed by an EDR API instance is a multidimensional dataset that could be accessed via an implementation of the https://www.ogc.org/standards/wcs[Web Coverage Service (WCS)] standard. In contrast to SOS and WCS, the EDR API is fully consistent with the patterns of the https://ogcapi.ogc.org/[OGC API] family of standards and aims to provide a single set of simple-to-use query patterns. Use cases for EDR range from real or virtual time-series observation retrievals, to sub-setting 4-dimensional data cubes along user-supplied sampling geometries. These query patterns do not attempt to satisfy the full scope of either SOS or WCS, but instead provide useful building blocks to enable the composition of APIs that satisfy a wide range of geospatial data use cases. By defining a small set of query patterns (and no requirement to implement all of them), the EDR API should help to simplify the design of systems (as they can be performance tuned for the supported queries) making it easier to build robust and scalable infrastructures. With the OGC API family of standards, the OGC community has extended its suite of standards to include Resource Oriented Architectures and Web Application Programming Interfaces (APIs). These standards are based on a shared foundation, specified in https://ogcapi.ogc.org/common[OGC API-Common], which defines the resources and access paths that are supported by all OGC APIs. The resources are listed in <>. This document extends that foundation to define the EDR API. diff --git a/core/standard/sections/clause_3_references.adoc b/core/standard/sections/clause_3_references.adoc index 88d1fee39..26ff9227d 100755 --- a/core/standard/sections/clause_3_references.adoc +++ b/core/standard/sections/clause_3_references.adoc @@ -16,8 +16,8 @@ The following normative documents contain provisions that, through reference in * [[[schema_org,schema_org]]]Schema.org: https://schema.org/docs/schemas.html[https://schema.org/docs/schemas.html] * [[[OGC21-069r2,OGC 21-069r2]]] Little, C., Blower, J., Riechert, M., Kralidis, T., Davies, E., Olson, S., McGibbney, L.: OGC CoverageJSON Community Standard, https://docs.ogc.org/cs/21-069r2/21-069r2.html[https://docs.ogc.org/cs/21-069r2/21-069r2.html] * [[[RFC2413,RFC 2413]]] Weibel, S., Kunze, J., Lagoze, C., Wolf, M.: IETF RFC 2413, Dublin Core Metadata for Resource Discovery, https://tools.ietf.org/rfc/rfc2413.txt[https://tools.ietf.org/rfc/rfc2413.txt] -* [[[OGC06-103r4,OGC 06-103r4]]] Herring, J.: Simple Feature Access - Part 1: Common Architecture, http://portal.opengeospatial.org/files/?artifact_id=25355[http://portal.opengeospatial.org/files/?artifact_id=25355] -* [[[OGC18-010r7,OGC 18-010r7]]] Lott, R.: Well-Known Text representation of Coordinate Reference Systems, http://docs.opengeospatial.org/is/18-010r7/18-010r7.html[http://docs.opengeospatial.org/is/18-010r7/18-010r7.html] -* [[[OGC17-069r3,OGC 17-069r3]]] Portele, C., Vretanos, P., Heazel, C.: OGC API - Features - Part 1: Core, http://www.opengis.net/doc/IS/ogcapi-features-1/1.0[http://www.opengis.net/doc/IS/ogcapi-features-1/1.0] +* [[[OGC06-103r4,OGC 06-103r4]]] Herring, J.: Simple Feature Access - Part 1: Common Architecture, https://portal.ogc.org/files/?artifact_id=25355[https://portal.ogc.org/files/?artifact_id=25355] +* [[[OGC18-010r7,OGC 18-010r7]]] Lott, R.: Well-Known Text representation of Coordinate Reference Systems, https://docs.ogc.org/is/18-010r7/18-010r7.html[https://docs.ogc.org/is/18-010r7/18-010r7.html] +* [[[OGC17-069r3,OGC 17-069r3]]] Portele, C., Vretanos, P., Heazel, C.: OGC API - Features - Part 1: Core, https://www.opengis.net/doc/IS/ogcapi-features-1/1.0[https://www.opengis.net/doc/IS/ogcapi-features-1/1.0] * [[[OGC19-072,OGC 19-072]]] Charles Heazel: OGC API - Common - Part 1: Core. OGC 19-072, Open Geospatial Consortium, https://docs.ogc.org/is/19-072/19-072.html[https://docs.ogc.org/is/19-072/19-072.html] -* [[[OGC20-024,OGC 20-024]]] Charles Heazel: OGC API - Common - Part 2: Geospatial Data (Draft). OGC 20-024, Open Geospatial Consortium, http://docs.ogc.org/DRAFTS/20-024.html[http://docs.ogc.org/DRAFTS/20-024.html] +* [[[OGC20-024,OGC 20-024]]] Charles Heazel: OGC API - Common - Part 2: Geospatial Data (Draft). OGC 20-024, Open Geospatial Consortium, https://docs.ogc.org/DRAFTS/20-024.html[https://docs.ogc.org/DRAFTS/20-024.html] diff --git a/core/standard/sections/clause_5_conventions.adoc b/core/standard/sections/clause_5_conventions.adoc index 83eb3e736..e7e83a131 100755 --- a/core/standard/sections/clause_5_conventions.adoc +++ b/core/standard/sections/clause_5_conventions.adoc @@ -7,7 +7,7 @@ The https://www.w3.org/TR/webarch/[Architecture of the World Wide Web] establish The normative provisions in this standard are denoted by the URI: -http://www.opengis.net/spec/ogcapi-edr-1/1.1 +https://www.opengis.net/spec/ogcapi-edr-1/1.1 All <> and <> that appear in this document are denoted by partial URIs which are relative to this base. @@ -19,7 +19,7 @@ Implementation of the URI Templates is recommended in that they provide a common === Link relations -To express relationships between resources, <> and <> are used wherever possible and denoted below with [IANA]. Additional link relation types are registered with the http://www.opengis.net/def/rel[OGC Link Relation Type Register]. These are denoted below with [OGC]. +To express relationships between resources, <> and <> are used wherever possible and denoted below with [IANA]. Additional link relation types are registered with the https://www.opengis.net/def/rel[OGC Link Relation Type Register]. These are denoted below with [OGC]. The following link-relations are in common use by OGC <> Standards. @@ -60,13 +60,13 @@ JSON media types that would typically be used in an OGC API that supports JSON a * `application/vnd.cov+json` for resources that include coverage content encoded according to CoverageJSON * `application/geo+json` for feature <> and features -* `application/json` for all other resource representations, as well as coverage content encoded according to the http://docs.opengeospatial.org/is/09-146r8/09-146r8.html[Coverage Implementation Schema (CIS)] +* `application/json` for all other resource representations, as well as coverage content encoded according to the https://docs.ogc.org/is/09-146r8/09-146r8.html[Coverage Implementation Schema (CIS)] XML media types that would typically occur in an OGC API that supports XML are: * `application/gml+xml;version=3.2` for any https://portal.ogc.org/files/?artifact_id=74183&version=2[Geography Markup Language (GML) 3.2] feature <> and features -* `application/gml+xml;version=3.2;profile=http://www.opengis.net/def/profile/ogc/2.0/gml-sf0` for GML 3.2 feature <> and features conforming to the GML Simple Feature Level 0 profile -* `application/gml+xml;version=3.2;profile=http://www.opengis.net/def/profile/ogc/2.0/gml-sf2` for GML 3.2 feature <> and features conforming to the GML Simple Feature Level 2 profile +* `application/gml+xml;version=3.2;profile=https://www.opengis.net/def/profile/ogc/2.0/gml-sf0` for GML 3.2 feature <> and features conforming to the GML Simple Feature Level 0 profile +* `application/gml+xml;version=3.2;profile=https://www.opengis.net/def/profile/ogc/2.0/gml-sf2` for GML 3.2 feature <> and features conforming to the GML Simple Feature Level 2 profile * `application/xml` for all other resources The typical HTML media type for all "web pages" in an OGC API would be `text/html`. diff --git a/core/standard/sections/clause_7_core.adoc b/core/standard/sections/clause_7_core.adoc index ab9cf76ce..9cc5a2ba2 100755 --- a/core/standard/sections/clause_7_core.adoc +++ b/core/standard/sections/clause_7_core.adoc @@ -3,8 +3,8 @@ The OGC API-EDR standard is an extension of <> and <>. Therefore, an implementation of OGC API-EDR shall first satisfy the appropriate Requirements Classes from OGC API - Common, namely: -* Core, <> -* Collections, <> +* Core, <> +* Collections, <> [[rc_core-section]] === Overview @@ -27,14 +27,14 @@ The following four sections explain aspects of the `Core`, `Collections` and `Qu [width="90%",cols="2,4,4",options="header"] |==== ^|*API-EDR Section* ^|*API-EDR Requirements Class* ^|*API-Common Requirements Class* -|<>| <> | http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core -|<>| <> | http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core -|<>| <> | http://www.opengis.net/spec/ogcapi-common-1/1.0/req/core -|<>| <> | http://www.opengis.net/spec/ogcapi-common-2/1.0/req/collections -|<>| <> | http://www.opengis.net/spec/ogcapi-common-1/1.0/req/oas30 -|<>| <> | http://www.opengis.net/spec/ogcapi-common-1/1.0/req/json -|<>| <> | http://www.opengis.net/spec/ogcapi-common-1/1.0/req/json -|<>| <> | http://www.opengis.net/spec/ogcapi-common-1/1.0/req/html +|<>| <> | https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +|<>| <> | https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +|<>| <> | https://www.opengis.net/spec/ogcapi-common-1/1.0/req/core +|<>| <> | https://www.opengis.net/spec/ogcapi-common-2/1.0/req/collections +|<>| <> | https://www.opengis.net/spec/ogcapi-common-1/1.0/req/oas30 +|<>| <> | https://www.opengis.net/spec/ogcapi-common-1/1.0/req/json +|<>| <> | https://www.opengis.net/spec/ogcapi-common-1/1.0/req/json +|<>| <> | https://www.opengis.net/spec/ogcapi-common-1/1.0/req/html |==== [[api-platform-section]] @@ -49,7 +49,7 @@ The landing page provides links that support exploration of the resources offere .Dependencies -* Core, <> +* Core, <> ===== Operation @@ -81,7 +81,7 @@ include::../examples/json/landingPage_example.json[] ===== Error Handling -The requirements for handling unsuccessful requests are provided in Recommendation <> of OGC API - Common. General guidance on HTTP status codes and how they should be handled is provided in <> - HTTP Status Codes. +The requirements for handling unsuccessful requests are provided in Recommendation <> of OGC API - Common. General guidance on HTTP status codes and how they should be handled is provided in <> - HTTP Status Codes. [[api-definition]] ==== API definition @@ -92,7 +92,7 @@ Support for an API definition is specified in the following Requirements Class o .Dependencies -* Core, <> +* Core, <> ===== Operation @@ -109,7 +109,7 @@ A successful response to the API Definition request is a resource which document ===== Error Handling -The requirements for handling unsuccessful requests are provided in Recommendation <> of OGC API - Common. General guidance on HTTP status codes and how they should be handled is provided in <> - HTTP Status Codes. +The requirements for handling unsuccessful requests are provided in Recommendation <> of OGC API - Common. General guidance on HTTP status codes and how they should be handled is provided in <> - HTTP Status Codes. [[conformance-classes]] ==== Declaration of conformance classes @@ -120,7 +120,7 @@ Support for the declaration of conformance classes is specified in the following .Dependencies -* Core, <> +* Core, <> ===== Operation diff --git a/core/standard/sections/clause_9_general.adoc b/core/standard/sections/clause_9_general.adoc index a128ce21d..6b4f563ba 100755 --- a/core/standard/sections/clause_9_general.adoc +++ b/core/standard/sections/clause_9_general.adoc @@ -69,7 +69,7 @@ For example, if the query requires handling requests asynchronously, one option As discussed in Chapter 9 of the OGC/W3C Spatial Data on the Web <>, how to express and share the location of resources in a consistent way is one of the most fundamental aspects of publishing geospatial or spatio-temporal data and it is important to be clear about the coordinate reference system that the coordinates use. -For the reasons discussed in the Best Practices, EDR APIs SHOULD support WGS84 longitude and latitude (http://www.opengis.net/def/crs/OGC/1.3/CRS84) as a coordinate reference system. +For the reasons discussed in the Best Practices, EDR APIs SHOULD support WGS84 longitude and latitude (https://www.opengis.net/def/crs/OGC/1.3/CRS84) as a coordinate reference system. [[rc_encoding-section]] @@ -172,7 +172,7 @@ include::../recommendations/core/REC_link-header.adoc[] Apply the <>. -The OpenAPI 3.0 Requirements Class used in OGC API - Common is applicable to the EDR API as well. So an implementation of EDR API which supports OpenAPI 3.0 as an API Description format shall also comply with the OpenAPI 3.0 Requirements Class (http://www.opengis.net/spec/ogcapi-common-1/1.0/req/oas30) specified in OGC API — Common. +The OpenAPI 3.0 Requirements Class used in OGC API - Common is applicable to the EDR API as well. So an implementation of EDR API which supports OpenAPI 3.0 as an API Description format shall also comply with the OpenAPI 3.0 Requirements Class (https://www.opengis.net/spec/ogcapi-common-1/1.0/req/oas30) specified in OGC API — Common. Apply <> for OpenAPI 3.0 conformance. @@ -180,7 +180,7 @@ Implementations shall also advertise conformance with this Requirements Class. Apply <> for OpenAPI 3.0 implementation. -An example OpenAPI definition document is available at https://schemas.opengis.net/ogcapi/edr/1.1/openapi/ogcapi-environmental-data-retrieval-1.yaml +An example OpenAPI definition document is available at https://schemas.opengis.net/ogcapi/edr/1.2/openapi/ogcapi-environmental-data-retrieval-1.yaml ==== Complete definition @@ -203,7 +203,7 @@ description: An error occurred. content: application/json: schema: - $ref: https://schemas.opengis.net/ogcapi/edr/1.1/openapi/schemas/core/exception.yaml + $ref: https://schemas.opengis.net/ogcapi/edr/1.2/openapi/schemas/core/exception.yaml text/html: schema: type: string @@ -213,11 +213,11 @@ content: [[security]] === Security considerations -The http://www.opengis.net/doc/IS/ogcapi-edr-1/1.1[OGC API - EDR] Standard is an extension of <>. The <> Standard does not mandate any specific security controls. However, the Standard was constructed so that security controls can be added without impacting conformance. +The https://www.opengis.net/doc/IS/ogcapi-edr-1/1.1[OGC API - EDR] Standard is an extension of <>. The <> Standard does not mandate any specific security controls. However, the Standard was constructed so that security controls can be added without impacting conformance. Apply <> for OpenAPI 3.0 Security support. -The OpenAPI specification, which is used by the http://www.opengis.net/doc/IS/ogcapi-edr-1/1.1[OGC API - EDR] Standard, currently supports the following link:https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#security-scheme-object[security schemes]: +The OpenAPI specification, which is used by the https://www.opengis.net/doc/IS/ogcapi-edr-1/1.1[OGC API - EDR] Standard, currently supports the following link:https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#security-scheme-object[security schemes]: * HTTP authentication, * an API key (either as a header or as a query parameter), diff --git a/deployments.md b/deployments.md index 452b0c1c7..d202139b7 100644 --- a/deployments.md +++ b/deployments.md @@ -9,7 +9,7 @@ Modern web browsers can, of course, act as clients. To help promote OGC API standards and their implementations, implementers of OGC API standards are encouraged to register their implementations on the Programmable Web API Directory (https://www.programmableweb.com/add/api), in addition to registering at the OGC Compliance Database (https://www.ogc.org/resource/products/registration). These are the implementations that were used for the development of the standard: -1. [UK Met Office](http://labs.metoffice.gov.uk/edr/) +1. [UK Met Office](https://labs.metoffice.gov.uk/edr/) [Further details](#uk-met-office) 1. [US NWS](https://data-api.mdl.nws.noaa.gov/EDR-API) [Further details](#us-national-weather-service) @@ -40,20 +40,20 @@ family of standards, including EDR. ### UK Met Office Servers: -- [Example Server](http://labs.metoffice.gov.uk/edr/) developed by Mark Burgoyne. +- [Example Server](https://labs.metoffice.gov.uk/edr/) developed by Mark Burgoyne. Clients: -- [Example Client](http://labs.metoffice.gov.uk/edr/static/html/query.html) +- [Example Client](https://labs.metoffice.gov.uk/edr/static/html/query.html) Server description: implemented using python supports point, radius, area, trajectory and location queries Client description: #### Sample requests -- position: `http://labs.metoffice.gov.uk/edr/collections/terrain_tiles/position?coords=POINT(101.896366 45.209662)¶meter-name=Height&crs=CRS84&f=CoverageJSON` -- area: http://labs.metoffice.gov.uk/edr/collections/global_pop_density/area?coords=POLYGON((-3.652394 51.373721,-3.511786 50.264415,-1.973894 50.499557,-2.114501 51.73946,-3.652394 51.373721))¶meter-name=Pop_Density&crs=CRS84&f=CoverageJSON -- radius: http://labs.metoffice.gov.uk/edr/collections/global_pop_density/radius?coords=POINT(-0.104939 51.513418)&within=30&within-units=km¶meter-name=Pop_Density&crs=CRS84&f=CoverageJSON -- trajectory: `http://labs.metoffice.gov.uk/edr/collections/terrain_tiles/trajectory?coords=LINESTRING(-3.519 50.737,-3.511 50.745,-3.504 50.753,-3.496 50.762,-3.489 50.77,-3.481 50.778,-3.473 50.786,-3.466 50.795,-3.458 50.803,-3.451 50.811,-3.443 50.819,-3.435 50.828,-3.428 50.836,-3.42 50.844,-3.412 50.853,-3.403 50.857,-3.392 50.859,-3.381 50.861,-3.37 50.863,-3.359 50.865,-3.348 50.867,-3.336 50.869,-3.325 50.871,-3.314 50.873,-3.303 50.875,-3.292 50.877,-3.281 50.879,-3.27 50.881,-3.259 50.883,-3.248 50.885,-3.237 50.887,-3.226 50.889,-3.215 50.89,-3.204 50.892,-3.192 50.894,-3.181 50.896,-3.17 50.898,-3.159 50.9,-3.148 50.902,-3.137 50.904,-3.126 50.906,-3.115 50.908,-3.104 50.91,-3.093 50.912,-3.082 50.914,-3.071 50.916,-3.06 50.918,-3.049 50.92,-3.048 50.931,-3.046 50.943,-3.045 50.954,-3.043 50.965,-3.042 50.976,-3.041 50.987,-3.039 50.998,-3.038 51.009,-3.036 51.021,-3.035 51.032,-3.034 51.043,-3.032 51.054,-3.031 51.065,-3.029 51.076,-3.028 51.088,-3.027 51.099,-3.025 51.11,-3.024 51.121,-3.022 51.132,-3.021 51.143,-3.02 51.155,-3.018 51.165,-3.007 51.165,-2.995 51.165,-2.984 51.165,-2.973 51.165,-2.962 51.165,-2.95 51.164,-2.939 51.164,-2.928 51.164,-2.917 51.164,-2.906 51.164,-2.894 51.164,-2.883 51.163,-2.872 51.163,-2.861 51.163,-2.849 51.163,-2.838 51.163)¶meter-name=Height&crs=CRS84&f=CoverageJSON` +- position: `https://labs.metoffice.gov.uk/edr/collections/terrain_tiles/position?coords=POINT(101.896366 45.209662)¶meter-name=Height&crs=CRS84&f=CoverageJSON` +- area: https://labs.metoffice.gov.uk/edr/collections/global_pop_density/area?coords=POLYGON((-3.652394 51.373721,-3.511786 50.264415,-1.973894 50.499557,-2.114501 51.73946,-3.652394 51.373721))¶meter-name=Pop_Density&crs=CRS84&f=CoverageJSON +- radius: https://labs.metoffice.gov.uk/edr/collections/global_pop_density/radius?coords=POINT(-0.104939 51.513418)&within=30&within-units=km¶meter-name=Pop_Density&crs=CRS84&f=CoverageJSON +- trajectory: `https://labs.metoffice.gov.uk/edr/collections/terrain_tiles/trajectory?coords=LINESTRING(-3.519 50.737,-3.511 50.745,-3.504 50.753,-3.496 50.762,-3.489 50.77,-3.481 50.778,-3.473 50.786,-3.466 50.795,-3.458 50.803,-3.451 50.811,-3.443 50.819,-3.435 50.828,-3.428 50.836,-3.42 50.844,-3.412 50.853,-3.403 50.857,-3.392 50.859,-3.381 50.861,-3.37 50.863,-3.359 50.865,-3.348 50.867,-3.336 50.869,-3.325 50.871,-3.314 50.873,-3.303 50.875,-3.292 50.877,-3.281 50.879,-3.27 50.881,-3.259 50.883,-3.248 50.885,-3.237 50.887,-3.226 50.889,-3.215 50.89,-3.204 50.892,-3.192 50.894,-3.181 50.896,-3.17 50.898,-3.159 50.9,-3.148 50.902,-3.137 50.904,-3.126 50.906,-3.115 50.908,-3.104 50.91,-3.093 50.912,-3.082 50.914,-3.071 50.916,-3.06 50.918,-3.049 50.92,-3.048 50.931,-3.046 50.943,-3.045 50.954,-3.043 50.965,-3.042 50.976,-3.041 50.987,-3.039 50.998,-3.038 51.009,-3.036 51.021,-3.035 51.032,-3.034 51.043,-3.032 51.054,-3.031 51.065,-3.029 51.076,-3.028 51.088,-3.027 51.099,-3.025 51.11,-3.024 51.121,-3.022 51.132,-3.021 51.143,-3.02 51.155,-3.018 51.165,-3.007 51.165,-2.995 51.165,-2.984 51.165,-2.973 51.165,-2.962 51.165,-2.95 51.164,-2.939 51.164,-2.928 51.164,-2.917 51.164,-2.906 51.164,-2.894 51.164,-2.883 51.163,-2.872 51.163,-2.861 51.163,-2.849 51.163,-2.838 51.163)¶meter-name=Height&crs=CRS84&f=CoverageJSON` #### Sample workflows - sample URLs diff --git a/docs/BackgroundReading.md b/docs/BackgroundReading.md index 5913963ea..2fcf90ed5 100644 --- a/docs/BackgroundReading.md +++ b/docs/BackgroundReading.md @@ -10,7 +10,7 @@ 5. The [minutes](https://github.com/opengeospatial/ogcapi-environmental-data-retrieval/wiki) of this group should highlight the decisions that have been made. -6. The [background for an API](https://docs.opengeospatial.org/wp/16-019r4/16-019r4.html), rather than protocol, serialisation or data format, describes the OGC approach. See also this [blog entry](https://www.opengeospatial.org/blog/2996). The European Union Joint Research Centre (JRC) has also published a [report on Web APIs](https://op.europa.eu/en/publication-detail/-/publication/7144b6b0-0cf9-11ea-8c1f-01aa75ed71a1/language-en). +6. The [background for an API](https://docs.opengeospatial.org/wp/16-019r4/16-019r4.html), rather than protocol, serialisation or data format, describes the OGC approach. See also this [blog entry](https://www.ogc.org//blog/2996). The European Union Joint Research Centre (JRC) has also published a [report on Web APIs](https://op.europa.eu/en/publication-detail/-/publication/7144b6b0-0cf9-11ea-8c1f-01aa75ed71a1/language-en). 7. The API work across OGC is strongly informed by the W3C Recommmendation: [Data on the Web Best Practices](https://www.w3.org/TR/dwbp/) and the W3C Candidate Recommendation and Technical Note: [Spatial Data on the Web Best Practices](https://www.w3.org/TR/sdw-bp/), jointly developed by OGC and W3C. diff --git a/docs/EnvironmentalDataRetrievalAPI-SWG-Charter.adoc b/docs/EnvironmentalDataRetrievalAPI-SWG-Charter.adoc index 25d9d977a..299cec3ca 100644 --- a/docs/EnvironmentalDataRetrievalAPI-SWG-Charter.adoc +++ b/docs/EnvironmentalDataRetrievalAPI-SWG-Charter.adoc @@ -31,7 +31,7 @@ |=== |*Copyright notice* |Copyright (C) 2019 Open Geospatial Consortium -|To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ +|To obtain additional rights of use, visit https://www.ogc.org//legal/ |=== <<< diff --git a/extensions/pubsub/standard/abstract_tests/ATS_class_pubsub.adoc b/extensions/pubsub/standard/abstract_tests/ATS_class_pubsub.adoc index c30cbe508..4bb17885f 100644 --- a/extensions/pubsub/standard/abstract_tests/ATS_class_pubsub.adoc +++ b/extensions/pubsub/standard/abstract_tests/ATS_class_pubsub.adoc @@ -1,8 +1,8 @@ [conformance_class] ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-2/1.0/conf/pubsub -target:: http://www.opengis.net/spec/ogcapi-edr-2/1.0/req/pubsub +identifier:: https://www.opengis.net/spec/ogcapi-edr-2/1.0/conf/pubsub +target:: https://www.opengis.net/spec/ogcapi-edr-2/1.0/req/pubsub classification:: Target Type:Pub/Sub abstract-test:: /conf/pubsub/api ==== diff --git a/extensions/pubsub/standard/abstract_tests/ATS_class_pubsub_notification_message_payload.adoc b/extensions/pubsub/standard/abstract_tests/ATS_class_pubsub_notification_message_payload.adoc index 61a783d26..8040c1944 100644 --- a/extensions/pubsub/standard/abstract_tests/ATS_class_pubsub_notification_message_payload.adoc +++ b/extensions/pubsub/standard/abstract_tests/ATS_class_pubsub_notification_message_payload.adoc @@ -1,8 +1,8 @@ [conformance_class] ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-2/1.0/conf/pubsub-notification-message-payload -target:: http://www.opengis.net/spec/ogcapi-edr-2/1.0/req/pubsub-notification-message-payload +identifier:: https://www.opengis.net/spec/ogcapi-edr-2/1.0/conf/pubsub-notification-message-payload +target:: https://www.opengis.net/spec/ogcapi-edr-2/1.0/req/pubsub-notification-message-payload abstract-test:: /conf/pubsub-notification-message-payload/geojson abstract-test:: /conf/pubsub-notification-message-payload/id abstract-test:: /conf/pubsub-notification-message-payload/operation diff --git a/extensions/pubsub/standard/document.adoc b/extensions/pubsub/standard/document.adoc index 92a51735b..d23df8a8c 100644 --- a/extensions/pubsub/standard/document.adoc +++ b/extensions/pubsub/standard/document.adoc @@ -5,7 +5,7 @@ :status: public-rfc :committee: technical :draft: 1.0 -:external-id: http://www.opengis.net/doc/IS/ogcapi-edr-2/1.0 +:external-id: https://www.opengis.net/doc/IS/ogcapi-edr-2/1.0 :docnumber: 23-057r1 :received-date: 2024-02-16 :issued-date: 2024-05-07 diff --git a/extensions/pubsub/standard/examples/yaml/asyncapi.yaml b/extensions/pubsub/standard/examples/yaml/asyncapi.yaml index 6e73b7f5a..6d8651a42 100644 --- a/extensions/pubsub/standard/examples/yaml/asyncapi.yaml +++ b/extensions/pubsub/standard/examples/yaml/asyncapi.yaml @@ -2,14 +2,14 @@ asyncapi: '3.0.0' info: title: 'Example API conforming to version 1.0.0 of the OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard' version: 1.0.0 - description: "AsyncAPI description of an example API conforming to version 1.0.0 of the OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard. \n\n Copyright (c) 2024 Open Geospatial Consortium. To obtain additional rights of use, visit http://www.ogc.org/legal/ \n\n The OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard provides recommendations on applying Publish-Subscribe architectural patterns to implementations of one or more OGC API Standards." + description: "AsyncAPI description of an example API conforming to version 1.0.0 of the OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard. \n\n Copyright (c) 2024 Open Geospatial Consortium. To obtain additional rights of use, visit https://www.ogc.org/legal/ \n\n The OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard provides recommendations on applying Publish-Subscribe architectural patterns to implementations of one or more OGC API Standards." contact: name: Open Geospatial Consortium (OGC) url: https://www.ogc.org/contacts email: standards-team@ogc.org license: name: OGC license - url: http://www.ogc.org/legal/ + url: https://www.ogc.org/legal/ servers: mqtt_prod: diff --git a/extensions/pubsub/standard/requirements/requirements_class_pubsub.adoc b/extensions/pubsub/standard/requirements/requirements_class_pubsub.adoc index 15eaeaedd..bc0ee6938 100644 --- a/extensions/pubsub/standard/requirements/requirements_class_pubsub.adoc +++ b/extensions/pubsub/standard/requirements/requirements_class_pubsub.adoc @@ -3,7 +3,7 @@ .Requirements Class 'Publish-Subscribe (Pub/Sub)' ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-2/1.0/req/pubsub +identifier:: https://www.opengis.net/spec/ogcapi-edr-2/1.0/req/pubsub subject:: Pub/Sub requirement:: /req/pubsub/api ==== diff --git a/extensions/pubsub/standard/requirements/requirements_class_pubsub_notification_message_payload.adoc b/extensions/pubsub/standard/requirements/requirements_class_pubsub_notification_message_payload.adoc index 76f480297..bd504889d 100644 --- a/extensions/pubsub/standard/requirements/requirements_class_pubsub_notification_message_payload.adoc +++ b/extensions/pubsub/standard/requirements/requirements_class_pubsub_notification_message_payload.adoc @@ -3,7 +3,7 @@ .Requirements Class 'Publish-Subscribe (Pub/Sub) Notification Message Payloads' ==== [%metadata] -identifier:: http://www.opengis.net/spec/ogcapi-edr-2/1.0/req/pubsub-notification-message-payload +identifier:: https://www.opengis.net/spec/ogcapi-edr-2/1.0/req/pubsub-notification-message-payload subject:: Pub/Sub inherit:: /req/pubsub requirement:: /req/pubsub-notification-message-payload/geojson diff --git a/extensions/pubsub/standard/sections/clause_0_front_material.adoc b/extensions/pubsub/standard/sections/clause_0_front_material.adoc index 2e4359af3..3da3f8d56 100644 --- a/extensions/pubsub/standard/sections/clause_0_front_material.adoc +++ b/extensions/pubsub/standard/sections/clause_0_front_material.adoc @@ -1,5 +1,5 @@ == Preface -The http://www.opengis.net/doc/IS/ogcapi-edr-2/1.0[OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard] provides: +The https://www.opengis.net/doc/IS/ogcapi-edr-2/1.0[OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard] provides: 1. Requirements for Publish-Subscribe patterns specific to event driven data workflows and diff --git a/extensions/pubsub/standard/sections/clause_5_conventions.adoc b/extensions/pubsub/standard/sections/clause_5_conventions.adoc index 201fe3712..e4e0067b4 100644 --- a/extensions/pubsub/standard/sections/clause_5_conventions.adoc +++ b/extensions/pubsub/standard/sections/clause_5_conventions.adoc @@ -6,7 +6,7 @@ This section provides details and examples for any conventions used in the docum The normative provisions in this standard are denoted by the URI: -`+http://www.opengis.net/spec/ogcapi-edr-2/1.0+` +`+https://www.opengis.net/spec/ogcapi-edr-2/1.0+` All requirements and conformance tests that appear in this document are denoted by partial URIs which are relative to this base. diff --git a/extensions/pubsub/standard/sections/clause_7_pubsub.adoc b/extensions/pubsub/standard/sections/clause_7_pubsub.adoc index 90bff855b..1952095aa 100644 --- a/extensions/pubsub/standard/sections/clause_7_pubsub.adoc +++ b/extensions/pubsub/standard/sections/clause_7_pubsub.adoc @@ -10,7 +10,7 @@ Event-driven workflows provide Publish-Subscribe based capabilities as part of i The Open Geospatial Consortium (OGC) has conducted significant work on event-based models and architectures. The Publish-Subscribe model results in less network traffic and more timely responses to manage event-based models such as urgent, temporally unpredictable data (examples include, but are not limited to: traffic conditions, weather or hazard warnings, and real-time sensor data). -Building on the OGC Publish-Subscribe Interface Standard https://docs.ogc.org/is/13-131r1/13-131r1.html[OGC 13-131r1], as well as the recommendations put forward in the OGC Pub/Sub White Paper [OGC 20-081] produced as part of OGC Testbed 12, as well as the Discussion paper for Publish-Subscribe workflow in OGC APIs [OGC 23-013], the http://www.opengis.net/doc/IS/ogcapi-edr-2/1.0[OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard] discusses approaches for integrating Publish-Subscribe architecture into the OGC API suite of Standards. +Building on the OGC Publish-Subscribe Interface Standard https://docs.ogc.org/is/13-131r1/13-131r1.html[OGC 13-131r1], as well as the recommendations put forward in the OGC Pub/Sub White Paper [OGC 20-081] produced as part of OGC Testbed 12, as well as the Discussion paper for Publish-Subscribe workflow in OGC APIs [OGC 23-013], the https://www.opengis.net/doc/IS/ogcapi-edr-2/1.0[OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe Workflow Standard] discusses approaches for integrating Publish-Subscribe architecture into the OGC API suite of Standards. include::../recommendations/pubsub/PER_protocols.adoc[] diff --git a/implementations/README.adoc b/implementations/README.adoc index 5bc6e2be6..42b13cea6 100644 --- a/implementations/README.adoc +++ b/implementations/README.adoc @@ -4,7 +4,7 @@ This page lists software packages that implement approved or draft OGC API Features standards. Draft standards are only added once they have a tagged version. Currently the following parts are covered: -* http://docs.opengeospatial.org/DRAFTS/19-086.html[OGC API - Environmental Data Retrieval Standard 1.0] +* https://docs.ogc.org/DRAFTS/19-086.html[OGC API - Environmental Data Retrieval Standard 1.0] Two types of software packages are distinguished: @@ -20,7 +20,7 @@ If you have a server product, please consider to https://www.ogc.org/resource/pr ## Servers -The columns for each part list the conformance classes of the standard that are implemented by the server implementation. The conformance classes available in a specific API that is provided using the implementation will be listed in the http://docs.opengeospatial.org/DRAFTS/19-086.html#conformance-classes[Conformance Declaration resource] of the API. +The columns for each part list the conformance classes of the standard that are implemented by the server implementation. The conformance classes available in a specific API that is provided using the implementation will be listed in the https://docs.ogc.org/DRAFTS/19-086.html#conformance-classes[Conformance Declaration resource] of the API. .Server implementations [cols="5h,^3,2,2",options="header",grid="rows",stripes="hover"] diff --git a/implementations/clients/covjson-reader.md b/implementations/clients/covjson-reader.md index 6fff4d634..22142d53f 100644 --- a/implementations/clients/covjson-reader.md +++ b/implementations/clients/covjson-reader.md @@ -14,7 +14,7 @@ This example uses covjson-reader 0.7.2. ## Required and supported Conformance classes -The API shall support the [Core](http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core), [Queries](http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/queries] and [CoverageJSON](http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/covjson) conformance classes. +The API shall support the [Core](https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core), [Queries](https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/queries] and [CoverageJSON](https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/covjson) conformance classes. covjson-reader does not support OGC API - EDR, so the coverage data for each collection has to be accessed directly as CoverageJSON. @@ -26,7 +26,7 @@ Here is an example using sample data from the CoverageJSON cookbook: ```javascript var map = L.map('map', { center: [10, 0], zoom: 2 }) -L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map) +L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map) var layers = L.control.layers(null, null, {collapsed: false}).addTo(map) @@ -50,4 +50,4 @@ map.on('click', function (e) { }) ``` -Open the complete HTML document in [Codepen](http://codepen.io/letmaik/pen/OXgPXQ) +Open the complete HTML document in [Codepen](https://codepen.io/letmaik/pen/OXgPXQ) diff --git a/implementations/clients/leaflet-coverage.md b/implementations/clients/leaflet-coverage.md index 4ee55b5f2..91a449141 100644 --- a/implementations/clients/leaflet-coverage.md +++ b/implementations/clients/leaflet-coverage.md @@ -14,7 +14,7 @@ This example uses covjson-reader 0.7.2. ## Required and supported Conformance classes -The API shall support the [Core](http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core), [Queries](http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/queries] and [CoverageJSON](http://www.opengis.net/spec/ogcapi-common-1/1.0/conf/covjson) conformance classes. +The API shall support the [Core](https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/core), [Queries](https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/queries] and [CoverageJSON](https://www.opengis.net/spec/ogcapi-common-1/1.0/conf/covjson) conformance classes. leaflet-coverage does not support OGC API - EDR, so the coverage data for each collection has to be accessed directly as CoverageJSON. diff --git a/implementations/clients/owslib.md b/implementations/clients/owslib.md index 6d6735daf..d9b255ca5 100644 --- a/implementations/clients/owslib.md +++ b/implementations/clients/owslib.md @@ -4,7 +4,7 @@ This page shows how to connect with [OWSLib](https://geopython.github.io/OWSLib) ## Links -- [OWSLib OGC API - Environmental Data Retrieval documentation](http://geopython.github.io/OWSLib/#ogc-api-environmental-data-retrieval-1-0) +- [OWSLib OGC API - Environmental Data Retrieval documentation](https://geopython.github.io/OWSLib/#ogc-api-environmental-data-retrieval-1-0) ## Software version @@ -14,12 +14,12 @@ This description uses the latest OWSLib release. The API must support the following conformance classes: -- [Core](http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/core) -- [Queries](http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/queries) -- [JSON](http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/json) conformance classes. -- [GeoJSON](http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/geojson) conformance classes. -- [EDR GeoJSON](http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/edr-geojson) conformance classes. -- [OpenAPI 3.0](http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/oas30) conformance classes. +- [Core](https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/core) +- [Queries](https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/queries) +- [JSON](https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/json) conformance classes. +- [GeoJSON](https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/geojson) conformance classes. +- [EDR GeoJSON](https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/edr-geojson) conformance classes. +- [OpenAPI 3.0](https://www.opengis.net/spec/ogcapi-edr-1/1.2/req/oas30) conformance classes. ## Examples diff --git a/ogcapi-environmental-data-retrieval-1.bundled.json b/ogcapi-environmental-data-retrieval-1.bundled.json index 413623e96..9fb3d628b 100644 --- a/ogcapi-environmental-data-retrieval-1.bundled.json +++ b/ogcapi-environmental-data-retrieval-1.bundled.json @@ -268,7 +268,7 @@ { "name": "bbox", "in": "query", - "description": "Only features that have a geometry that intersects the bounding box are selected.\nThe bounding box is provided as four or six numbers, depending on whether the\ncoordinate reference system includes a vertical axis (height or depth):\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(http://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in the parameter `bbox-crs`.\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\nIf the vertical axis is included, the third and the sixth number are the\nbottom and the top of the 3-dimensional bounding box.\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.", + "description": "Only features that have a geometry that intersects the bounding box are selected.\nThe bounding box is provided as four or six numbers, depending on whether the\ncoordinate reference system includes a vertical axis (height or depth):\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(https://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in the parameter `bbox-crs`.\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\nIf the vertical axis is included, the third and the sixth number are the\nbottom and the top of the 3-dimensional bounding box.\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.", "required": false, "schema": { "oneOf": [ @@ -519,7 +519,7 @@ "type": "array", "minItems": 1, "items": { - "description": "Each bounding box is provided as four or six numbers, depending on\nwhether the coordinate reference system includes a vertical axis\n(height or depth):\n\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\n\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(http://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in `crs`.\n\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\n\nIf the vertical axis is included, the third and the sixth number are\nthe bottom and the top of the 3-dimensional bounding box.\n\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.", + "description": "Each bounding box is provided as four or six numbers, depending on\nwhether the coordinate reference system includes a vertical axis\n(height or depth):\n\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\n\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(https://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in `crs`.\n\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\n\nIf the vertical axis is included, the third and the sixth number are\nthe bottom and the top of the 3-dimensional bounding box.\n\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.", "oneOf": [ { "items": { @@ -637,7 +637,7 @@ "description": "Coordinate reference system of the coordinates in the temporal extent\n(property `interval`). The default reference system is the Gregorian calendar.\nIn the Core this is the only supported temporal coordinate reference system.\nExtensions may support additional temporal coordinate reference systems ", "type": "string", "example": "TIMECRS[\"DateTime\",TDATUM[\"Gregorian Calendar\"],CS[TemporalDateTime,1],AXIS[\"Time (T)\",future]]", - "default": "http://www.opengis.net/def/uom/ISO-8601/0/Gregorian" + "default": "https://www.opengis.net/def/uom/ISO-8601/0/Gregorian" }, "name": { "description": "Name of the temporal coordinate reference system", @@ -1273,7 +1273,7 @@ ], "example": { "value": "hPa", - "type": "http://www.opengis.net/def/uom/UCUM/" + "type": "https://www.opengis.net/def/uom/UCUM/" } }, "id": { @@ -1286,7 +1286,7 @@ }, "symbol": { "value": "K", - "type": "http://www.opengis.net/def/uom/UCUM/" + "type": "https://www.opengis.net/def/uom/UCUM/" } } }, @@ -1362,7 +1362,7 @@ } }, "example": { - "id": "http://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/", + "id": "https://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/", "label": "Sea Ice Concentration" } }, @@ -1418,11 +1418,11 @@ "label": "Ratio", "symbol": { "value": "1", - "type": "http://www.opengis.net/def/uom/UCUM/" + "type": "https://www.opengis.net/def/uom/UCUM/" } }, "observedProperty": { - "id": "http://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/", + "id": "https://vocab.nerc.ac.uk/standard_name/sea_ice_area_fraction/", "label": "Sea Ice Concentration" } } @@ -1460,7 +1460,7 @@ { "name": "coords", "in": "query", - "description": "location(s) to return data for, the coordinates are defined by a Well Known Text\n(wkt) string. to retrieve a single location :\n\nPOINT(x y) i.e. POINT(0 51.48) for Greenwich, London\n\nAnd for a list of locations\n\nMULTIPOINT((x y),(x1 y1),(x2 y2),(x3 y3))\n\ni.e.\nMULTIPOINT((38.9 -77),(48.85 2.35),(39.92 116.38),(-35.29 149.1),(51.5 -0.1))\n\nsee http://portal.opengeospatial.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nthe coordinate values will depend on the CRS parameter, if this is not defined\nthe values will be assumed to WGS84 values (i.e x=longitude and y=latitude)\n", + "description": "location(s) to return data for, the coordinates are defined by a Well Known Text\n(wkt) string. to retrieve a single location :\n\nPOINT(x y) i.e. POINT(0 51.48) for Greenwich, London\n\nAnd for a list of locations\n\nMULTIPOINT((x y),(x1 y1),(x2 y2),(x3 y3))\n\ni.e.\nMULTIPOINT((38.9 -77),(48.85 2.35),(39.92 116.38),(-35.29 149.1),(51.5 -0.1))\n\nsee https://portal.ogc.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nthe coordinate values will depend on the CRS parameter, if this is not defined\nthe values will be assumed to WGS84 values (i.e x=longitude and y=latitude)\n", "required": true, "schema": { "type": "string" @@ -1594,7 +1594,7 @@ { "name": "coords", "in": "query", - "description": "location(s) to return data for, the coordinates are defined by a Well Known Text\n(wkt) string. to retrieve a single location :\n\nPOINT(x y) i.e. POINT(0 51.48) for Greenwich, London\n\nsee http://portal.opengeospatial.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nthe coordinate values will depend on the CRS parameter, if this is not defined\nthe values will be assumed to WGS84 values (i.e x=longitude and y=latitude)\n", + "description": "location(s) to return data for, the coordinates are defined by a Well Known Text\n(wkt) string. to retrieve a single location :\n\nPOINT(x y) i.e. POINT(0 51.48) for Greenwich, London\n\nsee https://portal.ogc.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nthe coordinate values will depend on the CRS parameter, if this is not defined\nthe values will be assumed to WGS84 values (i.e x=longitude and y=latitude)\n", "required": true, "schema": { "type": "string" @@ -1756,7 +1756,7 @@ { "name": "coords", "in": "query", - "description": "Only data that has a geometry that intersects the area defined by the polygon\nare selected. \n\nThe polygon is defined using a Well Known Text string following \n\ncoords=POLYGON((x y,x1 y1,x2 y2,...,xn yn x y))\n\nwhich are values in the coordinate system defined by the crs query parameter \n(if crs is not defined the values will be assumed to be WGS84 longitude/latitude coordinates). \n\nFor instance a polygon that roughly describes an area that contains \nSouth West England in WGS84 would look like: \n\ncoords=POLYGON((-6.1 50.3,-4.35 51.4,-2.6 51.6,-2.8 50.6,-5.3 49.9,-6.1,50.3))\n\nsee http://portal.opengeospatial.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nThe coords parameter will only support 2D POLYGON definitions", + "description": "Only data that has a geometry that intersects the area defined by the polygon\nare selected. \n\nThe polygon is defined using a Well Known Text string following \n\ncoords=POLYGON((x y,x1 y1,x2 y2,...,xn yn x y))\n\nwhich are values in the coordinate system defined by the crs query parameter \n(if crs is not defined the values will be assumed to be WGS84 longitude/latitude coordinates). \n\nFor instance a polygon that roughly describes an area that contains \nSouth West England in WGS84 would look like: \n\ncoords=POLYGON((-6.1 50.3,-4.35 51.4,-2.6 51.6,-2.8 50.6,-5.3 49.9,-6.1,50.3))\n\nsee https://portal.ogc.org/files/?artifact_id=25355 and \nhttps://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry\n\nThe coords parameter will only support 2D POLYGON definitions", "required": true, "schema": { "type": "string" diff --git a/ogcapi-ogc-org-edr-overview.md b/ogcapi-ogc-org-edr-overview.md index 3ff99f3e8..5ae8ac266 100644 --- a/ogcapi-ogc-org-edr-overview.md +++ b/ogcapi-ogc-org-edr-overview.md @@ -1,7 +1,7 @@ # OGC API - Environmental Data Retrieval [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 +in a consistent way. [OpenAPI](https://www.openapis.org/) is used to define the reusable API building blocks with responses in JSON and HTML. The OGC API family of standards is organized by resource type. The draft OGC API - Environmental Data Retrieval standard defines an Environmental Data Retrieval (EDR) API with two goals: diff --git a/ogcmetanorma.json b/ogcmetanorma.json index d89858209..bc152d31d 100644 --- a/ogcmetanorma.json +++ b/ogcmetanorma.json @@ -1,14 +1,14 @@ { "0": { "OGC_doc_number": "19-086r7", - "urn":"http://www.opengis.net/doc/IS/ogcapi-edr-1/1.2", + "urn":"https://www.opengis.net/doc/IS/ogcapi-edr-1/1.2", "title":"OGC API - Environmental Data Retrieval", "version":"1.2.0", "path":"core/standard/document.adoc" }, "1": { "OGC_doc_number": "23-057", - "urn":"http://www.opengis.net/doc/IS/ogcapi-edr-2/1.0", + "urn":"https://www.opengis.net/doc/IS/ogcapi-edr-2/1.0", "title":"OGC API - Environmental Data Retrieval - Part 2: Publish-Subscribe workflow", "version":"1.0.0", "path":"extensions/pubsub/standard/document.adoc"