allow limiting snapping to a given area

jef-n · jef-n · commit 9daa61b47d4e · 2017-01-01T18:46:19.000+01:00
(cherry picked from commit c6fb253)
diff --git a/python/core/qgssnappingutils.sip b/python/core/qgssnappingutils.sip
@@ -51,7 +51,8 @@ class QgsSnappingUtils : QObject
     {
       IndexAlwaysFull,    //!< For all layers build index of full extent. Uses more memory, but queries are faster.
       IndexNeverFull,     //!< For all layers only create temporary indexes of small extent. Low memory usage, slower queries.
-      IndexHybrid         //!< For "big" layers using IndexNeverFull, for the rest IndexAlwaysFull. Compromise between speed and memory usage.
+      IndexHybrid,        //!< For "big" layers using IndexNeverFull, for the rest IndexAlwaysFull. Compromise between speed and memory usage.
+      IndexExtent         //!< For all layer build index of extent given in map settings
     };
 
     /** Set a strategy for indexing geometry data - determines how fast and memory consuming the data structures will be */
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -848,7 +848,7 @@ QgsPointLocator::Match QgsPointLocator::nearestVertex( const QgsPoint& point, do
   QgsRectangle rect( point.x() - tolerance, point.y() - tolerance, point.x() + tolerance, point.y() + tolerance );
   mRTree->intersectsWithQuery( rect2region( rect ), visitor );
   if ( m.isValid() && m.distance() > tolerance )
-    return Match(); // // make sure that only match strictly within the tolerance is returned
+    return Match(); // make sure that only match strictly within the tolerance is returned
   return m;
 }
 
@@ -870,7 +870,7 @@ QgsPointLocator::Match QgsPointLocator::nearestEdge( const QgsPoint& point, doub
   QgsRectangle rect( point.x() - tolerance, point.y() - tolerance, point.x() + tolerance, point.y() + tolerance );
   mRTree->intersectsWithQuery( rect2region( rect ), visitor );
   if ( m.isValid() && m.distance() > tolerance )
-    return Match(); // // make sure that only match strictly within the tolerance is returned
+    return Match(); // make sure that only match strictly within the tolerance is returned
   return m;
 }
 
diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
@@ -99,7 +99,9 @@ bool QgsSnappingUtils::isIndexPrepared( QgsVectorLayer* vl, const QgsRectangle&
   if ( mStrategy == IndexAlwaysFull && loc->hasIndex() )
     return true;
 
-  if ( mStrategy == IndexHybrid && loc->hasIndex() && ( !loc->extent() || loc->extent()->contains( areaOfInterest ) ) )
+  QgsRectangle aoi( areaOfInterest );
+  aoi.scale( 0.999 );
+  if (( mStrategy == IndexHybrid || mStrategy == IndexExtent ) && loc->hasIndex() && ( !loc->extent() || loc->extent()->contains( aoi ) ) )
     return true;
 
   return false; // the index - even if it exists - is not suitable
@@ -349,7 +351,13 @@ void QgsSnappingUtils::prepareIndex( const QList<LayerAndAreaOfInterest>& layers
       QTime tt;
       tt.start();
       QgsPointLocator* loc = locatorForLayer( vl );
-      if ( mStrategy == IndexHybrid )
+      if ( mStrategy == IndexExtent )
+      {
+        QgsRectangle rect( mMapSettings.extent() );
+        loc->setExtent( &rect );
+        loc->init();
+      }
+      else if ( mStrategy == IndexHybrid )
       {
         // first time the layer is used? - let's set an initial guess about indexing
         if ( !mHybridMaxAreaPerLayer.contains( vl->id() ) )
@@ -533,7 +541,7 @@ QString QgsSnappingUtils::dump()
            .arg( layer.layer->name() )
            .arg( layer.type ).arg( layer.tolerance ).arg( layer.unit );
 
-    if ( mStrategy == IndexAlwaysFull || mStrategy == IndexHybrid )
+    if ( mStrategy == IndexAlwaysFull || mStrategy == IndexHybrid || mStrategy == IndexExtent )
     {
       if ( QgsPointLocator* loc = locatorForLayer( layer.layer ) )
       {
diff --git a/src/core/qgssnappingutils.h b/src/core/qgssnappingutils.h
@@ -88,7 +88,8 @@ class CORE_EXPORT QgsSnappingUtils : public QObject
     {
       IndexAlwaysFull,    //!< For all layers build index of full extent. Uses more memory, but queries are faster.
       IndexNeverFull,     //!< For all layers only create temporary indexes of small extent. Low memory usage, slower queries.
-      IndexHybrid         //!< For "big" layers using IndexNeverFull, for the rest IndexAlwaysFull. Compromise between speed and memory usage.
+      IndexHybrid,        //!< For "big" layers using IndexNeverFull, for the rest IndexAlwaysFull. Compromise between speed and memory usage.
+      IndexExtent         //!< For all layer build index of extent given in map settings
     };
 
     /** Set a strategy for indexing geometry data - determines how fast and memory consuming the data structures will be */
diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp
@@ -1084,13 +1084,15 @@ QMap< QString, QStringList > QgsCptCityDirectoryItem::rampsMap()
     }
 
   }
+#if 0
   //TODO what to do with other vars? e.g. schemeNames
-  // // add schemes to archive
-  // mSchemeMap[ path ] = schemeNames;
-  // schemeCount += schemeName.count();
-  // schemeNames.clear();
-  // listVariant.clear();
-  // prevName = "";
+  // add schemes to archive
+  mSchemeMap[ path ] = schemeNames;
+  schemeCount += schemeName.count();
+  schemeNames.clear();
+  listVariant.clear();
+  prevName = "";
+#endif
   return mRampsMap;
 }
 
diff --git a/src/plugins/grass/qtermwidget/BlockArray.h b/src/plugins/grass/qtermwidget/BlockArray.h
@@ -40,7 +40,6 @@ struct Block {
     size_t size;
 };
 
-// ///////////////////////////////////////////////////////
 
 class BlockArray {
 public:

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ class QgsSnappingUtils : QObject`
`51`	`51`	`{`
`52`	`52`	`IndexAlwaysFull, //!< For all layers build index of full extent. Uses more memory, but queries are faster.`
`53`	`53`	`IndexNeverFull, //!< For all layers only create temporary indexes of small extent. Low memory usage, slower queries.`
`54`		`- IndexHybrid //!< For "big" layers using IndexNeverFull, for the rest IndexAlwaysFull. Compromise between speed and memory usage.`
	`54`	`+ IndexHybrid, //!< For "big" layers using IndexNeverFull, for the rest IndexAlwaysFull. Compromise between speed and memory usage.`
	`55`	`+ IndexExtent //!< For all layer build index of extent given in map settings`
`55`	`56`	`};`
`56`	`57`
`57`	`58`	`/** Set a strategy for indexing geometry data - determines how fast and memory consuming the data structures will be */`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@ class CORE_EXPORT QgsSnappingUtils : public QObject`
`88`	`88`	`{`
`89`	`89`	`IndexAlwaysFull, //!< For all layers build index of full extent. Uses more memory, but queries are faster.`
`90`	`90`	`IndexNeverFull, //!< For all layers only create temporary indexes of small extent. Low memory usage, slower queries.`
`91`		`- IndexHybrid //!< For "big" layers using IndexNeverFull, for the rest IndexAlwaysFull. Compromise between speed and memory usage.`
	`91`	`+ IndexHybrid, //!< For "big" layers using IndexNeverFull, for the rest IndexAlwaysFull. Compromise between speed and memory usage.`
	`92`	`+ IndexExtent //!< For all layer build index of extent given in map settings`
`92`	`93`	`};`
`93`	`94`
`94`	`95`	`/** Set a strategy for indexing geometry data - determines how fast and memory consuming the data structures will be */`