Support plain tables from WFS sources

palmerj · mhugent · commit aedddc22b11e · 2012-10-04T15:07:43.000+02:00
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -69,6 +69,8 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
     case QGis::Polygon:
       stackedPlacement->setCurrentWidget( pagePolygon );
       break;
+    case QGis::NoGeometry:
+      break;
     default:
       Q_ASSERT( 0 && "NOOOO!" );
   }
diff --git a/src/providers/wfs/qgswfsdata.cpp b/src/providers/wfs/qgswfsdata.cpp
@@ -127,7 +127,7 @@ int QgsWFSData::getWFSData()
   delete reply;
   delete progressDialog;
 
-  if ( mExtent )
+  if ( mExtent && *mWkbType != QGis::WKBNoGeometry )
   {
     if ( mExtent->isEmpty() )
     {
@@ -317,7 +317,10 @@ void QgsWFSData::endElement( const XML_Char* el )
     }
 
 
-    mCurrentFeature->setGeometryAndOwnership( mCurrentWKB, mCurrentWKBSize );
+    if ( mCurrentWKBSize > 0 )
+    {
+      mCurrentFeature->setGeometryAndOwnership( mCurrentWKB, mCurrentWKBSize );
+    }
     mFeatures.insert( mCurrentFeature->id(), mCurrentFeature );
     if ( !mCurrentFeatureId.isEmpty() )
     {
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -153,11 +153,14 @@ void QgsWFSProvider::copyFeature( QgsFeature* f, QgsFeature& feature, bool fetch
 
   //copy the geometry
   QgsGeometry* geometry = f->geometry();
-  unsigned char *geom = geometry->asWkb();
-  int geomSize = geometry->wkbSize();
-  unsigned char* copiedGeom = new unsigned char[geomSize];
-  memcpy( copiedGeom, geom, geomSize );
-  feature.setGeometryAndOwnership( copiedGeom, geomSize );
+  if ( geometry )
+  {
+    unsigned char *geom = geometry->asWkb();
+    int geomSize = geometry->wkbSize();
+    unsigned char* copiedGeom = new unsigned char[geomSize];
+    memcpy( copiedGeom, geom, geomSize );
+    feature.setGeometryAndOwnership( copiedGeom, geomSize );
+  }
 
   //and the attributes
   const QgsAttributeMap& attributes = f->attributeMap();
@@ -210,7 +213,7 @@ bool QgsWFSProvider::nextFeature( QgsFeature& feature )
       continue;
     }
 
-    copyFeature( f, feature, true, mAttributesToFetch );
+    copyFeature( f, feature, mFetchGeom, mAttributesToFetch );
 
     if ( mUseIntersect )
     {
@@ -277,6 +280,12 @@ void QgsWFSProvider::select( QgsAttributeList fetchAttributes,
                              bool fetchGeometry,
                              bool useIntersect )
 {
+
+  if ( geometryType() == QGis::WKBNoGeometry )
+  {
+    fetchGeometry = false;
+  }
+
   mUseIntersect = useIntersect;
   mAttributesToFetch = fetchAttributes;
   mFetchGeom = fetchGeometry;
@@ -789,10 +798,13 @@ int QgsWFSProvider::getFeatureGET( const QString& uri, const QString& geometryAt
   QgsDebugMsg( QString( "feature count after request is: %1" ).arg( mFeatures.size() ) );
   QgsDebugMsg( QString( "mExtent after request is: %1" ).arg( mExtent.toString() ) );
 
-  for ( QMap<QgsFeatureId, QgsFeature*>::iterator it = mFeatures.begin(); it != mFeatures.end(); ++it )
+  if (mWKBType != QGis::WKBNoGeometry)
   {
-    QgsDebugMsg( "feature " + FID_TO_STRING(( *it )->id() ) );
-    mSpatialIndex->insertFeature( *( it.value() ) );
+    for ( QMap<QgsFeatureId, QgsFeature*>::iterator it = mFeatures.begin(); it != mFeatures.end(); ++it )
+    {
+      QgsDebugMsg( "feature " + FID_TO_STRING(( *it )->id() ) );
+      mSpatialIndex->insertFeature( *( it.value() ) );
+    }
   }
 
   mFeatureCount = mFeatures.size();
@@ -820,7 +832,7 @@ int QgsWFSProvider::getFeatureFILE( const QString& uri, const QString& geometryA
 
   QDomElement featureCollectionElement = gmlDoc.documentElement();
   //get and set Extent
-  if ( getExtentFromGML2( &mExtent, featureCollectionElement ) != 0 )
+  if ( mWKBType != QGis::WKBNoGeometry && QGis::WKBNoGeometry && getExtentFromGML2( &mExtent, featureCollectionElement ) != 0 )
   {
     return 3;
   }
@@ -905,7 +917,7 @@ int QgsWFSProvider::describeFeatureTypeFile( const QString& uri, QString& geomet
   std::list<QString> thematicAttributes;
 
   //if this fails (e.g. no schema file), try to guess the geometry attribute and the names of the thematic attributes from the .gml file
-  if ( guessAttributesFromFile( uri, geometryAttribute, thematicAttributes ) != 0 )
+  if ( guessAttributesFromFile( uri, geometryAttribute, thematicAttributes, geomType ) != 0 )
   {
     return 1;
   }
@@ -985,6 +997,8 @@ int QgsWFSProvider::readAttributesFromSchema( QDomDocument& schemaDoc, QString&
     return 5;
   }
 
+  bool foundGeometryAttribute = false;
+
   for ( uint i = 0; i < attributeNodeList.length(); ++i )
   {
     QDomElement attributeElement = attributeNodeList.at( i ).toElement();
@@ -998,6 +1012,7 @@ int QgsWFSProvider::readAttributesFromSchema( QDomDocument& schemaDoc, QString&
     QRegExp gmlPT( "gml:(.*)PropertyType" );
     if ( type.indexOf( gmlPT ) == 0 || name.isEmpty() )
     {
+      foundGeometryAttribute = true;
       geometryAttribute = name;
       geomType = geomTypeFromPropertyType( geometryAttribute, gmlPT.cap( 1 ) );
     }
@@ -1019,10 +1034,15 @@ int QgsWFSProvider::readAttributesFromSchema( QDomDocument& schemaDoc, QString&
       fields[fields.size()] = QgsField( name, attributeType, type );
     }
   }
+  if ( !foundGeometryAttribute )
+  {
+      geomType = QGis::WKBNoGeometry;
+  }
+
   return 0;
 }
 
-int QgsWFSProvider::guessAttributesFromFile( const QString& uri, QString& geometryAttribute, std::list<QString>& thematicAttributes ) const
+int QgsWFSProvider::guessAttributesFromFile( const QString& uri, QString& geometryAttribute, std::list<QString>& thematicAttributes, QGis::WkbType& geomType ) const
 {
   QFile gmlFile( uri );
   if ( !gmlFile.open( QIODevice::ReadOnly ) )
@@ -1056,6 +1076,7 @@ int QgsWFSProvider::guessAttributesFromFile( const QString& uri, QString& geomet
   QString attributeText;
   QDomElement attributeChildElement;
   QString attributeChildLocalName;
+  bool foundGeometryAttribute = false;
 
   while ( !attributeNode.isNull() )//loop over attributes
   {
@@ -1083,6 +1104,11 @@ int QgsWFSProvider::guessAttributesFromFile( const QString& uri, QString& geomet
     attributeNode = attributeNode.nextSibling();
   }
 
+  if ( !foundGeometryAttribute )
+  {
+      geomType = QGis::WKBNoGeometry;
+  }
+
   return 0;
 }
 
@@ -1232,7 +1258,6 @@ int QgsWFSProvider::getFeaturesFromGML2( const QDomElement& wfsCollectionElement
   QDomElement layerNameElem;
   QDomNode currentAttributeChild;
   QDomElement currentAttributeElement;
-  int counter = 0;
   QgsFeature* f = 0;
   unsigned char* wkb = 0;
   int wkbSize = 0;
@@ -1241,7 +1266,7 @@ int QgsWFSProvider::getFeaturesFromGML2( const QDomElement& wfsCollectionElement
 
   for ( int i = 0; i < featureTypeNodeList.size(); ++i )
   {
-    f = new QgsFeature( counter );
+    f = new QgsFeature( mFeatureCount );
     currentFeatureMemberElem = featureTypeNodeList.at( i ).toElement();
     //the first child element is always <namespace:layer>
     layerNameElem = currentFeatureMemberElem.firstChild().toElement();
@@ -1281,10 +1306,10 @@ int QgsWFSProvider::getFeaturesFromGML2( const QDomElement& wfsCollectionElement
     {
       //insert bbox and pointer to feature into search tree
       mSpatialIndex->insertFeature( *f );
-      mFeatures.insert( f->id(), f );
-      ++mFeatureCount;
     }
-    ++counter;
+
+    mFeatures.insert( f->id(), f );
+    ++mFeatureCount;
   }
   return 0;
 }
diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h
@@ -217,7 +217,7 @@ class QgsWFSProvider: public QgsVectorDataProvider
     /**Reads the name of the geometry attribute, the thematic attributes and their types from a dom document. Returns 0 in case of success*/
     int readAttributesFromSchema( QDomDocument& schemaDoc, QString& geometryAttribute, QgsFieldMap& fields, QGis::WkbType& geomType );
     /**This method tries to guess the geometry attribute and the other attribute names from the .gml file if no schema is present. Returns 0 in case of success*/
-    int guessAttributesFromFile( const QString& uri, QString& geometryAttribute, std::list<QString>& thematicAttributes ) const;
+    int guessAttributesFromFile( const QString& uri, QString& geometryAttribute, std::list<QString>& thematicAttributes, QGis::WkbType& geomType ) const;
 
     /**Copies feature attributes / geometry from f to feature*/
     void copyFeature( QgsFeature* f, QgsFeature& feature, bool fetchGeometry, QgsAttributeList fetchAttributes );

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM`
`69`	`69`	`case QGis::Polygon:`
`70`	`70`	`stackedPlacement->setCurrentWidget( pagePolygon );`
`71`	`71`	`break;`
	`72`	`+ case QGis::NoGeometry:`
	`73`	`+ break;`
`72`	`74`	`default:`
`73`	`75`	`Q_ASSERT( 0 && "NOOOO!" );`
`74`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ int QgsWFSData::getWFSData()`
`127`	`127`	`delete reply;`
`128`	`128`	`delete progressDialog;`
`129`	`129`
`130`		`- if ( mExtent )`
	`130`	`+ if ( mExtent && *mWkbType != QGis::WKBNoGeometry )`
`131`	`131`	`{`
`132`	`132`	`if ( mExtent->isEmpty() )`
`133`	`133`	`{`
`@@ -317,7 +317,10 @@ void QgsWFSData::endElement( const XML_Char* el )`
`317`	`317`	`}`
`318`	`318`
`319`	`319`
`320`		`- mCurrentFeature->setGeometryAndOwnership( mCurrentWKB, mCurrentWKBSize );`
	`320`	`+ if ( mCurrentWKBSize > 0 )`
	`321`	`+ {`
	`322`	`+ mCurrentFeature->setGeometryAndOwnership( mCurrentWKB, mCurrentWKBSize );`
	`323`	`+ }`
`321`	`324`	`mFeatures.insert( mCurrentFeature->id(), mCurrentFeature );`
`322`	`325`	`if ( !mCurrentFeatureId.isEmpty() )`
`323`	`326`	`{`