[FEATURE]: possibility to segmentize feature info geometry in server

Author: mhugent

python/server/qgswmsconfigparser.sip

@@ -53,6 +53,9 @@ class QgsWMSConfigParser
     /** True if the feature info response should contain the wkt geometry for vector features*/
     virtual bool featureInfoWithWktGeometry() const = 0;
 
+    /** True if the feature info wkt geometry is delivered with segmentized curve types*/
+    virtual bool segmentizeFeatureInfoWktGeometry() const = 0;
+
     /** Returns map with layer aliases for GetFeatureInfo (or 0 pointer if not supported). Key: layer name, Value: layer alias*/
     virtual QHash<QString, QString> featureInfoLayerAliasMap() const = 0;
 

python/server/qgswmsprojectparser.sip

@@ -83,6 +83,10 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
     /** True if the feature info response should contain the wkt geometry for vector features*/
     bool featureInfoWithWktGeometry() const  /*override*/ ;
 
+    /** True if the feature info wkt geometry is delivered with segmentized curve types*/
+    bool segmentizeFeatureInfoWktGeometry() const /*override*/ ;
+
+
     /** Returns map with layer aliases for GetFeatureInfo (or 0 pointer if not supported). Key: layer name, Value: layer alias*/
     QHash<QString, QString> featureInfoLayerAliasMap() const  /*override*/ ;
 

src/app/qgsprojectproperties.cpp

@@ -530,6 +530,9 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
   bool addWktGeometry = QgsProject::instance()->readBoolEntry( "WMSAddWktGeometry", "/" );
   mAddWktGeometryCheckBox->setChecked( addWktGeometry );
 
+  bool segmentizeFeatureInfoGeometry = QgsProject::instance()->readBoolEntry( "WMSSegmentizeFeatureInfoGeometry", "/" );
+  mSegmentizeFeatureInfoGeometryCheckBox->setChecked( segmentizeFeatureInfoGeometry );
+
   bool useLayerIDs = QgsProject::instance()->readBoolEntry( "WMSUseLayerIDs", "/" );
   mWmsUseLayerIDs->setChecked( useLayerIDs );
 
@@ -1077,6 +1080,7 @@ void QgsProjectProperties::apply()
   }
 
   QgsProject::instance()->writeEntry( "WMSAddWktGeometry", "/", mAddWktGeometryCheckBox->isChecked() );
+  QgsProject::instance()->writeEntry( "WMSSegmentizeFeatureInfoGeometry", "/", mSegmentizeFeatureInfoGeometryCheckBox->isChecked() );
   QgsProject::instance()->writeEntry( "WMSUseLayerIDs", "/", mWmsUseLayerIDs->isChecked() );
 
   QString maxWidthText = mMaxWidthLineEdit->text();

src/server/qgssldconfigparser.cpp

@@ -515,6 +515,15 @@ bool QgsSLDConfigParser::featureInfoWithWktGeometry() const
   return false;
 }
 
+bool QgsSLDConfigParser::segmentizeFeatureInfoWktGeometry() const
+{
+  if ( mFallbackParser )
+  {
+    return mFallbackParser->segmentizeFeatureInfoWktGeometry();
+  }
+  return false;
+}
+
 
 QHash<QString, QString> QgsSLDConfigParser::featureInfoLayerAliasMap() const
 {

src/server/qgssldconfigparser.h

@@ -64,6 +64,9 @@ class QgsSLDConfigParser : public QgsWMSConfigParser
     /** True if the feature info response should contain the wkt geometry for vector features*/
     bool featureInfoWithWktGeometry() const override;
 
+    /** True if the feature info wkt geometry is delivered with segmentized curve types*/
+    bool segmentizeFeatureInfoWktGeometry() const override;
+
     /** Returns map with layer aliases for GetFeatureInfo (or 0 pointer if not supported). Key: layer name, Value: layer alias*/
     QHash<QString, QString> featureInfoLayerAliasMap() const override;
 

src/server/qgswmsconfigparser.h

@@ -64,6 +64,9 @@ class SERVER_EXPORT QgsWMSConfigParser
     /** True if the feature info response should contain the wkt geometry for vector features*/
     virtual bool featureInfoWithWktGeometry() const = 0;
 
+    /** True if the feature info wkt geometry is delivered with segmentized curve types*/
+    virtual bool segmentizeFeatureInfoWktGeometry() const = 0;
+
     /** Returns map with layer aliases for GetFeatureInfo (or 0 pointer if not supported). Key: layer name, Value: layer alias*/
     virtual QHash<QString, QString> featureInfoLayerAliasMap() const = 0;
 

src/server/qgswmsprojectparser.cpp

@@ -2012,6 +2012,28 @@ bool QgsWMSProjectParser::featureInfoWithWktGeometry() const
   return ( wktElem.text().compare( "true", Qt::CaseInsensitive ) == 0 );
 }
 
+bool QgsWMSProjectParser::segmentizeFeatureInfoWktGeometry() const
+{
+  if ( !mProjectParser->xmlDocument() )
+  {
+    return false;
+  }
+
+  QDomElement propertiesElem = mProjectParser->propertiesElem();
+  if ( propertiesElem.isNull() )
+  {
+    return false;
+  }
+
+  QDomElement segmentizeElem = propertiesElem.firstChildElement( "WMSSegmentizeFeatureInfoGeometry" );
+  if ( segmentizeElem.isNull() )
+  {
+    return false;
+  }
+
+  return( segmentizeElem.text().compare( "true", Qt::CaseInsensitive ) == 0 );
+}
+
 QHash<QString, QString> QgsWMSProjectParser::featureInfoLayerAliasMap() const
 {
   QHash<QString, QString> aliasMap;

src/server/qgswmsprojectparser.h

@@ -100,6 +100,9 @@ class SERVER_EXPORT QgsWMSProjectParser : public QgsWMSConfigParser
     /** True if the feature info response should contain the wkt geometry for vector features*/
     bool featureInfoWithWktGeometry() const override;
 
+    /** True if the feature info wkt geometry is delivered with segmentized curve types*/
+    bool segmentizeFeatureInfoWktGeometry() const override;
+
     /** Returns map with layer aliases for GetFeatureInfo (or 0 pointer if not supported). Key: layer name, Value: layer alias*/
     QHash<QString, QString> featureInfoLayerAliasMap() const override;
 

src/server/qgswmsserver.cpp

@@ -2191,6 +2191,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
   layer->updateFields();
   const QgsFields& fields = layer->pendingFields();
   bool addWktGeometry = mConfigParser && mConfigParser->featureInfoWithWktGeometry();
+  bool segmentizeWktGeometry = mConfigParser && mConfigParser->segmentizeFeatureInfoWktGeometry();
   const QSet<QString>& excludedAttributes = layer->excludeAttributesWMS();
 
   QgsFeatureRequest fReq;
@@ -2365,6 +2366,19 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
             if ( transform )
               geom->transform( *transform );
           }
+
+          if ( segmentizeWktGeometry )
+          {
+            QgsAbstractGeometryV2* abstractGeom = geom->geometry();
+            if ( abstractGeom )
+            {
+              if ( QgsWKBTypes::isCurvedType( abstractGeom->wkbType() ) )
+              {
+                QgsAbstractGeometryV2* segmentizedGeom = abstractGeom-> segmentize();
+                geom->setGeometry( segmentizedGeom );
+              }
+            }
+          }
           QDomElement geometryElement = infoDocument.createElement( "Attribute" );
           geometryElement.setAttribute( "name", "geometry" );
           geometryElement.setAttribute( "value", geom->exportToWkt( getWMSPrecision( 8 ) ) );