Fix wkbType cast from OGR 25D Type. #50233
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As mentionned by @Koyaani a PolygonZ is opened as a Polygon25D and can cause problems. This fix use the QgsOgrUtils method to return the true QGIS wkbType. Fixes qgis#50218
lbartoletti
added
backport queued_ltr_backports
rouault
approved these changes
Sep 16, 2022
|
failed tests: |
| @@ -212,10 +212,10 @@ void TestQgsOgrUtils::ogrGeometryToQgsGeometry2_data() | |||
| QTest::newRow( "point25d" ) << QStringLiteral( "Point25D (1.1 2.2 3.3)" ) << static_cast< int >( QgsWkbTypes::Point25D ); | |||
|
|
|||
| QTest::newRow( "linestring" ) << QStringLiteral( "LineString (1.1 2.2, 3.3 4.4)" ) << static_cast< int >( QgsWkbTypes::LineString ); | |||
| QTest::newRow( "linestringz" ) << QStringLiteral( "LineStringZ (1.1 2.2 3.3, 4.4 5.5 6.6)" ) << static_cast< int >( QgsWkbTypes::LineString25D ); // ogr uses 25d for z | |||
| QTest::newRow( "linestringz" ) << QStringLiteral( "LineStringZ (1.1 2.2 3.3, 4.4 5.5 6.6)" ) << static_cast< int >( QgsWkbTypes::LineStringZ ); // ogr uses 25d for z | |||
There was a problem hiding this comment.
@lbartoletti, the comment is now obsolete, isn't it?
There was a problem hiding this comment.
Oh, yes! I forgot to remove this one. Thanks.
This was referenced Sep 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
As mentionned by @Koyaani a PolygonZ is opened as a Polygon25D and can cause problems.
This fix use the QgsOgrUtils method to return the true QGIS wkbType.
Fixes #50218