Merge pull request #6522 from mhugent/fix_18247

Fallback to feature id if pk attribute is not there
qgis · Mar 9, 2018 · 188ca9acec347f3d63be0803cfd4223b992de53c · 188ca9a
2 parents 45f04b7 + b0d3548
commit 188ca9acec347f3d63be0803cfd4223b992de53c
Unified Split

Showing with 7 additions and 1 deletion.

+7 −1 src/server/qgsowsserver.cpp
diff --git a/src/server/qgsowsserver.cpp b/src/server/qgsowsserver.cpp
@@ -85,7 +85,13 @@ QString QgsOWSServer::featureGmlId( const QgsFeature* f, const QgsAttributeList&
     {
       pkId.append( pkSeparator() );
     }
-    pkId.append( f->attribute( *it ).toString() );
+
+    QVariant pkAttribute = f->attribute( *it );
+    if ( !pkAttribute.isValid() )
+    {
+      return QString::number( f->id() );
+    }
+    pkId.append( pkAttribute.toString() );
   }
   return pkId;
 }