sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix #3682

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@15614 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2011-03-27 15:39:17 +00:00
parent ace914d903
commit e2de267b29
1 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
View File

@ -134,7 +134,6 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
, mDelimiter( "," )
, mDelimiterRegexp()
, mDelimiterType( "plain" )
, mHasWktField( false )
, mFieldCount( 0 )
, mXFieldIndex( -1 )
, mYFieldIndex( -1 )
@ -146,18 +145,16 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
, mFirstDataLine( 0 )
, mShowInvalidLines( true )
, mCrs()
, mWkbType( QGis::WKBNoGeometry )
, mWkbType( QGis::WKBUnknown )
{
QUrl url = QUrl::fromEncoded( uri.toAscii() );
// Extract the provider definition from the url
mFileName = url.toLocalFile();
QString wktField( "" );
QString xField( "" );
QString yField( "" );
QString wktField;
QString xField;
QString yField;
if ( url.hasQueryItem( "delimiter" ) ) mDelimiter = url.queryItemValue( "delimiter" );
if ( url.hasQueryItem( "delimiterType" ) ) mDelimiterType = url.queryItemValue( "delimiterType" );
@ -167,13 +164,11 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
if ( url.hasQueryItem( "skipLines" ) ) mSkipLines = url.queryItemValue( "skipLines" ).toInt();
if ( url.hasQueryItem( "crs" ) ) mCrs.createFromString( url.queryItemValue( "crs" ) );
mHasWktField = wktField != "";
QgsDebugMsg( "Data source uri is " + uri );
QgsDebugMsg( "Delimited text file is: " + mFileName );
QgsDebugMsg( "Delimiter is: " + mDelimiter );
QgsDebugMsg( "Delimiter type is: " + mDelimiterType );
QgsDebugMsg( "wktField is: " + xField );
QgsDebugMsg( "wktField is: " + wktField );
QgsDebugMsg( "xField is: " + xField );
QgsDebugMsg( "yField is: " + yField );
QgsDebugMsg( "skipLines is: " + QString::number( mSkipLines ) );
@ -251,21 +246,28 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
for ( int column = 0; column < mFieldCount; column++ )
{
QString field = fieldList[column];
if ( field.length() > 0 )
{
if (( field.left( 1 ) == "'" || field.left( 1 ) == "\"" ) &&
field.left( 1 ) == field.right( 1 ) )
// eat quotes
field = field.mid( 1, field.length() - 2 );
if ( field.length() == 0 )
// skip empty field names
continue;
// check to see if this field matches either the x or y field
if ( wktField == field )
if ( !wktField.isEmpty() && wktField == field )
{
QgsDebugMsg( "Found wkt field: " + ( field ) );
mWktFieldIndex = column;
}
else if ( xField == field )
else if ( !xField.isEmpty() && xField == field )
{
QgsDebugMsg( "Found x field: " + ( field ) );
mXFieldIndex = column;
}
else if ( yField == field )
else if ( !yField.isEmpty() && yField == field )
{
QgsDebugMsg( "Found y field: " + ( field ) );
mYFieldIndex = column;
@ -284,12 +286,14 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
couldBeDouble.insert( fieldPos, true );
fieldPos++;
}
}
if ( mWktFieldIndex >= 0 )
{
mXFieldIndex = -1;
mYFieldIndex = -1;
}
QgsDebugMsg( "wktfield index: " + QString::number( mWktFieldIndex ) );
QgsDebugMsg( "xfield index: " + QString::number( mXFieldIndex ) );
QgsDebugMsg( "yfield index: " + QString::number( mYFieldIndex ) );
QgsDebugMsg( "Field count for the delimited text file is " + QString::number( attributeFields.size() ) );
hasFields = true;
}
@ -304,9 +308,9 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
// Ensure that the input has at least the required number of fields (mainly to tolerate
// missed blank strings at end of row)
while ( parts.size() < mFieldCount )
parts.append( "" );
parts.append( QString::null );
if ( mHasWktField && mWktFieldIndex >= 0 )
if ( mWktFieldIndex >= 0 )
{
// Get the wkt - confirm it is valid, get the type, and
// if compatible with the rest of file, add to the extents
@ -325,6 +329,7 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
}
catch ( ... )
{
mInvalidLines << line;
geom = 0;
}
@ -349,7 +354,7 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
delete geom;
}
}
else if ( !mHasWktField && mXFieldIndex >= 0 && mYFieldIndex >= 0 )
else if ( mWktFieldIndex == -1 && mXFieldIndex >= 0 && mYFieldIndex >= 0 )
{
// Get the x and y values, first checking to make sure they
// aren't null.
@ -357,8 +362,8 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
QString sX = parts[mXFieldIndex];
QString sY = parts[mYFieldIndex];
bool xOk = true;
bool yOk = true;
bool xOk = false;
bool yOk = false;
double x = sX.toDouble( &xOk );
double y = sY.toDouble( &yOk );
@ -376,6 +381,15 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
}
mNumberFeatures++;
}
else
{
mInvalidLines << line;
}
}
else
{
mWkbType = QGis::WKBNoGeometry;
mNumberFeatures++;
}
for ( int i = 0; i < attributeFields.size(); i++ )
@ -396,6 +410,9 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
}
}
QgsDebugMsg( "geometry type is: " + QString::number( mWkbType ) );
QgsDebugMsg( "feature count is: " + QString::number( mNumberFeatures ) );
// now it's time to decide the types for the fields
for ( QgsFieldMap::iterator it = attributeFields.begin(); it != attributeFields.end(); ++it )
{
@ -411,7 +428,7 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
}
}
mValid = true;
mValid = mWkbType != QGis::WKBUnknown;
}
QgsDelimitedTextProvider::~QgsDelimitedTextProvider()
@ -443,11 +460,11 @@ bool QgsDelimitedTextProvider::nextFeature( QgsFeature& feature )
QStringList tokens = splitLine( line );
while ( tokens.size() < mFieldCount )
tokens.append( "" );
tokens.append( QString::null );
QgsGeometry *geom = 0;
if ( mHasWktField && mWktFieldIndex >= 0 )
if ( mWktFieldIndex >= 0 )
{
try
{
@ -478,7 +495,7 @@ bool QgsDelimitedTextProvider::nextFeature( QgsFeature& feature )
geom = 0;
}
}
else if ( !mHasWktField && mXFieldIndex >= 0 && mYFieldIndex >= 0 )
else if ( mXFieldIndex >= 0 && mYFieldIndex >= 0 )
{
bool xOk, yOk;
double x = tokens[mXFieldIndex].toDouble( &xOk );
@ -493,10 +510,11 @@ bool QgsDelimitedTextProvider::nextFeature( QgsFeature& feature )
}
}
// If no valid geometry skip to the next line
if ( !geom )
if ( !geom && mWkbType != QGis::WKBNoGeometry )
{
mInvalidLines << line;
continue;
}
// At this point the current feature values are valid
@ -504,6 +522,7 @@ bool QgsDelimitedTextProvider::nextFeature( QgsFeature& feature )
feature.setFeatureId( mFid );
if ( geom )
feature.setGeometry( geom );
for ( QgsAttributeList::const_iterator i = mAttributesToFetch.begin();