Merge pull request #52580 from YoannQDQ/fix-new-profile-scales

3nids · web-flow · commit 24f40ca777f3 · 2023-04-19T21:21:20.000+02:00
Fix new profile map scales
diff --git a/src/core/settings/qgssettingsregistrycore.cpp b/src/core/settings/qgssettingsregistrycore.cpp
@@ -107,7 +107,7 @@ const QgsSettingsEntryBool *QgsSettingsRegistryCore::settingsLayerTreeShowFeatur
 
 const QgsSettingsEntryBool *QgsSettingsRegistryCore::settingsEnableWMSTilePrefetching = new QgsSettingsEntryBool( QStringLiteral( "enable_wms_tile_prefetch" ), QgsSettingsTree::sTreeWms, false, QStringLiteral( "Whether to include WMS layers when rendering tiles adjacent to the visible map area" ) );
 
-const QgsSettingsEntryStringList *QgsSettingsRegistryCore::settingsMapScales = new QgsSettingsEntryStringList( QStringLiteral( "scales" ), QgsSettingsTree::sTreeMap, Qgis::defaultProjectScales().split( ',' ) );
+const QgsSettingsEntryStringList *QgsSettingsRegistryCore::settingsMapScales = new QgsSettingsEntryStringList( QStringLiteral( "default_scales" ), QgsSettingsTree::sTreeMap, Qgis::defaultProjectScales().split( ',' ) );
 
 
 QgsSettingsRegistryCore::QgsSettingsRegistryCore()
@@ -150,10 +150,41 @@ void QgsSettingsRegistryCore::migrateOldSettings()
   pal::Pal::settingsRenderingLabelCandidatesLimitLines->copyValueFromKey( QStringLiteral( "core/rendering/label_candidates_limit_lines" ), true );
   pal::Pal::settingsRenderingLabelCandidatesLimitPolygons->copyValueFromKey( QStringLiteral( "core/rendering/label_candidates_limit_polygons" ), true );
 
+  // handle bad migration - Fix profiles for old QGIS versions (restore the Map/scales key on windows)
+  // TODO: Remove this from QGIS 3.36
+  // PR Link: https://github.com/qgis/QGIS/pull/52580
+  if ( QgsSettings().contains( QStringLiteral( "Map/scales" ) ) )
+  {
+    const QStringList oldScales = QgsSettings().value( QStringLiteral( "Map/scales" ) ).toStringList();
+    if ( ! oldScales.isEmpty() && !oldScales.at( 0 ).isEmpty() )
+      QgsSettings().setValue( QStringLiteral( "Map/scales" ), oldScales.join( ',' ) );
+    else
+      QgsSettings().setValue( QStringLiteral( "Map/scales" ), Qgis::defaultProjectScales() );
+  }
+
   // migrate only one way for map scales
   if ( !settingsMapScales->exists() )
-    settingsMapScales->setValue( QgsSettings().value( QStringLiteral( "Map/scales" ) ).toString().split( ',' ) );
-
+  {
+    // Handle bad migration. Prefer map/scales over Map/scales
+    // TODO: Discard this part starting from QGIS 3.36
+    const QStringList oldScales = QgsSettings().value( QStringLiteral( "map/scales" ) ).toStringList();
+    if ( ! oldScales.isEmpty() && !oldScales.at( 0 ).isEmpty() )
+    {
+      // If migration has failed before (QGIS < 3.30.2), all scales might be
+      // concatenated in the first element of the list
+      QStringList actualScales;
+      for ( const QString &element : oldScales )
+      {
+        actualScales << element.split( "," );
+      }
+      settingsMapScales->setValue( actualScales );
+    }
+    // TODO: keep only this part of the migration starting from QGIS 3.36
+    else if ( QgsSettings().contains( QStringLiteral( "Map/scales" ) ) )
+    {
+      settingsMapScales->setValue( QgsSettings().value( QStringLiteral( "Map/scales" ) ).toString().split( ',' ) );
+    }
+  }
 
   // digitizing settings - added in 3.30
   {
