fix: ogx schemas (#1097)

- [ ] I added an entry to [`CHANGELOG.md`](CHANGELOG.md) if knowledge of
this change could be valuable to users.

---

Here is a brief summary of what I did:

<TEXT>

Author: jdroenner

openapi.json

@@ -4286,15 +4286,10 @@
           {
             "name": "request",
             "in": "query",
-            "description": "type of WMS request",
+            "description": "type of WCS request",
             "required": true,
             "schema": {
-              "type": "string",
-              "enum": [
-                "GetCapabilGetCapabilitiesities",
-                "DescribeCoverage",
-                "GetCoverage"
-              ]
+              "$ref": "#/components/schemas/WcsRequest"
             }
           },
           {
@@ -4450,11 +4445,7 @@
             "description": "type of WFS request",
             "required": true,
             "schema": {
-              "type": "string",
-              "enum": [
-                "GetCapabilities",
-                "GetFeature"
-              ]
+              "$ref": "#/components/schemas/WfsRequest"
             }
           },
           {
@@ -4732,7 +4723,7 @@
                   "type": "null"
                 },
                 {
-                  "$ref": "#/components/schemas/GetCapabilitiesFormat"
+                  "$ref": "#/components/schemas/WmsResponseFormat"
                 }
               ]
             }
@@ -4790,14 +4781,7 @@
             "description": "type of WMS request",
             "required": true,
             "schema": {
-              "type": "string",
-              "enum": [
-                "GetCapabilities",
-                "GetMap",
-                "GetFeatureInfo",
-                "GetStyles",
-                "GetLegendGraphic"
-              ]
+              "$ref": "#/components/schemas/WmsRequest"
             }
           },
           {
@@ -4888,14 +4872,7 @@
         ],
         "responses": {
           "200": {
-            "description": "OK",
-            "content": {
-              "text/xml": {
-                "schema": {
-                  "type": "string"
-                }
-              }
-            }
+            "$ref": "#/components/responses/PngResponse"
           }
         },
         "security": [
@@ -6935,37 +6912,19 @@
           }
         }
       },
-      "GetCapabilitiesFormat": {
-        "type": "string",
-        "enum": [
-          "text/xml"
-        ]
-      },
       "GetCoverageFormat": {
         "type": "string",
         "enum": [
           "image/tiff"
         ]
       },
-      "GetFeatureRequest": {
-        "type": "string",
-        "enum": [
-          "GetFeature"
-        ]
-      },
       "GetMapExceptionFormat": {
         "type": "string",
         "enum": [
           "XML",
           "JSON"
         ]
       },
-      "GetMapFormat": {
-        "type": "string",
-        "enum": [
-          "image/png"
-        ]
-      },
       "GfbioAbcdDataProviderDefinition": {
         "type": "object",
         "required": [
@@ -10830,6 +10789,14 @@
           }
         }
       },
+      "WcsRequest": {
+        "type": "string",
+        "enum": [
+          "GetCapabilities",
+          "DescribeCoverage",
+          "GetCoverage"
+        ]
+      },
       "WcsService": {
         "type": "string",
         "enum": [
@@ -10843,6 +10810,13 @@
           "1.1.1"
         ]
       },
+      "WfsRequest": {
+        "type": "string",
+        "enum": [
+          "GetCapabilities",
+          "GetFeature"
+        ]
+      },
       "WfsService": {
         "type": "string",
         "enum": [
@@ -10911,6 +10885,23 @@
           }
         }
       },
+      "WmsRequest": {
+        "type": "string",
+        "enum": [
+          "GetCapabilities",
+          "GetMap",
+          "GetFeatureInfo",
+          "GetStyles",
+          "GetLegendGraphic"
+        ]
+      },
+      "WmsResponseFormat": {
+        "type": "string",
+        "enum": [
+          "text/xml",
+          "image/png"
+        ]
+      },
       "WmsService": {
         "type": "string",
         "enum": [

services/src/api/apidoc.rs

@@ -331,20 +331,21 @@ use utoipa::{Modify, OpenApi};
 
             OgcBoundingBox,
 
+            wcs::request::WcsRequest,
             wcs::request::WcsService,
             wcs::request::WcsVersion,
             wcs::request::GetCoverageFormat,
             wcs::request::WcsBoundingbox,
 
+            wms::request::WmsRequest,
             wms::request::WmsService,
             wms::request::WmsVersion,
-            wms::request::GetCapabilitiesFormat,
             wms::request::GetMapExceptionFormat,
-            wms::request::GetMapFormat,
+            wms::request::WmsResponseFormat,
 
+            wfs::request::WfsRequest,
             wfs::request::WfsService,
             wfs::request::WfsVersion,
-            wfs::request::GetFeatureRequest,
             wfs::request::TypeNames,
 
             GeoJson,

services/src/api/handlers/wcs.rs

@@ -29,7 +29,7 @@ use std::time::Duration;
 use tracing::info;
 use url::Url;
 use utoipa::IntoParams;
-use utoipa::openapi::Required;
+use utoipa::openapi::{Ref, Required};
 use uuid::Uuid;
 
 pub(crate) fn init_wcs_routes<C>(cfg: &mut web::ServiceConfig)
@@ -63,16 +63,8 @@ impl IntoParams for WcsQueryParams {
                 .name("request")
                 .required(utoipa::openapi::Required::True)
                 .parameter_in(pip().unwrap_or_default())
-                .description(Some("type of WMS request"))
-                .schema(Some(
-                    utoipa::openapi::ObjectBuilder::new()
-                        .schema_type(utoipa::openapi::schema::Type::String)
-                        .enum_values(Some(vec![
-                            "GetCapabilGetCapabilitiesities",
-                            "DescribeCoverage",
-                            "GetCoverage",
-                        ])),
-                ))
+                .description(Some("type of WCS request"))
+                .schema(Some(Ref::from_schema_name("WcsRequest")))
                 .build(),
         );
 

services/src/api/handlers/wfs.rs

@@ -36,7 +36,7 @@ use serde_json::json;
 use snafu::ensure;
 use std::str::FromStr;
 use std::time::Duration;
-use utoipa::openapi::Required;
+use utoipa::openapi::{Ref, Required};
 use utoipa::{IntoParams, ToSchema};
 use uuid::Uuid;
 
@@ -72,11 +72,7 @@ impl IntoParams for WfsQueryParams {
                 .required(utoipa::openapi::Required::True)
                 .parameter_in(pip().unwrap_or_default())
                 .description(Some("type of WFS request"))
-                .schema(Some(
-                    utoipa::openapi::ObjectBuilder::new()
-                        .schema_type(utoipa::openapi::schema::Type::String)
-                        .enum_values(Some(vec!["GetCapabilities", "GetFeature"])),
-                ))
+                .schema(Some(Ref::from_schema_name("WfsRequest")))
                 .build(),
         );
 

services/src/api/handlers/wms.rs

@@ -32,7 +32,7 @@ use std::str::FromStr;
 use std::time::Duration;
 use tracing::debug;
 use utoipa::IntoParams;
-use utoipa::openapi::Required;
+use utoipa::openapi::{Ref, Required};
 use uuid::Uuid;
 
 pub(crate) fn init_wms_routes<C>(cfg: &mut web::ServiceConfig)
@@ -70,17 +70,7 @@ impl IntoParams for WmsQueryParams {
                 .required(utoipa::openapi::Required::True)
                 .parameter_in(pip().unwrap_or_default())
                 .description(Some("type of WMS request"))
-                .schema(Some(
-                    utoipa::openapi::ObjectBuilder::new()
-                        .schema_type(utoipa::openapi::schema::Type::String)
-                        .enum_values(Some(vec![
-                            "GetCapabilities",
-                            "GetMap",
-                            "GetFeatureInfo",
-                            "GetStyles",
-                            "GetLegendGraphic",
-                        ])),
-                ))
+                .schema(Some(Ref::from_schema_name("WmsRequest")))
                 .build(),
         );
 
@@ -172,7 +162,8 @@ impl IntoParams for WmsQueryParams {
             //     </Layer>
             //   </Capability>
             // </WMS_Capabilities>"#
-        )
+        ),
+        (status = 200, response = crate::api::model::responses::PngResponse),
     ),
     params(
         ("workflow" = WorkflowId, description = "Workflow id"),

services/src/api/ogc/wcs/request.rs

@@ -11,6 +11,14 @@ use serde::de::Error;
 use serde::{Deserialize, Serialize};
 use utoipa::{IntoParams, ToSchema};
 
+#[derive(Debug, Clone, Deserialize, ToSchema)]
+#[serde(rename_all = "PascalCase")]
+pub enum WcsRequest {
+    GetCapabilities,
+    DescribeCoverage,
+    GetCoverage,
+}
+
 #[derive(PartialEq, Eq, Debug, Deserialize, Serialize, ToSchema)]
 pub enum WcsService {
     #[serde(rename = "WCS")]

services/src/api/ogc/wfs/request.rs

@@ -7,6 +7,13 @@ use utoipa::openapi::Type;
 use utoipa::openapi::schema::{ObjectBuilder, SchemaType};
 use utoipa::{IntoParams, PartialSchema, ToSchema};
 
+#[derive(Debug, Clone, Deserialize, ToSchema)]
+#[serde(rename_all = "PascalCase")]
+pub enum WfsRequest {
+    GetCapabilities,
+    GetFeature,
+}
+
 #[derive(PartialEq, Eq, Debug, Deserialize, Serialize, ToSchema)]
 pub enum WfsService {
     #[serde(rename = "WFS")]
@@ -76,11 +83,6 @@ pub struct GetFeature {
                                 // TODO: feature_id, ...
 }
 
-#[derive(PartialEq, Eq, Debug, Deserialize, Serialize, ToSchema)]
-pub enum GetFeatureRequest {
-    GetFeature,
-}
-
 #[allow(clippy::option_if_let_else)]
 pub fn parse_type_names<'de, D>(deserializer: D) -> Result<TypeNames, D::Error>
 where

services/src/api/ogc/wms/request.rs

@@ -4,6 +4,17 @@ use crate::util::{bool_option_case_insensitive, from_str};
 use serde::{Deserialize, Serialize};
 use utoipa::{IntoParams, ToSchema};
 
+#[derive(Debug, Clone, Deserialize, ToSchema)]
+#[serde(rename_all = "PascalCase")]
+#[allow(clippy::enum_variant_names)]
+pub enum WmsRequest {
+    GetCapabilities,
+    GetMap,
+    GetFeatureInfo,
+    GetStyles,
+    GetLegendGraphic,
+}
+
 #[derive(PartialEq, Eq, Debug, Deserialize, Serialize, ToSchema)]
 pub enum WmsService {
     #[serde(rename = "WMS")]
@@ -23,13 +34,15 @@ pub struct GetCapabilities {
     #[serde(alias = "SERVICE")]
     pub service: WmsService,
     #[serde(alias = "FORMAT")]
-    pub format: Option<GetCapabilitiesFormat>,
+    pub format: Option<WmsResponseFormat>,
 }
 
 #[derive(PartialEq, Eq, Debug, Deserialize, Serialize, ToSchema)]
-pub enum GetCapabilitiesFormat {
+pub enum WmsResponseFormat {
     #[serde(rename = "text/xml")]
-    TextXml, // TODO: remaining formats
+    TextXml,
+    #[serde(rename = "image/png")]
+    ImagePng, // TODO: remaining formats
 }
 
 // TODO: remove serde aliases and use serde-aux and case insensitive keys
@@ -52,7 +65,7 @@ pub struct GetMap {
     #[param(example = "-90,-180,90,180")]
     pub bbox: OgcBoundingBox,
     #[serde(alias = "FORMAT")]
-    pub format: GetMapFormat,
+    pub format: WmsResponseFormat,
     #[serde(alias = "LAYERS")]
     #[param(example = "<Workflow Id>")]
     pub layers: String,
@@ -94,12 +107,6 @@ pub enum GetMapExceptionFormat {
     Json, // UNSUPPORTED: INIMAGE, BLANK
 }
 
-#[derive(PartialEq, Eq, Debug, Deserialize, Serialize, ToSchema)]
-pub enum GetMapFormat {
-    #[serde(rename = "image/png")]
-    ImagePng, // TODO: remaining formats
-}
-
 #[derive(PartialEq, Eq, Debug, Deserialize, Serialize, IntoParams)]
 pub struct GetFeatureInfo {
     pub version: String,
@@ -161,7 +168,7 @@ mod tests {
             elevation: Some("elevation".into()),
             bbox: OgcBoundingBox::new(1., 2., 3., 4.),
             height: 2,
-            format: GetMapFormat::ImagePng,
+            format: WmsResponseFormat::ImagePng,
             exceptions: Some(GetMapExceptionFormat::Json),
         };
 
@@ -188,7 +195,7 @@ mod tests {
             elevation: None,
             bbox: OgcBoundingBox::new(1., 2., 3., 4.),
             height: 2,
-            format: GetMapFormat::ImagePng,
+            format: WmsResponseFormat::ImagePng,
             exceptions: None,
         };