sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work with a distance tolerance for locateAlongFeature, report event items where linear referencing did not succeed

Browse Source
This commit is contained in:
Marco Hugentobler 2012-02-03 14:33:50 +01:00
parent f827095642
commit 287cf8f877
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/analysis/qgsgeometryanalyzer.sip
View File

@ -54,8 +54,8 @@ class QgsGeometryAnalyzer
@param locationField1 attribute index of location field in event layer @param locationField1 attribute index of location field in event layer
@param locationField2 attribute index of location end field (or -1 for point layer) @param locationField2 attribute index of location end field (or -1 for point layer)
*/ */
bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, const QString& outputLayer, bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList<int>& unlocatedFeatureIds /Out/,
const QString& outputFormat, int locationField1, int locationField2 = -1, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 ); const QString& outputLayer, const QString& outputFormat, int locationField1, int locationField2 = -1, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 );
/**Returns multilinestring*/ /**Returns multilinestring*/
QgsGeometry* locateBetweenMeasures( double fromMeasure, double toMeasure, QgsGeometry* lineGeom ); QgsGeometry* locateBetweenMeasures( double fromMeasure, double toMeasure, QgsGeometry* lineGeom );

29
src/analysis/vector/qgsgeometryanalyzer.cpp
View File

@ -909,7 +909,7 @@ void QgsGeometryAnalyzer::bufferFeature( QgsFeature& f, int nProcessedFeatures,
} }
} }
bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, const QString& outputLayer, bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList<int>& unlocatedFeatureIds, const QString& outputLayer,
const QString& outputFormat, int locationField1, int locationField2, QgsVectorDataProvider* memoryProvider, QProgressDialog* p ) const QString& outputFormat, int locationField1, int locationField2, QgsVectorDataProvider* memoryProvider, QProgressDialog* p )
{ {
if ( !lineLayer || !eventLayer || !lineLayer->isValid() || !eventLayer->isValid() ) if ( !lineLayer || !eventLayer || !lineLayer->isValid() || !eventLayer->isValid() )
@ -929,12 +929,13 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
//create output datasource or attributes in memory provider //create output datasource or attributes in memory provider
QgsVectorFileWriter* fileWriter = 0; QgsVectorFileWriter* fileWriter = 0;
QgsFeatureList memoryProviderFeatures;
if ( !memoryProvider ) if ( !memoryProvider )
{ {
fileWriter = new QgsVectorFileWriter( outputLayer, fileWriter = new QgsVectorFileWriter( outputLayer,
eventLayer->dataProvider()->encoding(), eventLayer->dataProvider()->encoding(),
eventLayer->pendingFields(), eventLayer->pendingFields(),
locationField2 == -1 ? QGis::WKBMultiPoint25D : QGis::WKBMultiLineString25D, locationField2 == -1 ? QGis::WKBMultiPoint : QGis::WKBMultiLineString,
&( lineLayer->crs() ), &( lineLayer->crs() ),
outputFormat ); outputFormat );
} }
@ -951,6 +952,7 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
int nEventFeatures = eventLayer->pendingFeatureCount(); int nEventFeatures = eventLayer->pendingFeatureCount();
int featureCounter = 0; int featureCounter = 0;
int nOutputFeatures = 0; //number of output features for the current event feature
if ( p ) if ( p )
{ {
p->setWindowModality( Qt::WindowModal ); p->setWindowModality( Qt::WindowModal );
@ -961,6 +963,8 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
while ( eventLayer->nextFeature( fet ) ) while ( eventLayer->nextFeature( fet ) )
{ {
nOutputFeatures = 0;
//update progress dialog //update progress dialog
if ( p ) if ( p )
{ {
@ -998,17 +1002,22 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
if ( lrsGeom ) if ( lrsGeom )
{ {
++nOutputFeatures;
fet.setGeometry( lrsGeom ); fet.setGeometry( lrsGeom );
if ( memoryProvider ) if ( memoryProvider )
{ {
memoryProvider->addFeatures( QgsFeatureList() << fet ); memoryProviderFeatures << fet;
} }
else else if ( fileWriter )
{ {
fileWriter->addFeature( fet ); fileWriter->addFeature( fet );
} }
} }
} }
if ( nOutputFeatures < 1 )
{
unlocatedFeatureIds.push_back( fet.id() );
}
} }
if ( p ) if ( p )
@ -1016,6 +1025,11 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
p->setValue( nEventFeatures ); p->setValue( nEventFeatures );
} }
if ( memoryProvider )
{
memoryProvider->addFeatures( memoryProviderFeatures );
}
delete fileWriter;
return true; return true;
} }
@ -1295,6 +1309,7 @@ void QgsGeometryAnalyzer::locateAlongSegment( double x1, double y1, double m1, d
bool reversed = false; bool reversed = false;
pt1Ok = false; pt1Ok = false;
pt2Ok = false; pt2Ok = false;
double tolerance = 0.000001; //work with a small tolerance to catch e.g. locations at endpoints
if ( m1 > m2 ) if ( m1 > m2 )
{ {
@ -1305,7 +1320,7 @@ void QgsGeometryAnalyzer::locateAlongSegment( double x1, double y1, double m1, d
} }
//segment does not match //segment does not match
if ( measure < m1 || measure > m2 ) if (( m1 - measure ) > tolerance || ( measure - m2 ) > tolerance )
{ {
pt1Ok = false; pt1Ok = false;
pt2Ok = false; pt2Ok = false;
@ -1313,7 +1328,7 @@ void QgsGeometryAnalyzer::locateAlongSegment( double x1, double y1, double m1, d
} }
//match with vertex1 //match with vertex1
if ( doubleNear( m1, measure ) ) if ( doubleNear( m1, measure, tolerance ) )
{ {
if ( reversed ) if ( reversed )
{ {
@ -1328,7 +1343,7 @@ void QgsGeometryAnalyzer::locateAlongSegment( double x1, double y1, double m1, d
} }
//match with vertex2 //match with vertex2
if ( doubleNear( m2, measure ) ) if ( doubleNear( m2, measure, tolerance ) )
{ {
if ( reversed ) if ( reversed )
{ {

2
src/analysis/vector/qgsgeometryanalyzer.h
View File

@ -109,7 +109,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
@param locationField1 attribute index of location field in event layer @param locationField1 attribute index of location field in event layer
@param locationField2 attribute index of location end field (or -1 for point layer) @param locationField2 attribute index of location end field (or -1 for point layer)
*/ */
bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, const QString& outputLayer, bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList<int>& unlocatedFeatureIds, const QString& outputLayer,
const QString& outputFormat, int locationField1, int locationField2 = -1, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 ); const QString& outputFormat, int locationField1, int locationField2 = -1, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 );
/**Returns linear reference geometry as a multiline (or 0 if no match). Currently, the z-coordinates are considered to be the measures (no support for m-values in QGIS)*/ /**Returns linear reference geometry as a multiline (or 0 if no match). Currently, the z-coordinates are considered to be the measures (no support for m-values in QGIS)*/