Use standard names for multi* geometry types

Author: nyalldawson

src/gui/qgsnewgeopackagelayerdialog.cpp

@@ -68,18 +68,18 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
   mGeometryTypeBox->addItem( tr( "Point" ), wkbPoint );
   mGeometryTypeBox->addItem( tr( "Line" ), wkbLineString );
   mGeometryTypeBox->addItem( tr( "Polygon" ), wkbPolygon );
-  mGeometryTypeBox->addItem( tr( "Multi point" ), wkbMultiPoint );
-  mGeometryTypeBox->addItem( tr( "Multi line" ), wkbMultiLineString );
-  mGeometryTypeBox->addItem( tr( "Multi polygon" ), wkbMultiPolygon );
+  mGeometryTypeBox->addItem( tr( "MultiPoint" ), wkbMultiPoint );
+  mGeometryTypeBox->addItem( tr( "MultiLine" ), wkbMultiLineString );
+  mGeometryTypeBox->addItem( tr( "MultiPolygon" ), wkbMultiPolygon );
 
 #if 0
   // QGIS always create CompoundCurve and there's no real interest of having just CircularString. CompoundCurve are more useful
   mGeometryTypeBox->addItem( tr( "Circular string" ), wkbCircularString );
 #endif
   mGeometryTypeBox->addItem( tr( "Compound curve" ), wkbCompoundCurve );
   mGeometryTypeBox->addItem( tr( "Curve polygon" ), wkbCurvePolygon );
-  mGeometryTypeBox->addItem( tr( "Multi curve" ), wkbMultiCurve );
-  mGeometryTypeBox->addItem( tr( "Multi surface" ), wkbMultiSurface );
+  mGeometryTypeBox->addItem( tr( "MultiCurve" ), wkbMultiCurve );
+  mGeometryTypeBox->addItem( tr( "MultiSurface" ), wkbMultiSurface );
 
   mGeometryWithZCheckBox->setEnabled( false );
   mGeometryWithMCheckBox->setEnabled( false );

src/gui/qgsnewmemorylayerdialog.cpp

@@ -58,9 +58,9 @@ QgsNewMemoryLayerDialog::QgsNewMemoryLayerDialog( QWidget *parent, Qt::WindowFla
   mGeometryTypeBox->addItem( tr( "Point" ), QgsWkbTypes::Point );
   mGeometryTypeBox->addItem( tr( "Line" ), QgsWkbTypes::LineString );
   mGeometryTypeBox->addItem( tr( "Polygon" ), QgsWkbTypes::Polygon );
-  mGeometryTypeBox->addItem( tr( "Multi point" ), QgsWkbTypes::MultiPoint );
-  mGeometryTypeBox->addItem( tr( "Multi line" ), QgsWkbTypes::MultiLineString );
-  mGeometryTypeBox->addItem( tr( "Multi polygon" ), QgsWkbTypes::MultiPolygon );
+  mGeometryTypeBox->addItem( tr( "MultiPoint" ), QgsWkbTypes::MultiPoint );
+  mGeometryTypeBox->addItem( tr( "MultiLine" ), QgsWkbTypes::MultiLineString );
+  mGeometryTypeBox->addItem( tr( "MultiPolygon" ), QgsWkbTypes::MultiPolygon );
 
   mGeometryWithZCheckBox->setEnabled( false );
   mGeometryWithMCheckBox->setEnabled( false );