Use plural for consistency

qgis · Sep 16, 2024 · a421ac4 · a421ac4
1 parent aeb9598
commit a421ac4
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 35 deletions.
diff --git a/python/PyQt6/core/auto_additions/qgis.py b/python/PyQt6/core/auto_additions/qgis.py
@@ -8638,9 +8638,9 @@
 QgsUnitTypes.MilesUSSurvey = Qgis.DistanceUnit.MilesUSSurvey
 QgsUnitTypes.MilesUSSurvey.is_monkey_patched = True
 QgsUnitTypes.MilesUSSurvey.__doc__ = "US Survery miles \n.. versionadded:: 3.40"
-QgsUnitTypes.Fathom = Qgis.DistanceUnit.Fathom
-QgsUnitTypes.Fathom.is_monkey_patched = True
-QgsUnitTypes.Fathom.__doc__ = "Fathoms \n.. versionadded:: 3.40"
+QgsUnitTypes.Fathoms = Qgis.DistanceUnit.Fathoms
+QgsUnitTypes.Fathoms.is_monkey_patched = True
+QgsUnitTypes.Fathoms.__doc__ = "Fathoms \n.. versionadded:: 3.40"
 QgsUnitTypes.MetersGermanLegal = Qgis.DistanceUnit.MetersGermanLegal
 QgsUnitTypes.MetersGermanLegal.is_monkey_patched = True
 QgsUnitTypes.MetersGermanLegal.__doc__ = "German legal meter \n.. versionadded:: 3.40"
@@ -8844,7 +8844,7 @@
 
   .. versionadded:: 3.40
 
-* ``Fathom``: Fathoms
+* ``Fathoms``: Fathoms
 
   .. versionadded:: 3.40
 

diff --git a/python/PyQt6/core/auto_generated/qgis.sip.in b/python/PyQt6/core/auto_generated/qgis.sip.in
@@ -2643,7 +2643,7 @@ The development version
       YardsIndian1962,
       YardsIndian1975,
       MilesUSSurvey,
-      Fathom,
+      Fathoms,
       MetersGermanLegal,
       Unknown,
     };

diff --git a/python/core/auto_additions/qgis.py b/python/core/auto_additions/qgis.py
@@ -8562,9 +8562,9 @@
 QgsUnitTypes.MilesUSSurvey = Qgis.DistanceUnit.MilesUSSurvey
 QgsUnitTypes.MilesUSSurvey.is_monkey_patched = True
 QgsUnitTypes.MilesUSSurvey.__doc__ = "US Survery miles \n.. versionadded:: 3.40"
-QgsUnitTypes.Fathom = Qgis.DistanceUnit.Fathom
-QgsUnitTypes.Fathom.is_monkey_patched = True
-QgsUnitTypes.Fathom.__doc__ = "Fathoms \n.. versionadded:: 3.40"
+QgsUnitTypes.Fathoms = Qgis.DistanceUnit.Fathoms
+QgsUnitTypes.Fathoms.is_monkey_patched = True
+QgsUnitTypes.Fathoms.__doc__ = "Fathoms \n.. versionadded:: 3.40"
 QgsUnitTypes.MetersGermanLegal = Qgis.DistanceUnit.MetersGermanLegal
 QgsUnitTypes.MetersGermanLegal.is_monkey_patched = True
 QgsUnitTypes.MetersGermanLegal.__doc__ = "German legal meter \n.. versionadded:: 3.40"
@@ -8768,7 +8768,7 @@
 
   .. versionadded:: 3.40
 
-* ``Fathom``: Fathoms
+* ``Fathoms``: Fathoms
 
   .. versionadded:: 3.40
 

diff --git a/python/core/auto_generated/qgis.sip.in b/python/core/auto_generated/qgis.sip.in
@@ -2643,7 +2643,7 @@ The development version
       YardsIndian1962,
       YardsIndian1975,
       MilesUSSurvey,
-      Fathom,
+      Fathoms,
       MetersGermanLegal,
       Unknown,
     };

diff --git a/src/app/decorations/qgsdecorationscalebar.cpp b/src/app/decorations/qgsdecorationscalebar.cpp
@@ -392,7 +392,7 @@ void QgsDecorationScaleBar::render( const QgsMapSettings &mapSettings, QgsRender
     case Qgis::DistanceUnit::YardsIndian1962:
     case Qgis::DistanceUnit::YardsIndian1975:
     case Qgis::DistanceUnit::MilesUSSurvey:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
     case Qgis::DistanceUnit::MetersGermanLegal:
       scaleBarUnitLabel = QgsUnitTypes::toAbbreviatedString( scaleBarUnits );
       break;

diff --git a/src/core/layout/qgslayoutitemelevationprofile.cpp b/src/core/layout/qgslayoutitemelevationprofile.cpp
@@ -1062,7 +1062,7 @@ void QgsLayoutItemElevationProfile::setDistanceUnit( Qgis::DistanceUnit unit )
     case Qgis::DistanceUnit::YardsIndian1962:
     case Qgis::DistanceUnit::YardsIndian1975:
     case Qgis::DistanceUnit::MilesUSSurvey:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
     case Qgis::DistanceUnit::MetersGermanLegal:
       mPlot->xAxis().setLabelSuffix( QStringLiteral( " %1" ).arg( QgsUnitTypes::toAbbreviatedString( mDistanceUnit ) ) );
       break;

diff --git a/src/core/proj/qgscoordinatereferencesystem.cpp b/src/core/proj/qgscoordinatereferencesystem.cpp
@@ -1915,7 +1915,7 @@ void QgsCoordinateReferenceSystem::setMapUnits()
     else if ( unitName.compare( QLatin1String( "yard" ), Qt::CaseInsensitive ) == 0 )
       d->mMapUnits = Qgis::DistanceUnit::Yards;
     else if ( unitName.compare( QLatin1String( "fathom" ), Qt::CaseInsensitive ) == 0 )
-      d->mMapUnits = Qgis::DistanceUnit::Fathom;
+      d->mMapUnits = Qgis::DistanceUnit::Fathoms;
     else if ( unitName.compare( QLatin1String( "US survey chain" ), Qt::CaseInsensitive ) == 0 )
       d->mMapUnits = Qgis::DistanceUnit::ChainsUSSurvey;
     else if ( unitName.compare( QLatin1String( "chain" ), Qt::CaseInsensitive ) == 0 )

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -4670,7 +4670,7 @@ class CORE_EXPORT Qgis
       YardsIndian1962, //!< Indian yards (1962) \since QGIS 3.40
       YardsIndian1975, //!< Indian yards (1975) \since QGIS 3.40
       MilesUSSurvey, //!< US Survery miles \since QGIS 3.40
-      Fathom, //!< Fathoms \since QGIS 3.40
+      Fathoms, //!< Fathoms \since QGIS 3.40
       MetersGermanLegal, //!< German legal meter \since QGIS 3.40
       Unknown SIP_MONKEYPATCH_COMPAT_NAME( DistanceUnknownUnit ), //!< Unknown distance unit
     };

diff --git a/src/core/qgsrendercontext.cpp b/src/core/qgsrendercontext.cpp
@@ -731,7 +731,7 @@ double QgsRenderContext::convertMetersToMapUnits( double meters ) const
     case Qgis::DistanceUnit::YardsIndian1962:
     case Qgis::DistanceUnit::YardsIndian1975:
     case Qgis::DistanceUnit::MilesUSSurvey:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
     case Qgis::DistanceUnit::MetersGermanLegal:
       return ( meters * QgsUnitTypes::fromUnitToUnitFactor( Qgis::DistanceUnit::Meters, mDistanceArea.sourceCrs().mapUnits() ) );
   }

diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
@@ -142,7 +142,7 @@ void QgsScaleCalculator::calculateMetrics( const QgsRectangle &mapExtent, double
     case Qgis::DistanceUnit::YardsIndian1962:
     case Qgis::DistanceUnit::YardsIndian1975:
     case Qgis::DistanceUnit::MilesUSSurvey:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
     case Qgis::DistanceUnit::MetersGermanLegal:
       // convert to inches
       conversionFactor = QgsUnitTypes::fromUnitToUnitFactor( mMapUnits, Qgis::DistanceUnit::Inches );

diff --git a/src/core/qgsunittypes.cpp b/src/core/qgsunittypes.cpp
@@ -120,7 +120,7 @@ Qgis::DistanceUnitType QgsUnitTypes::unitType( Qgis::DistanceUnit unit )
     case Qgis::DistanceUnit::YardsIndian1962:
     case Qgis::DistanceUnit::YardsIndian1975:
     case Qgis::DistanceUnit::MilesUSSurvey:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
     case Qgis::DistanceUnit::MetersGermanLegal:
       return Qgis::DistanceUnitType::Standard;
 
@@ -307,7 +307,7 @@ QString QgsUnitTypes::encodeUnit( Qgis::DistanceUnit unit )
     case Qgis::DistanceUnit::MilesUSSurvey:
       return QStringLiteral( "miles us survey" );
 
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
       return QStringLiteral( "yards fathom" );
 
     case Qgis::DistanceUnit::MetersGermanLegal:
@@ -380,7 +380,7 @@ Qgis::DistanceUnit QgsUnitTypes::decodeDistanceUnit( const QString &string, bool
           Qgis::DistanceUnit::YardsIndian1962,
           Qgis::DistanceUnit::YardsIndian1975,
           Qgis::DistanceUnit::MilesUSSurvey,
-          Qgis::DistanceUnit::Fathom,
+          Qgis::DistanceUnit::Fathoms,
           Qgis::DistanceUnit::MetersGermanLegal,
         } )
   {
@@ -541,7 +541,7 @@ QString QgsUnitTypes::toString( Qgis::DistanceUnit unit )
     case Qgis::DistanceUnit::MilesUSSurvey:
       return QObject::tr( "miles (US survey)", "distance" );
 
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
       return QObject::tr( "fathoms", "distance" );
 
     case Qgis::DistanceUnit::MetersGermanLegal:
@@ -661,7 +661,7 @@ QString QgsUnitTypes::toAbbreviatedString( Qgis::DistanceUnit unit )
     case Qgis::DistanceUnit::LinksUSSurvey:
       return QObject::tr( "lk", "distance" );
 
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
       return QObject::tr( "f", "distance" );
 
     case Qgis::DistanceUnit::MetersGermanLegal:
@@ -734,7 +734,7 @@ Qgis::DistanceUnit QgsUnitTypes::stringToDistanceUnit( const QString &string, bo
           Qgis::DistanceUnit::YardsIndian1962,
           Qgis::DistanceUnit::YardsIndian1975,
           Qgis::DistanceUnit::MilesUSSurvey,
-          Qgis::DistanceUnit::Fathom,
+          Qgis::DistanceUnit::Fathoms,
           Qgis::DistanceUnit::MetersGermanLegal,
         } )
   {
@@ -853,7 +853,7 @@ constexpr double distanceUnitToMeter( Qgis::DistanceUnit unit )
       return 0.9143985;
     case Qgis::DistanceUnit::MilesUSSurvey:
       return 1609.3472186944;
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
       return 1.8288;
     case Qgis::DistanceUnit::Unknown:
       return 1;
@@ -1599,7 +1599,7 @@ Qgis::AreaUnit QgsUnitTypes::distanceToAreaUnit( Qgis::DistanceUnit distanceUnit
     case Qgis::DistanceUnit::YardsIndian1937:
     case Qgis::DistanceUnit::YardsIndian1962:
     case Qgis::DistanceUnit::YardsIndian1975:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
       return Qgis::AreaUnit::SquareFeet;
 
     case Qgis::DistanceUnit::Yards:
@@ -2602,7 +2602,7 @@ Qgis::VolumeUnit QgsUnitTypes::distanceToVolumeUnit( Qgis::DistanceUnit distance
     case Qgis::DistanceUnit::LinksBritishSears1922:
     case Qgis::DistanceUnit::LinksClarkes:
     case Qgis::DistanceUnit::LinksUSSurvey:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
       return Qgis::VolumeUnit::CubicFeet;
 
     case Qgis::DistanceUnit::Degrees:

diff --git a/src/gui/elevation/qgselevationprofilecanvas.cpp b/src/gui/elevation/qgselevationprofilecanvas.cpp
@@ -150,7 +150,7 @@ class QgsElevationProfilePlotItem : public Qgs2DPlot, public QgsPlotCanvasItem
         case Qgis::DistanceUnit::YardsIndian1962:
         case Qgis::DistanceUnit::YardsIndian1975:
         case Qgis::DistanceUnit::MilesUSSurvey:
-        case Qgis::DistanceUnit::Fathom:
+        case Qgis::DistanceUnit::Fathoms:
         case Qgis::DistanceUnit::MetersGermanLegal:
           return QStringLiteral( " %1" ).arg( QgsUnitTypes::toAbbreviatedString( mDistanceUnit ) );
 

diff --git a/src/gui/layout/qgslayoutmapgridwidget.cpp b/src/gui/layout/qgslayoutmapgridwidget.cpp
@@ -1137,7 +1137,7 @@ void QgsLayoutMapGridWidget::onCrsChanged()
     case Qgis::DistanceUnit::YardsIndian1962:
     case Qgis::DistanceUnit::YardsIndian1975:
     case Qgis::DistanceUnit::MilesUSSurvey:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
     case Qgis::DistanceUnit::MetersGermanLegal:
       break;
 

diff --git a/src/gui/qgsextentwidget.cpp b/src/gui/qgsextentwidget.cpp
@@ -276,7 +276,7 @@ void QgsExtentWidget::setOutputExtent( const QgsRectangle &r, const QgsCoordinat
     case Qgis::DistanceUnit::YardsIndian1962:
     case Qgis::DistanceUnit::YardsIndian1975:
     case Qgis::DistanceUnit::MilesUSSurvey:
-    case Qgis::DistanceUnit::Fathom:
+    case Qgis::DistanceUnit::Fathoms:
     case Qgis::DistanceUnit::MetersGermanLegal:
       decimals = 4;
       break;

diff --git a/tests/src/python/test_qgsunittypes.py b/tests/src/python/test_qgsunittypes.py
@@ -98,7 +98,7 @@ def testDistanceUnitType(self):
                     Qgis.DistanceUnit.YardsIndian1962: QgsUnitTypes.DistanceUnitType.Standard,
                     Qgis.DistanceUnit.YardsIndian1975: QgsUnitTypes.DistanceUnitType.Standard,
                     Qgis.DistanceUnit.MilesUSSurvey: QgsUnitTypes.DistanceUnitType.Standard,
-                    Qgis.DistanceUnit.Fathom: QgsUnitTypes.DistanceUnitType.Standard,
+                    Qgis.DistanceUnit.Fathoms: QgsUnitTypes.DistanceUnitType.Standard,
                     Qgis.DistanceUnit.MetersGermanLegal: QgsUnitTypes.DistanceUnitType.Standard,
                     }
 
@@ -155,7 +155,7 @@ def testEncodeDecodeDistanceUnits(self):
                  Qgis.DistanceUnit.YardsIndian1962,
                  Qgis.DistanceUnit.YardsIndian1975,
                  Qgis.DistanceUnit.MilesUSSurvey,
-                 Qgis.DistanceUnit.Fathom,
+                 Qgis.DistanceUnit.Fathoms,
                  Qgis.DistanceUnit.MetersGermanLegal,
                  ]
 
@@ -224,7 +224,7 @@ def testDistanceUnitsToFromString(self):
                  Qgis.DistanceUnit.YardsIndian1962,
                  Qgis.DistanceUnit.YardsIndian1975,
                  Qgis.DistanceUnit.MilesUSSurvey,
-                 Qgis.DistanceUnit.Fathom,
+                 Qgis.DistanceUnit.Fathoms,
                  Qgis.DistanceUnit.MetersGermanLegal,
                  ]
 
@@ -565,7 +565,7 @@ def testFromUnitToUnitFactor(self):
                 Qgis.DistanceUnit.YardsIndian1962: 1 / 0.9143988,
                 Qgis.DistanceUnit.YardsIndian1975: 1 / 0.9143985,
                 Qgis.DistanceUnit.MilesUSSurvey: 1 / 1609.3472186944,
-                Qgis.DistanceUnit.Fathom: 1 / 1.8288,
+                Qgis.DistanceUnit.Fathoms: 1 / 1.8288,
                 Qgis.DistanceUnit.MetersGermanLegal: 1 / 1.0000135965,
             },
             QgsUnitTypes.DistanceUnit.DistanceKilometers: {
@@ -750,7 +750,7 @@ def testFromUnitToUnitFactor(self):
                 Qgis.DistanceUnit.Meters: 0.9143985},
             Qgis.DistanceUnit.MilesUSSurvey: {
                 Qgis.DistanceUnit.Meters: 1609.3472186944},
-            Qgis.DistanceUnit.Fathom: {
+            Qgis.DistanceUnit.Fathoms: {
                 Qgis.DistanceUnit.Meters: 1.8288},
             Qgis.DistanceUnit.MetersGermanLegal: {
                 Qgis.DistanceUnit.Meters: 1.0000135965},
@@ -1034,7 +1034,7 @@ def testDistanceToAreaUnit(self):
                     Qgis.DistanceUnit.YardsIndian1962: Qgis.AreaUnit.SquareFeet,
                     Qgis.DistanceUnit.YardsIndian1975: Qgis.AreaUnit.SquareFeet,
                     Qgis.DistanceUnit.MilesUSSurvey: Qgis.AreaUnit.SquareMiles,
-                    Qgis.DistanceUnit.Fathom: Qgis.AreaUnit.SquareFeet,
+                    Qgis.DistanceUnit.Fathoms: Qgis.AreaUnit.SquareFeet,
                     Qgis.DistanceUnit.MetersGermanLegal: Qgis.AreaUnit.SquareMeters,
                     }
 
@@ -1428,7 +1428,7 @@ def testDistanceToVolumeUnit(self):
                     Qgis.DistanceUnit.YardsIndian1962: Qgis.VolumeUnit.VolumeCubicYards,
                     Qgis.DistanceUnit.YardsIndian1975: Qgis.VolumeUnit.VolumeCubicYards,
                     Qgis.DistanceUnit.MilesUSSurvey: Qgis.VolumeUnit.VolumeCubicFeet,
-                    Qgis.DistanceUnit.Fathom: Qgis.VolumeUnit.VolumeCubicFeet,
+                    Qgis.DistanceUnit.Fathoms: Qgis.VolumeUnit.VolumeCubicFeet,
                     Qgis.DistanceUnit.MetersGermanLegal: Qgis.VolumeUnit.VolumeCubicMeters,
                     }