oapi-profile-builder 3.0.0__tar.gz → 3.1.0__tar.gz

{oapi_profile_builder-3.0.0/src/oapi_profile_builder.egg-info → oapi_profile_builder-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oapi-profile-builder
-Version: 3.0.0
+Version: 3.1.0
 Summary: Authoritative tooling for creating OGC API Service Profiles (EDR, Features)
 Author-email: Shane Mill <shane.mill@noaa.gov>
 License: Apache License
@@ -290,12 +290,18 @@ abstract_tests: []
 | `description` | string | no | Human-readable description of the service profile. Surfaces in the OpenAPI `info.description` and the landing page response schema |
 | `keywords` | list | no | Service-level keywords (e.g. query types, parameter names, domain terms). Surfaces in `info.x-keywords` and the landing page response schema. Distinct from `document_metadata.keywords`, which are for the OGC PDF header |
 | `server_url` | string | no | Documentation only — not written to the profile OpenAPI |
+| `provider` | object | no | Service provider / responsible party. Surfaces in OpenAPI `info.contact` and the document Point of Contact (see below) |
+| `classification` | object | no | Security classification (`level` + `system`). Surfaces as a document banner and `info.x-classification` |
+| `metadata_date` | string | no | Metadata update date (ISO 8601). Surfaces as `info.x-metadata-date` |
+| `resource_service_publish_date` | string | no | Resource/service publication date (ISO 8601). Surfaces as `info.x-resource-publish-date` |
+| `resource_default_locale` | string | no | Default resource locale (e.g. `eng`). Surfaces as `info.x-default-locale` |
 | `allow_post_queries` | bool | no | When `true`, generates `POST` alongside `GET` for all EDR data query endpoints. Defaults to `false` |
 | `collections` | list | yes | One or more EDR collections (see below) |
 | `required_conformance_classes` | list | no | Conformance classes implementations must declare. Defaults to EDR Core |
 | `extent_requirements` | object | no | Profile-level CRS/TRS/VRS constraints (see below) |
 | `output_formats` | list | no | Format name → media type + schema ref mappings |
 | `collection_id_pattern` | string | no | Regex all collection IDs must match |
+| `spec_uri_base` | string | no | Base URI for the requirements/conformance class identifiers. Defaults to the OGC EDR Part 3 namespace; override to publish under another SDO namespace (e.g. DGIWG) |
 | `parameter_name_pattern` | string | no | Regex all `parameter_names` keys must match |
 | `parameter_schema` | object | no | JSON Schema for parameter objects — replaces the default schema in the generated OpenAPI (see below) |
 | `processes` | list | no | OGC API Processes to expose in the OpenAPI |
@@ -303,7 +309,7 @@ abstract_tests: []
 | `abstract_tests` | list | no | Conformance tests — each must reference a valid requirement `id` |
 | `pubsub` | object | no | OGC API - EDR Part 2 PubSub config — generates `asyncapi.yaml` |
 | `collection_examples` | object | no | `{collectionId: {instanceId: "..."}}` — used by `validate-server` |
-| `document_metadata` | object | no | Metanorma PDF header (doc number, editors, orgs, keywords) |
+| `document_metadata` | object | no | Metanorma PDF header — doc number/type/subtype, status, editors, submitters, dates, notice, normative references (see below) |
 
 ---
 
@@ -360,6 +366,22 @@ data_queries:
         crs_details:
           - crs: "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
           - crs: "http://www.opengis.net/def/crs/EPSG/0/4326"
+  cube:
+    link:
+      href: https://example.com/collections/obs/cube
+      rel: data
+      variables:
+        query_type: cube
+        output_formats: [CoverageJSON, GeoTIFF]
+        # default_output_format: response format used when the `f` query
+        # parameter is omitted. Must be one of output_formats. Sets the
+        # `default` on the generated OpenAPI `f` parameter for this query.
+        default_output_format: GeoTIFF
+        # crs: shorthand for crs_details — a plain list of CRS URIs.
+        # Validated against extent_requirements.supported_crs.
+        crs:
+          - "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+          - "http://www.opengis.net/def/crs/EPSG/0/4326"
 ```
 
 #### `parameter_names` example
@@ -536,16 +558,39 @@ pubsub:
 
 ### `document_metadata`
 
-Required only when compiling a PDF with `--pdf`.
+Required only when compiling a PDF with `--pdf`. Fields map to Metanorma OGC document attributes.
 
 ```yaml
 document_metadata:
   doc_number: "25-myprofile"
-  doc_subtype: implementation   # implementation | best-practice | engineering-report
+  doc_type: draft-standard      # Metanorma :doctype: (draft-standard | standard | best-practice | engineering-report | ...)
+  doc_subtype: implementation   # implementation | best-practice | engineering-report | profile
+  status: approved              # Metanorma :status:/:docstage: (swg-draft | public-rfc | approved | ...)
   editors:
     - Jane Smith
+  # submitters: structured table for page iv — each row carries its own affiliation.
+  # When provided, takes precedence over the editors/submitting_orgs fallback.
+  submitters:
+    - name: Jane Smith
+      affiliation: My Organization
+      role: editor
+    - name: Standards Working Group
+      affiliation: My SDO
   submitting_orgs:
     - My Organization
+  # Title-page dates (YYYY-MM-DD). Omitted dates fall back to {copyright_year}-01-01.
+  submission_date: "2026-05-01"   # → :received-date:
+  approval_date:   "2026-06-15"   # → :issued-date:
+  publication_date: "2026-07-01"  # → :published-date:
+  # Custom notice paragraph rendered in the front matter. Note: the OGC cover-page
+  # legal notice itself is generated by Metanorma from doc_type/status.
+  notice: >
+    This is a DRAFT standard and is subject to change.
+  # Additional normative references appended to the References section.
+  normative_references:
+    - anchor: DGIWG-250
+      citation: DGIWG 250
+      title: DGIWG GeoTIFF Profile
   keywords:
     - ogcdoc
     - OGC API
@@ -554,6 +599,64 @@ document_metadata:
   external_id: http://www.opengis.net/doc/dp/my-profile/1.0
 ```
 
+The cover-page sub-title (e.g. "Draft Standard — Implementation — Approved") is produced by Metanorma from the `doc_type`, `doc_subtype`, and `status` combination.
+
+---
+
+### `provider`, `classification`, and provenance metadata
+
+Optional service-level metadata. Each may also be set per-collection (the collection value overrides the profile root for that collection and is round-tripped into `profile_config.json`).
+
+```yaml
+provider:
+  name: Austrian Military
+  url: "https://www.bmlv.gv.at/english/forces/organisation.shtml"
+  contact:
+    email: presse@bmlvs.gv.at
+    phone: "+43 ..."
+    hours: Monday to Friday 08:00 - 17:00
+    instructions: During hours of Service
+    address: "Ministry of Defence, Rossauer Lände 1"
+    postalcode: A-1090
+    city: Vienna
+    country: Austria
+
+classification:
+  level: "NATO RESTRICTED (NR)"
+  system: NATO
+
+metadata_date: "2026-06-25T07:31Z"
+resource_service_publish_date: "2026-06-24T14:10Z"
+resource_default_locale: eng
+```
+
+Where these surface:
+
+- `provider` → OpenAPI `info.contact` (`name`/`url`/`email`; the remaining contact fields become `x-` extensions) and a **Point of Contact** section in the generated document.
+- `classification` → a **security classification banner** in the document Abstract and `info.x-classification` in the OpenAPI.
+- `metadata_date` / `resource_service_publish_date` / `resource_default_locale` → `info.x-metadata-date` / `info.x-resource-publish-date` / `info.x-default-locale`.
+
+> The profile OpenAPI is implementation-independent (per EDR Part 3 REQ_publishing), so these describe the profile/data provenance rather than a specific deployment endpoint.
+
+---
+
+### `spec_uri_base`
+
+By default, the requirements class and conformance class identifiers are published under the OGC API - EDR Part 3 namespace:
+
+```
+http://www.opengis.net/spec/ogcapi-edr-3/1.0/req/<name>
+http://www.opengis.net/spec/ogcapi-edr-3/1.0/conf/<name>
+```
+
+Set `spec_uri_base` to publish under a different SDO namespace. This updates the OpenAPI `x-ogc-profile` link, the requirements/conformance AsciiDoc identifiers, and the conformance section:
+
+```yaml
+spec_uri_base: "https://schemas.dgiwg.org/edr/1.0"
+# → https://schemas.dgiwg.org/edr/1.0/req/<name>
+# → https://schemas.dgiwg.org/edr/1.0/conf/<name>
+```
+
 ---
 
 ## Validation Rules
@@ -564,10 +667,12 @@ The tool enforces these rules at build time. Violations produce clear error mess
 |---|---|
 | `name` format | Must match `^[a-z0-9_]+$` |
 | No duplicate collection IDs | Across the whole profile |
-| `extent_requirements` requires CRS spec | Either `allowed_crs` or `crs_pattern` must be set |
-| Collection CRS validated | Each `extent.spatial.crs` checked against `allowed_crs`/`crs_pattern` |
-| Collection TRS validated | Each `extent.temporal.trs` checked against `allowed_trs`/`trs_pattern` |
-| `crs_details` validated | Each `data_queries.*.variables.crs_details[].crs` checked against CRS constraints |
+| `extent_requirements` requires CRS spec | At least one of `extent_crs` or `supported_crs` must be set (each uses `allowed` or `pattern`) |
+| Collection CRS validated | Each `extent.spatial.crs` checked against `extent_crs`; `crs[]` and `crs_details` checked against `supported_crs` |
+| Collection TRS validated | Each `extent.temporal.trs` checked against `extent_trs` |
+| `crs_details` / `crs` validated | Each `data_queries.*.variables.crs_details[].crs` and `crs[]` checked against `supported_crs` |
+| `default_output_format` validated | Each `data_queries.*.variables.default_output_format` must be one of that query's `output_formats` |
+| Document dates format | `submission_date` / `approval_date` / `publication_date` must be `YYYY-MM-DD` |
 | Parameters need `unit` + `observedProperty` | Required by OGC API - EDR Part 3 |
 | `parameter_name_pattern` enforced | All `parameter_names` keys must match if set |
 | `collection_id_pattern` enforced | All collection IDs must match if set |

{oapi_profile_builder-3.0.0 → oapi_profile_builder-3.1.0}/README.md

@@ -245,12 +245,18 @@ abstract_tests: []
 | `description` | string | no | Human-readable description of the service profile. Surfaces in the OpenAPI `info.description` and the landing page response schema |
 | `keywords` | list | no | Service-level keywords (e.g. query types, parameter names, domain terms). Surfaces in `info.x-keywords` and the landing page response schema. Distinct from `document_metadata.keywords`, which are for the OGC PDF header |
 | `server_url` | string | no | Documentation only — not written to the profile OpenAPI |
+| `provider` | object | no | Service provider / responsible party. Surfaces in OpenAPI `info.contact` and the document Point of Contact (see below) |
+| `classification` | object | no | Security classification (`level` + `system`). Surfaces as a document banner and `info.x-classification` |
+| `metadata_date` | string | no | Metadata update date (ISO 8601). Surfaces as `info.x-metadata-date` |
+| `resource_service_publish_date` | string | no | Resource/service publication date (ISO 8601). Surfaces as `info.x-resource-publish-date` |
+| `resource_default_locale` | string | no | Default resource locale (e.g. `eng`). Surfaces as `info.x-default-locale` |
 | `allow_post_queries` | bool | no | When `true`, generates `POST` alongside `GET` for all EDR data query endpoints. Defaults to `false` |
 | `collections` | list | yes | One or more EDR collections (see below) |
 | `required_conformance_classes` | list | no | Conformance classes implementations must declare. Defaults to EDR Core |
 | `extent_requirements` | object | no | Profile-level CRS/TRS/VRS constraints (see below) |
 | `output_formats` | list | no | Format name → media type + schema ref mappings |
 | `collection_id_pattern` | string | no | Regex all collection IDs must match |
+| `spec_uri_base` | string | no | Base URI for the requirements/conformance class identifiers. Defaults to the OGC EDR Part 3 namespace; override to publish under another SDO namespace (e.g. DGIWG) |
 | `parameter_name_pattern` | string | no | Regex all `parameter_names` keys must match |
 | `parameter_schema` | object | no | JSON Schema for parameter objects — replaces the default schema in the generated OpenAPI (see below) |
 | `processes` | list | no | OGC API Processes to expose in the OpenAPI |
@@ -258,7 +264,7 @@ abstract_tests: []
 | `abstract_tests` | list | no | Conformance tests — each must reference a valid requirement `id` |
 | `pubsub` | object | no | OGC API - EDR Part 2 PubSub config — generates `asyncapi.yaml` |
 | `collection_examples` | object | no | `{collectionId: {instanceId: "..."}}` — used by `validate-server` |
-| `document_metadata` | object | no | Metanorma PDF header (doc number, editors, orgs, keywords) |
+| `document_metadata` | object | no | Metanorma PDF header — doc number/type/subtype, status, editors, submitters, dates, notice, normative references (see below) |
 
 ---
 
@@ -315,6 +321,22 @@ data_queries:
         crs_details:
           - crs: "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
           - crs: "http://www.opengis.net/def/crs/EPSG/0/4326"
+  cube:
+    link:
+      href: https://example.com/collections/obs/cube
+      rel: data
+      variables:
+        query_type: cube
+        output_formats: [CoverageJSON, GeoTIFF]
+        # default_output_format: response format used when the `f` query
+        # parameter is omitted. Must be one of output_formats. Sets the
+        # `default` on the generated OpenAPI `f` parameter for this query.
+        default_output_format: GeoTIFF
+        # crs: shorthand for crs_details — a plain list of CRS URIs.
+        # Validated against extent_requirements.supported_crs.
+        crs:
+          - "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+          - "http://www.opengis.net/def/crs/EPSG/0/4326"
 ```
 
 #### `parameter_names` example
@@ -491,16 +513,39 @@ pubsub:
 
 ### `document_metadata`
 
-Required only when compiling a PDF with `--pdf`.
+Required only when compiling a PDF with `--pdf`. Fields map to Metanorma OGC document attributes.
 
 ```yaml
 document_metadata:
   doc_number: "25-myprofile"
-  doc_subtype: implementation   # implementation | best-practice | engineering-report
+  doc_type: draft-standard      # Metanorma :doctype: (draft-standard | standard | best-practice | engineering-report | ...)
+  doc_subtype: implementation   # implementation | best-practice | engineering-report | profile
+  status: approved              # Metanorma :status:/:docstage: (swg-draft | public-rfc | approved | ...)
   editors:
     - Jane Smith
+  # submitters: structured table for page iv — each row carries its own affiliation.
+  # When provided, takes precedence over the editors/submitting_orgs fallback.
+  submitters:
+    - name: Jane Smith
+      affiliation: My Organization
+      role: editor
+    - name: Standards Working Group
+      affiliation: My SDO
   submitting_orgs:
     - My Organization
+  # Title-page dates (YYYY-MM-DD). Omitted dates fall back to {copyright_year}-01-01.
+  submission_date: "2026-05-01"   # → :received-date:
+  approval_date:   "2026-06-15"   # → :issued-date:
+  publication_date: "2026-07-01"  # → :published-date:
+  # Custom notice paragraph rendered in the front matter. Note: the OGC cover-page
+  # legal notice itself is generated by Metanorma from doc_type/status.
+  notice: >
+    This is a DRAFT standard and is subject to change.
+  # Additional normative references appended to the References section.
+  normative_references:
+    - anchor: DGIWG-250
+      citation: DGIWG 250
+      title: DGIWG GeoTIFF Profile
   keywords:
     - ogcdoc
     - OGC API
@@ -509,6 +554,64 @@ document_metadata:
   external_id: http://www.opengis.net/doc/dp/my-profile/1.0
 ```
 
+The cover-page sub-title (e.g. "Draft Standard — Implementation — Approved") is produced by Metanorma from the `doc_type`, `doc_subtype`, and `status` combination.
+
+---
+
+### `provider`, `classification`, and provenance metadata
+
+Optional service-level metadata. Each may also be set per-collection (the collection value overrides the profile root for that collection and is round-tripped into `profile_config.json`).
+
+```yaml
+provider:
+  name: Austrian Military
+  url: "https://www.bmlv.gv.at/english/forces/organisation.shtml"
+  contact:
+    email: presse@bmlvs.gv.at
+    phone: "+43 ..."
+    hours: Monday to Friday 08:00 - 17:00
+    instructions: During hours of Service
+    address: "Ministry of Defence, Rossauer Lände 1"
+    postalcode: A-1090
+    city: Vienna
+    country: Austria
+
+classification:
+  level: "NATO RESTRICTED (NR)"
+  system: NATO
+
+metadata_date: "2026-06-25T07:31Z"
+resource_service_publish_date: "2026-06-24T14:10Z"
+resource_default_locale: eng
+```
+
+Where these surface:
+
+- `provider` → OpenAPI `info.contact` (`name`/`url`/`email`; the remaining contact fields become `x-` extensions) and a **Point of Contact** section in the generated document.
+- `classification` → a **security classification banner** in the document Abstract and `info.x-classification` in the OpenAPI.
+- `metadata_date` / `resource_service_publish_date` / `resource_default_locale` → `info.x-metadata-date` / `info.x-resource-publish-date` / `info.x-default-locale`.
+
+> The profile OpenAPI is implementation-independent (per EDR Part 3 REQ_publishing), so these describe the profile/data provenance rather than a specific deployment endpoint.
+
+---
+
+### `spec_uri_base`
+
+By default, the requirements class and conformance class identifiers are published under the OGC API - EDR Part 3 namespace:
+
+```
+http://www.opengis.net/spec/ogcapi-edr-3/1.0/req/<name>
+http://www.opengis.net/spec/ogcapi-edr-3/1.0/conf/<name>
+```
+
+Set `spec_uri_base` to publish under a different SDO namespace. This updates the OpenAPI `x-ogc-profile` link, the requirements/conformance AsciiDoc identifiers, and the conformance section:
+
+```yaml
+spec_uri_base: "https://schemas.dgiwg.org/edr/1.0"
+# → https://schemas.dgiwg.org/edr/1.0/req/<name>
+# → https://schemas.dgiwg.org/edr/1.0/conf/<name>
+```
+
 ---
 
 ## Validation Rules
@@ -519,10 +622,12 @@ The tool enforces these rules at build time. Violations produce clear error mess
 |---|---|
 | `name` format | Must match `^[a-z0-9_]+$` |
 | No duplicate collection IDs | Across the whole profile |
-| `extent_requirements` requires CRS spec | Either `allowed_crs` or `crs_pattern` must be set |
-| Collection CRS validated | Each `extent.spatial.crs` checked against `allowed_crs`/`crs_pattern` |
-| Collection TRS validated | Each `extent.temporal.trs` checked against `allowed_trs`/`trs_pattern` |
-| `crs_details` validated | Each `data_queries.*.variables.crs_details[].crs` checked against CRS constraints |
+| `extent_requirements` requires CRS spec | At least one of `extent_crs` or `supported_crs` must be set (each uses `allowed` or `pattern`) |
+| Collection CRS validated | Each `extent.spatial.crs` checked against `extent_crs`; `crs[]` and `crs_details` checked against `supported_crs` |
+| Collection TRS validated | Each `extent.temporal.trs` checked against `extent_trs` |
+| `crs_details` / `crs` validated | Each `data_queries.*.variables.crs_details[].crs` and `crs[]` checked against `supported_crs` |
+| `default_output_format` validated | Each `data_queries.*.variables.default_output_format` must be one of that query's `output_formats` |
+| Document dates format | `submission_date` / `approval_date` / `publication_date` must be `YYYY-MM-DD` |
 | Parameters need `unit` + `observedProperty` | Required by OGC API - EDR Part 3 |
 | `parameter_name_pattern` enforced | All `parameter_names` keys must match if set |
 | `collection_id_pattern` enforced | All collection IDs must match if set |

{oapi_profile_builder-3.0.0 → oapi_profile_builder-3.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "oapi-profile-builder"
-version = "3.0.0"
+version = "3.1.0"
 description = "Authoritative tooling for creating OGC API Service Profiles (EDR, Features)"
 readme = "README.md"
 license = { file = "LICENSE" }

{oapi_profile_builder-3.0.0 → oapi_profile_builder-3.1.0}/src/oapi_profile_builder/cli.py

@@ -169,7 +169,7 @@ def main() -> None:
 
 def _run_validate_server(args) -> None:
     import re
-    from ogc_edr_profile.server_validation import validate_server
+    from oapi_profile_builder.server_validation import validate_server
 
     if args.openapi:
         import yaml

{oapi_profile_builder-3.0.0 → oapi_profile_builder-3.1.0}/src/oapi_profile_builder/generate.py

@@ -328,6 +328,17 @@ _POST_BODY_SCHEMAS: dict[str, dict] = {
 def _post_operation(get_op: dict, query_type: str, coll_id: str, responses: dict) -> dict:
     """Build a POST operation mirroring a GET EDR data query operation."""
     body_schema = _POST_BODY_SCHEMAS.get(query_type, {"type": "object"})
+    # Carry over a default output format from the GET operation's `f` parameter
+    # so the POST body documents the same default.
+    default_f = None
+    for p in get_op.get("parameters", []):
+        if isinstance(p, dict) and p.get("name") == "f":
+            default_f = p.get("schema", {}).get("default")
+            break
+    if default_f and "properties" in body_schema and "f" in body_schema["properties"]:
+        import copy
+        body_schema = copy.deepcopy(body_schema)
+        body_schema["properties"]["f"]["default"] = default_f
     return {
         "summary": get_op["summary"].replace("query", "query (POST)"),
         "description": get_op.get("description", ""),
@@ -583,6 +594,15 @@ def _collection_response_schema(coll: Collection,
                                             "type": "array",
                                             "items": {"type": "string"},
                                         },
+                                        "default_output_format": {
+                                            "type": "string",
+                                            "description": "Default output format for this data query when f is omitted",
+                                        },
+                                        "crs": {
+                                            "type": "array",
+                                            "description": "CRS values supported by this data query (shorthand for crs_details)",
+                                            "items": {"type": "string"},
+                                        },
                                         "crs_details": {
                                             "type": "array",
                                             "description": "CRS values supported by this data query",
@@ -665,12 +685,79 @@ def _parameter_schema() -> dict:
     }
 
 
+def _f_enum(profile: "ServiceProfile | None") -> list[str]:
+    """Allowed values for the `f` (output format) parameter: media types."""
+    enum = ["json", "html"]
+    if profile:
+        for fmt in profile.output_formats:
+            if fmt.media_type not in enum:
+                enum.append(fmt.media_type)
+    return enum
+
+
+def _format_media_type(profile: "ServiceProfile | None", format_name: str) -> str:
+    """Resolve a format name (e.g. 'GeoTIFF') to its media type, falling back to the name."""
+    if profile:
+        for fmt in profile.output_formats:
+            if fmt.name == format_name:
+                return fmt.media_type
+    return format_name
+
+
+def _query_default_format(variables: object) -> str | None:
+    """Read default_output_format from an EDR query's variables.
+
+    edr-pydantic's Variables defines default_output_format as a real field;
+    fall back to model_extra for forward compatibility.
+    """
+    val = getattr(variables, "default_output_format", None)
+    if val is None:
+        extra = getattr(variables, "model_extra", None) or {}
+        val = extra.get("default_output_format")
+    return val
+
+
+def _f_param(profile: "ServiceProfile | None", variables: object | None) -> dict:
+    """Return the `f` parameter for a query.
+
+    When the query's variables declare a default_output_format, an inline `f`
+    parameter is returned carrying that media type as its `default`. Otherwise
+    the shared component reference is used.
+    """
+    default_fmt = _query_default_format(variables) if variables is not None else None
+    if not default_fmt:
+        return _F
+    return {
+        "name": "f", "in": "query", "required": False,
+        "description": (
+            "The optional f parameter indicates the output format which the server "
+            "shall provide as part of the response document. Defaults to "
+            f"{default_fmt} for this query."
+        ),
+        "schema": {
+            "type": "string",
+            "enum": _f_enum(profile),
+            "default": _format_media_type(profile, default_fmt),
+        },
+        "style": "form", "explode": False,
+    }
+
+
+def _params_with_default_f(params: list[dict], profile: "ServiceProfile | None",
+                           variables: object | None) -> list[dict]:
+    """Replace the shared `_F` reference in a params list with a query-specific default."""
+    f_param = _f_param(profile, variables)
+    if f_param is _F:
+        return params
+    return [f_param if p is _F else p for p in params]
+
+
 def _collection_paths(coll: Collection, examples: dict | None = None,
                       profile: ServiceProfile | None = None) -> dict:
     paths: dict = {}
-    base = f"/collections/{coll.id}"
     tag = coll.id
     desc = getattr(coll, "description", None) or coll.id
+    base = f"/collections/{coll.id}"
 
     # Resolve effective POST flag: collection-level overrides profile-level default.
     # Collection.post_queries is None → inherit; True/False → explicit override.
@@ -726,10 +813,15 @@ def _collection_paths(coll: Collection, examples: dict | None = None,
     if not coll.data_queries:
         return paths
 
-    active = {name for name, val in coll.data_queries if val is not None}
+    dq_map = {name: val for name, val in coll.data_queries if val is not None}
+    active = set(dq_map)
+
+    def _vars(query_type: str) -> object | None:
+        qv = dq_map.get(query_type)
+        return qv.link.variables if qv is not None and qv.link else None
 
     for qt in active:
-        params = _QUERY_PARAMS.get(qt, [])
+        params = _params_with_default_f(_QUERY_PARAMS.get(qt, []), profile, _vars(qt))
 
         if qt == "instances":
             paths[f"{base}/instances"] = {"get": {
@@ -761,7 +853,7 @@ def _collection_paths(coll: Collection, examples: dict | None = None,
             }}
             # instance-level query sub-paths — GET + optional POST
             for sub_qt in (active - {"instances"}):
-                sub_params = _QUERY_PARAMS.get(sub_qt, [])
+                sub_params = _params_with_default_f(_QUERY_PARAMS.get(sub_qt, []), profile, _vars(sub_qt))
                 get_op = {
                     "summary": f"query {coll.id} instance by {sub_qt}",
                     "description": desc,
@@ -813,7 +905,7 @@ def _collection_paths(coll: Collection, examples: dict | None = None,
                 "tags": [tag],
                 "parameters": [
                     {"$ref": f"{_EDR}/parameters/locationId.yaml"},
-                    _DATETIME, _PARAM_NAME, _F,
+                    _DATETIME, _PARAM_NAME, _f_param(profile, _vars("locations")),
                 ],
                 "responses": cov_resp,
             }
@@ -1017,32 +1109,60 @@ def build_openapi(profile: ServiceProfile) -> dict:
         tags += [{"name": "jobs"}]
 
     # Build f parameter enum from profile output formats + standard formats
-    f_enum = ["json", "html"]
-    for fmt in profile.output_formats:
-        if fmt.media_type not in f_enum:
-            f_enum.append(fmt.media_type)
+    f_enum = _f_enum(profile)
 
-    # Build contact from document_metadata if available
+    # Build the info.contact block. A profile-level `provider` takes precedence;
+    # otherwise fall back to document_metadata editors/orgs.
     m = profile.document_metadata
     contact: dict = {}
-    if m and m.editors:
+    if profile.provider:
+        p = profile.provider
+        contact["name"] = p.name
+        if p.url:
+            contact["url"] = p.url
+        if p.contact:
+            c = p.contact
+            if c.email:
+                contact["email"] = c.email
+            # OpenAPI contact only models name/url/email — carry the rest as x- extensions.
+            for key in ("phone", "hours", "instructions", "address", "postalcode", "city", "country"):
+                val = getattr(c, key, None)
+                if val:
+                    contact[f"x-{key}"] = val
+    if "name" not in contact and m and m.editors:
         contact["name"] = m.editors[0]
-    if m and m.submitting_orgs:
+    if "x-organization" not in contact and m and m.submitting_orgs:
         contact["x-organization"] = m.submitting_orgs[0]
     # Fall back to a generic contact if nothing is specified
     if not contact:
         contact["name"] = profile.title
 
+    # Assemble the info block, adding optional x- metadata extensions.
+    info: dict = {
+        "title": profile.title,
+        "version": profile.version,
+        "description": profile.description or f"OGC API - EDR Part 3 Service Profile: {profile.title}",
+        "x-ogc-profile": profile.req_uri,
+        "x-keywords": profile.keywords if profile.keywords else [],
+        "contact": contact,
+    }
+    if profile.classification:
+        info["x-classification"] = {
+            k: v for k, v in (
+                ("level", profile.classification.level),
+                ("system", profile.classification.system),
+            ) if v
+        }
+    if profile.metadata_date:
+        info["x-metadata-date"] = profile.metadata_date
+    if profile.resource_service_publish_date:
+        info["x-resource-publish-date"] = profile.resource_service_publish_date
+    if profile.resource_default_locale:
+        info["x-default-locale"] = profile.resource_default_locale
+
     return {
         "openapi": "3.1.0",
-        "info": {
-            "title": profile.title,
-            "version": profile.version,
-            "description": profile.description or f"OGC API - EDR Part 3 Service Profile: {profile.title}",
-            "x-ogc-profile": profile.req_uri,
-            "x-keywords": profile.keywords if profile.keywords else [],
-            "contact": contact,
-        },
+        "info": info,
         # Per OGC API - EDR Part 3 REQ_publishing: this profile is implementation-independent.
         # The placeholder server URL "/" is required by OpenAPI validators but implementations
         # SHALL substitute their own server URL when deploying this profile.
@@ -1248,10 +1368,12 @@ def _individual_test_adoc(profile: ServiceProfile, test_id: str) -> str:
 def _build_document_adoc(profile: ServiceProfile) -> str:
     m = profile.document_metadata
     year = m.copyright_year if m else 2026
-    # draft-standard is the correct OGC doctype for in-progress profiles
-    doctype = "draft-standard"
-    # profile is not a valid OGC subtype; implementation is the closest for a service profile
-    docsubtype = "implementation" if not m or m.doc_subtype == "profile" else m.doc_subtype
+    default_date = f"{year}-01-01"
+    # doctype: configurable; draft-standard is the default for in-progress profiles
+    doctype = (m.doc_type if m and m.doc_type else "draft-standard")
+    # docsubtype: 'profile' is the natural subtype for a service profile, but when
+    # doctype is draft-standard/standard OGC expects implementation/profile etc.
+    docsubtype = m.doc_subtype if m else "implementation"
     lines = [
         f"= {profile.title}",
         f":doctype: {doctype}",
@@ -1261,10 +1383,12 @@ def _build_document_adoc(profile: ServiceProfile) -> str:
         ":committee: technical",
         f":docnumber: {m.doc_number if m else profile.name}",
         f":copyright-year: {year}",
-        f":published-date: {year}-01-01",
-        f":issued-date: {year}-01-01",
-        f":received-date: {year}-01-01",
+        f":published-date: {(m.publication_date if m and m.publication_date else default_date)}",
+        f":issued-date: {(m.approval_date if m and m.approval_date else default_date)}",
+        f":received-date: {(m.submission_date if m and m.submission_date else default_date)}",
     ]
+    if m and m.status:
+        lines.append(f":status: {m.status}")
     if m and m.external_id:
         lines.append(f":external-id: {m.external_id}")
     if m and m.editors:
@@ -1303,18 +1427,91 @@ def _build_document_adoc(profile: ServiceProfile) -> str:
 def _build_sections(profile: ServiceProfile) -> dict[str, str]:
     """Return the minimal boilerplate sections required by Metanorma OGC."""
     m = profile.document_metadata
-    conf_uris = [f"http://www.opengis.net/spec/ogcapi-edr-3/1.0/conf/{profile.name}"]
-    submitters = m.submitting_orgs if m and m.submitting_orgs else ["Unknown"]
+    conf_uris = [profile.conf_uri]
     req_includes = "\n".join(
         f"include::../requirements/core/REQ_{r.id}.adoc[]" for r in profile.requirements
     )
     ats_includes = "\n".join(
         f"include::../abstract_tests/core/ATS_{t.id}.adoc[]" for t in profile.abstract_tests
     )
+
+    # --- Submitters table rows (page iv) ---
+    # Prefer the structured `submitters` list (each with its own affiliation).
+    # Fall back to pairing editors with the first submitting org.
+    if m and m.submitters:
+        submitter_rows = "\n".join(
+            f"| {s.name}{f' _({s.role})_' if s.role else ''} |{s.affiliation or ''}"
+            for s in m.submitters
+        )
+    else:
+        fallback_org = (m.submitting_orgs[0] if m and m.submitting_orgs else "")
+        submitter_rows = "\n".join(
+            f"| {editor} _(editor)_ |{fallback_org}"
+            for editor in (m.editors if m and m.editors else ["Unknown"])
+        )
+
+    # --- Notice paragraph (front matter) ---
+    notice_block = ""
+    if m and m.notice:
+        notice_block = (
+            "\n[NOTE]\n"
+            "====\n"
+            f"{m.notice}\n"
+            "====\n"
+        )
+
+    # --- References: base OGC refs + any profile-supplied normative references ---
+    reference_lines = [
+        "* [[[OGC-EDR-1,OGC 19-086r6]]], OGC API - Environmental Data Retrieval Standard",
+        "* [[[OGC-EDR-3,nofetch(OGC ogcapi-edr-3)]]], OGC API - EDR Part 3: Service Profiles (draft)",
+    ]
+    if m and m.normative_references:
+        for ref in m.normative_references:
+            reference_lines.append(f"* [[[{ref.anchor},{ref.citation}]]], {ref.title}")
+
+    # --- Classification banner (e.g. NATO RESTRICTED) ---
+    classification_banner = ""
+    if profile.classification:
+        cl = profile.classification
+        label = cl.level + (f" ({cl.system})" if cl.system else "")
+        classification_banner = f"*SECURITY CLASSIFICATION: {label}*\n\n"
+
+    # --- Point of contact paragraph (from provider) ---
+    contact_block = ""
+    if profile.provider:
+        pv = profile.provider
+        parts_ = [f"This service is provided by {pv.name}"]
+        if pv.url:
+            parts_.append(f" ({pv.url})")
+        parts_.append(".")
+        if pv.contact:
+            c = pv.contact
+            details = []
+            if c.email:
+                details.append(f"Email: {c.email}")
+            if c.phone:
+                details.append(f"Phone: {c.phone}")
+            addr = ", ".join(
+                x for x in (c.address, c.postalcode, c.city, c.country) if x
+            )
+            if addr:
+                details.append(f"Address: {addr}")
+            if c.hours:
+                details.append(f"Hours: {c.hours}")
+            if c.instructions:
+                details.append(f"Contact instructions: {c.instructions}")
+            if details:
+                parts_.append(" " + " +\n".join(details))
+        contact_block = (
+            "\n[.preface]\n== Point of Contact\n\n"
+            + "".join(parts_) + "\n"
+        )
+
     return {
         "sections/00-abstract.adoc": (
             "[abstract]\n== Abstract\n\n"
-            f"This document defines the {profile.title}, "
+            + classification_banner
+            + f"This document defines the {profile.title}, "
             "an OGC API - Environmental Data Retrieval (EDR) Part 3 Service Profile. "
             "It specifies normative requirements and conformance tests for server implementations "
             f"conforming to this profile.\n"
@@ -1325,15 +1522,14 @@ def _build_sections(profile: ServiceProfile) -> dict[str, str]:
             ".Submitters\n"
             "|===\n"
             "h|Name h|Affiliation\n\n"
-            + "\n".join(
-                f"| {editor} _(editor)_ |{submitters[0] if submitters else ''}"
-                for editor in (m.editors if m and m.editors else ["Unknown"])
-            )
+            + submitter_rows
             + "\n|===\n"
         ),
         "sections/01-preface.adoc": (
             "[.preface]\n== Preface\n\n"
             f"This document was prepared by {', '.join(m.submitting_orgs) if m and m.submitting_orgs else 'the submitting organizations'}.\n"
+            + notice_block
+            + contact_block
         ),
         "sections/02-scope.adoc": (
             "== Scope\n\n"
@@ -1348,8 +1544,7 @@ def _build_sections(profile: ServiceProfile) -> dict[str, str]:
         ),
         "sections/04-references.adoc": (
             "[bibliography]\n== References\n\n"
-            "* [[[OGC-EDR-1,OGC 19-086r6]]], OGC API - Environmental Data Retrieval Standard\n"
-            "* [[[OGC-EDR-3,nofetch(OGC ogcapi-edr-3)]]], OGC API - EDR Part 3: Service Profiles (draft)\n"
+            + "\n".join(reference_lines) + "\n"
         ),
         "sections/05-terms.adoc": (
             "== Terms, Definitions and Abbreviated Terms\n\n"

{oapi_profile_builder-3.0.0 → oapi_profile_builder-3.1.0}/src/oapi_profile_builder/models.py

@@ -79,6 +79,31 @@ class ExtentWithNullBounds(EDRExtent):
     temporal: Optional[TemporalWithNullBounds] = None
 
 
+class Classification(BaseModel):
+    """Security classification metadata (e.g. for DGIWG / military profiles)."""
+    level: str = Field(description="Classification level, e.g. 'NATO RESTRICTED (NR)'")
+    system: str | None = Field(default=None, description="Classification system, e.g. 'NATO'")
+
+
+class ProviderContact(BaseModel):
+    """Point-of-contact details for the service provider (OWS/ISO-style)."""
+    email: str | None = None
+    phone: str | None = None
+    hours: str | None = None
+    instructions: str | None = None
+    address: str | None = None
+    postalcode: str | None = None
+    city: str | None = None
+    country: str | None = None
+
+
+class Provider(BaseModel):
+    """Service provider / responsible party (OWS ServiceProvider-like)."""
+    name: str
+    url: str | None = None
+    contact: ProviderContact | None = None
+
+
 class Collection(EDRCollection):
     """
     EDR Collection with a null-aware temporal extent and optional parameter_names.
@@ -116,6 +141,13 @@ class Collection(EDRCollection):
             "Omit (null) to inherit the profile-level default."
         ),
     )
+    # Optional per-collection metadata. When set, overrides the profile-level
+    # value for this collection. Round-tripped into profile_config.json.
+    classification: Optional[Classification] = None
+    provider: Optional[Provider] = None
+    metadata_date: Optional[str] = None
+    resource_service_publish_date: Optional[str] = None
+    resource_default_locale: Optional[str] = None
 
 
 # ---------------------------------------------------------------------------
@@ -255,16 +287,112 @@ class OutputFormat(BaseModel):
     schema_ref: str | None = Field(default=None, description="URL to schema definition")
 
 
+class Submitter(BaseModel):
+    """A single entry in the document's submitters table (page iv).
+
+    Allows each submitter to carry their own affiliation, rather than sharing
+    a single organisation across every editor.
+    """
+    name: str
+    affiliation: str | None = None
+    role: str | None = Field(
+        default=None,
+        description="Role annotation shown next to the name, e.g. 'editor' or 'contributor'",
+    )
+
+
+class NormativeReference(BaseModel):
+    """An additional normative/bibliographic reference for the References section.
+
+    Rendered as a Metanorma bibliography entry of the form
+    ``* [[[<anchor>,<citation>]]], <title>``.
+    """
+    anchor: Annotated[str, Field(pattern=r"^[A-Za-z0-9_\-]+$")] = Field(
+        description="Cross-reference anchor (letters, digits, dash, underscore), e.g. DGIWG-250",
+    )
+    citation: str = Field(description="Short citation label, e.g. 'DGIWG 250' or 'OGC 19-086r6'")
+    title: str = Field(description="Full reference title")
+
+
+# Metanorma OGC document stages (`:status:` / `:docstage:`). See
+# https://www.metanorma.org/author/ogc/ref/document-attributes/
+DocStatus = Literal[
+    "draft",
+    "work-item-draft",
+    "swg-draft",
+    "oab-review",
+    "public-rfc",
+    "tc-vote",
+    "approved",
+    "published",
+    "deprecated",
+    "rescinded",
+    "retired",
+    "legacy",
+]
+
+# Loose ISO 8601 date (YYYY-MM-DD) check for document dates.
+_DATE_RE = re.compile(r"^\d{4}-\d{2}-\d{2}$")
+
+
 class DocumentMetadata(BaseModel):
     """Metanorma/OGC document header metadata for PDF compilation."""
     doc_number: str
-    doc_subtype: Literal["implementation", "best-practice", "engineering-report"] = "implementation"
+    doc_type: str = Field(
+        default="draft-standard",
+        description=(
+            "Metanorma OGC :doctype: value (e.g. 'draft-standard', 'standard', "
+            "'best-practice', 'engineering-report'). Drives the cover-page document type."
+        ),
+    )
+    doc_subtype: Literal["implementation", "best-practice", "engineering-report", "profile"] = "implementation"
+    status: DocStatus | None = Field(
+        default=None,
+        description=(
+            "Metanorma OGC :status:/:docstage: value (e.g. 'swg-draft', 'approved'). "
+            "Combined with doc_type/doc_subtype this produces the cover-page sub-title."
+        ),
+    )
     editors: list[str] = Field(default_factory=list)
     submitting_orgs: list[str] = Field(default_factory=list)
+    submitters: list[Submitter] = Field(
+        default_factory=list,
+        description=(
+            "Structured submitters table (name + affiliation + role) for page iv. "
+            "When provided, takes precedence over the editors/submitting_orgs fallback."
+        ),
+    )
     keywords: list[str] = Field(default_factory=list)
     copyright_year: int = Field(default=2026)
+    # Title-page dates. Map to Metanorma attributes:
+    #   submission_date  -> :received-date:  (:submissionDate:)
+    #   approval_date    -> :issued-date:    (:approvalDate:)
+    #   publication_date -> :published-date: (:publicationDate:)
+    # Format: YYYY-MM-DD. When omitted, falls back to {copyright_year}-01-01.
+    submission_date: str | None = Field(default=None, description="Submission date (YYYY-MM-DD)")
+    approval_date: str | None = Field(default=None, description="Approval date (YYYY-MM-DD)")
+    publication_date: str | None = Field(default=None, description="Publication date (YYYY-MM-DD)")
+    notice: str | None = Field(
+        default=None,
+        description=(
+            "Custom notice text rendered in the document front matter. Note: the OGC "
+            "cover-page legal notice itself is generated by Metanorma from doc_type/status; "
+            "this field adds a notice paragraph in the preface."
+        ),
+    )
+    normative_references: list[NormativeReference] = Field(
+        default_factory=list,
+        description="Additional normative references appended to the References section.",
+    )
     external_id: str | None = None
 
+    @field_validator("submission_date", "approval_date", "publication_date")
+    @classmethod
+    def _valid_date(cls, v: str | None) -> str | None:
+        if v is not None and not _DATE_RE.match(v):
+            raise ValueError("date must be in YYYY-MM-DD format")
+        return v
+
 
 class PubSubServer(BaseModel):
     """A single pub/sub server endpoint."""
@@ -324,6 +452,34 @@ class ServiceProfile(BaseModel):
         ),
     )
     server_url: str | None = Field(default=None, description="Base URL for implementation (not used in profile OpenAPI per standard)")
+    provider: Provider | None = Field(
+        default=None,
+        description=(
+            "Service provider / responsible party. Surfaces in the OpenAPI info.contact "
+            "block (name/url/email plus x- extensions for phone, address, etc.) and as the "
+            "document point of contact."
+        ),
+    )
+    classification: Classification | None = Field(
+        default=None,
+        description=(
+            "Security classification of the service/profile (e.g. NATO RESTRICTED). "
+            "Surfaces as a banner in the generated document and as info.x-classification "
+            "in the OpenAPI."
+        ),
+    )
+    metadata_date: str | None = Field(
+        default=None,
+        description="Date the metadata was last updated (ISO 8601 string). Surfaces as info.x-metadata-date.",
+    )
+    resource_service_publish_date: str | None = Field(
+        default=None,
+        description="Date the resource/service was published (ISO 8601 string). Surfaces as info.x-resource-publish-date.",
+    )
+    resource_default_locale: str | None = Field(
+        default=None,
+        description="Default locale of the resource (e.g. 'eng'). Surfaces as info.x-default-locale.",
+    )
     collections: list[Collection] = Field(min_length=1)
     collection_examples: dict[str, dict] = Field(default_factory=dict)
     requirements: list[Requirement] = Field(default_factory=list)
@@ -361,6 +517,16 @@ class ServiceProfile(BaseModel):
         default=None,
         description="Regex pattern for valid collection IDs"
     )
+    spec_uri_base: str = Field(
+        default="http://www.opengis.net/spec/ogcapi-edr-3/1.0",
+        description=(
+            "Base URI for the requirements class and conformance class identifiers. "
+            "Defaults to the OGC API - EDR Part 3 namespace. Override this to publish "
+            "under a different SDO namespace (e.g. a DGIWG location). Used to derive "
+            "req_uri and conf_uri, which appear in the OpenAPI x-ogc-profile link, the "
+            "requirements/conformance AsciiDoc identifiers, and the conformance section."
+        ),
+    )
     parameter_name_pattern: str | None = Field(
         default=None,
         description="Regex pattern that all parameter_names keys must match"
@@ -376,14 +542,14 @@ class ServiceProfile(BaseModel):
         ),
     )
 
-    # OGC identifiers derived from name — not user-supplied
+    # OGC identifiers derived from name and spec_uri_base — not user-supplied directly
     @property
     def req_uri(self) -> str:
-        return f"http://www.opengis.net/spec/ogcapi-edr-3/1.0/req/{self.name}"
+        return f"{self.spec_uri_base.rstrip('/')}/req/{self.name}"
 
     @property
     def conf_uri(self) -> str:
-        return f"http://www.opengis.net/spec/ogcapi-edr-3/1.0/conf/{self.name}"
+        return f"{self.spec_uri_base.rstrip('/')}/conf/{self.name}"
 
     @model_validator(mode="after")
     def tests_reference_valid_requirements(self) -> ServiceProfile:
@@ -503,17 +669,18 @@ class ServiceProfile(BaseModel):
                 for crs_val in coll.crs:
                     _check(f"Collection '{coll.id}' crs[]", crs_val, er.supported_crs)
 
-            # --- crs_details in data_queries → supported_crs ---
+            # --- crs_details / crs shorthand in data_queries → supported_crs ---
             if coll.data_queries and er.supported_crs:
                 for qt_name, qt_val in coll.data_queries:
                     if qt_val is None:
                         continue
-                    crs_details = (
-                        qt_val.link.variables.model_extra.get("crs_details", [])
+                    extra = (
+                        qt_val.link.variables.model_extra
                         if hasattr(qt_val.link.variables, "model_extra")
-                        else []
-                    )
-                    for entry in (crs_details or []):
+                        else {}
+                    ) or {}
+                    crs_details = extra.get("crs_details", []) or []
+                    for entry in crs_details:
                         dq_crs = entry.get("crs") if isinstance(entry, dict) else None
                         if dq_crs:
                             _check(
@@ -521,6 +688,41 @@ class ServiceProfile(BaseModel):
                                 dq_crs,
                                 er.supported_crs,
                             )
+                    # `crs` is an accepted shorthand: a plain list of CRS URIs at
+                    # the query level, equivalent to crs_details: [{crs: ...}].
+                    for dq_crs in (extra.get("crs", []) or []):
+                        if isinstance(dq_crs, str):
+                            _check(
+                                f"Collection '{coll.id}' data_queries.{qt_name}.crs",
+                                dq_crs,
+                                er.supported_crs,
+                            )
+        return self
+
+    @model_validator(mode="after")
+    def validate_default_output_format(self) -> ServiceProfile:
+        """Ensure a query's default_output_format is one of its output_formats."""
+        for coll in self.collections:
+            if not coll.data_queries:
+                continue
+            for qt_name, qt_val in coll.data_queries:
+                if qt_val is None:
+                    continue
+                extra = (
+                    qt_val.link.variables.model_extra
+                    if hasattr(qt_val.link.variables, "model_extra")
+                    else {}
+                ) or {}
+                variables = qt_val.link.variables
+                default = getattr(variables, "default_output_format", None) or extra.get("default_output_format")
+                if default is None:
+                    continue
+                formats = getattr(variables, "output_formats", None) or extra.get("output_formats") or []
+                if formats and default not in formats:
+                    raise ValueError(
+                        f"Collection '{coll.id}' data_queries.{qt_name}: "
+                        f"default_output_format '{default}' is not in output_formats {formats}"
+                    )
         return self
 
     @model_validator(mode="after")

{oapi_profile_builder-3.0.0 → oapi_profile_builder-3.1.0/src/oapi_profile_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oapi-profile-builder
-Version: 3.0.0
+Version: 3.1.0
 Summary: Authoritative tooling for creating OGC API Service Profiles (EDR, Features)
 Author-email: Shane Mill <shane.mill@noaa.gov>
 License: Apache License
@@ -290,12 +290,18 @@ abstract_tests: []
 | `description` | string | no | Human-readable description of the service profile. Surfaces in the OpenAPI `info.description` and the landing page response schema |
 | `keywords` | list | no | Service-level keywords (e.g. query types, parameter names, domain terms). Surfaces in `info.x-keywords` and the landing page response schema. Distinct from `document_metadata.keywords`, which are for the OGC PDF header |
 | `server_url` | string | no | Documentation only — not written to the profile OpenAPI |
+| `provider` | object | no | Service provider / responsible party. Surfaces in OpenAPI `info.contact` and the document Point of Contact (see below) |
+| `classification` | object | no | Security classification (`level` + `system`). Surfaces as a document banner and `info.x-classification` |
+| `metadata_date` | string | no | Metadata update date (ISO 8601). Surfaces as `info.x-metadata-date` |
+| `resource_service_publish_date` | string | no | Resource/service publication date (ISO 8601). Surfaces as `info.x-resource-publish-date` |
+| `resource_default_locale` | string | no | Default resource locale (e.g. `eng`). Surfaces as `info.x-default-locale` |
 | `allow_post_queries` | bool | no | When `true`, generates `POST` alongside `GET` for all EDR data query endpoints. Defaults to `false` |
 | `collections` | list | yes | One or more EDR collections (see below) |
 | `required_conformance_classes` | list | no | Conformance classes implementations must declare. Defaults to EDR Core |
 | `extent_requirements` | object | no | Profile-level CRS/TRS/VRS constraints (see below) |
 | `output_formats` | list | no | Format name → media type + schema ref mappings |
 | `collection_id_pattern` | string | no | Regex all collection IDs must match |
+| `spec_uri_base` | string | no | Base URI for the requirements/conformance class identifiers. Defaults to the OGC EDR Part 3 namespace; override to publish under another SDO namespace (e.g. DGIWG) |
 | `parameter_name_pattern` | string | no | Regex all `parameter_names` keys must match |
 | `parameter_schema` | object | no | JSON Schema for parameter objects — replaces the default schema in the generated OpenAPI (see below) |
 | `processes` | list | no | OGC API Processes to expose in the OpenAPI |
@@ -303,7 +309,7 @@ abstract_tests: []
 | `abstract_tests` | list | no | Conformance tests — each must reference a valid requirement `id` |
 | `pubsub` | object | no | OGC API - EDR Part 2 PubSub config — generates `asyncapi.yaml` |
 | `collection_examples` | object | no | `{collectionId: {instanceId: "..."}}` — used by `validate-server` |
-| `document_metadata` | object | no | Metanorma PDF header (doc number, editors, orgs, keywords) |
+| `document_metadata` | object | no | Metanorma PDF header — doc number/type/subtype, status, editors, submitters, dates, notice, normative references (see below) |
 
 ---
 
@@ -360,6 +366,22 @@ data_queries:
         crs_details:
           - crs: "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
           - crs: "http://www.opengis.net/def/crs/EPSG/0/4326"
+  cube:
+    link:
+      href: https://example.com/collections/obs/cube
+      rel: data
+      variables:
+        query_type: cube
+        output_formats: [CoverageJSON, GeoTIFF]
+        # default_output_format: response format used when the `f` query
+        # parameter is omitted. Must be one of output_formats. Sets the
+        # `default` on the generated OpenAPI `f` parameter for this query.
+        default_output_format: GeoTIFF
+        # crs: shorthand for crs_details — a plain list of CRS URIs.
+        # Validated against extent_requirements.supported_crs.
+        crs:
+          - "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+          - "http://www.opengis.net/def/crs/EPSG/0/4326"
 ```
 
 #### `parameter_names` example
@@ -536,16 +558,39 @@ pubsub:
 
 ### `document_metadata`
 
-Required only when compiling a PDF with `--pdf`.
+Required only when compiling a PDF with `--pdf`. Fields map to Metanorma OGC document attributes.
 
 ```yaml
 document_metadata:
   doc_number: "25-myprofile"
-  doc_subtype: implementation   # implementation | best-practice | engineering-report
+  doc_type: draft-standard      # Metanorma :doctype: (draft-standard | standard | best-practice | engineering-report | ...)
+  doc_subtype: implementation   # implementation | best-practice | engineering-report | profile
+  status: approved              # Metanorma :status:/:docstage: (swg-draft | public-rfc | approved | ...)
   editors:
     - Jane Smith
+  # submitters: structured table for page iv — each row carries its own affiliation.
+  # When provided, takes precedence over the editors/submitting_orgs fallback.
+  submitters:
+    - name: Jane Smith
+      affiliation: My Organization
+      role: editor
+    - name: Standards Working Group
+      affiliation: My SDO
   submitting_orgs:
     - My Organization
+  # Title-page dates (YYYY-MM-DD). Omitted dates fall back to {copyright_year}-01-01.
+  submission_date: "2026-05-01"   # → :received-date:
+  approval_date:   "2026-06-15"   # → :issued-date:
+  publication_date: "2026-07-01"  # → :published-date:
+  # Custom notice paragraph rendered in the front matter. Note: the OGC cover-page
+  # legal notice itself is generated by Metanorma from doc_type/status.
+  notice: >
+    This is a DRAFT standard and is subject to change.
+  # Additional normative references appended to the References section.
+  normative_references:
+    - anchor: DGIWG-250
+      citation: DGIWG 250
+      title: DGIWG GeoTIFF Profile
   keywords:
     - ogcdoc
     - OGC API
@@ -554,6 +599,64 @@ document_metadata:
   external_id: http://www.opengis.net/doc/dp/my-profile/1.0
 ```
 
+The cover-page sub-title (e.g. "Draft Standard — Implementation — Approved") is produced by Metanorma from the `doc_type`, `doc_subtype`, and `status` combination.
+
+---
+
+### `provider`, `classification`, and provenance metadata
+
+Optional service-level metadata. Each may also be set per-collection (the collection value overrides the profile root for that collection and is round-tripped into `profile_config.json`).
+
+```yaml
+provider:
+  name: Austrian Military
+  url: "https://www.bmlv.gv.at/english/forces/organisation.shtml"
+  contact:
+    email: presse@bmlvs.gv.at
+    phone: "+43 ..."
+    hours: Monday to Friday 08:00 - 17:00
+    instructions: During hours of Service
+    address: "Ministry of Defence, Rossauer Lände 1"
+    postalcode: A-1090
+    city: Vienna
+    country: Austria
+
+classification:
+  level: "NATO RESTRICTED (NR)"
+  system: NATO
+
+metadata_date: "2026-06-25T07:31Z"
+resource_service_publish_date: "2026-06-24T14:10Z"
+resource_default_locale: eng
+```
+
+Where these surface:
+
+- `provider` → OpenAPI `info.contact` (`name`/`url`/`email`; the remaining contact fields become `x-` extensions) and a **Point of Contact** section in the generated document.
+- `classification` → a **security classification banner** in the document Abstract and `info.x-classification` in the OpenAPI.
+- `metadata_date` / `resource_service_publish_date` / `resource_default_locale` → `info.x-metadata-date` / `info.x-resource-publish-date` / `info.x-default-locale`.
+
+> The profile OpenAPI is implementation-independent (per EDR Part 3 REQ_publishing), so these describe the profile/data provenance rather than a specific deployment endpoint.
+
+---
+
+### `spec_uri_base`
+
+By default, the requirements class and conformance class identifiers are published under the OGC API - EDR Part 3 namespace:
+
+```
+http://www.opengis.net/spec/ogcapi-edr-3/1.0/req/<name>
+http://www.opengis.net/spec/ogcapi-edr-3/1.0/conf/<name>
+```
+
+Set `spec_uri_base` to publish under a different SDO namespace. This updates the OpenAPI `x-ogc-profile` link, the requirements/conformance AsciiDoc identifiers, and the conformance section:
+
+```yaml
+spec_uri_base: "https://schemas.dgiwg.org/edr/1.0"
+# → https://schemas.dgiwg.org/edr/1.0/req/<name>
+# → https://schemas.dgiwg.org/edr/1.0/conf/<name>
+```
+
 ---
 
 ## Validation Rules
@@ -564,10 +667,12 @@ The tool enforces these rules at build time. Violations produce clear error mess
 |---|---|
 | `name` format | Must match `^[a-z0-9_]+$` |
 | No duplicate collection IDs | Across the whole profile |
-| `extent_requirements` requires CRS spec | Either `allowed_crs` or `crs_pattern` must be set |
-| Collection CRS validated | Each `extent.spatial.crs` checked against `allowed_crs`/`crs_pattern` |
-| Collection TRS validated | Each `extent.temporal.trs` checked against `allowed_trs`/`trs_pattern` |
-| `crs_details` validated | Each `data_queries.*.variables.crs_details[].crs` checked against CRS constraints |
+| `extent_requirements` requires CRS spec | At least one of `extent_crs` or `supported_crs` must be set (each uses `allowed` or `pattern`) |
+| Collection CRS validated | Each `extent.spatial.crs` checked against `extent_crs`; `crs[]` and `crs_details` checked against `supported_crs` |
+| Collection TRS validated | Each `extent.temporal.trs` checked against `extent_trs` |
+| `crs_details` / `crs` validated | Each `data_queries.*.variables.crs_details[].crs` and `crs[]` checked against `supported_crs` |
+| `default_output_format` validated | Each `data_queries.*.variables.default_output_format` must be one of that query's `output_formats` |
+| Document dates format | `submission_date` / `approval_date` / `publication_date` must be `YYYY-MM-DD` |
 | Parameters need `unit` + `observedProperty` | Required by OGC API - EDR Part 3 |
 | `parameter_name_pattern` enforced | All `parameter_names` keys must match if set |
 | `collection_id_pattern` enforced | All collection IDs must match if set |