don't use temporary list, and edit temporary snapping config

qgis · Jul 15, 2019 · decc3f5 · decc3f5
1 parent a93cbf1
commit decc3f5
Showing 1 changed file with 10 additions and 19 deletions.
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -87,17 +87,6 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath,
     return false;
   }
 
-  //preserve individual snapping settings
-  QgsSnappingConfig snappingConfig = QgsProject::instance()->snappingConfig();
-  QHash<QString, QgsSnappingConfig::IndividualLayerSettings> preservedIndividualLayerSettings;
-  const QHash<QgsVectorLayer *, QgsSnappingConfig::IndividualLayerSettings> individualLayerSettings = snappingConfig.individualLayerSettings();
-  for ( const QgsSnappingConfig::IndividualLayerSettings &individualSetting : individualLayerSettings )
-  {
-    preservedIndividualLayerSettings.insert( individualLayerSettings.key( individualSetting )->id(), individualSetting );
-  }
-
-  snappingConfig.removeLayers( QgsProject::instance()->mapLayers().values() );
-
   QString dbPath = QDir( offlineDataPath ).absoluteFilePath( offlineDbFile );
   if ( createOfflineDb( dbPath, containerType ) )
   {
@@ -144,6 +133,9 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath,
         joinInfoBuffer.insert( vl->id(), joins );
       }
 
+      //preserve individual snapping settings
+      QgsSnappingConfig snappingConfig = QgsProject::instance()->snappingConfig();
+
       // copy selected vector layers to SpatiaLite
       for ( int i = 0; i < layerIds.count(); i++ )
       {
@@ -158,13 +150,20 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath,
           if ( newLayer )
           {
             layerIdMapping.insert( origLayerId, newLayer );
+            //append snapping setting on new layer
+            snappingConfig.setIndividualLayerSettings( newLayer, QgsProject::instance()->snappingConfig().individualLayerSettings( vl ) );
+            snappingConfig.removeLayers( QList<QgsMapLayer *>() << vl );
+
             // remove remote layer
             QgsProject::instance()->removeMapLayers(
               QStringList() << origLayerId );
           }
         }
       }
 
+      //set snapping config
+      QgsProject::instance()->setSnappingConfig( snappingConfig );
+
       // restore join info on new SpatiaLite layer
       QMap<QString, QgsVectorJoinList >::ConstIterator it;
       for ( it = joinInfoBuffer.constBegin(); it != joinInfoBuffer.constEnd(); ++it )
@@ -186,7 +185,6 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath,
         }
       }
 
-
       emit progressStopped();
 
       // save offline project
@@ -200,13 +198,6 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath,
 
       QgsProject::instance()->writeEntry( PROJECT_ENTRY_SCOPE_OFFLINE, PROJECT_ENTRY_KEY_OFFLINE_DB_PATH, QgsProject::instance()->writePath( dbPath ) );
 
-      //preserve individual snapping settings
-      for ( const QgsSnappingConfig::IndividualLayerSettings &preservedIndividualSetting : preservedIndividualLayerSettings )
-      {
-        snappingConfig.setIndividualLayerSettings( layerIdMapping.value( preservedIndividualLayerSettings.key( preservedIndividualSetting ) ), preservedIndividualSetting );
-      }
-      QgsProject::instance()->setSnappingConfig( snappingConfig );
-
       return true;
     }
   }