Skip to content

Commit fe42464

Browse files
committed
Use standard names for multi* geometry types
1 parent fb28adf commit fe42464

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/gui/qgsnewgeopackagelayerdialog.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
6868
mGeometryTypeBox->addItem( tr( "Point" ), wkbPoint );
6969
mGeometryTypeBox->addItem( tr( "Line" ), wkbLineString );
7070
mGeometryTypeBox->addItem( tr( "Polygon" ), wkbPolygon );
71-
mGeometryTypeBox->addItem( tr( "Multi point" ), wkbMultiPoint );
72-
mGeometryTypeBox->addItem( tr( "Multi line" ), wkbMultiLineString );
73-
mGeometryTypeBox->addItem( tr( "Multi polygon" ), wkbMultiPolygon );
71+
mGeometryTypeBox->addItem( tr( "MultiPoint" ), wkbMultiPoint );
72+
mGeometryTypeBox->addItem( tr( "MultiLine" ), wkbMultiLineString );
73+
mGeometryTypeBox->addItem( tr( "MultiPolygon" ), wkbMultiPolygon );
7474

7575
#if 0
7676
// QGIS always create CompoundCurve and there's no real interest of having just CircularString. CompoundCurve are more useful
7777
mGeometryTypeBox->addItem( tr( "Circular string" ), wkbCircularString );
7878
#endif
7979
mGeometryTypeBox->addItem( tr( "Compound curve" ), wkbCompoundCurve );
8080
mGeometryTypeBox->addItem( tr( "Curve polygon" ), wkbCurvePolygon );
81-
mGeometryTypeBox->addItem( tr( "Multi curve" ), wkbMultiCurve );
82-
mGeometryTypeBox->addItem( tr( "Multi surface" ), wkbMultiSurface );
81+
mGeometryTypeBox->addItem( tr( "MultiCurve" ), wkbMultiCurve );
82+
mGeometryTypeBox->addItem( tr( "MultiSurface" ), wkbMultiSurface );
8383

8484
mGeometryWithZCheckBox->setEnabled( false );
8585
mGeometryWithMCheckBox->setEnabled( false );

src/gui/qgsnewmemorylayerdialog.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ QgsNewMemoryLayerDialog::QgsNewMemoryLayerDialog( QWidget *parent, Qt::WindowFla
5858
mGeometryTypeBox->addItem( tr( "Point" ), QgsWkbTypes::Point );
5959
mGeometryTypeBox->addItem( tr( "Line" ), QgsWkbTypes::LineString );
6060
mGeometryTypeBox->addItem( tr( "Polygon" ), QgsWkbTypes::Polygon );
61-
mGeometryTypeBox->addItem( tr( "Multi point" ), QgsWkbTypes::MultiPoint );
62-
mGeometryTypeBox->addItem( tr( "Multi line" ), QgsWkbTypes::MultiLineString );
63-
mGeometryTypeBox->addItem( tr( "Multi polygon" ), QgsWkbTypes::MultiPolygon );
61+
mGeometryTypeBox->addItem( tr( "MultiPoint" ), QgsWkbTypes::MultiPoint );
62+
mGeometryTypeBox->addItem( tr( "MultiLine" ), QgsWkbTypes::MultiLineString );
63+
mGeometryTypeBox->addItem( tr( "MultiPolygon" ), QgsWkbTypes::MultiPolygon );
6464

6565
mGeometryWithZCheckBox->setEnabled( false );
6666
mGeometryWithMCheckBox->setEnabled( false );

0 commit comments

Comments
 (0)