[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r4853 - trunk/Utilities/ExpressionEngine/Src
From:       svn_fdo () osgeo ! org
Date:       2009-07-17 21:28:22
Message-ID: 20090717212822.847FDE00BDE () lists ! osgeo ! org
[Download RAW message or body]

Author: romicadascalescu
Date: 2009-07-17 17:28:22 -0400 (Fri, 17 Jul 2009)
New Revision: 4853

Modified:
   trunk/Utilities/ExpressionEngine/Src/FdoExpressionEngineImp.cpp
Log:
#504 SQLite improvements
 - optimize the spatial queries before evaluate them

Modified: trunk/Utilities/ExpressionEngine/Src/FdoExpressionEngineImp.cpp
===================================================================
--- trunk/Utilities/ExpressionEngine/Src/FdoExpressionEngineImp.cpp	2009-07-17 \
                21:18:07 UTC (rev 4852)
+++ trunk/Utilities/ExpressionEngine/Src/FdoExpressionEngineImp.cpp	2009-07-17 \
21:28:22 UTC (rev 4853) @@ -3774,8 +3774,11 @@
                             break;
                     }
 			    }
-				
-                if( (retOpt == FdoOptimizeResultType_Invalid ) || \
FdoSpatialUtility::Evaluate (m_geomRight, FdoSpatialOperations_Disjoint, m_geomLeft \
)) +
+                if( (retOpt == FdoOptimizeResultType_Invalid ) || 
+                    (FdoSpatialUtility::Evaluate (m_geomRight, \
FdoSpatialOperations_Disjoint, m_geomLeft ) && +                    !((rightOp == \
FdoSpatialOperations_Crosses || rightOp == FdoSpatialOperations_Intersects || rightOp \
== FdoSpatialOperations_Overlaps || rightOp == \
FdoSpatialOperations_EnvelopeIntersects) +                    && (leftOp == \
FdoSpatialOperations_Crosses || leftOp == FdoSpatialOperations_Intersects || leftOp \
== FdoSpatialOperations_Overlaps || leftOp == \
FdoSpatialOperations_EnvelopeIntersects))))  {
 					// If the condition do not overlap, then replace it with a filter that returns \
0 features.  #ifdef _WIN32

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-commits


[prev in list] [next in list] [prev in thread] [next in thread]