Skip to content

/ QGIS

Permalink
Browse files
Loading status checks…

switch for enumerations containertype 

use the switch for the enum containertype for GPKG/SpatiaLite/...
  • Loading branch information
@signedav
signedav committed Jul 9, 2018
1 parent 51c9c59 commit 32d50479705856bc243788edaf7aaf59c3cf3f26
Unified Split
Showing with 165 additions and 152 deletions.
  1. +132 −122 src/core/qgsofflineediting.cpp
  2. +33 −30 src/plugins/offline_editing/offline_editing_plugin_gui.cpp
254 src/core/qgsofflineediting.cpp
View file
@@ -407,20 +407,27 @@ bool QgsOfflineEditing::createOfflineDb( const QString &offlineDbPath, Container
QString dbPath = newDb.fileName();

// creating geopackage
if ( containerType == GPKG )
switch ( containerType )
{
OGRSFDriverH hGpkgDriver = OGRGetDriverByName( "GPKG" );
if ( !hGpkgDriver )
case GPKG:
{
showWarning( tr( "Creation of database failed. GeoPackage driver not found." ) );
return false;
}
OGRSFDriverH hGpkgDriver = OGRGetDriverByName( "GPKG" );
if ( !hGpkgDriver )
{
showWarning( tr( "Creation of database failed. GeoPackage driver not found." ) );
return false;
}

gdal::ogr_datasource_unique_ptr hDS( OGR_Dr_CreateDataSource( hGpkgDriver, dbPath.toUtf8().constData(), nullptr ) );
if ( !hDS )
gdal::ogr_datasource_unique_ptr hDS( OGR_Dr_CreateDataSource( hGpkgDriver, dbPath.toUtf8().constData(), nullptr ) );
if ( !hDS )
{
showWarning( tr( "Creation of database failed (OGR error: %1)" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );
return false;
}
}
case SpatiaLite:
{
showWarning( tr( "Creation of database failed (OGR error: %1)" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );
return false;
break;
}
}

@@ -503,136 +510,139 @@ QgsVectorLayer *QgsOfflineEditing::copyVectorLayer( QgsVectorLayer *layer, sqlit
// new layer
QgsVectorLayer *newLayer = nullptr;

if ( containerType != GPKG )
switch ( containerType )
{
// create table
QString sql = QStringLiteral( "CREATE TABLE '%1' (" ).arg( tableName );
QString delim;
const QgsFields providerFields = layer->dataProvider()->fields();
for ( const auto &field : providerFields )
case SpatiaLite:
{
QString dataType;
QVariant::Type type = field.type();
if ( type == QVariant::Int || type == QVariant::LongLong )
{
dataType = QStringLiteral( "INTEGER" );
}
else if ( type == QVariant::Double )
{
dataType = QStringLiteral( "REAL" );
}
else if ( type == QVariant::String )
// create table
QString sql = QStringLiteral( "CREATE TABLE '%1' (" ).arg( tableName );
QString delim;
const QgsFields providerFields = layer->dataProvider()->fields();
for ( const auto &field : providerFields )
{
dataType = QStringLiteral( "TEXT" );
}
else
{
showWarning( tr( "%1: Unknown data type %2. Not using type affinity for the field." ).arg( field.name(), QVariant::typeToName( type ) ) );
}

sql += delim + QStringLiteral( "'%1' %2" ).arg( field.name(), dataType );
delim = ',';
}
sql += ')';
QString dataType;
QVariant::Type type = field.type();
if ( type == QVariant::Int || type == QVariant::LongLong )
{
dataType = QStringLiteral( "INTEGER" );
}
else if ( type == QVariant::Double )
{
dataType = QStringLiteral( "REAL" );
}
else if ( type == QVariant::String )
{
dataType = QStringLiteral( "TEXT" );
}
else
{
showWarning( tr( "%1: Unknown data type %2. Not using type affinity for the field." ).arg( field.name(), QVariant::typeToName( type ) ) );
}

int rc = sqlExec( db, sql );
sql += delim + QStringLiteral( "'%1' %2" ).arg( field.name(), dataType );
delim = ',';
}
sql += ')';

// add geometry column
if ( layer->isSpatial() )
{
const QgsWkbTypes::Type sourceWkbType = layer->wkbType();
int rc = sqlExec( db, sql );

QString geomType;
switch ( QgsWkbTypes::flatType( sourceWkbType ) )
{
case QgsWkbTypes::Point:
geomType = QStringLiteral( "POINT" );
break;
case QgsWkbTypes::MultiPoint:
geomType = QStringLiteral( "MULTIPOINT" );
break;
case QgsWkbTypes::LineString:
geomType = QStringLiteral( "LINESTRING" );
break;
case QgsWkbTypes::MultiLineString:
geomType = QStringLiteral( "MULTILINESTRING" );
break;
case QgsWkbTypes::Polygon:
geomType = QStringLiteral( "POLYGON" );
break;
case QgsWkbTypes::MultiPolygon:
geomType = QStringLiteral( "MULTIPOLYGON" );
break;
default:
showWarning( tr( "Layer %1 has unsupported geometry type %2." ).arg( layer->name(), QgsWkbTypes::displayString( layer->wkbType() ) ) );
break;
};

QString zmInfo = QStringLiteral( "XY" );

if ( QgsWkbTypes::hasZ( sourceWkbType ) )
zmInfo += 'Z';
if ( QgsWkbTypes::hasM( sourceWkbType ) )
zmInfo += 'M';

QString epsgCode;

if ( layer->crs().authid().startsWith( QLatin1String( "EPSG:" ), Qt::CaseInsensitive ) )
// add geometry column
if ( layer->isSpatial() )
{
epsgCode = layer->crs().authid().mid( 5 );
}
else
{
epsgCode = '0';
showWarning( tr( "Layer %1 has unsupported Coordinate Reference System (%2)." ).arg( layer->name(), layer->crs().authid() ) );
}
const QgsWkbTypes::Type sourceWkbType = layer->wkbType();

QString geomType;
switch ( QgsWkbTypes::flatType( sourceWkbType ) )
{
case QgsWkbTypes::Point:
geomType = QStringLiteral( "POINT" );
break;
case QgsWkbTypes::MultiPoint:
geomType = QStringLiteral( "MULTIPOINT" );
break;
case QgsWkbTypes::LineString:
geomType = QStringLiteral( "LINESTRING" );
break;
case QgsWkbTypes::MultiLineString:
geomType = QStringLiteral( "MULTILINESTRING" );
break;
case QgsWkbTypes::Polygon:
geomType = QStringLiteral( "POLYGON" );
break;
case QgsWkbTypes::MultiPolygon:
geomType = QStringLiteral( "MULTIPOLYGON" );
break;
default:
showWarning( tr( "Layer %1 has unsupported geometry type %2." ).arg( layer->name(), QgsWkbTypes::displayString( layer->wkbType() ) ) );
break;
};

QString zmInfo = QStringLiteral( "XY" );

if ( QgsWkbTypes::hasZ( sourceWkbType ) )
zmInfo += 'Z';
if ( QgsWkbTypes::hasM( sourceWkbType ) )
zmInfo += 'M';

QString epsgCode;

if ( layer->crs().authid().startsWith( QLatin1String( "EPSG:" ), Qt::CaseInsensitive ) )
{
epsgCode = layer->crs().authid().mid( 5 );
}
else
{
epsgCode = '0';
showWarning( tr( "Layer %1 has unsupported Coordinate Reference System (%2)." ).arg( layer->name(), layer->crs().authid() ) );
}

QString sqlAddGeom = QStringLiteral( "SELECT AddGeometryColumn('%1', 'Geometry', %2, '%3', '%4')" )
.arg( tableName, epsgCode, geomType, zmInfo );
QString sqlAddGeom = QStringLiteral( "SELECT AddGeometryColumn('%1', 'Geometry', %2, '%3', '%4')" )
.arg( tableName, epsgCode, geomType, zmInfo );

// create spatial index
QString sqlCreateIndex = QStringLiteral( "SELECT CreateSpatialIndex('%1', 'Geometry')" ).arg( tableName );
// create spatial index
QString sqlCreateIndex = QStringLiteral( "SELECT CreateSpatialIndex('%1', 'Geometry')" ).arg( tableName );

if ( rc == SQLITE_OK )
{
rc = sqlExec( db, sqlAddGeom );
if ( rc == SQLITE_OK )
{
rc = sqlExec( db, sqlCreateIndex );
rc = sqlExec( db, sqlAddGeom );
if ( rc == SQLITE_OK )
{
rc = sqlExec( db, sqlCreateIndex );
}
}
}
}

if ( rc != SQLITE_OK )
{
showWarning( tr( "Filling SpatiaLite for layer %1 failed" ).arg( layer->name() ) );
return nullptr;
}
if ( rc != SQLITE_OK )
{
showWarning( tr( "Filling SpatiaLite for layer %1 failed" ).arg( layer->name() ) );
return nullptr;
}

// add new layer
QString connectionString = QStringLiteral( "dbname='%1' table='%2'%3 sql=" )
.arg( offlineDbPath,
tableName, layer->isSpatial() ? "(Geometry)" : "" );
newLayer = new QgsVectorLayer( connectionString,
layer->name() + " (offline)", QStringLiteral( "spatialite" ) );
}
else
{
QgsVectorFileWriter::SaveVectorOptions options;
options.driverName = QStringLiteral( "GPKG" );
options.layerName = tableName;
options.actionOnExistingFile = QgsVectorFileWriter::CreateOrOverwriteLayer;
options.onlySelectedFeatures = onlySelected;

QString error;
if ( QgsVectorFileWriter::writeAsVectorFormat( layer, offlineDbPath, options, &error ) != QgsVectorFileWriter::NoError )
{
showWarning( tr( "Packaging layer %1 failed: %2" ).arg( layer->name(), error ) );
return nullptr;
// add new layer
QString connectionString = QStringLiteral( "dbname='%1' table='%2'%3 sql=" )
.arg( offlineDbPath,
tableName, layer->isSpatial() ? "(Geometry)" : "" );
newLayer = new QgsVectorLayer( connectionString,
layer->name() + " (offline)", QStringLiteral( "spatialite" ) );
}
case GPKG:
{
QgsVectorFileWriter::SaveVectorOptions options;
options.driverName = QStringLiteral( "GPKG" );
options.layerName = tableName;
options.actionOnExistingFile = QgsVectorFileWriter::CreateOrOverwriteLayer;
options.onlySelectedFeatures = onlySelected;

QString error;
if ( QgsVectorFileWriter::writeAsVectorFormat( layer, offlineDbPath, options, &error ) != QgsVectorFileWriter::NoError )
{
showWarning( tr( "Packaging layer %1 failed: %2" ).arg( layer->name(), error ) );
return nullptr;
}

QString uri = QStringLiteral( "%1|layername=%2" ).arg( offlineDbPath, tableName );
newLayer = new QgsVectorLayer( uri, layer->name() + " (offline)", QStringLiteral( "ogr" ) );
QString uri = QStringLiteral( "%1|layername=%2" ).arg( offlineDbPath, tableName );
newLayer = new QgsVectorLayer( uri, layer->name() + " (offline)", QStringLiteral( "ogr" ) );
}
}

if ( newLayer->isValid() )
63 src/plugins/offline_editing/offline_editing_plugin_gui.cpp
View file
@@ -156,44 +156,47 @@ QgsOfflineEditing::ContainerType QgsOfflineEditingPluginGui::dbContainerType() c

void QgsOfflineEditingPluginGui::mBrowseButton_clicked()
{
if ( dbContainerType() == QgsOfflineEditing::GPKG )
switch ( dbContainerType() )
{
//GeoPackage
QString fileName = QFileDialog::getSaveFileName( this,
tr( "Select target database for offline data" ),
QDir( mOfflineDataPath ).absoluteFilePath( mOfflineDbFile ),
tr( "GeoPackage" ) + " (*.gpkg);;"
+ tr( "All files" ) + " (*.*)" );

if ( !fileName.isEmpty() )
case QgsOfflineEditing::GPKG:
{
if ( !fileName.endsWith( QLatin1String( ".gpkg" ), Qt::CaseInsensitive ) )
//GeoPackage
QString fileName = QFileDialog::getSaveFileName( this,
tr( "Select target database for offline data" ),
QDir( mOfflineDataPath ).absoluteFilePath( mOfflineDbFile ),
tr( "GeoPackage" ) + " (*.gpkg);;"
+ tr( "All files" ) + " (*.*)" );

if ( !fileName.isEmpty() )
{
fileName += QLatin1String( ".gpkg" );
if ( !fileName.endsWith( QLatin1String( ".gpkg" ), Qt::CaseInsensitive ) )
{
fileName += QLatin1String( ".gpkg" );
}
mOfflineDbFile = QFileInfo( fileName ).fileName();
mOfflineDataPath = QFileInfo( fileName ).absolutePath();
mOfflineDataPathLineEdit->setText( fileName );
}
mOfflineDbFile = QFileInfo( fileName ).fileName();
mOfflineDataPath = QFileInfo( fileName ).absolutePath();
mOfflineDataPathLineEdit->setText( fileName );
}
}
else
{
//Spacialite
QString fileName = QFileDialog::getSaveFileName( this,
tr( "Select target database for offline data" ),
QDir( mOfflineDataPath ).absoluteFilePath( mOfflineDbFile ),
tr( "SpatiaLite DB" ) + " (*.sqlite);;"
+ tr( "All files" ) + " (*.*)" );

if ( !fileName.isEmpty() )
case QgsOfflineEditing::SpatiaLite:
{
if ( !fileName.endsWith( QLatin1String( ".sqlite" ), Qt::CaseInsensitive ) )
//Spacialite
QString fileName = QFileDialog::getSaveFileName( this,
tr( "Select target database for offline data" ),
QDir( mOfflineDataPath ).absoluteFilePath( mOfflineDbFile ),
tr( "SpatiaLite DB" ) + " (*.sqlite);;"
+ tr( "All files" ) + " (*.*)" );

if ( !fileName.isEmpty() )
{
fileName += QLatin1String( ".sqlite" );
if ( !fileName.endsWith( QLatin1String( ".sqlite" ), Qt::CaseInsensitive ) )
{
fileName += QLatin1String( ".sqlite" );
}
mOfflineDbFile = QFileInfo( fileName ).fileName();
mOfflineDataPath = QFileInfo( fileName ).absolutePath();
mOfflineDataPathLineEdit->setText( fileName );
}
mOfflineDbFile = QFileInfo( fileName ).fileName();
mOfflineDataPath = QFileInfo( fileName ).absolutePath();
mOfflineDataPathLineEdit->setText( fileName );
}
}
}

0 comments on commit 32d5047

Please sign in to comment.