sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make provider connection multi type handling more granualar, and use

Browse Source 
new API in GDAL 3.6 to determine whether or not the multi
linestring/polygon types should be exposed for new table creation
This commit is contained in:
Nyall Dawson 2022-07-26 12:55:27 +10:00
parent cf4abe496e
commit 6dfa7e260c
7 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in
View File

@ -363,7 +363,10 @@ This information is calculated from the geometry columns types.
Z,
M,
SinglePart,
Curves
Curves,
SinglePoint,
SingleLineString,
SinglePolygon,
};
typedef QFlags<QgsAbstractDatabaseProviderConnection::GeometryColumnCapability> GeometryColumnCapabilities;

4
src/core/providers/ogr/qgsgeopackageproviderconnection.cpp
View File

@ -340,7 +340,9 @@ void QgsGeoPackageProviderConnection::setDefaultCapabilities()
{
GeometryColumnCapability::Z,
GeometryColumnCapability::M,
GeometryColumnCapability::SinglePart,
GeometryColumnCapability::SingleLineString,
GeometryColumnCapability::SinglePoint,
GeometryColumnCapability::SinglePolygon,
GeometryColumnCapability::Curves
};
mSqlLayerDefinitionCapabilities =

27
src/core/providers/ogr/qgsogrproviderconnection.cpp
View File

@ -371,7 +371,32 @@ void QgsOgrProviderConnection::setDefaultCapabilities()
mDriverName = GDALGetDriverShortName( hDriver );
mGeometryColumnCapabilities = GeometryColumnCapability::SinglePart;
#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,6,0)
mGeometryColumnCapabilities = GeometryColumnCapability::SinglePoint;
if ( const char *pszGeometryFlags = GDALGetMetadataItem( hDriver, GDAL_DMD_GEOMETRY_FLAGS, nullptr ) )
{
char **papszTokens = CSLTokenizeString2( pszGeometryFlags, " ", 0 );
if ( CSLFindString( papszTokens, "EquatesMultiAndSingleLineStringDuringWrite" ) < 0 )
{
mGeometryColumnCapabilities |= GeometryColumnCapability::SingleLineString;
}
if ( CSLFindString( papszTokens, "EquatesMultiAndSinglePolygonDuringWrite" ) < 0 )
{
mGeometryColumnCapabilities |= GeometryColumnCapability::SinglePolygon;
}
CSLDestroy( papszTokens );
}
else
{
mGeometryColumnCapabilities |= GeometryColumnCapability::SingleLineString;
mGeometryColumnCapabilities |= GeometryColumnCapability::SinglePolygon;
}
#else
mGeometryColumnCapabilities |= GeometryColumnCapability::SinglePoint;
mGeometryColumnCapabilities |= GeometryColumnCapability::SingleLineString;
mGeometryColumnCapabilities |= GeometryColumnCapability::SinglePolygon;
#endif
char **driverMetadata = GDALGetMetadata( hDriver, nullptr );

8
src/core/providers/qgsabstractdatabaseproviderconnection.h
View File

@ -518,9 +518,13 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
{
Z = 1 << 1, //!< Supports Z dimension
M = 1 << 2, //!< Supports M dimension
SinglePart = 1 << 3, //!< Multi and single part types are distinct types
Curves = 1 << 4 //!< Supports curves
SinglePart = 1 << 3, //!< Multi and single part types are distinct types. Deprecated since QGIS 3.28 -- use the granular SinglePoint/SingleLineString/SinglePolygon capabilities instead.
Curves = 1 << 4, //!< Supports curves
SinglePoint = 1 << 5, //!< Supports single point types (as distinct from multi point types) (since QGIS 3.28)
SingleLineString = 1 << 6, //!< Supports single linestring types (as distinct from multi line types) (since QGIS 3.28)
SinglePolygon = 1 << 7, //!< Supports single polygon types (as distinct from multi polygon types) (since QGIS 3.28)
};
// TODO QGIS 4.0 -- remove SinglePart
Q_ENUM( GeometryColumnCapability )
Q_DECLARE_FLAGS( GeometryColumnCapabilities, GeometryColumnCapability )

8
src/gui/qgsnewvectortabledialog.cpp
View File

@ -140,7 +140,9 @@ QgsNewVectorTableDialog::QgsNewVectorTableDialog( QgsAbstractDatabaseProviderCon
mCrs->setShowAccuracyWarnings( true );
// geometry types
Q_NOWARN_DEPRECATED_PUSH
const bool hasSinglePart { conn->geometryColumnCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::GeometryColumnCapability::SinglePart ) };
Q_NOWARN_DEPRECATED_POP
const auto addGeomItem = [this]( QgsWkbTypes::Type type )
{
@ -148,13 +150,13 @@ QgsNewVectorTableDialog::QgsNewVectorTableDialog( QgsAbstractDatabaseProviderCon
};
mGeomTypeCbo->addItem( QgsApplication::getThemeIcon( QStringLiteral( "mIconTableLayer.svg" ) ), tr( "No Geometry" ), QgsWkbTypes::Type::NoGeometry );
if ( hasSinglePart )
if ( hasSinglePart || conn->geometryColumnCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::GeometryColumnCapability::SinglePoint ) )
addGeomItem( QgsWkbTypes::Type::Point );
addGeomItem( QgsWkbTypes::Type::MultiPoint );
if ( hasSinglePart )
if ( hasSinglePart || conn->geometryColumnCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::GeometryColumnCapability::SingleLineString ) )
addGeomItem( QgsWkbTypes::Type::LineString );
addGeomItem( QgsWkbTypes::Type::MultiLineString );
if ( hasSinglePart )
if ( hasSinglePart || conn->geometryColumnCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::GeometryColumnCapability::SinglePolygon ) )
addGeomItem( QgsWkbTypes::Type::Polygon );
addGeomItem( QgsWkbTypes::Type::MultiPolygon );

4
src/providers/postgres/qgspostgresproviderconnection.cpp
View File

@ -82,7 +82,9 @@ void QgsPostgresProviderConnection::setDefaultCapabilities()
{
GeometryColumnCapability::Z,
GeometryColumnCapability::M,
GeometryColumnCapability::SinglePart,
GeometryColumnCapability::SinglePoint,
GeometryColumnCapability::SingleLineString,
GeometryColumnCapability::SinglePolygon,
GeometryColumnCapability::Curves
};
mSqlLayerDefinitionCapabilities =

4
src/providers/spatialite/qgsspatialiteproviderconnection.cpp
View File

@ -454,7 +454,9 @@ void QgsSpatiaLiteProviderConnection::setDefaultCapabilities()
{
GeometryColumnCapability::Z,
GeometryColumnCapability::M,
GeometryColumnCapability::SinglePart,
GeometryColumnCapability::SinglePoint,
GeometryColumnCapability::SingleLineString,
GeometryColumnCapability::SinglePolygon,
};
mSqlLayerDefinitionCapabilities =
{