Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Oracle] advertize 3D geometry as Z geometry, not 25D
  • Loading branch information
troopa81 authored and github-actions[bot] committed Jan 24, 2023
1 parent 4be30e9 commit 6095315
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/providers/oracle/qgsoracleconn.cpp
Expand Up @@ -851,20 +851,20 @@ QgsWkbTypes::Type QgsOracleConn::wkbTypeFromDatabase( int gtype )
switch ( t )
{
case 1:
return QgsWkbTypes::Point25D;
return QgsWkbTypes::PointZ;
case 2:
return QgsWkbTypes::CompoundCurveZ;
case 3:
return QgsWkbTypes::Polygon25D;
return QgsWkbTypes::PolygonZ;
case 4:
QgsDebugMsg( QStringLiteral( "geometry collection type %1 unsupported" ).arg( gtype ) );
return QgsWkbTypes::Unknown;
case 5:
return QgsWkbTypes::MultiPoint25D;
return QgsWkbTypes::MultiPointZ;
case 6:
return QgsWkbTypes::MultiCurveZ;
case 7:
return QgsWkbTypes::MultiPolygon25D;
return QgsWkbTypes::MultiPolygonZ;
default:
QgsDebugMsg( QStringLiteral( "gtype %1 unsupported" ).arg( gtype ) );
return QgsWkbTypes::Unknown;
Expand Down
12 changes: 6 additions & 6 deletions src/providers/oracle/qgsoracleproviderconnection.cpp
Expand Up @@ -240,23 +240,23 @@ QgsVectorLayer *QgsOracleProviderConnection::createSqlVectorLayer( const QgsAbst
break;
// 3K...
case 3001:
geomType = QgsWkbTypes::Point25D;
geomType = QgsWkbTypes::PointZ;
break;
case 3002:
geomType = QgsWkbTypes::LineString25D;
geomType = QgsWkbTypes::LineStringZ;
break;
case 3003:
geomType = QgsWkbTypes::Polygon25D;
geomType = QgsWkbTypes::PolygonZ;
break;
// Note: 3004 is missing
case 3005:
geomType = QgsWkbTypes::MultiPoint25D;
geomType = QgsWkbTypes::MultiPointZ;
break;
case 3006:
geomType = QgsWkbTypes::MultiLineString25D;
geomType = QgsWkbTypes::MultiLineStringZ;
break;
case 3007:
geomType = QgsWkbTypes::MultiPolygon25D;
geomType = QgsWkbTypes::MultiPolygonZ;
break;
default:
geomType = QgsWkbTypes::Type::Unknown;
Expand Down

0 comments on commit 6095315

Please sign in to comment.