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

Merge pull request #63417 from qgis/backport-63404-to-release-3_44

Browse Source 
[Backport release-3_44] [mssql] Fix curvepolygon hidden in browser
This commit is contained in:
Alexander Bruy 2025-10-02 07:50:06 +01:00 committed by GitHub
commit 58efdb82ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/providers/mssql/qgsmssqldataitems.cpp
View File

@ -143,7 +143,7 @@ QVector<QgsDataItem *> QgsMssqlConnectionItem::createChildren()
} }
// build sql statement // build sql statement
QString query = QgsMssqlConnection::buildQueryForTables( mName ); const QString query = QgsMssqlConnection::buildQueryForTables( mName );
const bool disableInvalidGeometryHandling = QgsMssqlConnection::isInvalidGeometryHandlingDisabled( mName ); const bool disableInvalidGeometryHandling = QgsMssqlConnection::isInvalidGeometryHandlingDisabled( mName );
@ -471,19 +471,16 @@ QgsMssqlLayerItem *QgsMssqlSchemaItem::addLayer( const QgsMssqlLayerProperty &la
QString tip = tr( "%1 as %2 in %3" ).arg( layerProperty.geometryColName, QgsWkbTypes::displayString( wkbType ), layerProperty.srid ); QString tip = tr( "%1 as %2 in %3" ).arg( layerProperty.geometryColName, QgsWkbTypes::displayString( wkbType ), layerProperty.srid );
Qgis::BrowserLayerType layerType; Qgis::BrowserLayerType layerType;
Qgis::WkbType flatType = QgsWkbTypes::flatType( wkbType ); const Qgis::GeometryType geomType = QgsWkbTypes::geometryType( wkbType );
switch ( flatType ) switch ( geomType )
{ {
case Qgis::WkbType::Point: case Qgis::GeometryType::Point:
case Qgis::WkbType::MultiPoint:
layerType = Qgis::BrowserLayerType::Point; layerType = Qgis::BrowserLayerType::Point;
break; break;
case Qgis::WkbType::LineString: case Qgis::GeometryType::Line:
case Qgis::WkbType::MultiLineString:
layerType = Qgis::BrowserLayerType::Line; layerType = Qgis::BrowserLayerType::Line;
break; break;
case Qgis::WkbType::Polygon: case Qgis::GeometryType::Polygon:
case Qgis::WkbType::MultiPolygon:
layerType = Qgis::BrowserLayerType::Polygon; layerType = Qgis::BrowserLayerType::Polygon;
break; break;
default: default: