Skip to content

Commit

Permalink
Merge pull request #441 from opengeospatial/20230705_updates
Browse files Browse the repository at this point in the history 
Work In Progress: Final review of V1.1 for publication
  • Loading branch information
@ghobona
ghobona authored Jul 5, 2023
2 parents efe47ff + c4b26ae commit c326b15
Show file tree
Hide file tree
Showing 9 changed files with 128 additions and 6,710 deletions.
2 changes: 1 addition & 1 deletion standard/README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Run the python script to generate abstract tests that are shared by multiple que

Compile the document using docker.

`docker run -v "$(pwd)":/metanorma -v ${HOME}/.fontist/fonts/:/config/fonts metanorma/mn metanorma compile --agree-to-terms -t ogc -x xml,html,doc,pdf document.adoc`.
`docker run -v "$(pwd)":/metanorma -v ${HOME}/.fontist/fonts/:/config/fonts metanorma/metanorma metanorma compile --agree-to-terms -t ogc -x xml,html,doc,pdf document.adoc`.


Note that the document was compiled using version 1.2.9.2 of the metanorma/mn docker image.
112 changes: 112 additions & 0 deletions standard/abstract_tests/ATS_class_queries.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,118 @@ subject:: <<rc_queries,http://www.opengis.net/spec/ogcapi-edr-1/1.1/req/queries>
classification:: Target Type:Web API
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/core
inherit:: http://www.opengis.net/spec/ogcapi-edr-1/1.1/conf/collections
conformance-test:: /conf/position/no-query-params
conformance-test:: /conf/position/no-coords-param
conformance-test:: /conf/position/coords-param-invalid
conformance-test:: /conf/position/valid-query-params
conformance-test:: /conf/edr/rc-coords-definition-position
conformance-test:: /conf/edr/rc-coords-response-position
conformance-test:: /conf/edr/rc-z-definition-position
conformance-test:: /conf/edr/rc-z-response-position
conformance-test:: /conf/core/datetime-definition-position
conformance-test:: /conf/core/datetime-response-position
conformance-test:: /conf/collections/REQ_rc-parameter-name-definition-position
conformance-test:: /conf/edr/rc-parameter-name-response-position
conformance-test:: /conf/edr/REQ_rc-crs-definition-position
conformance-test:: /conf/edr/REQ_rc-crs-response-position
conformance-test:: /conf/edr/rc-f-definition-position
conformance-test:: /conf/collections/rc-f-response-position
conformance-test:: /conf/area/no-query-params
conformance-test:: /conf/area/no-coords-param
conformance-test:: /conf/area/coords-param-invalid
conformance-test:: /conf/area/valid-query-params
conformance-test:: /conf/edr/rc-coords-definition-area
conformance-test:: /conf/edr/rc-coords-response-area
conformance-test:: /conf/edr/rc-z-definition-area
conformance-test:: /conf/edr/rc-z-response-area
conformance-test:: /conf/core/datetime-definition-area
conformance-test:: /conf/core/datetime-response-area
conformance-test:: /conf/collections/REQ_rc-parameter-name-definition-area
conformance-test:: /conf/edr/rc-parameter-name-response-area
conformance-test:: /conf/edr/REQ_rc-crs-definition-area
conformance-test:: /conf/edr/REQ_rc-crs-response-area
conformance-test:: /conf/edr/rc-f-definition-area
conformance-test:: /conf/collections/rc-f-response-area
conformance-test:: /conf/cube/no-query-params
conformance-test:: /conf/cube/no-bbox-param
conformance-test:: /conf/cube/bbox-param-invalid
conformance-test:: /conf/cube/valid-query-params
conformance-test:: /conf/edr/rc-z-definition-cube
conformance-test:: /conf/edr/rc-z-response-cube
conformance-test:: /conf/core/datetime-definition-cube
conformance-test:: /conf/core/datetime-response-cube
conformance-test:: /conf/collections/REQ_rc-parameter-name-definition-cube
conformance-test:: /conf/edr/rc-parameter-name-response-cube
conformance-test:: /conf/edr/REQ_rc-crs-definition-cube
conformance-test:: /conf/edr/REQ_rc-crs-response-cube
conformance-test:: /conf/edr/rc-f-definition-cube
conformance-test:: /conf/collections/rc-f-response-cube
conformance-test:: /conf/trajectory/no-query-params
conformance-test:: /conf/trajectory/no-coords-param
conformance-test:: /conf/trajectory/coords-param-invalid-linestring
conformance-test:: /conf/trajectory/coords-param-invalid-linestringm
conformance-test:: /conf/trajectory/coords-param-separate-z-linestringz
conformance-test:: /conf/trajectory/coords-param-separate-z-linestringzm
conformance-test:: /conf/trajectory/coords-param-invalid-linestringzm
conformance-test:: /conf/trajectory/coords-param-invalid-linestringz
conformance-test:: /conf/trajectory/coords-param-invalid-time
conformance-test:: /conf/trajectory/valid-query-params
conformance-test:: /conf/edr/rc-coords-definition-trajectory
conformance-test:: /conf/edr/rc-coords-response-trajectory
conformance-test:: /conf/collections/REQ_rc-parameter-name-definition-trajectory
conformance-test:: /conf/edr/rc-parameter-name-response-trajectory
conformance-test:: /conf/edr/REQ_rc-crs-definition-trajectory
conformance-test:: /conf/edr/REQ_rc-crs-response-trajectory
conformance-test:: /conf/edr/rc-f-definition-trajectory
conformance-test:: /conf/collections/rc-f-response-trajectory
conformance-test:: /conf/corridor/no-query-params
conformance-test:: /conf/corridor/no-coords-param
conformance-test:: /conf/corridor/corridor-width-param-missing
conformance-test:: /conf/corridor/corridor-height-param-missing
conformance-test:: /conf/corridor/width-units-param-missing
conformance-test:: /conf/corridor/height-units-param-missing
conformance-test:: /conf/corridor/coords-param-invalid-linestring
conformance-test:: /conf/corridor/coords-param-invalid-linestringm
conformance-test:: /conf/corridor/coords-param-separate-z-linestringz
conformance-test:: /conf/corridor/coords-param-separate-z-linestringzm
conformance-test:: /conf/corridor/coords-param-invalid-linestringzm
conformance-test:: /conf/corridor/coords-param-invalid-linestringz
conformance-test:: /conf/corridor/coords-param-invalid-time
conformance-test:: /conf/corridor/width-units-param-invalid
conformance-test:: /conf/corridor/height-units-param-invalid
conformance-test:: /conf/corridor/valid-query-params
conformance-test:: /conf/edr/rc-coords-definition-corridor
conformance-test:: /conf/edr/rc-coords-response-corridor
conformance-test:: /conf/edr/REQ_rc-corridor-width-definition
conformance-test:: /conf/collections/REQ_rc-corridor-width-response
conformance-test:: /conf/edr/REQ_rc-corridor-height-definition
conformance-test:: /conf/collections/REQ_rc-corridor-height-response
conformance-test:: /conf/edr/REQ_rc-width-units-definition
conformance-test:: /conf/collections/REQ_rc-width-units-response
conformance-test:: /conf/edr/REQ_rc-height-units-definition
conformance-test:: /conf/collections/rc-height-units-response
conformance-test:: /conf/collections/REQ_rc-parameter-name-definition-corridor
conformance-test:: /conf/edr/rc-parameter-name-response-corridor
conformance-test:: /conf/edr/REQ_rc-crs-definition-corridor
conformance-test:: /conf/edr/REQ_rc-crs-response-corridor
conformance-test:: /conf/edr/rc-f-definition-corridor
conformance-test:: /conf/collections/rc-f-response-corridor
conformance-test:: /conf/instances/rc-md-op
conformance-test:: /conf/instances/rc-md-success
conformance-test:: /conf/instances/src-md-op
conformance-test:: /conf/instances/src-md-success
conformance-test:: /conf/locations/no-query-params
conformance-test:: /conf/locations/location-identifier-invalid
conformance-test:: /conf/locations/valid-query-params
conformance-test:: /conf/core/datetime-definition-locations
conformance-test:: /conf/core/datetime-response-locations
conformance-test:: /conf/collections/REQ_rc-parameter-name-definition-locations
conformance-test:: /conf/edr/rc-parameter-name-response-locations
conformance-test:: /conf/edr/REQ_rc-crs-definition-locations
conformance-test:: /conf/edr/REQ_rc-crs-response-locations
conformance-test:: /conf/edr/rc-f-definition-locations
conformance-test:: /conf/collections/rc-f-response-locations
====

==== Query Pattern Tests
Expand Down
29 changes: 0 additions & 29 deletions standard/abstract_tests/collections/cube/ATS_rc-coords-definition.adoc
View file

This file was deleted.

16 changes: 0 additions & 16 deletions standard/abstract_tests/collections/cube/ATS_rc-coords-response.adoc
View file

This file was deleted.

7 changes: 5 additions & 2 deletions standard/abstract_tests/queries/ATS_cube.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,12 @@ and verify that only information that matches the selection criteria is returned
--
====

include::../collections/cube/ATS_rc-coords-definition.adoc[]
// The coords param tests have been commented out because they are not supported by the Cube query.
// See https://github.com/opengeospatial/ogcapi-environmental-data-retrieval/issues/423#issuecomment-1553144063

include::../collections/cube/ATS_rc-coords-response.adoc[]
//include::../collections/cube/ATS_rc-coords-definition.adoc[]

//include::../collections/cube/ATS_rc-coords-response.adoc[]

include::../collections/cube/ATS_rc-z-definition.adoc[]

Expand Down
10 changes: 7 additions & 3 deletions standard/code/generate_query_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ def generate(infile_path,outfile_path,querytype):

#cube

generate('./abstract_tests/collections/ATS_rc-coords-definition.adoc','./abstract_tests/collections/cube/ATS_rc-coords-definition.adoc','cube')
generate('./abstract_tests/collections/ATS_rc-coords-response.adoc','./abstract_tests/collections/cube/ATS_rc-coords-response.adoc','cube')
generate('./abstract_tests/collections/ATS_rc-z-definition.adoc','./abstract_tests/collections/cube/ATS_rc-z-definition.adoc','cube')
# The coords param tests have been commented out because they are not supported by the Cube query.
# See https://github.com/opengeospatial/ogcapi-environmental-data-retrieval/issues/423#issuecomment-1553144063
#generate('./abstract_tests/collections/ATS_rc-coords-definition.adoc','./abstract_tests/collections/cube/ATS_rc-coords-definition.adoc','cube')
#generate('./abstract_tests/collections/ATS_rc-coords-response.adoc','./abstract_tests/collections/cube/ATS_rc-coords-response.adoc','cube')

# See ATS_cube.adoc, we do not modify ATS_rc-cube-z-response.adoc. So there is no call to generate the associated file.
generate('./abstract_tests/collections/ATS_rc-z-definition.adoc','./abstract_tests/collections/cube/ATS_rc-z-definition.adoc','cube')

generate('./abstract_tests/collections/ATS_rc-parameter-name-definition.adoc','./abstract_tests/collections/cube/ATS_rc-parameter-name-definition.adoc','cube')
generate('./abstract_tests/collections/ATS_rc-parameter-name-response.adoc','./abstract_tests/collections/cube/ATS_rc-parameter-name-response.adoc','cube')
generate('./abstract_tests/collections/ATS_rc-crs-definition.adoc','./abstract_tests/collections/cube/ATS_rc-crs-definition.adoc','cube')
Expand Down
2 changes: 2 additions & 0 deletions standard/document.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
:keywords: ogcdoc, OGC document, property, geographic information, spatial data, spatial thing, spatio-temporal, dataset, distribution, API, JSON, geoJSON, coverageJSON, HTML, OpenAPI, AsyncAPI, REST, Common, position, area, trajectory, corridor, cube, time-series, radius, polygon, WKT
:submitting-organizations: UK Met Office; US Geological Survey (USGS); US National Weather Service; Wuhan University; Meteorological Service of Canada; Finnish Meteorological Institute; Esri; National Aeronautics and Space Administration (NASA); Météo-France
:docfile: document.adoc
:htmltoclevels: 4
:toclevels: 4
:mn-document-class: ogc
:mn-output-extensions: xml,html,doc,pdf
:local-cache-only:
Expand Down
Loading

0 comments on commit c326b15

Please sign in to comment.