sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Complete EPSG distance unit mapping by adding historic distance units

Browse Source 
Ensures we don't perform a lossy conversion of units from the EPSG
CRS database to QGIS units
This commit is contained in:
Nyall Dawson 2024-09-16 08:47:04 +10:00
parent 7b5d8bea57
commit 0777e7683f
16 changed files with 2027 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

273
python/PyQt6/core/auto_additions/qgis.py
View File

@ -8527,6 +8527,123 @@ QgsUnitTypes.DistanceMillimeters.__doc__ = "Millimeters"
QgsUnitTypes.Inches = Qgis.DistanceUnit.Inches
QgsUnitTypes.Inches.is_monkey_patched = True
QgsUnitTypes.Inches.__doc__ = "Inches \n.. versionadded:: 3.32"
QgsUnitTypes.ChainsInternational = Qgis.DistanceUnit.ChainsInternational
QgsUnitTypes.ChainsInternational.is_monkey_patched = True
QgsUnitTypes.ChainsInternational.__doc__ = "International chains \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsBritishBenoit1895A = Qgis.DistanceUnit.ChainsBritishBenoit1895A
QgsUnitTypes.ChainsBritishBenoit1895A.is_monkey_patched = True
QgsUnitTypes.ChainsBritishBenoit1895A.__doc__ = "British chains (Benoit 1895 A) \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsBritishBenoit1895B = Qgis.DistanceUnit.ChainsBritishBenoit1895B
QgsUnitTypes.ChainsBritishBenoit1895B.is_monkey_patched = True
QgsUnitTypes.ChainsBritishBenoit1895B.__doc__ = "British chains (Benoit 1895 B) \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsBritishSears1922Truncated = Qgis.DistanceUnit.ChainsBritishSears1922Truncated
QgsUnitTypes.ChainsBritishSears1922Truncated.is_monkey_patched = True
QgsUnitTypes.ChainsBritishSears1922Truncated.__doc__ = "British chains (Sears 1922 truncated) \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsBritishSears1922 = Qgis.DistanceUnit.ChainsBritishSears1922
QgsUnitTypes.ChainsBritishSears1922.is_monkey_patched = True
QgsUnitTypes.ChainsBritishSears1922.__doc__ = "British chains (Sears 1922) \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsClarkes = Qgis.DistanceUnit.ChainsClarkes
QgsUnitTypes.ChainsClarkes.is_monkey_patched = True
QgsUnitTypes.ChainsClarkes.__doc__ = "Clarke's chains \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsUSSurvey = Qgis.DistanceUnit.ChainsUSSurvey
QgsUnitTypes.ChainsUSSurvey.is_monkey_patched = True
QgsUnitTypes.ChainsUSSurvey.__doc__ = "US Survery chains \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritish1865 = Qgis.DistanceUnit.FeetBritish1865
QgsUnitTypes.FeetBritish1865.is_monkey_patched = True
QgsUnitTypes.FeetBritish1865.__doc__ = "British feet (1865) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritish1936 = Qgis.DistanceUnit.FeetBritish1936
QgsUnitTypes.FeetBritish1936.is_monkey_patched = True
QgsUnitTypes.FeetBritish1936.__doc__ = "British feet (1936) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritishBenoit1895A = Qgis.DistanceUnit.FeetBritishBenoit1895A
QgsUnitTypes.FeetBritishBenoit1895A.is_monkey_patched = True
QgsUnitTypes.FeetBritishBenoit1895A.__doc__ = "British feet (Benoit 1895 A) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritishBenoit1895B = Qgis.DistanceUnit.FeetBritishBenoit1895B
QgsUnitTypes.FeetBritishBenoit1895B.is_monkey_patched = True
QgsUnitTypes.FeetBritishBenoit1895B.__doc__ = "British feet (Benoit 1895 B) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritishSears1922Truncated = Qgis.DistanceUnit.FeetBritishSears1922Truncated
QgsUnitTypes.FeetBritishSears1922Truncated.is_monkey_patched = True
QgsUnitTypes.FeetBritishSears1922Truncated.__doc__ = "British feet (Sears 1922 truncated) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritishSears1922 = Qgis.DistanceUnit.FeetBritishSears1922
QgsUnitTypes.FeetBritishSears1922.is_monkey_patched = True
QgsUnitTypes.FeetBritishSears1922.__doc__ = "British feet (Sears 1922) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetClarkes = Qgis.DistanceUnit.FeetClarkes
QgsUnitTypes.FeetClarkes.is_monkey_patched = True
QgsUnitTypes.FeetClarkes.__doc__ = "Clarke's feet \n.. versionadded:: 3.40"
QgsUnitTypes.FeetGoldCoast = Qgis.DistanceUnit.FeetGoldCoast
QgsUnitTypes.FeetGoldCoast.is_monkey_patched = True
QgsUnitTypes.FeetGoldCoast.__doc__ = "Gold Coast feet \n.. versionadded:: 3.40"
QgsUnitTypes.FeetIndian = Qgis.DistanceUnit.FeetIndian
QgsUnitTypes.FeetIndian.is_monkey_patched = True
QgsUnitTypes.FeetIndian.__doc__ = "Indian (geodetic) feet \n.. versionadded:: 3.40"
QgsUnitTypes.FeetIndian1937 = Qgis.DistanceUnit.FeetIndian1937
QgsUnitTypes.FeetIndian1937.is_monkey_patched = True
QgsUnitTypes.FeetIndian1937.__doc__ = "Indian feet (1937) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetIndian1962 = Qgis.DistanceUnit.FeetIndian1962
QgsUnitTypes.FeetIndian1962.is_monkey_patched = True
QgsUnitTypes.FeetIndian1962.__doc__ = "Indian feet (1962) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetIndian1975 = Qgis.DistanceUnit.FeetIndian1975
QgsUnitTypes.FeetIndian1975.is_monkey_patched = True
QgsUnitTypes.FeetIndian1975.__doc__ = "Indian feet (1975) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetUSSurvey = Qgis.DistanceUnit.FeetUSSurvey
QgsUnitTypes.FeetUSSurvey.is_monkey_patched = True
QgsUnitTypes.FeetUSSurvey.__doc__ = "US Survery feet \n.. versionadded:: 3.40"
QgsUnitTypes.LinksInternational = Qgis.DistanceUnit.LinksInternational
QgsUnitTypes.LinksInternational.is_monkey_patched = True
QgsUnitTypes.LinksInternational.__doc__ = "International links \n.. versionadded:: 3.40"
QgsUnitTypes.LinksBritishBenoit1895A = Qgis.DistanceUnit.LinksBritishBenoit1895A
QgsUnitTypes.LinksBritishBenoit1895A.is_monkey_patched = True
QgsUnitTypes.LinksBritishBenoit1895A.__doc__ = "British links (Benoit 1895 A) \n.. versionadded:: 3.40"
QgsUnitTypes.LinksBritishBenoit1895B = Qgis.DistanceUnit.LinksBritishBenoit1895B
QgsUnitTypes.LinksBritishBenoit1895B.is_monkey_patched = True
QgsUnitTypes.LinksBritishBenoit1895B.__doc__ = "British links (Benoit 1895 B) \n.. versionadded:: 3.40"
QgsUnitTypes.LinksBritishSears1922Truncated = Qgis.DistanceUnit.LinksBritishSears1922Truncated
QgsUnitTypes.LinksBritishSears1922Truncated.is_monkey_patched = True
QgsUnitTypes.LinksBritishSears1922Truncated.__doc__ = "British links (Sears 1922 truncated) \n.. versionadded:: 3.40"
QgsUnitTypes.LinksBritishSears1922 = Qgis.DistanceUnit.LinksBritishSears1922
QgsUnitTypes.LinksBritishSears1922.is_monkey_patched = True
QgsUnitTypes.LinksBritishSears1922.__doc__ = "British links (Sears 1922) \n.. versionadded:: 3.40"
QgsUnitTypes.LinksClarkes = Qgis.DistanceUnit.LinksClarkes
QgsUnitTypes.LinksClarkes.is_monkey_patched = True
QgsUnitTypes.LinksClarkes.__doc__ = "Clarke's links \n.. versionadded:: 3.40"
QgsUnitTypes.LinksUSSurvey = Qgis.DistanceUnit.LinksUSSurvey
QgsUnitTypes.LinksUSSurvey.is_monkey_patched = True
QgsUnitTypes.LinksUSSurvey.__doc__ = "US Survery links \n.. versionadded:: 3.40"
QgsUnitTypes.YardsBritishBenoit1895A = Qgis.DistanceUnit.YardsBritishBenoit1895A
QgsUnitTypes.YardsBritishBenoit1895A.is_monkey_patched = True
QgsUnitTypes.YardsBritishBenoit1895A.__doc__ = "British yards (Benoit 1895 A) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsBritishBenoit1895B = Qgis.DistanceUnit.YardsBritishBenoit1895B
QgsUnitTypes.YardsBritishBenoit1895B.is_monkey_patched = True
QgsUnitTypes.YardsBritishBenoit1895B.__doc__ = "British yards (Benoit 1895 B) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsBritishSears1922Truncated = Qgis.DistanceUnit.YardsBritishSears1922Truncated
QgsUnitTypes.YardsBritishSears1922Truncated.is_monkey_patched = True
QgsUnitTypes.YardsBritishSears1922Truncated.__doc__ = "British yards (Sears 1922 truncated) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsBritishSears1922 = Qgis.DistanceUnit.YardsBritishSears1922
QgsUnitTypes.YardsBritishSears1922.is_monkey_patched = True
QgsUnitTypes.YardsBritishSears1922.__doc__ = "British yards (Sears 1922) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsClarkes = Qgis.DistanceUnit.YardsClarkes
QgsUnitTypes.YardsClarkes.is_monkey_patched = True
QgsUnitTypes.YardsClarkes.__doc__ = "Clarke's yards \n.. versionadded:: 3.40"
QgsUnitTypes.YardsIndian = Qgis.DistanceUnit.YardsIndian
QgsUnitTypes.YardsIndian.is_monkey_patched = True
QgsUnitTypes.YardsIndian.__doc__ = "Indian yards \n.. versionadded:: 3.40"
QgsUnitTypes.YardsIndian1937 = Qgis.DistanceUnit.YardsIndian1937
QgsUnitTypes.YardsIndian1937.is_monkey_patched = True
QgsUnitTypes.YardsIndian1937.__doc__ = "Indian yards (1937) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsIndian1962 = Qgis.DistanceUnit.YardsIndian1962
QgsUnitTypes.YardsIndian1962.is_monkey_patched = True
QgsUnitTypes.YardsIndian1962.__doc__ = "Indian yards (1962) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsIndian1975 = Qgis.DistanceUnit.YardsIndian1975
QgsUnitTypes.YardsIndian1975.is_monkey_patched = True
QgsUnitTypes.YardsIndian1975.__doc__ = "Indian yards (1975) \n.. versionadded:: 3.40"
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.MetersGermanLegal = Qgis.DistanceUnit.MetersGermanLegal
QgsUnitTypes.MetersGermanLegal.is_monkey_patched = True
QgsUnitTypes.MetersGermanLegal.__doc__ = "German legal meter \n.. versionadded:: 3.40"
QgsUnitTypes.DistanceUnknownUnit = Qgis.DistanceUnit.Unknown
QgsUnitTypes.DistanceUnit.DistanceUnknownUnit = Qgis.DistanceUnit.Unknown
QgsUnitTypes.DistanceUnknownUnit.is_monkey_patched = True
@ -8579,6 +8696,162 @@ Qgis.DistanceUnit.__doc__ = """Units of distance
.. versionadded:: 3.32
* ``ChainsInternational``: International chains
.. versionadded:: 3.40
* ``ChainsBritishBenoit1895A``: British chains (Benoit 1895 A)
.. versionadded:: 3.40
* ``ChainsBritishBenoit1895B``: British chains (Benoit 1895 B)
.. versionadded:: 3.40
* ``ChainsBritishSears1922Truncated``: British chains (Sears 1922 truncated)
.. versionadded:: 3.40
* ``ChainsBritishSears1922``: British chains (Sears 1922)
.. versionadded:: 3.40
* ``ChainsClarkes``: Clarke's chains
.. versionadded:: 3.40
* ``ChainsUSSurvey``: US Survery chains
.. versionadded:: 3.40
* ``FeetBritish1865``: British feet (1865)
.. versionadded:: 3.40
* ``FeetBritish1936``: British feet (1936)
.. versionadded:: 3.40
* ``FeetBritishBenoit1895A``: British feet (Benoit 1895 A)
.. versionadded:: 3.40
* ``FeetBritishBenoit1895B``: British feet (Benoit 1895 B)
.. versionadded:: 3.40
* ``FeetBritishSears1922Truncated``: British feet (Sears 1922 truncated)
.. versionadded:: 3.40
* ``FeetBritishSears1922``: British feet (Sears 1922)
.. versionadded:: 3.40
* ``FeetClarkes``: Clarke's feet
.. versionadded:: 3.40
* ``FeetGoldCoast``: Gold Coast feet
.. versionadded:: 3.40
* ``FeetIndian``: Indian (geodetic) feet
.. versionadded:: 3.40
* ``FeetIndian1937``: Indian feet (1937)
.. versionadded:: 3.40
* ``FeetIndian1962``: Indian feet (1962)
.. versionadded:: 3.40
* ``FeetIndian1975``: Indian feet (1975)
.. versionadded:: 3.40
* ``FeetUSSurvey``: US Survery feet
.. versionadded:: 3.40
* ``LinksInternational``: International links
.. versionadded:: 3.40
* ``LinksBritishBenoit1895A``: British links (Benoit 1895 A)
.. versionadded:: 3.40
* ``LinksBritishBenoit1895B``: British links (Benoit 1895 B)
.. versionadded:: 3.40
* ``LinksBritishSears1922Truncated``: British links (Sears 1922 truncated)
.. versionadded:: 3.40
* ``LinksBritishSears1922``: British links (Sears 1922)
.. versionadded:: 3.40
* ``LinksClarkes``: Clarke's links
.. versionadded:: 3.40
* ``LinksUSSurvey``: US Survery links
.. versionadded:: 3.40
* ``YardsBritishBenoit1895A``: British yards (Benoit 1895 A)
.. versionadded:: 3.40
* ``YardsBritishBenoit1895B``: British yards (Benoit 1895 B)
.. versionadded:: 3.40
* ``YardsBritishSears1922Truncated``: British yards (Sears 1922 truncated)
.. versionadded:: 3.40
* ``YardsBritishSears1922``: British yards (Sears 1922)
.. versionadded:: 3.40
* ``YardsClarkes``: Clarke's yards
.. versionadded:: 3.40
* ``YardsIndian``: Indian yards
.. versionadded:: 3.40
* ``YardsIndian1937``: Indian yards (1937)
.. versionadded:: 3.40
* ``YardsIndian1962``: Indian yards (1962)
.. versionadded:: 3.40
* ``YardsIndian1975``: Indian yards (1975)
.. versionadded:: 3.40
* ``MilesUSSurvey``: US Survery miles
.. versionadded:: 3.40
* ``Fathom``: Fathoms
.. versionadded:: 3.40
* ``MetersGermanLegal``: German legal meter
.. versionadded:: 3.40
* ``Unknown``: Unknown distance unit
Available as ``QgsUnitTypes.DistanceUnknownUnit`` in older QGIS releases.

39
python/PyQt6/core/auto_generated/qgis.sip.in
View File

@ -2606,6 +2606,45 @@ The development version
Centimeters,
Millimeters,
Inches,
ChainsInternational,
ChainsBritishBenoit1895A,
ChainsBritishBenoit1895B,
ChainsBritishSears1922Truncated,
ChainsBritishSears1922,
ChainsClarkes,
ChainsUSSurvey,
FeetBritish1865,
FeetBritish1936,
FeetBritishBenoit1895A,
FeetBritishBenoit1895B,
FeetBritishSears1922Truncated,
FeetBritishSears1922,
FeetClarkes,
FeetGoldCoast,
FeetIndian,
FeetIndian1937,
FeetIndian1962,
FeetIndian1975,
FeetUSSurvey,
LinksInternational,
LinksBritishBenoit1895A,
LinksBritishBenoit1895B,
LinksBritishSears1922Truncated,
LinksBritishSears1922,
LinksClarkes,
LinksUSSurvey,
YardsBritishBenoit1895A,
YardsBritishBenoit1895B,
YardsBritishSears1922Truncated,
YardsBritishSears1922,
YardsClarkes,
YardsIndian,
YardsIndian1937,
YardsIndian1962,
YardsIndian1975,
MilesUSSurvey,
Fathom,
MetersGermanLegal,
Unknown,
};

273
python/core/auto_additions/qgis.py
View File

@ -8451,6 +8451,123 @@ QgsUnitTypes.DistanceMillimeters.__doc__ = "Millimeters"
QgsUnitTypes.Inches = Qgis.DistanceUnit.Inches
QgsUnitTypes.Inches.is_monkey_patched = True
QgsUnitTypes.Inches.__doc__ = "Inches \n.. versionadded:: 3.32"
QgsUnitTypes.ChainsInternational = Qgis.DistanceUnit.ChainsInternational
QgsUnitTypes.ChainsInternational.is_monkey_patched = True
QgsUnitTypes.ChainsInternational.__doc__ = "International chains \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsBritishBenoit1895A = Qgis.DistanceUnit.ChainsBritishBenoit1895A
QgsUnitTypes.ChainsBritishBenoit1895A.is_monkey_patched = True
QgsUnitTypes.ChainsBritishBenoit1895A.__doc__ = "British chains (Benoit 1895 A) \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsBritishBenoit1895B = Qgis.DistanceUnit.ChainsBritishBenoit1895B
QgsUnitTypes.ChainsBritishBenoit1895B.is_monkey_patched = True
QgsUnitTypes.ChainsBritishBenoit1895B.__doc__ = "British chains (Benoit 1895 B) \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsBritishSears1922Truncated = Qgis.DistanceUnit.ChainsBritishSears1922Truncated
QgsUnitTypes.ChainsBritishSears1922Truncated.is_monkey_patched = True
QgsUnitTypes.ChainsBritishSears1922Truncated.__doc__ = "British chains (Sears 1922 truncated) \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsBritishSears1922 = Qgis.DistanceUnit.ChainsBritishSears1922
QgsUnitTypes.ChainsBritishSears1922.is_monkey_patched = True
QgsUnitTypes.ChainsBritishSears1922.__doc__ = "British chains (Sears 1922) \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsClarkes = Qgis.DistanceUnit.ChainsClarkes
QgsUnitTypes.ChainsClarkes.is_monkey_patched = True
QgsUnitTypes.ChainsClarkes.__doc__ = "Clarke's chains \n.. versionadded:: 3.40"
QgsUnitTypes.ChainsUSSurvey = Qgis.DistanceUnit.ChainsUSSurvey
QgsUnitTypes.ChainsUSSurvey.is_monkey_patched = True
QgsUnitTypes.ChainsUSSurvey.__doc__ = "US Survery chains \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritish1865 = Qgis.DistanceUnit.FeetBritish1865
QgsUnitTypes.FeetBritish1865.is_monkey_patched = True
QgsUnitTypes.FeetBritish1865.__doc__ = "British feet (1865) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritish1936 = Qgis.DistanceUnit.FeetBritish1936
QgsUnitTypes.FeetBritish1936.is_monkey_patched = True
QgsUnitTypes.FeetBritish1936.__doc__ = "British feet (1936) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritishBenoit1895A = Qgis.DistanceUnit.FeetBritishBenoit1895A
QgsUnitTypes.FeetBritishBenoit1895A.is_monkey_patched = True
QgsUnitTypes.FeetBritishBenoit1895A.__doc__ = "British feet (Benoit 1895 A) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritishBenoit1895B = Qgis.DistanceUnit.FeetBritishBenoit1895B
QgsUnitTypes.FeetBritishBenoit1895B.is_monkey_patched = True
QgsUnitTypes.FeetBritishBenoit1895B.__doc__ = "British feet (Benoit 1895 B) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritishSears1922Truncated = Qgis.DistanceUnit.FeetBritishSears1922Truncated
QgsUnitTypes.FeetBritishSears1922Truncated.is_monkey_patched = True
QgsUnitTypes.FeetBritishSears1922Truncated.__doc__ = "British feet (Sears 1922 truncated) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetBritishSears1922 = Qgis.DistanceUnit.FeetBritishSears1922
QgsUnitTypes.FeetBritishSears1922.is_monkey_patched = True
QgsUnitTypes.FeetBritishSears1922.__doc__ = "British feet (Sears 1922) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetClarkes = Qgis.DistanceUnit.FeetClarkes
QgsUnitTypes.FeetClarkes.is_monkey_patched = True
QgsUnitTypes.FeetClarkes.__doc__ = "Clarke's feet \n.. versionadded:: 3.40"
QgsUnitTypes.FeetGoldCoast = Qgis.DistanceUnit.FeetGoldCoast
QgsUnitTypes.FeetGoldCoast.is_monkey_patched = True
QgsUnitTypes.FeetGoldCoast.__doc__ = "Gold Coast feet \n.. versionadded:: 3.40"
QgsUnitTypes.FeetIndian = Qgis.DistanceUnit.FeetIndian
QgsUnitTypes.FeetIndian.is_monkey_patched = True
QgsUnitTypes.FeetIndian.__doc__ = "Indian (geodetic) feet \n.. versionadded:: 3.40"
QgsUnitTypes.FeetIndian1937 = Qgis.DistanceUnit.FeetIndian1937
QgsUnitTypes.FeetIndian1937.is_monkey_patched = True
QgsUnitTypes.FeetIndian1937.__doc__ = "Indian feet (1937) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetIndian1962 = Qgis.DistanceUnit.FeetIndian1962
QgsUnitTypes.FeetIndian1962.is_monkey_patched = True
QgsUnitTypes.FeetIndian1962.__doc__ = "Indian feet (1962) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetIndian1975 = Qgis.DistanceUnit.FeetIndian1975
QgsUnitTypes.FeetIndian1975.is_monkey_patched = True
QgsUnitTypes.FeetIndian1975.__doc__ = "Indian feet (1975) \n.. versionadded:: 3.40"
QgsUnitTypes.FeetUSSurvey = Qgis.DistanceUnit.FeetUSSurvey
QgsUnitTypes.FeetUSSurvey.is_monkey_patched = True
QgsUnitTypes.FeetUSSurvey.__doc__ = "US Survery feet \n.. versionadded:: 3.40"
QgsUnitTypes.LinksInternational = Qgis.DistanceUnit.LinksInternational
QgsUnitTypes.LinksInternational.is_monkey_patched = True
QgsUnitTypes.LinksInternational.__doc__ = "International links \n.. versionadded:: 3.40"
QgsUnitTypes.LinksBritishBenoit1895A = Qgis.DistanceUnit.LinksBritishBenoit1895A
QgsUnitTypes.LinksBritishBenoit1895A.is_monkey_patched = True
QgsUnitTypes.LinksBritishBenoit1895A.__doc__ = "British links (Benoit 1895 A) \n.. versionadded:: 3.40"
QgsUnitTypes.LinksBritishBenoit1895B = Qgis.DistanceUnit.LinksBritishBenoit1895B
QgsUnitTypes.LinksBritishBenoit1895B.is_monkey_patched = True
QgsUnitTypes.LinksBritishBenoit1895B.__doc__ = "British links (Benoit 1895 B) \n.. versionadded:: 3.40"
QgsUnitTypes.LinksBritishSears1922Truncated = Qgis.DistanceUnit.LinksBritishSears1922Truncated
QgsUnitTypes.LinksBritishSears1922Truncated.is_monkey_patched = True
QgsUnitTypes.LinksBritishSears1922Truncated.__doc__ = "British links (Sears 1922 truncated) \n.. versionadded:: 3.40"
QgsUnitTypes.LinksBritishSears1922 = Qgis.DistanceUnit.LinksBritishSears1922
QgsUnitTypes.LinksBritishSears1922.is_monkey_patched = True
QgsUnitTypes.LinksBritishSears1922.__doc__ = "British links (Sears 1922) \n.. versionadded:: 3.40"
QgsUnitTypes.LinksClarkes = Qgis.DistanceUnit.LinksClarkes
QgsUnitTypes.LinksClarkes.is_monkey_patched = True
QgsUnitTypes.LinksClarkes.__doc__ = "Clarke's links \n.. versionadded:: 3.40"
QgsUnitTypes.LinksUSSurvey = Qgis.DistanceUnit.LinksUSSurvey
QgsUnitTypes.LinksUSSurvey.is_monkey_patched = True
QgsUnitTypes.LinksUSSurvey.__doc__ = "US Survery links \n.. versionadded:: 3.40"
QgsUnitTypes.YardsBritishBenoit1895A = Qgis.DistanceUnit.YardsBritishBenoit1895A
QgsUnitTypes.YardsBritishBenoit1895A.is_monkey_patched = True
QgsUnitTypes.YardsBritishBenoit1895A.__doc__ = "British yards (Benoit 1895 A) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsBritishBenoit1895B = Qgis.DistanceUnit.YardsBritishBenoit1895B
QgsUnitTypes.YardsBritishBenoit1895B.is_monkey_patched = True
QgsUnitTypes.YardsBritishBenoit1895B.__doc__ = "British yards (Benoit 1895 B) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsBritishSears1922Truncated = Qgis.DistanceUnit.YardsBritishSears1922Truncated
QgsUnitTypes.YardsBritishSears1922Truncated.is_monkey_patched = True
QgsUnitTypes.YardsBritishSears1922Truncated.__doc__ = "British yards (Sears 1922 truncated) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsBritishSears1922 = Qgis.DistanceUnit.YardsBritishSears1922
QgsUnitTypes.YardsBritishSears1922.is_monkey_patched = True
QgsUnitTypes.YardsBritishSears1922.__doc__ = "British yards (Sears 1922) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsClarkes = Qgis.DistanceUnit.YardsClarkes
QgsUnitTypes.YardsClarkes.is_monkey_patched = True
QgsUnitTypes.YardsClarkes.__doc__ = "Clarke's yards \n.. versionadded:: 3.40"
QgsUnitTypes.YardsIndian = Qgis.DistanceUnit.YardsIndian
QgsUnitTypes.YardsIndian.is_monkey_patched = True
QgsUnitTypes.YardsIndian.__doc__ = "Indian yards \n.. versionadded:: 3.40"
QgsUnitTypes.YardsIndian1937 = Qgis.DistanceUnit.YardsIndian1937
QgsUnitTypes.YardsIndian1937.is_monkey_patched = True
QgsUnitTypes.YardsIndian1937.__doc__ = "Indian yards (1937) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsIndian1962 = Qgis.DistanceUnit.YardsIndian1962
QgsUnitTypes.YardsIndian1962.is_monkey_patched = True
QgsUnitTypes.YardsIndian1962.__doc__ = "Indian yards (1962) \n.. versionadded:: 3.40"
QgsUnitTypes.YardsIndian1975 = Qgis.DistanceUnit.YardsIndian1975
QgsUnitTypes.YardsIndian1975.is_monkey_patched = True
QgsUnitTypes.YardsIndian1975.__doc__ = "Indian yards (1975) \n.. versionadded:: 3.40"
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.MetersGermanLegal = Qgis.DistanceUnit.MetersGermanLegal
QgsUnitTypes.MetersGermanLegal.is_monkey_patched = True
QgsUnitTypes.MetersGermanLegal.__doc__ = "German legal meter \n.. versionadded:: 3.40"
QgsUnitTypes.DistanceUnknownUnit = Qgis.DistanceUnit.Unknown
QgsUnitTypes.DistanceUnit.DistanceUnknownUnit = Qgis.DistanceUnit.Unknown
QgsUnitTypes.DistanceUnknownUnit.is_monkey_patched = True
@ -8503,6 +8620,162 @@ Qgis.DistanceUnit.__doc__ = """Units of distance
.. versionadded:: 3.32
* ``ChainsInternational``: International chains
.. versionadded:: 3.40
* ``ChainsBritishBenoit1895A``: British chains (Benoit 1895 A)
.. versionadded:: 3.40
* ``ChainsBritishBenoit1895B``: British chains (Benoit 1895 B)
.. versionadded:: 3.40
* ``ChainsBritishSears1922Truncated``: British chains (Sears 1922 truncated)
.. versionadded:: 3.40
* ``ChainsBritishSears1922``: British chains (Sears 1922)
.. versionadded:: 3.40
* ``ChainsClarkes``: Clarke's chains
.. versionadded:: 3.40
* ``ChainsUSSurvey``: US Survery chains
.. versionadded:: 3.40
* ``FeetBritish1865``: British feet (1865)
.. versionadded:: 3.40
* ``FeetBritish1936``: British feet (1936)
.. versionadded:: 3.40
* ``FeetBritishBenoit1895A``: British feet (Benoit 1895 A)
.. versionadded:: 3.40
* ``FeetBritishBenoit1895B``: British feet (Benoit 1895 B)
.. versionadded:: 3.40
* ``FeetBritishSears1922Truncated``: British feet (Sears 1922 truncated)
.. versionadded:: 3.40
* ``FeetBritishSears1922``: British feet (Sears 1922)
.. versionadded:: 3.40
* ``FeetClarkes``: Clarke's feet
.. versionadded:: 3.40
* ``FeetGoldCoast``: Gold Coast feet
.. versionadded:: 3.40
* ``FeetIndian``: Indian (geodetic) feet
.. versionadded:: 3.40
* ``FeetIndian1937``: Indian feet (1937)
.. versionadded:: 3.40
* ``FeetIndian1962``: Indian feet (1962)
.. versionadded:: 3.40
* ``FeetIndian1975``: Indian feet (1975)
.. versionadded:: 3.40
* ``FeetUSSurvey``: US Survery feet
.. versionadded:: 3.40
* ``LinksInternational``: International links
.. versionadded:: 3.40
* ``LinksBritishBenoit1895A``: British links (Benoit 1895 A)
.. versionadded:: 3.40
* ``LinksBritishBenoit1895B``: British links (Benoit 1895 B)
.. versionadded:: 3.40
* ``LinksBritishSears1922Truncated``: British links (Sears 1922 truncated)
.. versionadded:: 3.40
* ``LinksBritishSears1922``: British links (Sears 1922)
.. versionadded:: 3.40
* ``LinksClarkes``: Clarke's links
.. versionadded:: 3.40
* ``LinksUSSurvey``: US Survery links
.. versionadded:: 3.40
* ``YardsBritishBenoit1895A``: British yards (Benoit 1895 A)
.. versionadded:: 3.40
* ``YardsBritishBenoit1895B``: British yards (Benoit 1895 B)
.. versionadded:: 3.40
* ``YardsBritishSears1922Truncated``: British yards (Sears 1922 truncated)
.. versionadded:: 3.40
* ``YardsBritishSears1922``: British yards (Sears 1922)
.. versionadded:: 3.40
* ``YardsClarkes``: Clarke's yards
.. versionadded:: 3.40
* ``YardsIndian``: Indian yards
.. versionadded:: 3.40
* ``YardsIndian1937``: Indian yards (1937)
.. versionadded:: 3.40
* ``YardsIndian1962``: Indian yards (1962)
.. versionadded:: 3.40
* ``YardsIndian1975``: Indian yards (1975)
.. versionadded:: 3.40
* ``MilesUSSurvey``: US Survery miles
.. versionadded:: 3.40
* ``Fathom``: Fathoms
.. versionadded:: 3.40
* ``MetersGermanLegal``: German legal meter
.. versionadded:: 3.40
* ``Unknown``: Unknown distance unit
Available as ``QgsUnitTypes.DistanceUnknownUnit`` in older QGIS releases.

39
python/core/auto_generated/qgis.sip.in
View File

@ -2606,6 +2606,45 @@ The development version
Centimeters,
Millimeters,
Inches,
ChainsInternational,
ChainsBritishBenoit1895A,
ChainsBritishBenoit1895B,
ChainsBritishSears1922Truncated,
ChainsBritishSears1922,
ChainsClarkes,
ChainsUSSurvey,
FeetBritish1865,
FeetBritish1936,
FeetBritishBenoit1895A,
FeetBritishBenoit1895B,
FeetBritishSears1922Truncated,
FeetBritishSears1922,
FeetClarkes,
FeetGoldCoast,
FeetIndian,
FeetIndian1937,
FeetIndian1962,
FeetIndian1975,
FeetUSSurvey,
LinksInternational,
LinksBritishBenoit1895A,
LinksBritishBenoit1895B,
LinksBritishSears1922Truncated,
LinksBritishSears1922,
LinksClarkes,
LinksUSSurvey,
YardsBritishBenoit1895A,
YardsBritishBenoit1895B,
YardsBritishSears1922Truncated,
YardsBritishSears1922,
YardsClarkes,
YardsIndian,
YardsIndian1937,
YardsIndian1962,
YardsIndian1975,
MilesUSSurvey,
Fathom,
MetersGermanLegal,
Unknown,
};

39
src/app/decorations/qgsdecorationscalebar.cpp
View File

@ -355,6 +355,45 @@ void QgsDecorationScaleBar::render( const QgsMapSettings &mapSettings, QgsRender
case Qgis::DistanceUnit::Millimeters:
case Qgis::DistanceUnit::Inches:
case Qgis::DistanceUnit::Unknown:
case Qgis::DistanceUnit::ChainsInternational:
case Qgis::DistanceUnit::ChainsBritishBenoit1895A:
case Qgis::DistanceUnit::ChainsBritishBenoit1895B:
case Qgis::DistanceUnit::ChainsBritishSears1922Truncated:
case Qgis::DistanceUnit::ChainsBritishSears1922:
case Qgis::DistanceUnit::ChainsClarkes:
case Qgis::DistanceUnit::ChainsUSSurvey:
case Qgis::DistanceUnit::FeetBritish1865:
case Qgis::DistanceUnit::FeetBritish1936:
case Qgis::DistanceUnit::FeetBritishBenoit1895A:
case Qgis::DistanceUnit::FeetBritishBenoit1895B:
case Qgis::DistanceUnit::FeetBritishSears1922Truncated:
case Qgis::DistanceUnit::FeetBritishSears1922:
case Qgis::DistanceUnit::FeetClarkes:
case Qgis::DistanceUnit::FeetGoldCoast:
case Qgis::DistanceUnit::FeetIndian:
case Qgis::DistanceUnit::FeetIndian1937:
case Qgis::DistanceUnit::FeetIndian1962:
case Qgis::DistanceUnit::FeetIndian1975:
case Qgis::DistanceUnit::FeetUSSurvey:
case Qgis::DistanceUnit::LinksInternational:
case Qgis::DistanceUnit::LinksBritishBenoit1895A:
case Qgis::DistanceUnit::LinksBritishBenoit1895B:
case Qgis::DistanceUnit::LinksBritishSears1922Truncated:
case Qgis::DistanceUnit::LinksBritishSears1922:
case Qgis::DistanceUnit::LinksClarkes:
case Qgis::DistanceUnit::LinksUSSurvey:
case Qgis::DistanceUnit::YardsBritishBenoit1895A:
case Qgis::DistanceUnit::YardsBritishBenoit1895B:
case Qgis::DistanceUnit::YardsBritishSears1922Truncated:
case Qgis::DistanceUnit::YardsBritishSears1922:
case Qgis::DistanceUnit::YardsClarkes:
case Qgis::DistanceUnit::YardsIndian:
case Qgis::DistanceUnit::YardsIndian1937:
case Qgis::DistanceUnit::YardsIndian1962:
case Qgis::DistanceUnit::YardsIndian1975:
case Qgis::DistanceUnit::MilesUSSurvey:
case Qgis::DistanceUnit::Fathom:
case Qgis::DistanceUnit::MetersGermanLegal:
scaleBarUnitLabel = QgsUnitTypes::toAbbreviatedString( scaleBarUnits );
break;
}

39
src/core/layout/qgslayoutitemelevationprofile.cpp
View File

@ -1025,6 +1025,45 @@ void QgsLayoutItemElevationProfile::setDistanceUnit( Qgis::DistanceUnit unit )
case Qgis::DistanceUnit::Centimeters:
case Qgis::DistanceUnit::Millimeters:
case Qgis::DistanceUnit::Inches:
case Qgis::DistanceUnit::ChainsInternational:
case Qgis::DistanceUnit::ChainsBritishBenoit1895A:
case Qgis::DistanceUnit::ChainsBritishBenoit1895B:
case Qgis::DistanceUnit::ChainsBritishSears1922Truncated:
case Qgis::DistanceUnit::ChainsBritishSears1922:
case Qgis::DistanceUnit::ChainsClarkes:
case Qgis::DistanceUnit::ChainsUSSurvey:
case Qgis::DistanceUnit::FeetBritish1865:
case Qgis::DistanceUnit::FeetBritish1936:
case Qgis::DistanceUnit::FeetBritishBenoit1895A:
case Qgis::DistanceUnit::FeetBritishBenoit1895B:
case Qgis::DistanceUnit::FeetBritishSears1922Truncated:
case Qgis::DistanceUnit::FeetBritishSears1922:
case Qgis::DistanceUnit::FeetClarkes:
case Qgis::DistanceUnit::FeetGoldCoast:
case Qgis::DistanceUnit::FeetIndian:
case Qgis::DistanceUnit::FeetIndian1937:
case Qgis::DistanceUnit::FeetIndian1962:
case Qgis::DistanceUnit::FeetIndian1975:
case Qgis::DistanceUnit::FeetUSSurvey:
case Qgis::DistanceUnit::LinksInternational:
case Qgis::DistanceUnit::LinksBritishBenoit1895A:
case Qgis::DistanceUnit::LinksBritishBenoit1895B:
case Qgis::DistanceUnit::LinksBritishSears1922Truncated:
case Qgis::DistanceUnit::LinksBritishSears1922:
case Qgis::DistanceUnit::LinksClarkes:
case Qgis::DistanceUnit::LinksUSSurvey:
case Qgis::DistanceUnit::YardsBritishBenoit1895A:
case Qgis::DistanceUnit::YardsBritishBenoit1895B:
case Qgis::DistanceUnit::YardsBritishSears1922Truncated:
case Qgis::DistanceUnit::YardsBritishSears1922:
case Qgis::DistanceUnit::YardsClarkes:
case Qgis::DistanceUnit::YardsIndian:
case Qgis::DistanceUnit::YardsIndian1937:
case Qgis::DistanceUnit::YardsIndian1962:
case Qgis::DistanceUnit::YardsIndian1975:
case Qgis::DistanceUnit::MilesUSSurvey:
case Qgis::DistanceUnit::Fathom:
case Qgis::DistanceUnit::MetersGermanLegal:
mPlot->xAxis().setLabelSuffix( QStringLiteral( " %1" ).arg( QgsUnitTypes::toAbbreviatedString( mDistanceUnit ) ) );
break;

86
src/core/proj/qgscoordinatereferencesystem.cpp
View File

@ -1836,10 +1836,74 @@ void QgsCoordinateReferenceSystem::setMapUnits()
|| unitName.compare( QLatin1String( "m" ), Qt::CaseInsensitive ) == 0
|| unitName.compare( QLatin1String( "meter" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::Meters;
// we don't differentiate between these, suck it imperial users!
else if ( unitName.compare( QLatin1String( "US survey foot" ), Qt::CaseInsensitive ) == 0 ||
unitName.compare( QLatin1String( "foot" ), Qt::CaseInsensitive ) == 0 )
else if ( unitName.compare( QLatin1String( "US survey foot" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetUSSurvey;
else if ( unitName.compare( QLatin1String( "foot" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::Feet;
else if ( unitName.compare( QLatin1String( "British yard (Sears 1922)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsBritishSears1922;
else if ( unitName.compare( QLatin1String( "British yard (Sears 1922 truncated)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsBritishSears1922Truncated;
else if ( unitName.compare( QLatin1String( "British foot (Sears 1922)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetBritishSears1922;
else if ( unitName.compare( QLatin1String( "British foot (Sears 1922 truncated)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetBritishSears1922Truncated;
else if ( unitName.compare( QLatin1String( "British chain (Sears 1922)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::ChainsBritishSears1922;
else if ( unitName.compare( QLatin1String( "British chain (Sears 1922 truncated)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::ChainsBritishSears1922Truncated;
else if ( unitName.compare( QLatin1String( "British link (Sears 1922)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::LinksBritishSears1922;
else if ( unitName.compare( QLatin1String( "British link (Sears 1922 truncated)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::LinksBritishSears1922Truncated;
else if ( unitName.compare( QLatin1String( "British yard (Benoit 1895 A)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsBritishBenoit1895A;
else if ( unitName.compare( QLatin1String( "British foot (Benoit 1895 A)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetBritishBenoit1895A;
else if ( unitName.compare( QLatin1String( "British chain (Benoit 1895 A)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::ChainsBritishBenoit1895A;
else if ( unitName.compare( QLatin1String( "British link (Benoit 1895 A)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::LinksBritishBenoit1895A;
else if ( unitName.compare( QLatin1String( "British yard (Benoit 1895 B)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsBritishBenoit1895B;
else if ( unitName.compare( QLatin1String( "British foot (Benoit 1895 B)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetBritishBenoit1895B;
else if ( unitName.compare( QLatin1String( "British chain (Benoit 1895 B)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::ChainsBritishBenoit1895B;
else if ( unitName.compare( QLatin1String( "British link (Benoit 1895 B)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::LinksBritishBenoit1895B;
else if ( unitName.compare( QLatin1String( "British foot (1865)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetBritish1865;
else if ( unitName.compare( QLatin1String( "British foot (1936)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetBritish1936;
else if ( unitName.compare( QLatin1String( "Indian foot" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetIndian;
else if ( unitName.compare( QLatin1String( "Indian foot (1937)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetIndian1937;
else if ( unitName.compare( QLatin1String( "Indian foot (1962)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetIndian1962;
else if ( unitName.compare( QLatin1String( "Indian foot (1975)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetIndian1975;
else if ( unitName.compare( QLatin1String( "Indian yard" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsIndian;
else if ( unitName.compare( QLatin1String( "Indian yard (1937)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsIndian1937;
else if ( unitName.compare( QLatin1String( "Indian yard (1962)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsIndian1962;
else if ( unitName.compare( QLatin1String( "Indian yard (1975)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsIndian1975;
else if ( unitName.compare( QLatin1String( "Gold Coast foot" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetGoldCoast;
else if ( unitName.compare( QLatin1String( "Clarke's foot" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetClarkes;
else if ( unitName.compare( QLatin1String( "Clarke's yard" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsClarkes;
else if ( unitName.compare( QLatin1String( "Clarke's chain" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::ChainsClarkes;
else if ( unitName.compare( QLatin1String( "Clarke's link" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::LinksClarkes;
else if ( unitName.compare( QLatin1String( "Indian foot (1937)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::FeetIndian1937;
else if ( unitName.compare( QLatin1String( "kilometre" ), Qt::CaseInsensitive ) == 0 ) //#spellok
d->mMapUnits = Qgis::DistanceUnit::Kilometers;
else if ( unitName.compare( QLatin1String( "centimetre" ), Qt::CaseInsensitive ) == 0 ) //#spellok
@ -1852,6 +1916,22 @@ void QgsCoordinateReferenceSystem::setMapUnits()
d->mMapUnits = Qgis::DistanceUnit::NauticalMiles;
else if ( unitName.compare( QLatin1String( "yard" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::Yards;
else if ( unitName.compare( QLatin1String( "Indian yard (1937)" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::YardsIndian1937;
else if ( unitName.compare( QLatin1String( "fathom" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::Fathom;
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 )
d->mMapUnits = Qgis::DistanceUnit::ChainsInternational;
else if ( unitName.compare( QLatin1String( "link" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::LinksInternational;
else if ( unitName.compare( QLatin1String( "US survey link" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::LinksUSSurvey;
else if ( unitName.compare( QLatin1String( "US survey mile" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::MilesUSSurvey;
else if ( unitName.compare( QLatin1String( "German legal metre" ), Qt::CaseInsensitive ) == 0 )
d->mMapUnits = Qgis::DistanceUnit::MetersGermanLegal;
// TODO - maybe more values to handle here?
else
d->mMapUnits = Qgis::DistanceUnit::Unknown;

39
src/core/qgis.h
View File

@ -4633,6 +4633,45 @@ class CORE_EXPORT Qgis
Centimeters SIP_MONKEYPATCH_COMPAT_NAME( DistanceCentimeters ), //!< Centimeters
Millimeters SIP_MONKEYPATCH_COMPAT_NAME( DistanceMillimeters ), //!< Millimeters
Inches, //!< Inches \since QGIS 3.32
ChainsInternational, //!< International chains \since QGIS 3.40
ChainsBritishBenoit1895A, //!< British chains (Benoit 1895 A) \since QGIS 3.40
ChainsBritishBenoit1895B, //!< British chains (Benoit 1895 B) \since QGIS 3.40
ChainsBritishSears1922Truncated, //!< British chains (Sears 1922 truncated) \since QGIS 3.40
ChainsBritishSears1922, //!< British chains (Sears 1922) \since QGIS 3.40
ChainsClarkes, //!< Clarke's chains \since QGIS 3.40
ChainsUSSurvey, //!< US Survery chains \since QGIS 3.40
FeetBritish1865, //!< British feet (1865) \since QGIS 3.40
FeetBritish1936, //!< British feet (1936) \since QGIS 3.40
FeetBritishBenoit1895A, //!< British feet (Benoit 1895 A) \since QGIS 3.40
FeetBritishBenoit1895B, //!< British feet (Benoit 1895 B) \since QGIS 3.40
FeetBritishSears1922Truncated, //!< British feet (Sears 1922 truncated) \since QGIS 3.40
FeetBritishSears1922, //!< British feet (Sears 1922) \since QGIS 3.40
FeetClarkes, //!< Clarke's feet \since QGIS 3.40
FeetGoldCoast, //!< Gold Coast feet \since QGIS 3.40
FeetIndian, //!< Indian (geodetic) feet \since QGIS 3.40
FeetIndian1937, //!< Indian feet (1937) \since QGIS 3.40
FeetIndian1962, //!< Indian feet (1962) \since QGIS 3.40
FeetIndian1975, //!< Indian feet (1975) \since QGIS 3.40
FeetUSSurvey, //!< US Survery feet \since QGIS 3.40
LinksInternational, //!< International links \since QGIS 3.40
LinksBritishBenoit1895A, //!< British links (Benoit 1895 A) \since QGIS 3.40
LinksBritishBenoit1895B, //!< British links (Benoit 1895 B) \since QGIS 3.40
LinksBritishSears1922Truncated, //!< British links (Sears 1922 truncated) \since QGIS 3.40
LinksBritishSears1922, //!< British links (Sears 1922) \since QGIS 3.40
LinksClarkes, //!< Clarke's links \since QGIS 3.40
LinksUSSurvey, //!< US Survery links \since QGIS 3.40
YardsBritishBenoit1895A, //!< British yards (Benoit 1895 A) \since QGIS 3.40
YardsBritishBenoit1895B, //!< British yards (Benoit 1895 B) \since QGIS 3.40
YardsBritishSears1922Truncated, //!< British yards (Sears 1922 truncated) \since QGIS 3.40
YardsBritishSears1922, //!< British yards (Sears 1922) \since QGIS 3.40
YardsClarkes, //!< Clarke's yards \since QGIS 3.40
YardsIndian, //!< Indian yards \since QGIS 3.40
YardsIndian1937, //!< Indian yards (1937) \since QGIS 3.40
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
MetersGermanLegal, //!< German legal meter \since QGIS 3.40
Unknown SIP_MONKEYPATCH_COMPAT_NAME( DistanceUnknownUnit ), //!< Unknown distance unit
};
Q_ENUM( DistanceUnit )

39
src/core/qgsrendercontext.cpp
View File

@ -694,6 +694,45 @@ double QgsRenderContext::convertMetersToMapUnits( double meters ) const
case Qgis::DistanceUnit::Millimeters:
case Qgis::DistanceUnit::Inches:
case Qgis::DistanceUnit::Unknown:
case Qgis::DistanceUnit::ChainsInternational:
case Qgis::DistanceUnit::ChainsBritishBenoit1895A:
case Qgis::DistanceUnit::ChainsBritishBenoit1895B:
case Qgis::DistanceUnit::ChainsBritishSears1922Truncated:
case Qgis::DistanceUnit::ChainsBritishSears1922:
case Qgis::DistanceUnit::ChainsClarkes:
case Qgis::DistanceUnit::ChainsUSSurvey:
case Qgis::DistanceUnit::FeetBritish1865:
case Qgis::DistanceUnit::FeetBritish1936:
case Qgis::DistanceUnit::FeetBritishBenoit1895A:
case Qgis::DistanceUnit::FeetBritishBenoit1895B:
case Qgis::DistanceUnit::FeetBritishSears1922Truncated:
case Qgis::DistanceUnit::FeetBritishSears1922:
case Qgis::DistanceUnit::FeetClarkes:
case Qgis::DistanceUnit::FeetGoldCoast:
case Qgis::DistanceUnit::FeetIndian:
case Qgis::DistanceUnit::FeetIndian1937:
case Qgis::DistanceUnit::FeetIndian1962:
case Qgis::DistanceUnit::FeetIndian1975:
case Qgis::DistanceUnit::FeetUSSurvey:
case Qgis::DistanceUnit::LinksInternational:
case Qgis::DistanceUnit::LinksBritishBenoit1895A:
case Qgis::DistanceUnit::LinksBritishBenoit1895B:
case Qgis::DistanceUnit::LinksBritishSears1922Truncated:
case Qgis::DistanceUnit::LinksBritishSears1922:
case Qgis::DistanceUnit::LinksClarkes:
case Qgis::DistanceUnit::LinksUSSurvey:
case Qgis::DistanceUnit::YardsBritishBenoit1895A:
case Qgis::DistanceUnit::YardsBritishBenoit1895B:
case Qgis::DistanceUnit::YardsBritishSears1922Truncated:
case Qgis::DistanceUnit::YardsBritishSears1922:
case Qgis::DistanceUnit::YardsClarkes:
case Qgis::DistanceUnit::YardsIndian:
case Qgis::DistanceUnit::YardsIndian1937:
case Qgis::DistanceUnit::YardsIndian1962:
case Qgis::DistanceUnit::YardsIndian1975:
case Qgis::DistanceUnit::MilesUSSurvey:
case Qgis::DistanceUnit::Fathom:
case Qgis::DistanceUnit::MetersGermanLegal:
return ( meters * QgsUnitTypes::fromUnitToUnitFactor( Qgis::DistanceUnit::Meters, mDistanceArea.sourceCrs().mapUnits() ) );
}
return meters;

39
src/core/qgsscalecalculator.cpp
View File

@ -105,6 +105,45 @@ void QgsScaleCalculator::calculateMetrics( const QgsRectangle &mapExtent, double
case Qgis::DistanceUnit::Centimeters:
case Qgis::DistanceUnit::Miles:
case Qgis::DistanceUnit::NauticalMiles:
case Qgis::DistanceUnit::ChainsInternational:
case Qgis::DistanceUnit::ChainsBritishBenoit1895A:
case Qgis::DistanceUnit::ChainsBritishBenoit1895B:
case Qgis::DistanceUnit::ChainsBritishSears1922Truncated:
case Qgis::DistanceUnit::ChainsBritishSears1922:
case Qgis::DistanceUnit::ChainsClarkes:
case Qgis::DistanceUnit::ChainsUSSurvey:
case Qgis::DistanceUnit::FeetBritish1865:
case Qgis::DistanceUnit::FeetBritish1936:
case Qgis::DistanceUnit::FeetBritishBenoit1895A:
case Qgis::DistanceUnit::FeetBritishBenoit1895B:
case Qgis::DistanceUnit::FeetBritishSears1922Truncated:
case Qgis::DistanceUnit::FeetBritishSears1922:
case Qgis::DistanceUnit::FeetClarkes:
case Qgis::DistanceUnit::FeetGoldCoast:
case Qgis::DistanceUnit::FeetIndian:
case Qgis::DistanceUnit::FeetIndian1937:
case Qgis::DistanceUnit::FeetIndian1962:
case Qgis::DistanceUnit::FeetIndian1975:
case Qgis::DistanceUnit::FeetUSSurvey:
case Qgis::DistanceUnit::LinksInternational:
case Qgis::DistanceUnit::LinksBritishBenoit1895A:
case Qgis::DistanceUnit::LinksBritishBenoit1895B:
case Qgis::DistanceUnit::LinksBritishSears1922Truncated:
case Qgis::DistanceUnit::LinksBritishSears1922:
case Qgis::DistanceUnit::LinksClarkes:
case Qgis::DistanceUnit::LinksUSSurvey:
case Qgis::DistanceUnit::YardsBritishBenoit1895A:
case Qgis::DistanceUnit::YardsBritishBenoit1895B:
case Qgis::DistanceUnit::YardsBritishSears1922Truncated:
case Qgis::DistanceUnit::YardsBritishSears1922:
case Qgis::DistanceUnit::YardsClarkes:
case Qgis::DistanceUnit::YardsIndian:
case Qgis::DistanceUnit::YardsIndian1937:
case Qgis::DistanceUnit::YardsIndian1962:
case Qgis::DistanceUnit::YardsIndian1975:
case Qgis::DistanceUnit::MilesUSSurvey:
case Qgis::DistanceUnit::Fathom:
case Qgis::DistanceUnit::MetersGermanLegal:
// convert to inches
conversionFactor = QgsUnitTypes::fromUnitToUnitFactor( mMapUnits, Qgis::DistanceUnit::Inches );
break;

967
src/core/qgsunittypes.cpp
View File

File diff suppressed because it is too large Load Diff

39
src/gui/elevation/qgselevationprofilecanvas.cpp
View File

@ -113,6 +113,45 @@ class QgsElevationProfilePlotItem : public Qgs2DPlot, public QgsPlotCanvasItem
case Qgis::DistanceUnit::Centimeters:
case Qgis::DistanceUnit::Millimeters:
case Qgis::DistanceUnit::Inches:
case Qgis::DistanceUnit::ChainsInternational:
case Qgis::DistanceUnit::ChainsBritishBenoit1895A:
case Qgis::DistanceUnit::ChainsBritishBenoit1895B:
case Qgis::DistanceUnit::ChainsBritishSears1922Truncated:
case Qgis::DistanceUnit::ChainsBritishSears1922:
case Qgis::DistanceUnit::ChainsClarkes:
case Qgis::DistanceUnit::ChainsUSSurvey:
case Qgis::DistanceUnit::FeetBritish1865:
case Qgis::DistanceUnit::FeetBritish1936:
case Qgis::DistanceUnit::FeetBritishBenoit1895A:
case Qgis::DistanceUnit::FeetBritishBenoit1895B:
case Qgis::DistanceUnit::FeetBritishSears1922Truncated:
case Qgis::DistanceUnit::FeetBritishSears1922:
case Qgis::DistanceUnit::FeetClarkes:
case Qgis::DistanceUnit::FeetGoldCoast:
case Qgis::DistanceUnit::FeetIndian:
case Qgis::DistanceUnit::FeetIndian1937:
case Qgis::DistanceUnit::FeetIndian1962:
case Qgis::DistanceUnit::FeetIndian1975:
case Qgis::DistanceUnit::FeetUSSurvey:
case Qgis::DistanceUnit::LinksInternational:
case Qgis::DistanceUnit::LinksBritishBenoit1895A:
case Qgis::DistanceUnit::LinksBritishBenoit1895B:
case Qgis::DistanceUnit::LinksBritishSears1922Truncated:
case Qgis::DistanceUnit::LinksBritishSears1922:
case Qgis::DistanceUnit::LinksClarkes:
case Qgis::DistanceUnit::LinksUSSurvey:
case Qgis::DistanceUnit::YardsBritishBenoit1895A:
case Qgis::DistanceUnit::YardsBritishBenoit1895B:
case Qgis::DistanceUnit::YardsBritishSears1922Truncated:
case Qgis::DistanceUnit::YardsBritishSears1922:
case Qgis::DistanceUnit::YardsClarkes:
case Qgis::DistanceUnit::YardsIndian:
case Qgis::DistanceUnit::YardsIndian1937:
case Qgis::DistanceUnit::YardsIndian1962:
case Qgis::DistanceUnit::YardsIndian1975:
case Qgis::DistanceUnit::MilesUSSurvey:
case Qgis::DistanceUnit::Fathom:
case Qgis::DistanceUnit::MetersGermanLegal:
return QStringLiteral( " %1" ).arg( QgsUnitTypes::toAbbreviatedString( mDistanceUnit ) );
case Qgis::DistanceUnit::Degrees:

39
src/gui/layout/qgslayoutmapgridwidget.cpp
View File

@ -1100,6 +1100,45 @@ void QgsLayoutMapGridWidget::onCrsChanged()
case Qgis::DistanceUnit::Centimeters:
case Qgis::DistanceUnit::Millimeters:
case Qgis::DistanceUnit::Inches:
case Qgis::DistanceUnit::ChainsInternational:
case Qgis::DistanceUnit::ChainsBritishBenoit1895A:
case Qgis::DistanceUnit::ChainsBritishBenoit1895B:
case Qgis::DistanceUnit::ChainsBritishSears1922Truncated:
case Qgis::DistanceUnit::ChainsBritishSears1922:
case Qgis::DistanceUnit::ChainsClarkes:
case Qgis::DistanceUnit::ChainsUSSurvey:
case Qgis::DistanceUnit::FeetBritish1865:
case Qgis::DistanceUnit::FeetBritish1936:
case Qgis::DistanceUnit::FeetBritishBenoit1895A:
case Qgis::DistanceUnit::FeetBritishBenoit1895B:
case Qgis::DistanceUnit::FeetBritishSears1922Truncated:
case Qgis::DistanceUnit::FeetBritishSears1922:
case Qgis::DistanceUnit::FeetClarkes:
case Qgis::DistanceUnit::FeetGoldCoast:
case Qgis::DistanceUnit::FeetIndian:
case Qgis::DistanceUnit::FeetIndian1937:
case Qgis::DistanceUnit::FeetIndian1962:
case Qgis::DistanceUnit::FeetIndian1975:
case Qgis::DistanceUnit::FeetUSSurvey:
case Qgis::DistanceUnit::LinksInternational:
case Qgis::DistanceUnit::LinksBritishBenoit1895A:
case Qgis::DistanceUnit::LinksBritishBenoit1895B:
case Qgis::DistanceUnit::LinksBritishSears1922Truncated:
case Qgis::DistanceUnit::LinksBritishSears1922:
case Qgis::DistanceUnit::LinksClarkes:
case Qgis::DistanceUnit::LinksUSSurvey:
case Qgis::DistanceUnit::YardsBritishBenoit1895A:
case Qgis::DistanceUnit::YardsBritishBenoit1895B:
case Qgis::DistanceUnit::YardsBritishSears1922Truncated:
case Qgis::DistanceUnit::YardsBritishSears1922:
case Qgis::DistanceUnit::YardsClarkes:
case Qgis::DistanceUnit::YardsIndian:
case Qgis::DistanceUnit::YardsIndian1937:
case Qgis::DistanceUnit::YardsIndian1962:
case Qgis::DistanceUnit::YardsIndian1975:
case Qgis::DistanceUnit::MilesUSSurvey:
case Qgis::DistanceUnit::Fathom:
case Qgis::DistanceUnit::MetersGermanLegal:
break;
case Qgis::DistanceUnit::Degrees:

39
src/gui/qgsextentwidget.cpp
View File

@ -239,6 +239,45 @@ void QgsExtentWidget::setOutputExtent( const QgsRectangle &r, const QgsCoordinat
case Qgis::DistanceUnit::Centimeters:
case Qgis::DistanceUnit::Millimeters:
case Qgis::DistanceUnit::Inches:
case Qgis::DistanceUnit::ChainsInternational:
case Qgis::DistanceUnit::ChainsBritishBenoit1895A:
case Qgis::DistanceUnit::ChainsBritishBenoit1895B:
case Qgis::DistanceUnit::ChainsBritishSears1922Truncated:
case Qgis::DistanceUnit::ChainsBritishSears1922:
case Qgis::DistanceUnit::ChainsClarkes:
case Qgis::DistanceUnit::ChainsUSSurvey:
case Qgis::DistanceUnit::FeetBritish1865:
case Qgis::DistanceUnit::FeetBritish1936:
case Qgis::DistanceUnit::FeetBritishBenoit1895A:
case Qgis::DistanceUnit::FeetBritishBenoit1895B:
case Qgis::DistanceUnit::FeetBritishSears1922Truncated:
case Qgis::DistanceUnit::FeetBritishSears1922:
case Qgis::DistanceUnit::FeetClarkes:
case Qgis::DistanceUnit::FeetGoldCoast:
case Qgis::DistanceUnit::FeetIndian:
case Qgis::DistanceUnit::FeetIndian1937:
case Qgis::DistanceUnit::FeetIndian1962:
case Qgis::DistanceUnit::FeetIndian1975:
case Qgis::DistanceUnit::FeetUSSurvey:
case Qgis::DistanceUnit::LinksInternational:
case Qgis::DistanceUnit::LinksBritishBenoit1895A:
case Qgis::DistanceUnit::LinksBritishBenoit1895B:
case Qgis::DistanceUnit::LinksBritishSears1922Truncated:
case Qgis::DistanceUnit::LinksBritishSears1922:
case Qgis::DistanceUnit::LinksClarkes:
case Qgis::DistanceUnit::LinksUSSurvey:
case Qgis::DistanceUnit::YardsBritishBenoit1895A:
case Qgis::DistanceUnit::YardsBritishBenoit1895B:
case Qgis::DistanceUnit::YardsBritishSears1922Truncated:
case Qgis::DistanceUnit::YardsBritishSears1922:
case Qgis::DistanceUnit::YardsClarkes:
case Qgis::DistanceUnit::YardsIndian:
case Qgis::DistanceUnit::YardsIndian1937:
case Qgis::DistanceUnit::YardsIndian1962:
case Qgis::DistanceUnit::YardsIndian1975:
case Qgis::DistanceUnit::MilesUSSurvey:
case Qgis::DistanceUnit::Fathom:
case Qgis::DistanceUnit::MetersGermanLegal:
decimals = 4;
break;
}

39
src/providers/hana/qgshanautils.cpp
View File

@ -190,6 +190,45 @@ QString QgsHanaUtils::toString( Qgis::DistanceUnit unit )
return QStringLiteral( "nautical mile" );
case Qgis::DistanceUnit::Inches:
return QStringLiteral( "inch" );
case Qgis::DistanceUnit::ChainsInternational:
case Qgis::DistanceUnit::ChainsBritishBenoit1895A:
case Qgis::DistanceUnit::ChainsBritishBenoit1895B:
case Qgis::DistanceUnit::ChainsBritishSears1922Truncated:
case Qgis::DistanceUnit::ChainsBritishSears1922:
case Qgis::DistanceUnit::ChainsClarkes:
case Qgis::DistanceUnit::ChainsUSSurvey:
case Qgis::DistanceUnit::FeetBritish1865:
case Qgis::DistanceUnit::FeetBritish1936:
case Qgis::DistanceUnit::FeetBritishBenoit1895A:
case Qgis::DistanceUnit::FeetBritishBenoit1895B:
case Qgis::DistanceUnit::FeetBritishSears1922Truncated:
case Qgis::DistanceUnit::FeetBritishSears1922:
case Qgis::DistanceUnit::FeetClarkes:
case Qgis::DistanceUnit::FeetGoldCoast:
case Qgis::DistanceUnit::FeetIndian:
case Qgis::DistanceUnit::FeetIndian1937:
case Qgis::DistanceUnit::FeetIndian1962:
case Qgis::DistanceUnit::FeetIndian1975:
case Qgis::DistanceUnit::FeetUSSurvey:
case Qgis::DistanceUnit::LinksInternational:
case Qgis::DistanceUnit::LinksBritishBenoit1895A:
case Qgis::DistanceUnit::LinksBritishBenoit1895B:
case Qgis::DistanceUnit::LinksBritishSears1922Truncated:
case Qgis::DistanceUnit::LinksBritishSears1922:
case Qgis::DistanceUnit::LinksClarkes:
case Qgis::DistanceUnit::LinksUSSurvey:
case Qgis::DistanceUnit::YardsBritishBenoit1895A:
case Qgis::DistanceUnit::YardsBritishBenoit1895B:
case Qgis::DistanceUnit::YardsBritishSears1922Truncated:
case Qgis::DistanceUnit::YardsBritishSears1922:
case Qgis::DistanceUnit::YardsClarkes:
case Qgis::DistanceUnit::YardsIndian:
case Qgis::DistanceUnit::YardsIndian1937:
case Qgis::DistanceUnit::YardsIndian1962:
case Qgis::DistanceUnit::YardsIndian1975:
case Qgis::DistanceUnit::MilesUSSurvey:
case Qgis::DistanceUnit::Fathom:
case Qgis::DistanceUnit::MetersGermanLegal:
case Qgis::DistanceUnit::Unknown:
return QStringLiteral( "<unknown>" );
}

328
tests/src/python/test_qgsunittypes.py
View File

@ -60,7 +60,46 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.DistanceUnit.DistanceMillimeters: QgsUnitTypes.DistanceUnitType.Standard,
QgsUnitTypes.DistanceUnit.DistanceUnknownUnit: QgsUnitTypes.DistanceUnitType.UnknownType,
QgsUnitTypes.DistanceUnit.DistanceNauticalMiles: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.Inches: QgsUnitTypes.DistanceUnitType.Standard
Qgis.DistanceUnit.Inches: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.ChainsInternational: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.ChainsBritishBenoit1895A: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.ChainsBritishBenoit1895B: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.ChainsBritishSears1922Truncated: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.ChainsBritishSears1922: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.ChainsClarkes: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.ChainsUSSurvey: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetBritish1865: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetBritish1936: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetBritishBenoit1895A: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetBritishBenoit1895B: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetBritishSears1922Truncated: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetBritishSears1922: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetClarkes: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetGoldCoast: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetIndian: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetIndian1937: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetIndian1962: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetIndian1975: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.FeetUSSurvey: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.LinksInternational: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.LinksBritishBenoit1895A: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.LinksBritishBenoit1895B: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.LinksBritishSears1922Truncated: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.LinksBritishSears1922: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.LinksClarkes: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.LinksUSSurvey: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.YardsBritishBenoit1895A: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.YardsBritishBenoit1895B: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.YardsBritishSears1922Truncated: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.YardsBritishSears1922: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.YardsClarkes: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.YardsIndian: QgsUnitTypes.DistanceUnitType.Standard,
Qgis.DistanceUnit.YardsIndian1937: QgsUnitTypes.DistanceUnitType.Standard,
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.MetersGermanLegal: QgsUnitTypes.DistanceUnitType.Standard,
}
for t in list(expected.keys()):
@ -78,7 +117,47 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.DistanceUnit.DistanceMillimeters,
QgsUnitTypes.DistanceUnit.DistanceUnknownUnit,
QgsUnitTypes.DistanceUnit.DistanceNauticalMiles,
Qgis.DistanceUnit.Inches]
Qgis.DistanceUnit.Inches,
Qgis.DistanceUnit.ChainsInternational,
Qgis.DistanceUnit.ChainsBritishBenoit1895A,
Qgis.DistanceUnit.ChainsBritishBenoit1895B,
Qgis.DistanceUnit.ChainsBritishSears1922Truncated,
Qgis.DistanceUnit.ChainsBritishSears1922,
Qgis.DistanceUnit.ChainsClarkes,
Qgis.DistanceUnit.ChainsUSSurvey,
Qgis.DistanceUnit.FeetBritish1865,
Qgis.DistanceUnit.FeetBritish1936,
Qgis.DistanceUnit.FeetBritishBenoit1895A,
Qgis.DistanceUnit.FeetBritishBenoit1895B,
Qgis.DistanceUnit.FeetBritishSears1922Truncated,
Qgis.DistanceUnit.FeetBritishSears1922,
Qgis.DistanceUnit.FeetClarkes,
Qgis.DistanceUnit.FeetGoldCoast,
Qgis.DistanceUnit.FeetIndian,
Qgis.DistanceUnit.FeetIndian1937,
Qgis.DistanceUnit.FeetIndian1962,
Qgis.DistanceUnit.FeetIndian1975,
Qgis.DistanceUnit.FeetUSSurvey,
Qgis.DistanceUnit.LinksInternational,
Qgis.DistanceUnit.LinksBritishBenoit1895A,
Qgis.DistanceUnit.LinksBritishBenoit1895B,
Qgis.DistanceUnit.LinksBritishSears1922Truncated,
Qgis.DistanceUnit.LinksBritishSears1922,
Qgis.DistanceUnit.LinksClarkes,
Qgis.DistanceUnit.LinksUSSurvey,
Qgis.DistanceUnit.YardsBritishBenoit1895A,
Qgis.DistanceUnit.YardsBritishBenoit1895B,
Qgis.DistanceUnit.YardsBritishSears1922Truncated,
Qgis.DistanceUnit.YardsBritishSears1922,
Qgis.DistanceUnit.YardsClarkes,
Qgis.DistanceUnit.YardsIndian,
Qgis.DistanceUnit.YardsIndian1937,
Qgis.DistanceUnit.YardsIndian1962,
Qgis.DistanceUnit.YardsIndian1975,
Qgis.DistanceUnit.MilesUSSurvey,
Qgis.DistanceUnit.Fathom,
Qgis.DistanceUnit.MetersGermanLegal,
]
for u in units:
res, ok = QgsUnitTypes.decodeDistanceUnit(QgsUnitTypes.encodeUnit(u))
@ -107,11 +186,51 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.DistanceUnit.DistanceMillimeters,
QgsUnitTypes.DistanceUnit.DistanceUnknownUnit,
QgsUnitTypes.DistanceUnit.DistanceNauticalMiles,
Qgis.DistanceUnit.Inches]
Qgis.DistanceUnit.Inches,
Qgis.DistanceUnit.ChainsInternational,
Qgis.DistanceUnit.ChainsBritishBenoit1895A,
Qgis.DistanceUnit.ChainsBritishBenoit1895B,
Qgis.DistanceUnit.ChainsBritishSears1922Truncated,
Qgis.DistanceUnit.ChainsBritishSears1922,
Qgis.DistanceUnit.ChainsClarkes,
Qgis.DistanceUnit.ChainsUSSurvey,
Qgis.DistanceUnit.FeetBritish1865,
Qgis.DistanceUnit.FeetBritish1936,
Qgis.DistanceUnit.FeetBritishBenoit1895A,
Qgis.DistanceUnit.FeetBritishBenoit1895B,
Qgis.DistanceUnit.FeetBritishSears1922Truncated,
Qgis.DistanceUnit.FeetBritishSears1922,
Qgis.DistanceUnit.FeetClarkes,
Qgis.DistanceUnit.FeetGoldCoast,
Qgis.DistanceUnit.FeetIndian,
Qgis.DistanceUnit.FeetIndian1937,
Qgis.DistanceUnit.FeetIndian1962,
Qgis.DistanceUnit.FeetIndian1975,
Qgis.DistanceUnit.FeetUSSurvey,
Qgis.DistanceUnit.LinksInternational,
Qgis.DistanceUnit.LinksBritishBenoit1895A,
Qgis.DistanceUnit.LinksBritishBenoit1895B,
Qgis.DistanceUnit.LinksBritishSears1922Truncated,
Qgis.DistanceUnit.LinksBritishSears1922,
Qgis.DistanceUnit.LinksClarkes,
Qgis.DistanceUnit.LinksUSSurvey,
Qgis.DistanceUnit.YardsBritishBenoit1895A,
Qgis.DistanceUnit.YardsBritishBenoit1895B,
Qgis.DistanceUnit.YardsBritishSears1922Truncated,
Qgis.DistanceUnit.YardsBritishSears1922,
Qgis.DistanceUnit.YardsClarkes,
Qgis.DistanceUnit.YardsIndian,
Qgis.DistanceUnit.YardsIndian1937,
Qgis.DistanceUnit.YardsIndian1962,
Qgis.DistanceUnit.YardsIndian1975,
Qgis.DistanceUnit.MilesUSSurvey,
Qgis.DistanceUnit.Fathom,
Qgis.DistanceUnit.MetersGermanLegal,
]
for u in units:
res, ok = QgsUnitTypes.stringToDistanceUnit(QgsUnitTypes.toString(u))
assert ok
self.assertTrue(ok, f'QgsUnitTypes.stringToDistanceUnit failed for {u.name}')
self.assertEqual(res, u)
# Test converting bad strings
@ -408,7 +527,46 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.DistanceUnit.DistanceNauticalMiles: 0.000539957,
QgsUnitTypes.DistanceUnit.DistanceMillimeters: 1000.0,
QgsUnitTypes.DistanceUnit.DistanceCentimeters: 100.0,
Qgis.DistanceUnit.Inches: 39.37007874015748
Qgis.DistanceUnit.Inches: 39.37007874015748,
Qgis.DistanceUnit.ChainsInternational: 1 / 20.1168,
Qgis.DistanceUnit.ChainsBritishBenoit1895A: 1 / 20.1167824,
Qgis.DistanceUnit.ChainsBritishBenoit1895B: 1 / 20.116782494376,
Qgis.DistanceUnit.ChainsBritishSears1922Truncated: 1 / 20.116756,
Qgis.DistanceUnit.ChainsBritishSears1922: 1 / 20.11676512155,
Qgis.DistanceUnit.ChainsClarkes: 1 / 20.1166195164,
Qgis.DistanceUnit.ChainsUSSurvey: 1 / 20.11684023368,
Qgis.DistanceUnit.FeetBritish1865: 1 / 0.30480083333333,
Qgis.DistanceUnit.FeetBritish1936: 1 / 0.3048007491,
Qgis.DistanceUnit.FeetBritishBenoit1895A: 1 / 0.30479973333333,
Qgis.DistanceUnit.FeetBritishBenoit1895B: 1 / 0.30479973476327,
Qgis.DistanceUnit.FeetBritishSears1922Truncated: 1 / 0.30479933333333,
Qgis.DistanceUnit.FeetBritishSears1922: 1 / 0.30479947153868,
Qgis.DistanceUnit.FeetClarkes: 1 / 0.3047972654,
Qgis.DistanceUnit.FeetGoldCoast: 1 / 0.30479971018151,
Qgis.DistanceUnit.FeetIndian: 1 / 0.30479951024815,
Qgis.DistanceUnit.FeetIndian1937: 1 / 0.30479841,
Qgis.DistanceUnit.FeetIndian1962: 1 / 0.3047996,
Qgis.DistanceUnit.FeetIndian1975: 1 / 0.3047995,
Qgis.DistanceUnit.FeetUSSurvey: 1 / 0.30480060960122,
Qgis.DistanceUnit.LinksInternational: 1 / 0.201168,
Qgis.DistanceUnit.LinksBritishBenoit1895A: 1 / 0.201167824,
Qgis.DistanceUnit.LinksBritishBenoit1895B: 1 / 0.20116782494376,
Qgis.DistanceUnit.LinksBritishSears1922Truncated: 1 / 0.20116756,
Qgis.DistanceUnit.LinksBritishSears1922: 1 / 0.20116765121553,
Qgis.DistanceUnit.LinksClarkes: 1 / 0.20116619516,
Qgis.DistanceUnit.LinksUSSurvey: 1 / 0.2011684023368,
Qgis.DistanceUnit.YardsBritishBenoit1895A: 1 / 0.9143992,
Qgis.DistanceUnit.YardsBritishBenoit1895B: 1 / 0.9143992042898,
Qgis.DistanceUnit.YardsBritishSears1922Truncated: 1 / 0.914398,
Qgis.DistanceUnit.YardsBritishSears1922: 1 / 0.91439841461603,
Qgis.DistanceUnit.YardsClarkes: 1 / 0.9143917962,
Qgis.DistanceUnit.YardsIndian: 1 / 0.91439853074444,
Qgis.DistanceUnit.YardsIndian1937: 1 / 0.91439523,
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.MetersGermanLegal: 1 / 1.0000135965,
},
QgsUnitTypes.DistanceUnit.DistanceKilometers: {
QgsUnitTypes.DistanceUnit.DistanceMeters: 1000.0,
@ -518,6 +676,84 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.DistanceUnit.DistanceCentimeters: 2.54,
Qgis.DistanceUnit.Inches: 1.0
},
Qgis.DistanceUnit.ChainsInternational: {
Qgis.DistanceUnit.Meters: 20.1168},
Qgis.DistanceUnit.ChainsBritishBenoit1895A: {
Qgis.DistanceUnit.Meters: 20.1167824},
Qgis.DistanceUnit.ChainsBritishBenoit1895B: {
Qgis.DistanceUnit.Meters: 20.116782494376},
Qgis.DistanceUnit.ChainsBritishSears1922Truncated: {
Qgis.DistanceUnit.Meters: 20.116756},
Qgis.DistanceUnit.ChainsBritishSears1922: {
Qgis.DistanceUnit.Meters: 20.11676512155},
Qgis.DistanceUnit.ChainsClarkes: {
Qgis.DistanceUnit.Meters: 20.1166195164},
Qgis.DistanceUnit.ChainsUSSurvey: {
Qgis.DistanceUnit.Meters: 20.11684023368},
Qgis.DistanceUnit.FeetBritish1865: {
Qgis.DistanceUnit.Meters: 0.30480083333333},
Qgis.DistanceUnit.FeetBritish1936: {
Qgis.DistanceUnit.Meters: 0.3048007491},
Qgis.DistanceUnit.FeetBritishBenoit1895A: {
Qgis.DistanceUnit.Meters: 0.30479973333333},
Qgis.DistanceUnit.FeetBritishBenoit1895B: {
Qgis.DistanceUnit.Meters: 0.30479973476327},
Qgis.DistanceUnit.FeetBritishSears1922Truncated: {
Qgis.DistanceUnit.Meters: 0.30479933333333},
Qgis.DistanceUnit.FeetBritishSears1922: {
Qgis.DistanceUnit.Meters: 0.30479947153868},
Qgis.DistanceUnit.FeetClarkes: {
Qgis.DistanceUnit.Meters: 0.3047972654},
Qgis.DistanceUnit.FeetGoldCoast: {
Qgis.DistanceUnit.Meters: 0.30479971018151},
Qgis.DistanceUnit.FeetIndian: {
Qgis.DistanceUnit.Meters: 0.30479951024815},
Qgis.DistanceUnit.FeetIndian1937: {
Qgis.DistanceUnit.Meters: 0.30479841},
Qgis.DistanceUnit.FeetIndian1962: {
Qgis.DistanceUnit.Meters: 0.3047996},
Qgis.DistanceUnit.FeetIndian1975: {
Qgis.DistanceUnit.Meters: 0.3047995},
Qgis.DistanceUnit.FeetUSSurvey: {
Qgis.DistanceUnit.Meters: 0.30480060960122},
Qgis.DistanceUnit.LinksInternational: {
Qgis.DistanceUnit.Meters: 0.201168},
Qgis.DistanceUnit.LinksBritishBenoit1895A: {
Qgis.DistanceUnit.Meters: 0.201167824},
Qgis.DistanceUnit.LinksBritishBenoit1895B: {
Qgis.DistanceUnit.Meters: 0.20116782494376},
Qgis.DistanceUnit.LinksBritishSears1922Truncated: {
Qgis.DistanceUnit.Meters: 0.20116756},
Qgis.DistanceUnit.LinksBritishSears1922: {
Qgis.DistanceUnit.Meters: 0.20116765121553},
Qgis.DistanceUnit.LinksClarkes: {
Qgis.DistanceUnit.Meters: 0.20116619516},
Qgis.DistanceUnit.LinksUSSurvey: {
Qgis.DistanceUnit.Meters: 0.2011684023368},
Qgis.DistanceUnit.YardsBritishBenoit1895A: {
Qgis.DistanceUnit.Meters: 0.9143992},
Qgis.DistanceUnit.YardsBritishBenoit1895B: {
Qgis.DistanceUnit.Meters: 0.9143992042898},
Qgis.DistanceUnit.YardsBritishSears1922Truncated: {
Qgis.DistanceUnit.Meters: 0.914398},
Qgis.DistanceUnit.YardsBritishSears1922: {
Qgis.DistanceUnit.Meters: 0.91439841461603},
Qgis.DistanceUnit.YardsClarkes: {
Qgis.DistanceUnit.Meters: 0.9143917962},
Qgis.DistanceUnit.YardsIndian: {
Qgis.DistanceUnit.Meters: 0.91439853074444},
Qgis.DistanceUnit.YardsIndian1937: {
Qgis.DistanceUnit.Meters: 0.91439523},
Qgis.DistanceUnit.YardsIndian1962: {
Qgis.DistanceUnit.Meters: 0.9143988},
Qgis.DistanceUnit.YardsIndian1975: {
Qgis.DistanceUnit.Meters: 0.9143985},
Qgis.DistanceUnit.MilesUSSurvey: {
Qgis.DistanceUnit.Meters: 1609.3472186944},
Qgis.DistanceUnit.Fathom: {
Qgis.DistanceUnit.Meters: 1.8288},
Qgis.DistanceUnit.MetersGermanLegal: {
Qgis.DistanceUnit.Meters: 1.0000135965},
QgsUnitTypes.DistanceUnit.DistanceUnknownUnit: {
QgsUnitTypes.DistanceUnit.DistanceMeters: 1.0,
QgsUnitTypes.DistanceUnit.DistanceKilometers: 1.0,
@ -760,7 +996,46 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.DistanceUnit.DistanceMillimeters: QgsUnitTypes.AreaUnit.AreaSquareMillimeters,
QgsUnitTypes.DistanceUnit.DistanceUnknownUnit: QgsUnitTypes.AreaUnit.AreaUnknownUnit,
QgsUnitTypes.DistanceUnit.DistanceNauticalMiles: QgsUnitTypes.AreaUnit.AreaSquareNauticalMiles,
Qgis.DistanceUnit.Inches: Qgis.AreaUnit.SquareInches
Qgis.DistanceUnit.Inches: Qgis.AreaUnit.SquareInches,
Qgis.DistanceUnit.ChainsInternational: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.ChainsBritishBenoit1895A: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.ChainsBritishBenoit1895B: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.ChainsBritishSears1922Truncated: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.ChainsBritishSears1922: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.ChainsClarkes: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.ChainsUSSurvey: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetBritish1865: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetBritish1936: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetBritishBenoit1895A: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetBritishBenoit1895B: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetBritishSears1922Truncated: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetBritishSears1922: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetClarkes: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetGoldCoast: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetIndian: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetIndian1937: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetIndian1962: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetIndian1975: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.FeetUSSurvey: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.LinksInternational: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.LinksBritishBenoit1895A: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.LinksBritishBenoit1895B: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.LinksBritishSears1922Truncated: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.LinksBritishSears1922: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.LinksClarkes: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.LinksUSSurvey: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.YardsBritishBenoit1895A: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.YardsBritishBenoit1895B: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.YardsBritishSears1922Truncated: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.YardsBritishSears1922: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.YardsClarkes: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.YardsIndian: Qgis.AreaUnit.SquareFeet,
Qgis.DistanceUnit.YardsIndian1937: Qgis.AreaUnit.SquareFeet,
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.MetersGermanLegal: Qgis.AreaUnit.SquareMeters,
}
for t in list(expected.keys()):
@ -1115,7 +1390,46 @@ class TestQgsUnitTypes(unittest.TestCase):
QgsUnitTypes.DistanceUnit.DistanceMillimeters: QgsUnitTypes.VolumeUnit.VolumeCubicCentimeter,
QgsUnitTypes.DistanceUnit.DistanceUnknownUnit: QgsUnitTypes.VolumeUnit.VolumeUnknownUnit,
QgsUnitTypes.DistanceUnit.DistanceNauticalMiles: QgsUnitTypes.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.Inches: QgsUnitTypes.VolumeUnit.VolumeCubicInch
Qgis.DistanceUnit.Inches: QgsUnitTypes.VolumeUnit.VolumeCubicInch,
Qgis.DistanceUnit.ChainsInternational: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.ChainsBritishBenoit1895A: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.ChainsBritishBenoit1895B: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.ChainsBritishSears1922Truncated: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.ChainsBritishSears1922: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.ChainsClarkes: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.ChainsUSSurvey: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetBritish1865: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetBritish1936: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetBritishBenoit1895A: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetBritishBenoit1895B: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetBritishSears1922Truncated: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetBritishSears1922: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetClarkes: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetGoldCoast: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetIndian: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetIndian1937: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetIndian1962: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetIndian1975: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.FeetUSSurvey: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.LinksInternational: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.LinksBritishBenoit1895A: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.LinksBritishBenoit1895B: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.LinksBritishSears1922Truncated: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.LinksBritishSears1922: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.LinksClarkes: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.LinksUSSurvey: Qgis.VolumeUnit.VolumeCubicFeet,
Qgis.DistanceUnit.YardsBritishBenoit1895A: Qgis.VolumeUnit.VolumeCubicYards,
Qgis.DistanceUnit.YardsBritishBenoit1895B: Qgis.VolumeUnit.VolumeCubicYards,
Qgis.DistanceUnit.YardsBritishSears1922Truncated: Qgis.VolumeUnit.VolumeCubicYards,
Qgis.DistanceUnit.YardsBritishSears1922: Qgis.VolumeUnit.VolumeCubicYards,
Qgis.DistanceUnit.YardsClarkes: Qgis.VolumeUnit.VolumeCubicYards,
Qgis.DistanceUnit.YardsIndian: Qgis.VolumeUnit.VolumeCubicYards,
Qgis.DistanceUnit.YardsIndian1937: Qgis.VolumeUnit.VolumeCubicYards,
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.MetersGermanLegal: Qgis.VolumeUnit.VolumeCubicMeters,
}
for t in list(expected.keys()):