Merge pull request #5096 from boundlessgeo/server_ogr_multi_geom

[server] Rely on the provider to get the correct wkbType
qgis · Aug 31, 2017 · 341947e · 341947e
2 parents 9fa12ac + 0346fb8
commit 341947e
Showing 1 changed file with 30 additions and 39 deletions.
diff --git a/src/server/services/wfs/qgswfsdescribefeaturetype.cpp b/src/server/services/wfs/qgswfsdescribefeaturetype.cpp
@@ -200,46 +200,37 @@ namespace QgsWfs
     {
       QDomElement geomElem = doc.createElement( QStringLiteral( "element" )/*xsd:element*/ );
       geomElem.setAttribute( QStringLiteral( "name" ), QStringLiteral( "geometry" ) );
-      if ( provider->name() == QLatin1String( "ogr" ) )
-      {
-        // because some ogr drivers (e.g. ESRI ShapeFile, GML)
-        // are not able to determine the geometry type of a layer.
-        // we set to GeometryType
-        geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:GeometryPropertyType" ) );
-      }
-      else
+
+      QgsWkbTypes::Type wkbType = layer->wkbType();
+      switch ( wkbType )
       {
-        QgsWkbTypes::Type wkbType = layer->wkbType();
-        switch ( wkbType )
-        {
-          case QgsWkbTypes::Point25D:
-          case QgsWkbTypes::Point:
-            geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:PointPropertyType" ) );
-            break;
-          case QgsWkbTypes::LineString25D:
-          case QgsWkbTypes::LineString:
-            geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:LineStringPropertyType" ) );
-            break;
-          case QgsWkbTypes::Polygon25D:
-          case QgsWkbTypes::Polygon:
-            geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:PolygonPropertyType" ) );
-            break;
-          case QgsWkbTypes::MultiPoint25D:
-          case QgsWkbTypes::MultiPoint:
-            geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:MultiPointPropertyType" ) );
-            break;
-          case QgsWkbTypes::MultiLineString25D:
-          case QgsWkbTypes::MultiLineString:
-            geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:MultiLineStringPropertyType" ) );
-            break;
-          case QgsWkbTypes::MultiPolygon25D:
-          case QgsWkbTypes::MultiPolygon:
-            geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:MultiPolygonPropertyType" ) );
-            break;
-          default:
-            geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:GeometryPropertyType" ) );
-            break;
-        }
+        case QgsWkbTypes::Point25D:
+        case QgsWkbTypes::Point:
+          geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:PointPropertyType" ) );
+          break;
+        case QgsWkbTypes::LineString25D:
+        case QgsWkbTypes::LineString:
+          geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:LineStringPropertyType" ) );
+          break;
+        case QgsWkbTypes::Polygon25D:
+        case QgsWkbTypes::Polygon:
+          geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:PolygonPropertyType" ) );
+          break;
+        case QgsWkbTypes::MultiPoint25D:
+        case QgsWkbTypes::MultiPoint:
+          geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:MultiPointPropertyType" ) );
+          break;
+        case QgsWkbTypes::MultiLineString25D:
+        case QgsWkbTypes::MultiLineString:
+          geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:MultiLineStringPropertyType" ) );
+          break;
+        case QgsWkbTypes::MultiPolygon25D:
+        case QgsWkbTypes::MultiPolygon:
+          geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:MultiPolygonPropertyType" ) );
+          break;
+        default:
+          geomElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "gml:GeometryPropertyType" ) );
+          break;
       }
       geomElem.setAttribute( QStringLiteral( "minOccurs" ), QStringLiteral( "0" ) );
       geomElem.setAttribute( QStringLiteral( "maxOccurs" ), QStringLiteral( "1" ) );