Add Area: Acre, Hectare (#179)

* Add Area: Acre and Hectare

Author: BMcFerrin

UnitsNet.Tests/CustomCode/AreaTests.cs

@@ -29,6 +29,11 @@ public class AreaTests : AreaTestsBase
         protected override double SquareKilometersInOneSquareMeter => 1E-6;
 
         protected override double SquareMetersInOneSquareMeter => 1;
+
+        protected override double AcresInOneSquareMeter => 2.471053816137*1E-4;
+
+        protected override double HectaresInOneSquareMeter => 1E-4;
+
         protected override double SquareCentimetersInOneSquareMeter => 1E4;
 
         protected override double SquareDecimetersInOneSquareMeter => 1E2;

UnitsNet.Tests/GeneratedCode/AreaTestsBase.g.cs

@@ -36,6 +36,8 @@ namespace UnitsNet.Tests
 // ReSharper disable once PartialTypeWithSinglePart
     public abstract partial class AreaTestsBase
     {
+        protected abstract double AcresInOneSquareMeter { get; }
+        protected abstract double HectaresInOneSquareMeter { get; }
         protected abstract double SquareCentimetersInOneSquareMeter { get; }
         protected abstract double SquareDecimetersInOneSquareMeter { get; }
         protected abstract double SquareFeetInOneSquareMeter { get; }
@@ -48,6 +50,8 @@ public abstract partial class AreaTestsBase
         protected abstract double SquareYardsInOneSquareMeter { get; }
 
 // ReSharper disable VirtualMemberNeverOverriden.Global
+        protected virtual double AcresTolerance { get { return 1e-5; } }
+        protected virtual double HectaresTolerance { get { return 1e-5; } }
         protected virtual double SquareCentimetersTolerance { get { return 1e-5; } }
         protected virtual double SquareDecimetersTolerance { get { return 1e-5; } }
         protected virtual double SquareFeetTolerance { get { return 1e-5; } }
@@ -64,6 +68,8 @@ public abstract partial class AreaTestsBase
         public void SquareMeterToAreaUnits()
         {
             Area squaremeter = Area.FromSquareMeters(1);
+            Assert.AreEqual(AcresInOneSquareMeter, squaremeter.Acres, AcresTolerance);
+            Assert.AreEqual(HectaresInOneSquareMeter, squaremeter.Hectares, HectaresTolerance);
             Assert.AreEqual(SquareCentimetersInOneSquareMeter, squaremeter.SquareCentimeters, SquareCentimetersTolerance);
             Assert.AreEqual(SquareDecimetersInOneSquareMeter, squaremeter.SquareDecimeters, SquareDecimetersTolerance);
             Assert.AreEqual(SquareFeetInOneSquareMeter, squaremeter.SquareFeet, SquareFeetTolerance);
@@ -79,6 +85,8 @@ public void SquareMeterToAreaUnits()
         [Test]
         public void FromValueAndUnit()
         {
+            Assert.AreEqual(1, Area.From(1, AreaUnit.Acre).Acres, AcresTolerance);
+            Assert.AreEqual(1, Area.From(1, AreaUnit.Hectare).Hectares, HectaresTolerance);
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareCentimeter).SquareCentimeters, SquareCentimetersTolerance);
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareDecimeter).SquareDecimeters, SquareDecimetersTolerance);
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareFoot).SquareFeet, SquareFeetTolerance);
@@ -95,6 +103,8 @@ public void FromValueAndUnit()
         public void As()
         {
             var squaremeter = Area.FromSquareMeters(1);
+            Assert.AreEqual(AcresInOneSquareMeter, squaremeter.As(AreaUnit.Acre), AcresTolerance);
+            Assert.AreEqual(HectaresInOneSquareMeter, squaremeter.As(AreaUnit.Hectare), HectaresTolerance);
             Assert.AreEqual(SquareCentimetersInOneSquareMeter, squaremeter.As(AreaUnit.SquareCentimeter), SquareCentimetersTolerance);
             Assert.AreEqual(SquareDecimetersInOneSquareMeter, squaremeter.As(AreaUnit.SquareDecimeter), SquareDecimetersTolerance);
             Assert.AreEqual(SquareFeetInOneSquareMeter, squaremeter.As(AreaUnit.SquareFoot), SquareFeetTolerance);
@@ -111,6 +121,8 @@ public void As()
         public void ConversionRoundTrip()
         {
             Area squaremeter = Area.FromSquareMeters(1);
+            Assert.AreEqual(1, Area.FromAcres(squaremeter.Acres).SquareMeters, AcresTolerance);
+            Assert.AreEqual(1, Area.FromHectares(squaremeter.Hectares).SquareMeters, HectaresTolerance);
             Assert.AreEqual(1, Area.FromSquareCentimeters(squaremeter.SquareCentimeters).SquareMeters, SquareCentimetersTolerance);
             Assert.AreEqual(1, Area.FromSquareDecimeters(squaremeter.SquareDecimeters).SquareMeters, SquareDecimetersTolerance);
             Assert.AreEqual(1, Area.FromSquareFeet(squaremeter.SquareFeet).SquareMeters, SquareFeetTolerance);

UnitsNet/GeneratedCode/Enums/AreaUnit.g.cs

@@ -25,6 +25,8 @@ namespace UnitsNet.Units
     public enum AreaUnit
     {
         Undefined = 0,
+        Acre,
+        Hectare,
         SquareCentimeter,
         SquareDecimeter,
         SquareFoot,

UnitsNet/GeneratedCode/UnitClasses/Area.g.cs

@@ -93,6 +93,22 @@ public static AreaUnit BaseUnit
             get { return AreaUnit.SquareMeter; }
         }
 
+        /// <summary>
+        ///     Get Area in Acres.
+        /// </summary>
+        public double Acres
+        {
+            get { return _squareMeters/4046.85642; }
+        }
+
+        /// <summary>
+        ///     Get Area in Hectares.
+        /// </summary>
+        public double Hectares
+        {
+            get { return _squareMeters/1e4; }
+        }
+
         /// <summary>
         ///     Get Area in SquareCentimeters.
         /// </summary>
@@ -182,6 +198,22 @@ public static Area Zero
             get { return new Area(); }
         }
 
+        /// <summary>
+        ///     Get Area from Acres.
+        /// </summary>
+        public static Area FromAcres(double acres)
+        {
+            return new Area(acres*4046.85642);
+        }
+
+        /// <summary>
+        ///     Get Area from Hectares.
+        /// </summary>
+        public static Area FromHectares(double hectares)
+        {
+            return new Area(hectares*1e4);
+        }
+
         /// <summary>
         ///     Get Area from SquareCentimeters.
         /// </summary>
@@ -263,6 +295,36 @@ public static Area FromSquareYards(double squareyards)
         }
 
 #if !WINDOWS_UWP
+        /// <summary>
+        ///     Get nullable Area from nullable Acres.
+        /// </summary>
+        public static Area? FromAcres(double? acres)
+        {
+            if (acres.HasValue)
+            {
+                return FromAcres(acres.Value);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        ///     Get nullable Area from nullable Hectares.
+        /// </summary>
+        public static Area? FromHectares(double? hectares)
+        {
+            if (hectares.HasValue)
+            {
+                return FromHectares(hectares.Value);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         /// <summary>
         ///     Get nullable Area from nullable SquareCentimeters.
         /// </summary>
@@ -425,6 +487,10 @@ public static Area From(double val, AreaUnit fromUnit)
         {
             switch (fromUnit)
             {
+                case AreaUnit.Acre:
+                    return FromAcres(val);
+                case AreaUnit.Hectare:
+                    return FromHectares(val);
                 case AreaUnit.SquareCentimeter:
                     return FromSquareCentimeters(val);
                 case AreaUnit.SquareDecimeter:
@@ -466,6 +532,10 @@ public static Area From(double val, AreaUnit fromUnit)
             }
             switch (fromUnit)
             {
+                case AreaUnit.Acre:
+                    return FromAcres(value.Value);
+                case AreaUnit.Hectare:
+                    return FromHectares(value.Value);
                 case AreaUnit.SquareCentimeter:
                     return FromSquareCentimeters(value.Value);
                 case AreaUnit.SquareDecimeter:
@@ -640,6 +710,10 @@ public double As(AreaUnit unit)
         {
             switch (unit)
             {
+                case AreaUnit.Acre:
+                    return Acres;
+                case AreaUnit.Hectare:
+                    return Hectares;
                 case AreaUnit.SquareCentimeter:
                     return SquareCentimeters;
                 case AreaUnit.SquareDecimeter:

UnitsNet/GeneratedCode/UnitClasses/Volume.g.cs

@@ -448,6 +448,14 @@ public static Volume FromDeciliters(double deciliters)
             return new Volume((deciliters/1e3) * 1e-1d);
         }
 
+        /// <summary>
+        ///     Get Volume from Drums.
+        /// </summary>
+        public static Volume FromDrums(double drums)
+        {
+            return new Volume(drums*0.20819765);
+        }
+
         /// <summary>
         ///     Get Volume from Hectoliters.
         /// </summary>
@@ -528,6 +536,14 @@ public static Volume FromTeaspoons(double teaspoons)
             return new Volume(teaspoons*4.92892159375e-6);
         }
 
+        /// <summary>
+        ///     Get Volume from Totes.
+        /// </summary>
+        public static Volume FromTotes(double totes)
+        {
+            return new Volume(totes*1.0409882);
+        }
+
         /// <summary>
         ///     Get Volume from UkTablespoons.
         /// </summary>
@@ -780,6 +796,21 @@ public static Volume FromUsTeaspoons(double usteaspoons)
             }
         }
 
+        /// <summary>
+        ///     Get nullable Volume from nullable Drums.
+        /// </summary>
+        public static Volume? FromDrums(double? drums)
+        {
+            if (drums.HasValue)
+            {
+                return FromDrums(drums.Value);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         /// <summary>
         ///     Get nullable Volume from nullable Hectoliters.
         /// </summary>
@@ -930,6 +961,21 @@ public static Volume FromUsTeaspoons(double usteaspoons)
             }
         }
 
+        /// <summary>
+        ///     Get nullable Volume from nullable Totes.
+        /// </summary>
+        public static Volume? FromTotes(double? totes)
+        {
+            if (totes.HasValue)
+            {
+                return FromTotes(totes.Value);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         /// <summary>
         ///     Get nullable Volume from nullable UkTablespoons.
         /// </summary>
@@ -1073,6 +1119,8 @@ public static Volume From(double val, VolumeUnit fromUnit)
                     return FromCubicYards(val);
                 case VolumeUnit.Deciliter:
                     return FromDeciliters(val);
+                case VolumeUnit.Drum:
+                    return FromDrums(val);
                 case VolumeUnit.Hectoliter:
                     return FromHectoliters(val);
                 case VolumeUnit.ImperialGallon:
@@ -1093,6 +1141,8 @@ public static Volume From(double val, VolumeUnit fromUnit)
                     return FromTablespoons(val);
                 case VolumeUnit.Teaspoon:
                     return FromTeaspoons(val);
+                case VolumeUnit.Tote:
+                    return FromTotes(val);
                 case VolumeUnit.UkTablespoon:
                     return FromUkTablespoons(val);
                 case VolumeUnit.UsCustomaryCup:
@@ -1154,6 +1204,8 @@ public static Volume From(double val, VolumeUnit fromUnit)
                     return FromCubicYards(value.Value);
                 case VolumeUnit.Deciliter:
                     return FromDeciliters(value.Value);
+                case VolumeUnit.Drum:
+                    return FromDrums(value.Value);
                 case VolumeUnit.Hectoliter:
                     return FromHectoliters(value.Value);
                 case VolumeUnit.ImperialGallon:
@@ -1174,6 +1226,8 @@ public static Volume From(double val, VolumeUnit fromUnit)
                     return FromTablespoons(value.Value);
                 case VolumeUnit.Teaspoon:
                     return FromTeaspoons(value.Value);
+                case VolumeUnit.Tote:
+                    return FromTotes(value.Value);
                 case VolumeUnit.UkTablespoon:
                     return FromUkTablespoons(value.Value);
                 case VolumeUnit.UsCustomaryCup:
@@ -1368,6 +1422,8 @@ public double As(VolumeUnit unit)
                     return CubicYards;
                 case VolumeUnit.Deciliter:
                     return Deciliters;
+                case VolumeUnit.Drum:
+                    return Drums;
                 case VolumeUnit.Hectoliter:
                     return Hectoliters;
                 case VolumeUnit.ImperialGallon:
@@ -1388,6 +1444,8 @@ public double As(VolumeUnit unit)
                     return Tablespoons;
                 case VolumeUnit.Teaspoon:
                     return Teaspoons;
+                case VolumeUnit.Tote:
+                    return Totes;
                 case VolumeUnit.UkTablespoon:
                     return UkTablespoons;
                 case VolumeUnit.UsCustomaryCup:

UnitsNet/GeneratedCode/UnitSystem.Default.g.cs

@@ -175,6 +175,16 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
                 new UnitLocalization(typeof (AreaUnit),
                     new[]
                     {
+                        new CulturesForEnumValue((int) AreaUnit.Acre,
+                            new[]
+                            {
+                                new AbbreviationsForCulture("en-US", "ac"),
+                            }),
+                        new CulturesForEnumValue((int) AreaUnit.Hectare,
+                            new[]
+                            {
+                                new AbbreviationsForCulture("en-US", "ha"),
+                            }),
                         new CulturesForEnumValue((int) AreaUnit.SquareCentimeter,
                             new[]
                             {

UnitsNet/Scripts/UnitDefinitions/Area.json

@@ -162,6 +162,30 @@
           "Abbreviations": [ "дюйм²" ]
         }
       ]
+    },
+	{
+      "SingularName": "Acre",
+      "PluralName": "Acres",
+      "FromUnitToBaseFunc": "x*4046.85642",
+      "FromBaseToUnitFunc": "x/4046.85642",
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "ac" ]
+        }
+      ]
+    },
+	{
+      "SingularName": "Hectare",
+      "PluralName": "Hectares",
+      "FromUnitToBaseFunc": "x*1e4",
+      "FromBaseToUnitFunc": "x/1e4",
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "ha" ]
+        }
+      ]
     }
   ]
 }