Expose extra geometries as WKT

Author: elpaso

src/server/services/wfs3/qgswfs3handlers.cpp

@@ -31,6 +31,7 @@
 #include "qgslogger.h"
 #include "qgsmessagelog.h"
 #include "qgsogrutils.h"
+#include "qgsreferencedgeometry.h"
 #include "qgsserverapicontext.h"
 #include "qgsserverapiutils.h"
 #include "qgsserverfeatureid.h"
@@ -455,8 +456,26 @@ void QgsWfs3AbstractItemsHandler::gatherLayerFieldsInfo( json &data, const QgsVe
         fInfo.type = "string";
         break;
       }
+      case QMetaType::Type::QByteArray:
+      {
+        fInfo.type = "binary";
+        break;
+      }
+      case QMetaType::Type::User:
+      {
+        if ( field.typeName().toLower() == "geometry" )
+        {
+          // no format: we do not have the information about the geometry type
+          fInfo.format = "geometry-any";
+          fInfo.type = "string";
+        }
+        break;
+      }
       default:
+      {
+        QgsDebugMsgLevel( u"Field '%1' has unsupported  meta type '%2', defaulting to string"_s.arg( field.name() ).arg( field.type() ), 2 );
         break;
+      }
     }
   };
 
@@ -667,6 +686,8 @@ void QgsWfs3AbstractItemsHandler::gatherLayerFieldsInfo( json &data, const QgsVe
           //         For now, we skip and warn (info level) assuming that if the widget is not set this is intentional.
           QgsMessageLog::logMessage( u"Unhandled widget type '%1' for field '%2'"_s.arg( widgetType, fieldIdentifier ), u"Server"_s, Qgis::MessageLevel::Info );
         }
+        // ////////////////////////////////////////////////////
+        // Generic code that may apply to several widget types
 
         // Extract the pattern
         const QgsFieldConstraints constraints = field.constraints();
@@ -692,9 +713,6 @@ void QgsWfs3AbstractItemsHandler::gatherLayerFieldsInfo( json &data, const QgsVe
           }
         }
 
-        // ////////////////////////////////////////////////////
-        // Generic code that may apply to several widget types
-
         // Check for std::numeric_limits max/min(lowest for double) and reset if found
         if ( fInfo.maximum.has_value() )
         {
@@ -1772,7 +1790,20 @@ void QgsWfs3CollectionsItemsHandler::writeJsonOutput( const QgsVectorLayer *mapL
 
   json data = exporter.exportFeaturesToJsonObject( featureList );
 
-  // Patch feature IDs with server feature IDs
+  QMap<int, QString> extraGeomFields;
+  const QList<int> requestedAttrs = featureRequest.subsetOfAttributes();
+  for ( const int idx : std::as_const( requestedAttrs ) )
+  {
+    if ( mapLayer->fields().field( idx ).type() == QMetaType::Type::User && mapLayer->fields().field( idx ).typeName().compare( "geometry"_L1 ) == 0 )
+    {
+      extraGeomFields.insert( idx, mapLayer->fields().field( idx ).displayName() );
+    }
+  }
+
+  // Patch feature
+  //  - IDs with server feature IDs
+  //  - add references
+  //  - format extra geometries
   for ( int i = 0; i < featureList.length(); i++ )
   {
     data["features"][i]["id"] = fidMap.value( data["features"][i]["id"] ).toStdString();
@@ -1786,6 +1817,11 @@ void QgsWfs3CollectionsItemsHandler::writeJsonOutput( const QgsVectorLayer *mapL
         data["features"][i]["properties"][fieldIdentifier.toStdString()] = relatedFeatureReference( rawValue, referencedInfo, relAs, apiContext );
       }
     }
+    for ( const auto &[fieldIdx, fieldIdentifier] : extraGeomFields.toStdMap() )
+    {
+      const QgsReferencedGeometry &refGeom = featureList[i].attribute( fieldIdx ).value<QgsReferencedGeometry>();
+      data["features"][i]["properties"][fieldIdentifier.toStdString()] = refGeom.asWkt().toStdString();
+    }
   }
 
   // Add some metadata

tests/src/python/test_qgsserver_ogcapi_schema.py

@@ -563,6 +563,60 @@ def test_relation(self):
             },
         )
 
+    def test_extra_geometry(self):
+
+        if "QGIS_PGTEST_DB" in os.environ:
+            dbconn = os.environ["QGIS_PGTEST_DB"]
+        else:
+            dbconn = "service=qgis_test dbname=qgis_test sslmode=disable "
+
+        # Test layer
+        uri = dbconn + " dbname=qgis_test sslmode=disable "
+        md = QgsProviderRegistry.instance().providerMetadata("postgres")
+
+        if not md:
+            self.skipTest("postgres provider not available")
+
+        conn = md.createConnection(uri, {})
+        conn.executeSql('DROP TABLE IF EXISTS "qgis_test"."TwoGeoms" CASCADE')
+        conn.executeSql('CREATE TABLE "qgis_test"."TwoGeoms" (id serial primary key)')
+
+        conn.executeSql(
+            "SELECT AddGeometryColumn('qgis_test', 'TwoGeoms', 'geom1', 4326, 'POINT', 2 )"
+        )
+        conn.executeSql(
+            "SELECT AddGeometryColumn('qgis_test', 'TwoGeoms', 'geom2', 4326, 'POINT', 2 )"
+        )
+
+        conn.executeSql(
+            "INSERT INTO \"qgis_test\".\"TwoGeoms\" (geom1, geom2) VALUES (ST_GeomFromText('POINT(0 0)', 4326), ST_GeomFromText('POINT(1 1)', 4326))"
+        )
+
+        layer_source = conn.tableUri("qgis_test", "TwoGeoms") + " (geom2) sql="
+
+        project = QgsProject()
+        layer = QgsVectorLayer(layer_source, "TwoGeoms", "postgres")
+        self.assertTrue(layer.isValid())
+
+        project.addMapLayer(layer)
+        # Expose to WFS
+        project.writeEntry("WFSLayers", "/", [layer.id()])
+
+        j = self._getJsonResponse(
+            "http://server.qgis.org/wfs3/collections/TwoGeoms/schema.json", project
+        )
+
+        self.assertEqual(
+            j["properties"]["geom1"],
+            {"format": "geometry-any", "type": "string", "x-ogc-propertySeq": 1},
+        )
+
+        # Get data and check geom1 is correctly exposed as WKT
+        j = self._getJsonResponse(
+            "http://server.qgis.org/wfs3/collections/TwoGeoms/items?f=json", project
+        )
+        self.assertEqual(j["features"][0]["properties"]["geom1"].upper(), "POINT (0 0)")
+
 
 if __name__ == "__main__":
     unittest.main()