[geometry] optimize point distance to point

qgis · Jun 4, 2018 · 783b6b8 · 783b6b8
1 parent 84806b9
commit 783b6b8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -1595,6 +1595,12 @@ double QgsGeometry::distance( const QgsGeometry &geom ) const
     return -1.0;
   }
 
+  // avoid calling geos for trivial point-to-point distance calculations
+  if ( QgsWkbTypes::flatType( d->geometry->wkbType() ) == QgsWkbTypes::Point && QgsWkbTypes::flatType( geom.wkbType() ) == QgsWkbTypes::Point )
+  {
+    return qgsgeometry_cast< const QgsPoint * >( d->geometry.get() )->distance( *qgsgeometry_cast< const QgsPoint * >( geom.constGet() ) );
+  }
+
   QgsGeos g( d->geometry.get() );
   mLastError.clear();
   return g.distance( geom.d->geometry.get(), &mLastError );