Event layer function: catch various error cases for line offsets

mhugent · mhugent · commit b480d171c02d · 2014-06-04T14:23:43.000+02:00
diff --git a/src/analysis/vector/qgsgeometryanalyzer.cpp b/src/analysis/vector/qgsgeometryanalyzer.cpp
@@ -986,6 +986,10 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
     if ( locationField2 != -1 )
     {
       measure2 = fet.attribute( locationField2 ).toDouble();
+      if ( qgsDoubleNear(( measure2 - measure1 ), 0.0 ) )
+      {
+        continue;
+      }
     }
 
     QList<QgsFeature> featureIdList = lineLayerIdMap.values( fet.attribute( eventField ).toString() );
@@ -1052,7 +1056,11 @@ void QgsGeometryAnalyzer::addEventLayerFeature( QgsFeature& feature, QgsGeometry
     {
       double offsetVal = feature.attribute( offsetField ).toDouble();
       offsetVal *= offsetScale;
-      createOffsetGeometry( *geomIt, lineGeom, offsetVal );
+      if ( !createOffsetGeometry( *geomIt, lineGeom, offsetVal ) )
+      {
+        delete *geomIt;
+        continue;
+      }
     }
 
     feature.setGeometry( *geomIt );
@@ -1072,11 +1080,11 @@ void QgsGeometryAnalyzer::addEventLayerFeature( QgsFeature& feature, QgsGeometry
   }
 }
 
-void QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry* lineGeom, double offset )
+bool QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry* lineGeom, double offset )
 {
   if ( !geom || !lineGeom )
   {
-    return;
+    return false;
   }
 
   QList<QgsGeometry*> inputGeomList;
@@ -1099,7 +1107,17 @@ void QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*
       //geos 3.3 needed for line offsets
 #if defined(GEOS_VERSION_MAJOR) && defined(GEOS_VERSION_MINOR) && \
       ((GEOS_VERSION_MAJOR>3) || ((GEOS_VERSION_MAJOR==3) && (GEOS_VERSION_MINOR>=3)))
-      outputGeomList.push_back( GEOSOffsetCurve(( *inputGeomIt )->asGeos(), -offset, 8 /*quadSegments*/, 0 /*joinStyle*/, 5.0 /*mitreLimit*/ ) );
+      GEOSGeometry* offsetGeom = GEOSOffsetCurve(( *inputGeomIt )->asGeos(), -offset, 8 /*quadSegments*/, 0 /*joinStyle*/, 5.0 /*mitreLimit*/ );
+      if ( !offsetGeom || !GEOSisValid( offsetGeom ) )
+      {
+        return false;
+      }
+      if ( !GEOSisValid( offsetGeom ) || GEOSGeomTypeId( offsetGeom ) != GEOS_LINESTRING || GEOSGeomGetNumPoints( offsetGeom ) < 1 )
+      {
+        GEOSGeom_destroy( offsetGeom );
+        return false;
+      }
+      outputGeomList.push_back( offsetGeom );
 #else
       outputGeomList.push_back( GEOSGeom_clone(( *inputGeomIt )->asGeos() ) );
 #endif
@@ -1143,6 +1161,7 @@ void QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*
     geom->fromGeos( collection );
     delete[] geomArray;
   }
+  return true;
 }
 
 QgsPoint QgsGeometryAnalyzer::createPointOffset( double x, double y, double dist, QgsGeometry* lineGeom ) const
diff --git a/src/analysis/vector/qgsgeometryanalyzer.h b/src/analysis/vector/qgsgeometryanalyzer.h
@@ -150,7 +150,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
         @param geom the geometry to modify
         @param lineGeom the line geometry to which the feature is referenced
         @param offset the offset value in layer unit. Negative values mean offset towards left, positive values offset to the right side*/
-    void createOffsetGeometry( QgsGeometry* geom, QgsGeometry* lineGeom, double offset );
+    bool createOffsetGeometry( QgsGeometry* geom, QgsGeometry* lineGeom, double offset );
     QgsPoint createPointOffset( double x, double y, double dist, QgsGeometry* lineGeom ) const;
     const unsigned char* locateBetweenWkbString( const unsigned char* ptr, QgsMultiPolyline& result, double fromMeasure, double toMeasure );
     const unsigned char* locateAlongWkbString( const unsigned char* ptr, QgsMultiPoint& result, double measure );

Original file line number	Diff line number	Diff line change
`@@ -986,6 +986,10 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*`
`986`	`986`	`if ( locationField2 != -1 )`
`987`	`987`	`{`
`988`	`988`	`measure2 = fet.attribute( locationField2 ).toDouble();`
	`989`	`+ if ( qgsDoubleNear(( measure2 - measure1 ), 0.0 ) )`
	`990`	`+ {`
	`991`	`+ continue;`
	`992`	`+ }`
`989`	`993`	`}`
`990`	`994`
`991`	`995`	`QList<QgsFeature> featureIdList = lineLayerIdMap.values( fet.attribute( eventField ).toString() );`
`@@ -1052,7 +1056,11 @@ void QgsGeometryAnalyzer::addEventLayerFeature( QgsFeature& feature, QgsGeometry`
`1052`	`1056`	`{`
`1053`	`1057`	`double offsetVal = feature.attribute( offsetField ).toDouble();`
`1054`	`1058`	`offsetVal *= offsetScale;`
`1055`		`- createOffsetGeometry( *geomIt, lineGeom, offsetVal );`
	`1059`	`+ if ( !createOffsetGeometry( *geomIt, lineGeom, offsetVal ) )`
	`1060`	`+ {`
	`1061`	`+ delete *geomIt;`
	`1062`	`+ continue;`
	`1063`	`+ }`
`1056`	`1064`	`}`
`1057`	`1065`
`1058`	`1066`	`feature.setGeometry( *geomIt );`
`@@ -1072,11 +1080,11 @@ void QgsGeometryAnalyzer::addEventLayerFeature( QgsFeature& feature, QgsGeometry`
`1072`	`1080`	`}`
`1073`	`1081`	`}`
`1074`	`1082`
`1075`		`-void QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry* lineGeom, double offset )`
	`1083`	`+bool QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry* lineGeom, double offset )`
`1076`	`1084`	`{`
`1077`	`1085`	`if ( !geom \|\| !lineGeom )`
`1078`	`1086`	`{`
`1079`		`- return;`
	`1087`	`+ return false;`
`1080`	`1088`	`}`
`1081`	`1089`
`1082`	`1090`	`QList<QgsGeometry*> inputGeomList;`
`@@ -1099,7 +1107,17 @@ void QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*`
`1099`	`1107`	`//geos 3.3 needed for line offsets`
`1100`	`1108`	`#if defined(GEOS_VERSION_MAJOR) && defined(GEOS_VERSION_MINOR) && \`
`1101`	`1109`	`((GEOS_VERSION_MAJOR>3) \|\| ((GEOS_VERSION_MAJOR==3) && (GEOS_VERSION_MINOR>=3)))`
`1102`		`- outputGeomList.push_back( GEOSOffsetCurve(( inputGeomIt )->asGeos(), -offset, 8 /quadSegments/, 0 /joinStyle/, 5.0 /mitreLimit*/ ) );`
	`1110`	`+ GEOSGeometry* offsetGeom = GEOSOffsetCurve(( inputGeomIt )->asGeos(), -offset, 8 /quadSegments/, 0 /joinStyle/, 5.0 /mitreLimit*/ );`
	`1111`	`+ if ( !offsetGeom \|\| !GEOSisValid( offsetGeom ) )`
	`1112`	`+ {`
	`1113`	`+ return false;`
	`1114`	`+ }`
	`1115`	`+ if ( !GEOSisValid( offsetGeom ) \|\| GEOSGeomTypeId( offsetGeom ) != GEOS_LINESTRING \|\| GEOSGeomGetNumPoints( offsetGeom ) < 1 )`
	`1116`	`+ {`
	`1117`	`+ GEOSGeom_destroy( offsetGeom );`
	`1118`	`+ return false;`
	`1119`	`+ }`
	`1120`	`+ outputGeomList.push_back( offsetGeom );`
`1103`	`1121`	`#else`
`1104`	`1122`	`outputGeomList.push_back( GEOSGeom_clone(( *inputGeomIt )->asGeos() ) );`
`1105`	`1123`	`#endif`
`@@ -1143,6 +1161,7 @@ void QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*`
`1143`	`1161`	`geom->fromGeos( collection );`
`1144`	`1162`	`delete[] geomArray;`
`1145`	`1163`	`}`
	`1164`	`+ return true;`
`1146`	`1165`	`}`
`1147`	`1166`
`1148`	`1167`	`QgsPoint QgsGeometryAnalyzer::createPointOffset( double x, double y, double dist, QgsGeometry* lineGeom ) const`